#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_intltool_update.dpatch by Steve Langasek <steve.langasek@ubuntu.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Regenerate pot, po files against the current source so that other
## DP: patches that touch translatable strings aren't filled with noise.

@DPATCH@
Index: aptitude/po/aptitude.pot
===================================================================
--- aptitude.orig/po/aptitude.pot
+++ aptitude/po/aptitude.pot
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
Index: aptitude/po/ar.po
===================================================================
--- aptitude.orig/po/ar.po
+++ aptitude/po/ar.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: aptitude_po\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2006-10-22 16:18+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -653,13 +653,11 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s غير مثبتة حالياً، لذا لن يتم تثبيتها مجدداً.\n"
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "%s مثبتة مسبقاً بالنسخة المطلوبة (%s)\n"
@@ -758,7 +756,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "سجل تغييرات %s"
 
@@ -915,7 +912,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "لاشيء"
 
@@ -1315,7 +1311,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "'&M' لتحديد الحزم بالتثبيت التلقائي"
 
@@ -1594,31 +1589,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "ترك التوصيات التالية غير محلولة:"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "التدقيق بالتو^صيات"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "إزالة %s لم تعد مطلوبة"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "التدقيق بالتو^صيات"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "أعمال"
 
@@ -1684,7 +1674,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:790
 #, fuzzy, c-format
-#| msgid "open: %d; closed: %d; defer: %d; conflict: %d"
 msgid "open: %zd; closed: %zd; defer: %zd; conflict: %zd"
 msgstr "مفتوح: %d; مغلق: %d; مؤجل: %d; متعارض: %d"
 
@@ -1803,13 +1792,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "إلا أنّها غير قابلة للتثبيت"
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "إلا أنه يجب تثبيت %s."
 
@@ -1908,13 +1895,11 @@
 
 #: src/cmdline/cmdline_show.cc:326
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s%s; will be installed"
 msgstr "%s; سيتم تثبيتها"
 
 #: src/cmdline/cmdline_show.cc:328
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s%s; will be installed automatically"
 msgstr "%s; سيتم تثبيتها آلياً"
 
@@ -2186,19 +2171,16 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "الحزم"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "الحزمة المصدرية: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "أرشيف"
 
@@ -2242,7 +2224,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "البحث: يجب أن تعطي كلمة بحث واحدة على الأقل\n"
 
@@ -2370,7 +2351,6 @@
 
 #: src/cmdline/cmdline_why.cc:1285
 #, fuzzy, c-format
-#| msgid "Packages depending on %s"
 msgid "Packages requiring %s:"
 msgstr "الحزم التي تعتمد على %s"
 
@@ -2404,7 +2384,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[خطأ]"
 
@@ -2746,7 +2725,6 @@
 
 #: src/generic/apt/download_update_manager.cc:138
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated quoted string in command: %s"
 msgstr "سلسلة أحرف غير منهاة بعد %s"
 
@@ -2825,7 +2803,6 @@
 
 #: src/generic/apt/dump_packages.cc:674
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create truncated cache: %s."
 msgstr "تعذر العثور على الحزمة %s"
 
@@ -2947,7 +2924,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "تنزيل الحزم"
 
@@ -3020,7 +2996,6 @@
 
 #: src/generic/apt/matching/parse.cc:1388
 #, fuzzy, c-format
-#| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "صيغة مشكلة بشكل سيء"
 
@@ -3058,19 +3033,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "عنوان URL لاستخدامه عند تنزيل سجلّات التغيير"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "عنوان URL لاستخدامه عند تنزيل سجلّات التغيير"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "سجل تغييرات %s"
 
@@ -3115,7 +3087,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "تعذر إعراب الصيغة %s"
 
@@ -3130,14 +3101,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "غير مثبتة"
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "غير مثبتة"
 
@@ -3174,13 +3143,11 @@
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "توقع رقم بعد -q=، لكن وجد %s\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "حرف عمل سيء '%c'\n"
 
@@ -3196,7 +3163,6 @@
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "توقع مُعرف السياسة، عثر على '%c'"
 
@@ -3207,13 +3173,11 @@
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "توقع مُعرف السياسة، عثر على '%c'"
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "عملية غير صالحة %s"
 
@@ -3232,19 +3196,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "')' غير متوقع"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " أو"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "')' غير متوقع"
 
@@ -3255,7 +3216,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "تعذر إنشاء دليل مؤقت من القالب \"%s\": %s"
 
@@ -3352,13 +3312,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "حزمة"
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "عروض"
 
@@ -3378,7 +3336,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "مساعدة"
 
@@ -3389,7 +3346,6 @@
 
 #: src/gtk/aptitude.glade:345 src/gtk/aptitude.glade:2614
 #, fuzzy
-#| msgid "List Update"
 msgid "Update"
 msgstr "تحديث القائمة"
 
@@ -3411,7 +3367,6 @@
 
 #: src/gtk/aptitude.glade:389 src/gtk/aptitude.glade:2658
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Remove"
 msgstr "مُثبّتة"
 
@@ -3425,33 +3380,28 @@
 
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "إزالة التصفية من لائحة الحزم"
 
 #: src/gtk/aptitude.glade:649
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "Apply these settings to all active package lists."
 msgstr "تصفية لائحة الحزم"
 
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "بحث"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "إعادة تثبيت"
 
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "خطأ "
 
@@ -3466,13 +3416,11 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "معتمدات %s"
 
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "^Changelog"
 msgid "Changelog"
 msgstr "^سجل التغيير"
 
@@ -3491,7 +3439,6 @@
 
 #: src/gtk/aptitude.glade:1051
 #, fuzzy
-#| msgid "Tags"
 msgid "tags"
 msgstr "علامات"
 
@@ -3514,13 +3461,11 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "الوضع"
 
 #: src/gtk/aptitude.glade:1247
 #, fuzzy
-#| msgid "Unknown action type: %s"
 msgid "Group by action type"
 msgstr "نوع عمل مجهول: %s"
 
@@ -3549,7 +3494,6 @@
 
 #: src/gtk/aptitude.glade:1328
 #, fuzzy
-#| msgid "Toggle ^Rejected"
 msgid "Rejected"
 msgstr "عكس المرفو^ضة"
 
@@ -3568,32 +3512,27 @@
 
 #: src/gtk/aptitude.glade:1400
 #, fuzzy
-#| msgid "^Examine Solution"
 msgid "Find a new solution"
 msgstr "^فحص الحلّ"
 
 #: src/gtk/aptitude.glade:1404
 #, fuzzy
-#| msgid "Select the next solution to the dependency problems."
 msgid "Calculate the next solution that has not yet been generated."
 msgstr "اختيار الحل التالي لمشاكل المعتمدات."
 
 #: src/gtk/aptitude.glade:1419
 #, fuzzy
-#| msgid "Perform the actions contained in the currently selected solution."
 msgid ""
 "Perform the actions in the currently selected solution and close this tab."
 msgstr "تنفيذ الأعمال المشمولة في الحل المحدد الحالي."
 
 #: src/gtk/aptitude.glade:1576
 #, fuzzy
-#| msgid "Upgrade"
 msgid "Upgrade Summary"
 msgstr "ترقية"
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "الحزمة المصدرية: "
 
@@ -3605,7 +3544,6 @@
 
 #: src/gtk/aptitude.glade:1652
 #, fuzzy
-#| msgid "Manual"
 msgid "Fix Manually"
 msgstr "تحديد يدوي"
 
@@ -3653,31 +3591,26 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "معطوب"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "تعذر التصحيح من أجل الحزم الغير متوفرة"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "^بحث"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for: "
 msgid "Search for packages."
 msgstr "البحث عن: "
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "حُصل على "
 
@@ -3712,19 +3645,16 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "عنوان URL لاستخدامه عند تنزيل سجلّات التغيير"
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "تثبيت %s النسخة %s (%s) مطلوبة"
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -3732,20 +3662,17 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr "يمكنك عرض سجلات تغيير حزم دبيان الرسميّة فقط."
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "تنزيل سجل التغيير"
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "عنوان URL لاستخدامه عند تنزيل سجلّات التغيير"
 
@@ -3759,7 +3686,6 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "عنوان URL لاستخدامه عند تنزيل سجلّات التغيير"
 
@@ -3769,8 +3695,6 @@
 
 #: src/gtk/dashboardtab.cc:414
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] "%d ترقية"
@@ -3780,13 +3704,11 @@
 
 #: src/gtk/dashboardtab.cc:633
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No upgrades are available."
 msgstr "غير مثبتة"
 
 #: src/gtk/dashboardtab.cc:645
 #, fuzzy
-#| msgid "Unable to locate package %s"
 msgid "Unable to calculate an upgrade."
 msgstr "تعذر العثور على الحزمة %s"
 
@@ -3825,7 +3747,6 @@
 
 #: src/gtk/dashboardtab.cc:708
 #, fuzzy, c-format
-#| msgid "Internal error: Default column string is unparsable"
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr "خطأ داخلي: نص العمود الافتراضي غير قابل للقراءة"
 
@@ -3864,7 +3785,6 @@
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "حذف الملفات المنزلة"
 
@@ -3875,13 +3795,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "التقدّم الكلي: "
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description"
 msgid "Short Description"
 msgstr "الوصف"
 
@@ -3891,13 +3809,11 @@
 
 #: src/gtk/download.cc:319
 #, fuzzy
-#| msgid "Cleaning while a download is in progress is not allowed"
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr "التنظيف أثناء القيام بالتنزيل غير مسموح به"
 
 #: src/gtk/download.cc:395 src/gtk/gui.cc:832
 #, fuzzy
-#| msgid "View next display"
 msgid "View Details"
 msgstr "عرض الشاشة التالية"
 
@@ -3917,19 +3833,16 @@
 
 #: src/gtk/download.cc:486
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s: %lu/%lu, stalled"
 msgstr "%s; سيتم تثبيتها"
 
 #: src/gtk/download.cc:507
 #, fuzzy, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr " [ %i%% ] (%s بايت/ثانية، %s متبقية)"
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "إلا أنه يجب تثبيت %s."
 
@@ -3943,7 +3856,6 @@
 
 #: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "تعذر العثور على الحزمة %s"
 
@@ -3954,7 +3866,6 @@
 
 #: src/gtk/dpkg_terminal.cc:429
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "%s: Unable to accept a connection: %s"
 msgstr "تعذر إنشاء دليل مؤقت من القالب \"%s\": %s"
 
@@ -3980,7 +3891,6 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "نسخ %s"
 
@@ -3996,50 +3906,42 @@
 
 #: src/gtk/entitysummary.cc:142
 #, fuzzy, c-format
-#| msgid "Keep the following packages at their current version:"
 msgid "Don't hold %s at its current version."
 msgstr "إبقاء الحزم التالية بنسختها الحالية:"
 
 #: src/gtk/entitysummary.cc:145 src/gtk/entitysummary.cc:165
 #: src/gtk/entitysummary.cc:168
 #, fuzzy, c-format
-#| msgid "Canc^el pending actions"
 msgid "Cancel any actions on %s."
 msgstr "إل^غاء الأعمال المؤجلة"
 
 #: src/gtk/entitysummary.cc:150
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the purge of %s."
 msgstr "إلغاء إزالة %F"
 
 #: src/gtk/entitysummary.cc:152
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s."
 msgstr "إلغاء إزالة %F"
 
 #: src/gtk/entitysummary.cc:157
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the upgrade of %s."
 msgstr "إلغاء إزالة %F"
 
 #: src/gtk/entitysummary.cc:159
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s."
 msgstr "إلغاء تثبيت %F"
 
 #: src/gtk/entitysummary.cc:161
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the downgrade of %s."
 msgstr "إلغاء إزالة %F"
 
 #: src/gtk/entitysummary.cc:163
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the reinstallation of %s."
 msgstr "إلغاء تثبيت %F"
 
@@ -4050,7 +3952,6 @@
 
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "^إلغاء"
 
@@ -4061,7 +3962,6 @@
 
 #: src/gtk/entitysummary.cc:223
 #, fuzzy, c-format
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Mark %s as automatically installed."
 msgstr "'&M' لتحديد الحزم بالتثبيت التلقائي"
 
@@ -4072,7 +3972,6 @@
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
 msgid "%s is a virtual package provided by:\n"
 msgstr "\"%s\" هي حزمة وهميّة توفّرها:\n"
 
@@ -4082,13 +3981,11 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "الحزمة المصدرية: "
 
 #: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 #, fuzzy
-#| msgid "ProgName"
 msgid "Name"
 msgstr "اسم البرنامج"
 
@@ -4098,13 +3995,11 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "تعذر فتح الملف \"%s\""
 
 #: src/gtk/entityview.cc:412
 #, fuzzy, c-format
-#| msgid "Rejecting the removal of %s"
 msgid "Editing the columns of \"%s\""
 msgstr "رفض إزالة %s"
 
@@ -4118,25 +4013,21 @@
 
 #: src/gtk/entityview.cc:570
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Whether the package is automatically installed."
 msgstr "'&M' لتحديد الحزم بالتثبيت التلقائي"
 
 #: src/gtk/entityview.cc:576
 #, fuzzy
-#| msgid "Cancel any action on the selected package"
 msgid "The name and description of the package."
 msgstr "إلغاء أيّ عمل على الحزمة المحددة"
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "النسخة: "
 
 #: src/gtk/entityview.cc:592
 #, fuzzy
-#| msgid "Check for new versions of packages"
 msgid "The version number of the package."
 msgstr "التحقق من وجود نسخ جديدة من الحزم"
 
@@ -4157,7 +4048,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "غير مثبتة"
 
@@ -4167,25 +4057,21 @@
 
 #: src/gtk/gui.cc:82
 #, fuzzy
-#| msgid "unpacked"
 msgid "Unpacked"
 msgstr "مُستخرجة"
 
 #: src/gtk/gui.cc:83
 #, fuzzy
-#| msgid "half-config"
 msgid "Half-configured"
 msgstr "نصف مهيّأ"
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "half-install"
 msgid "Half-installed"
 msgstr "نصف مثبت"
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "غير مثبتة (بقيت ملفات التهيئة)"
 
@@ -4219,7 +4105,6 @@
 
 #: src/gtk/gui.cc:97
 #, fuzzy
-#| msgid "forbidden upgrade"
 msgid "Hold (don't upgrade)"
 msgstr "ترقية ممنوعة"
 
@@ -4238,7 +4123,6 @@
 
 #: src/gtk/gui.cc:290
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "تصفية لائحة الحزم"
 
@@ -4253,13 +4137,11 @@
 
 #: src/gtk/gui.cc:359
 #, fuzzy, c-format
-#| msgid "List Update"
 msgid "Update %s?"
 msgstr "تحديث القائمة"
 
 #: src/gtk/gui.cc:385
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
@@ -4287,31 +4169,26 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "%s changes"
 msgid "Done applying changes!"
 msgstr "%s تغييرات"
 
 #: src/gtk/gui.cc:823
 #, fuzzy
-#| msgid "%s changes"
 msgid "Applying changes..."
 msgstr "%s تغييرات"
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "[%s] %s\n"
 msgid "%s: %s"
 msgstr "[%s] %s\n"
 
 #: src/gtk/gui.cc:878
 #, fuzzy, c-format
-#| msgid "No broken packages."
 msgid "Error in package %s"
 msgstr "ليست هناك حزم معطوبة"
 
 #: src/gtk/gui.cc:906
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "تعذر استبدال %s بملف التهيئة الجديد"
 
@@ -4321,25 +4198,21 @@
 
 #: src/gtk/gui.cc:1038
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "ليست هناك حزم معطوبة"
 
 #: src/gtk/gui.cc:1071
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "ليست هناك حزم معطوبة"
 
 #: src/gtk/gui.cc:1075
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "إرضاء المعتمدات"
 
 #: src/gtk/gui.cc:1103
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "ليس هناك حزم معطوبة."
@@ -4349,13 +4222,11 @@
 
 #: src/gtk/gui.cc:1147
 #, fuzzy
-#| msgid "%s changes"
 msgid "View changes"
 msgstr "%s تغييرات"
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "%s changes"
 msgid "Apply changes"
 msgstr "%s تغييرات"
 
@@ -4364,8 +4235,6 @@
 #. font.
 #: src/gtk/gui.cc:1192
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%d package to install"
 msgid_plural "%d packages to install"
 msgstr[0] "%d تثبيت"
@@ -4378,7 +4247,6 @@
 #. font.
 #: src/gtk/gui.cc:1207
 #, fuzzy, c-format
-#| msgid "failed to remove %s"
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "تعذرت إزالة %s"
@@ -4388,7 +4256,6 @@
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "حجم التنزيل"
 
@@ -4403,19 +4270,16 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "not installed"
 msgid "Not implemented"
 msgstr "غير مثبتة"
 
 #: src/gtk/gui.cc:1408 src/gtk/gui.cc:1427
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "مُثبّتة"
 
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "^إلغاء"
 
@@ -4433,7 +4297,6 @@
 
 #: src/gtk/gui.cc:1455
 #, fuzzy
-#| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "دليل المستخدم"
 
@@ -4456,7 +4319,6 @@
 
 #: src/gtk/info.cc:496
 #, fuzzy
-#| msgid "Not Installed"
 msgid "Not available"
 msgstr "غير مثبتة"
 
@@ -4466,7 +4328,6 @@
 
 #: src/gtk/info.cc:555
 #, fuzzy
-#| msgid "Packages which depend on %s"
 msgid "Package information: dependency list"
 msgstr "الحزم التي تعتمد على %s"
 
@@ -4476,7 +4337,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "لا"
 
@@ -4490,7 +4350,6 @@
 
 #: src/gtk/packagestab.cc:203
 #, fuzzy, c-format
-#| msgid "No packages matched the pattern \"%ls\"."
 msgid "No packages matched \"%s\"."
 msgstr "لم تطابق أية حزم الصيغة \"%ls\"."
 
@@ -4500,31 +4359,26 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "الحزمة: "
 
 #: src/gtk/pkgview.cc:224
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed automatically."
 msgstr "%s; سيتم تثبيتها آلياً"
 
 #: src/gtk/pkgview.cc:227
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed automatically."
 msgstr "%s; سيتم تثبيتها آلياً"
 
 #: src/gtk/pkgview.cc:235
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed manually."
 msgstr "%s; سيتم تثبيتها آلياً"
 
 #: src/gtk/pkgview.cc:238
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed manually."
 msgstr "%s; سيتم تثبيتها آلياً"
 
@@ -4534,13 +4388,11 @@
 
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "بحث"
 
 #: src/gtk/pkgview.cc:718
 #, fuzzy
-#| msgid "Building view"
 msgid "Finalizing view"
 msgstr "بناء العرض"
 
@@ -4665,13 +4517,11 @@
 
 #: src/gtk/previewtab.cc:179
 #, fuzzy
-#| msgid "Preview"
 msgid "Preview: "
 msgstr "معاينة"
 
 #: src/gtk/resolver.cc:68
 #, fuzzy, c-format
-#| msgid "Error while dumping resolver state"
 msgid "Error in dependency resolver: %s"
 msgstr "خطأ أثناء حفظ حالة مقدم الحلول"
 
@@ -4686,7 +4536,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package"
 msgid "Virtual package"
 msgstr "حزمة"
 
@@ -4696,25 +4545,21 @@
 
 #: src/gtk/resolver.cc:377
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Removing %s is rejected."
 msgstr "إزالة %s"
 
 #: src/gtk/resolver.cc:382
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Canceling the installation of %s is rejected."
 msgstr "إلغاء تثبيت %F"
 
 #: src/gtk/resolver.cc:391
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Canceling the removal of %s is rejected."
 msgstr "إلغاء إزالة %F"
 
 #: src/gtk/resolver.cc:394
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keeping %s at version %s is rejected."
 msgstr "إبقاء %F النسخة %s (%s)"
 
@@ -4730,7 +4575,6 @@
 
 #: src/gtk/resolver.cc:413
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrading %s to version %s is rejected."
 msgstr "نسخ %s"
 
@@ -4772,7 +4616,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr "نسخ %s"
@@ -4878,7 +4721,6 @@
 
 #: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862
 #, fuzzy
-#| msgid "Remove the following packages:"
 msgid "Keep the following packages:"
 msgstr "إزالة الحزم التالية:"
 
@@ -4894,49 +4736,41 @@
 
 #: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900
 #, fuzzy
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "Leave the following dependencies unresolved:"
 msgstr "ترك المعتمدات التالية غير محلولة:%n"
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Remove %F [%s (%s)]"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "إزالة %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1523
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "تثبيت %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1531
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s"
 msgstr "إلغاء تثبيت %F"
 
 #: src/gtk/resolver.cc:1534
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s"
 msgstr "إلغاء إزالة %F"
 
 #: src/gtk/resolver.cc:1537
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "إبقاء %F النسخة %s (%s)"
 
 #: src/gtk/resolver.cc:1544
 #, fuzzy, c-format
-#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "ترقية %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1553
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "تثبيط %F [%s (%s) -> %s (%s)]"
 
@@ -4952,37 +4786,31 @@
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "إبقاء %F النسخة %s (%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>keep</b> %s at version %s"
 msgstr "إبقاء %F النسخة %s (%s)"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr "إلغاء تثبيت %F"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>cancel</b> the installation of %s"
 msgstr "إلغاء تثبيت %F"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>Install</b> %s %s"
 msgstr "تثبيت %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>install</b> %s %s"
 msgstr "تثبيت %F [%s (%s)]"
 
@@ -4998,13 +4826,11 @@
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>Upgrade</b> %s to version %s"
 msgstr "نسخ %s"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>upgrade</b> %s to version %s"
 msgstr "نسخ %s"
 
@@ -5020,8 +4846,6 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "%d تثبيت"
@@ -5031,8 +4855,6 @@
 
 #: src/gtk/resolver.cc:1740
 #, fuzzy, c-format
-#| msgid "%d removal"
-#| msgid_plural "%d removals"
 msgid "%s remove"
 msgid_plural "%s removes"
 msgstr[0] "%d إزالة"
@@ -5042,8 +4864,6 @@
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "%d keep"
-#| msgid_plural "%d keeps"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "%d إبقاء"
@@ -5053,8 +4873,6 @@
 
 #: src/gtk/resolver.cc:1752
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%s upgrade"
 msgid_plural "%s upgrades"
 msgstr[0] "%d ترقية"
@@ -5064,8 +4882,6 @@
 
 #: src/gtk/resolver.cc:1758
 #, fuzzy, c-format
-#| msgid "%d downgrade"
-#| msgid_plural "%d downgrades"
 msgid "%s downgrade"
 msgid_plural "%s downgrades"
 msgstr[0] "%d تثبيط"
@@ -5075,7 +4891,6 @@
 
 #: src/gtk/resolver.cc:1764
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "%s unresolved recommendation"
 msgid_plural "%s unresolved recommendations"
 msgstr[0] "التدقيق بالتو^صيات"
@@ -5085,7 +4900,6 @@
 
 #: src/gtk/resolver.cc:2056
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions yet."
 msgstr "لا مزيد من الحلول."
 
@@ -5096,7 +4910,6 @@
 
 #: src/gtk/resolver.cc:2064
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions."
 msgstr "لا مزيد من الحلول."
 
@@ -5106,19 +4919,16 @@
 
 #: src/gtk/resolver.cc:2076
 #, fuzzy, c-format
-#| msgid "No more solutions."
 msgid "%u solutions."
 msgstr "لا مزيد من الحلول."
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "تعذر فتح الملف \"%s\""
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr "[مُنزل]"
 
@@ -5168,7 +4978,6 @@
 
 #: src/load_grouppolicy.cc:305
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected ',', '%c', or '('; got '%c'"
 msgstr "توقع ',' أو '('، عثر على '%c'"
 
@@ -5457,44 +5266,36 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - تثبيت/ترقية الحزم\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - إزالة الحزم\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - إزالة الحزم وملفات تهيئتها\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - وضع الحزم على الإبقاء\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - إلغاء أمر الإبقاء لحزمة\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - تعليم الحزم على أنها ثُبّتت تلقائياً\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - تحديد الحزم كمُثبتة يدوياً\n"
 
@@ -5507,7 +5308,6 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - تنزيل قوائم الحزم الجديدة/القابلة للترقية\n"
 
@@ -5530,51 +5330,41 @@
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - نسيان أي الحزم هي \"جديدة\"\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - البحث عن حزمة باسمها و/أو بصيغة\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - عرض معلومات مفصلة حول حزمة\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - حذف ملفات الحزم المنزلة\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - إزالة ملفات الحزم المنزلة القديمة\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - عرض سجل تغييرات حزمة\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - تنزيل الملف .deb لحزمة\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5604,7 +5394,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             نص المساعدة هذا\n"
 
@@ -5632,15 +5421,11 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             السؤال دائماً للتأكيد أو لتنفيذ الإجراءات\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
@@ -5649,9 +5434,6 @@
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5659,9 +5441,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5669,8 +5448,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 width       تحديد عرض الإظهار لتنسيق نتائج البحث\n"
@@ -5698,9 +5475,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5708,8 +5482,6 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr " -t [release]   تحديد الإصدارة التي يجب تثبيت الحزم منها\n"
@@ -5725,15 +5497,11 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o key=val     تعيين خيار التهيئة المسمى 'key' مباشرة\n"
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -5770,7 +5538,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "replaces"
 msgid "trace"
 msgstr "يستبدل"
 
@@ -5784,7 +5551,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "لا"
 
@@ -5798,7 +5564,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:377
 #, fuzzy
-#| msgid "Err "
 msgid "error"
 msgstr "خطأ "
 
@@ -5826,7 +5591,6 @@
 
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "عملية غير صالحة %s"
 
@@ -5879,7 +5643,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "حزمة"
 
@@ -5889,7 +5652,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "كل الحزم"
 
@@ -5909,7 +5671,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -5917,8 +5678,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -5926,7 +5685,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "لا يمكن تحديد -u و -i مع أمر واحد"
 
@@ -7133,7 +6891,6 @@
 
 #: src/ui.cc:472
 #, fuzzy, c-format
-#| msgid "Unable to open %ls"
 msgid "Unable to fork: %s"
 msgstr "تعذر فتح %ls"
 
@@ -7403,9 +7160,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7427,9 +7181,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7953,19 +7704,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "عنوان URL لاستخدامه عند تنزيل سجلّات التغيير"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "عنوان URL لاستخدامه عند تنزيل سجلّات التغيير"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "تنزيل سجل التغيير"
 
Index: aptitude/po/ast.po
===================================================================
--- aptitude.orig/po/ast.po
+++ aptitude/po/ast.po
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.4.11.11\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2009-04-26 17:44+0100\n"
 "Last-Translator: Marcos Alvarez Costales <marcos.alvarez.costales@gmail."
 "com>\n"
@@ -751,13 +751,11 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s nun ta instaláu anguaño, polo que nun se reinstalará.\n"
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "%s yá ta instaláu na versión solicitada (%s)\n"
@@ -858,7 +856,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "Rexistru de cambeos de %s"
 
@@ -1435,7 +1432,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "Whether the package is automatically installed."
 msgid "'a': the package was automatically installed or removed."
 msgstr "Si'l paquete s'instala automáticamente."
 
@@ -1568,9 +1564,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy, c-format
-#| msgid ""
-#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: "
-#| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
@@ -1617,10 +1610,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:259
 #, fuzzy
-#| msgid ""
-#| "reject the given package versions; don't display any solutions in which "
-#| "they occur.  Enter UNINST instead of a version to reject removing the "
-#| "package."
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package.  "
@@ -1632,9 +1621,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:261
 #, fuzzy
-#| msgid ""
-#| "accept the given package versions; display only solutions in which they "
-#| "occur.  Enter UNINST instead of a version to accept removing the package."
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package.  "
@@ -1740,31 +1726,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "Dexar les siguientes recomendaciones ensin resolver:"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "Auditar ^Recomendaciones"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "Ya nun ye necesariu'l desaniciáu de %s"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "Auditar ^Recomendaciones"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Aiciones"
 
@@ -1923,14 +1904,12 @@
 
 #: src/cmdline/cmdline_resolver.cc:1201
 #, fuzzy
-#| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Nun puede iguar les dependencies pa l'actualización (nun atopada solución)."
 
 #: src/cmdline/cmdline_resolver.cc:1207
 #, fuzzy, c-format
-#| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Nun pueden resolvese dependencies pa l'actualización (%s)."
 
@@ -2333,25 +2312,21 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages: "
 msgid "Package %s:"
 msgstr "Paquetes: "
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Paquete Fonte: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Archivu"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\".\n"
 msgid "No such package \"%s\"."
 msgstr "Ensin paquete coincidente \"%s\".\n"
 
@@ -2390,7 +2365,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "gueta: Debes dar al menos ún términu de gueta\n"
 
@@ -2547,7 +2521,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[FALLU]"
 
@@ -2803,7 +2776,6 @@
 
 #: src/generic/apt/aptitude_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Invalid hint \"%s\": expected a tier number, but found nothing."
 msgid ""
 "Invalid hint \"%s\": expected a component name and a number, but found "
 "nothing."
@@ -2811,7 +2783,6 @@
 
 #: src/generic/apt/aptitude_resolver.cc:521
 #, fuzzy, c-format
-#| msgid "Invalid hint \"%s\": expected a tier number, but found nothing."
 msgid ""
 "Invalid hint \"%s\": expected the numeric value following the component "
 "name, but found nothing."
@@ -2824,7 +2795,6 @@
 
 #: src/generic/apt/aptitude_resolver.cc:552
 #, fuzzy, c-format
-#| msgid "Invalid hint \"%s\": expected a target, but found nothing."
 msgid "Invalid hint \"%s\": expected a level, but found nothing."
 msgstr "Pista nun válida \"%s\": esperada una meta, pero na atopao."
 
@@ -2859,8 +2829,6 @@
 
 #: src/generic/apt/aptitude_resolver_universe.cc:828
 #, fuzzy, c-format
-#| msgid ""
-#| "Invalid search tier \"%s\" (not \"conflict\", \"minimum\", or an integer)."
 msgid ""
 "Invalid safety level \"%s\" (not \"discard\", \"maximum\", \"minimum\", or "
 "an integer)."
@@ -3117,7 +3085,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "Baxando paquetes"
 
@@ -3232,19 +3199,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "Failed to download the changelog: %s"
 msgid "Failed to download changelogs: %s"
 msgstr "Falló al descargar el cambéu de rexistru: %s"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "Failed to download the changelog: %s"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "Falló al descargar el cambéu de rexistru: %s"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "Rexistru de cambeos de %s"
 
@@ -3290,7 +3254,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Nun puede interpretase'l patrón %s"
 
@@ -3305,14 +3268,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "No upgrades are available."
 msgid "No tag descriptions are available."
 msgstr "Ensín actualizaciones disponibles."
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "No upgrades are available."
 msgid "No description available for %s."
 msgstr "Ensín actualizaciones disponibles."
 
@@ -3339,67 +3300,56 @@
 
 #: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got EOF."
 msgstr "Esperábase '%c', atopose '%c'."
 
 #: src/generic/util/parsers.h:737
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got '%s'."
 msgstr "Esperábase '%c', atopose '%c'."
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "Esperábase un númberu dempués de -q=, garró %s\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "Carauter d'acción incorreutu '%c'\n"
 
 #: src/generic/util/parsers.h:832
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got EOF."
 msgstr "Esperábase '%c', atopose '%c'."
 
 #: src/generic/util/parsers.h:843
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got '%c'."
 msgstr "Esperábase '%c', atopose '%c'."
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "Esperábase un identificador de norma, atópose '%c'"
 
 #: src/generic/util/parsers.h:1026
 #, fuzzy
-#| msgid "Expected '{', ')', or ',' following '||', got '%s'"
 msgid "Expected an integer following '-', got EOF."
 msgstr "Esperábase '{', ')', o ',' siguiendo a '||', obtúvose '%s'"
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "Esperábase un identificador de norma, atópose '%c'"
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid logger name \"%s\"."
 msgid "Invalid integer: \"%s\"."
 msgstr "Nome logeáu nun válidu \"%s\"."
 
 #: src/generic/util/parsers.h:1077
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected EOF, got '%c'."
 msgstr "Esperábase '%c', atopose '%c'."
 
@@ -3413,19 +3363,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "Nun esperáu ')'"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " o"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "Nun esperáu ')'"
 
@@ -3436,7 +3383,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "Nun puede criase direutoriu temporal den la plantilla \"%s\": %s"
 
@@ -3807,25 +3753,21 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "Frayáu"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "Nun pueden correxise los paquetes nun disponibles"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "^Guetar"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for: "
 msgid "Search for packages."
 msgstr "Guetar por: "
 
@@ -3872,7 +3814,6 @@
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "Requerida la instalación de %s versión %s (%s)"
 
@@ -3895,13 +3836,11 @@
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading changelog; please wait..."
 msgid "Downloading the changelog of %s version %s..."
 msgstr "Baxando Rexistru de cambeos; espere..."
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "Preparing to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "Tresnando la descarga rexistru de cambeos"
 
@@ -4741,7 +4680,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "first-package"
 msgid "Virtual package"
 msgstr "Primer paquete"
 
@@ -4830,8 +4768,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid ""
-#| "Upgrading %s to version %s is preferred over all un-accpted alternatives."
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr ""
@@ -5010,13 +4946,11 @@
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %s"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr "Encaboxar la instalación de %s"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %s"
 msgid "<b>cancel</b> the installation of %s"
 msgstr "Encaboxar la instalación de %s"
 
@@ -5125,7 +5059,6 @@
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Solution %s of %s (tier %s)."
 msgid "Solution %s of %s."
 msgstr "Solución %s de %s (nivel: %s)."
 
@@ -5409,19 +5342,16 @@
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  versión apt %d.%d.%d\n"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  versión apt %d.%d.%d\n"
 
 #: src/main.cc:164
 #, fuzzy, c-format
-#| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Desactiváu'l sofitu d'Ept.\n"
 
@@ -5469,19 +5399,16 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      -  Instala/actualiza paquetes\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       -  Desanicia paquetes\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr ""
 " purge        - Desanicia paquetes xunto colos sos ficheros de "
@@ -5489,26 +5416,21 @@
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Bloquea paquetes\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Desbloquea un paquete\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - marca paquetes como instalaos manualmente\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - desmarca paquetes como instalaos manualmente\n"
 
@@ -5523,21 +5445,16 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Baxa les llistes de paquetes nuevos/actualizables\n"
 
 #: src/main.cc:190
 #, fuzzy, c-format
-#| msgid " safe-upgrade - Perform a safe upgrade\n"
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade      - realiza una actualización segura\n"
 
 #: src/main.cc:191
 #, fuzzy, c-format
-#| msgid ""
-#| " full-upgrade - Perform an upgrade, possibly installing and removing "
-#| "packages\n"
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
@@ -5547,57 +5464,46 @@
 
 #: src/main.cc:192
 #, fuzzy, c-format
-#| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "'&BD' pa instalar les dependencies pa construyir d'un paquete."
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Escaez qué paquetes son \"nuevos\"\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Gueta un paquete por nome y/o espresión\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Visualiza información detallada d'un paquete\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Desanicia los ficheros de paquetes baxaos\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Desanicia los ficheros de paquetes baxaos obsoletos\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Ver el rexistru de cambeos del paquete\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Baxa los ficheros .deb pa un paquete\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5617,12 +5523,6 @@
 
 #: src/main.cc:203
 #, fuzzy, c-format
-#| msgid ""
-#| " why-not      - Show the manually installed packages that lead to a "
-#| "conflict\n"
-#| "                with the given package, or why one or more packages "
-#| "would\n"
-#| "                lead to a conflict with the given package if installed\n"
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
 "conflict\n"
@@ -5642,7 +5542,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             Esti testu d'aida\n"
 
@@ -5671,15 +5570,11 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             Siempre pide confirmación de les aiciones\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
@@ -5688,9 +5583,6 @@
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5700,9 +5592,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5712,8 +5601,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 ""
@@ -5743,9 +5630,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5754,8 +5638,6 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
@@ -5763,9 +5645,6 @@
 
 #: src/main.cc:226
 #, fuzzy, c-format
-#| msgid ""
-#| " -q             In command-line mode, suppress the incremental progress\n"
-#| "                indicators.\n"
 msgid ""
 " -q             In command-line mode, suppress the incremental progress.\n"
 "                indicators.\n"
@@ -5775,7 +5654,6 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o opconf=val  Establez direutamente la opción de configuración nomada "
@@ -5783,9 +5661,6 @@
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -5957,7 +5832,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -5965,8 +5839,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -5976,7 +5848,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "Puede que -u ya -i nun deban especificase con un comandu"
 
@@ -7495,9 +7366,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7520,9 +7388,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -8058,19 +7923,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "Preparing to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "Tresnando la descarga rexistru de cambeos"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "Failed to download the changelog: %s"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "Falló al descargar el cambéu de rexistru: %s"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading changelogs"
 msgid "Downloading the changelog of %s"
 msgstr "Baxando Rexistru de Cambeos"
 
Index: aptitude/po/bs.po
===================================================================
--- aptitude.orig/po/bs.po
+++ aptitude/po/bs.po
@@ -1540,7 +1540,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Section: "
 msgid "Action \"%s\""
 msgstr "Sekcija:"
 
@@ -2094,7 +2093,6 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Package: "
 msgid "Package %s:"
 msgstr "Paket:"
 
@@ -2105,7 +2103,6 @@
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Arhiva"
 
@@ -2940,13 +2937,11 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "URL koji će se koristiti za preuzimanje changelog datoteka"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "URL koji će se koristiti za preuzimanje changelog datoteka"
 
@@ -2996,7 +2991,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "URL koji će se koristiti za preuzimanje changelog datoteka"
 
@@ -3107,7 +3101,6 @@
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " ili"
 
@@ -3216,7 +3209,6 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package: "
 msgid "_Package"
 msgstr "Paket:"
 
@@ -3314,7 +3306,6 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Depends"
 msgid "Dependencies"
 msgstr "Zavisi"
 
@@ -3531,7 +3522,6 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "URL koji će se koristiti za preuzimanje changelog datoteka"
 
@@ -3555,13 +3545,11 @@
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "Preuzimam Changelog datoteku"
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "URL koji će se koristiti za preuzimanje changelog datoteka"
 
@@ -3575,7 +3563,6 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "URL koji će se koristiti za preuzimanje changelog datoteka"
 
@@ -3676,7 +3663,6 @@
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description of "
 msgid "Short Description"
 msgstr "Descripció de "
 
@@ -3895,7 +3881,6 @@
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "Verzija:"
 
@@ -4215,7 +4200,6 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "Paket:"
 
@@ -4361,7 +4345,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package: "
 msgid "Virtual package"
 msgstr "Paket:"
 
@@ -5214,7 +5197,6 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid "Prompt for confirmation at exit"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr "Tražiti potvrdu prilikom izlaska"
 
@@ -5427,7 +5409,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package: "
 msgid "first-package"
 msgstr "Paket:"
 
@@ -7414,19 +7395,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "URL koji će se koristiti za preuzimanje changelog datoteka"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "URL koji će se koristiti za preuzimanje changelog datoteka"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "Preuzimam Changelog datoteku"
 
Index: aptitude/po/ca.po
===================================================================
--- aptitude.orig/po/ca.po
+++ aptitude/po/ca.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.4.11.9\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2008-09-19 00:45+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -596,7 +596,6 @@
 
 #: src/cmdline/cmdline_action.cc:212
 #, fuzzy, c-format
-#| msgid "Unable to satisfy the build-depends: %s."
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "No s'ha pogut satisfer les dependències de construcció: %s."
 
@@ -653,13 +652,11 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "El paquet %s no està instal·lat, no es tornarà a instal·lar.\n"
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "La versió sol·licitada (%s) de %s ja està instal·lada\n"
@@ -761,7 +758,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "El registre de canvis de %s"
 
@@ -925,7 +921,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "cap"
 
@@ -1332,7 +1327,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "'&M' per marcar els paquets com a instal·lats automàticament"
 
@@ -1462,9 +1456,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy, c-format
-#| msgid ""
-#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: "
-#| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
@@ -1622,31 +1613,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "Deixa per resoldre les recomanacions següents:"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "Audita les ^recomanacions"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "No és necessària la supressió de %s"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "Audita les ^recomanacions"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Accions"
 
@@ -1802,7 +1788,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:1207
 #, fuzzy, c-format
-#| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "No s'han pogut resoldre les dependències per a l'actualització (%s)."
 
@@ -1833,13 +1818,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "però no es pot instal·lar."
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "però el %s està per instal·lar."
 
@@ -1938,13 +1921,11 @@
 
 #: src/cmdline/cmdline_show.cc:326
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s%s; will be installed"
 msgstr "%s; s'instal·larà"
 
 #: src/cmdline/cmdline_show.cc:328
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s%s; will be installed automatically"
 msgstr "%s; s'instal·larà automàticament"
 
@@ -2208,25 +2189,21 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "Paquets"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Font del paquet: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Arxiu"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\".\n"
 msgid "No such package \"%s\"."
 msgstr "El paquet «%s» no existeix.\n"
 
@@ -2265,7 +2242,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "cerca: heu de proporcionar, com a mínim, un terme de cerca\n"
 
@@ -2388,7 +2364,6 @@
 
 #: src/cmdline/cmdline_why.cc:1285
 #, fuzzy, c-format
-#| msgid "Packages depending on %s"
 msgid "Packages requiring %s:"
 msgstr "Paquets que depenen de %s"
 
@@ -2404,8 +2379,6 @@
 
 #: src/cmdline/cmdline_why.cc:1416
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: this command requires at least one argument (the package to query)."
 msgid ""
 "%s: this command requires at least one argument (the package to query).\n"
 msgstr ""
@@ -2425,7 +2398,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[Error]"
 
@@ -2782,7 +2754,6 @@
 
 #: src/generic/apt/download_update_manager.cc:138
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated quoted string in command: %s"
 msgstr "Cadena literal inacabada a continuació de %s"
 
@@ -2862,7 +2833,6 @@
 
 #: src/generic/apt/dump_packages.cc:674
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create truncated cache: %s."
 msgstr "No s'ha pogut ubicar el paquet %s"
 
@@ -2984,7 +2954,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "S'estan baixant les paquets"
 
@@ -3022,7 +2991,6 @@
 
 #: src/generic/apt/matching/parse.cc:860
 #, fuzzy, c-format
-#| msgid "Unknown matcher type: \"%s\"."
 msgid "Unknown term type: \"%s\"."
 msgstr "El tipus de coincidència és desconegut: «%s»."
 
@@ -3058,7 +3026,6 @@
 
 #: src/generic/apt/matching/parse.cc:1388
 #, fuzzy, c-format
-#| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "L'expressió està mal formada"
 
@@ -3098,19 +3065,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "URL a utilitzar per baixar els registres de canvis"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "URL a utilitzar per baixar els registres de canvis"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "El registre de canvis de %s"
 
@@ -3160,7 +3124,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "No s'ha pogut analitzar el patró %s"
 
@@ -3175,14 +3138,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "No instal·lat"
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "No instal·lat"
 
@@ -3209,67 +3170,56 @@
 
 #: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got EOF."
 msgstr "S'esperava «%c», s'ha obtingut «%c»."
 
 #: src/generic/util/parsers.h:737
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got '%s'."
 msgstr "S'esperava «%c», s'ha obtingut «%c»."
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "S'esperava un número a continuació de -q=, s'ha obtingut %s\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "El caràcter d'acció '%c' és erroni\n"
 
 #: src/generic/util/parsers.h:832
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got EOF."
 msgstr "S'esperava «%c», s'ha obtingut «%c»."
 
 #: src/generic/util/parsers.h:843
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got '%c'."
 msgstr "S'esperava «%c», s'ha obtingut «%c»."
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "S'esperava un identificador de política, s'ha obtingut «%c»"
 
 #: src/generic/util/parsers.h:1026
 #, fuzzy
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected an integer following '-', got EOF."
 msgstr "S'esperava «,» o «(» després de «||», s'ha obtingut «%s»"
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "S'esperava un identificador de política, s'ha obtingut «%c»"
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "L'operació %s no és vàlida"
 
 #: src/generic/util/parsers.h:1077
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected EOF, got '%c'."
 msgstr "S'esperava «%c», s'ha obtingut «%c»."
 
@@ -3283,19 +3233,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "El ')' és inesperat"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " o"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "El ')' és inesperat"
 
@@ -3307,7 +3254,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr ""
 "No s'ha pogut crear el directori temporal a partir de la plantilla \"%s\": %s"
@@ -3343,7 +3289,6 @@
 
 #: src/gtk/aptitude.glade:19 src/gtk/aptitude.glade:2273
 #, fuzzy
-#| msgid "False"
 msgid "_File"
 msgstr "Fals"
 
@@ -3410,13 +3355,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "Paquet"
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "Vistes"
 
@@ -3436,7 +3379,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "Ajuda"
 
@@ -3447,7 +3389,6 @@
 
 #: src/gtk/aptitude.glade:345 src/gtk/aptitude.glade:2614
 #, fuzzy
-#| msgid "List Update"
 msgid "Update"
 msgstr "Actualitza la llista"
 
@@ -3469,7 +3410,6 @@
 
 #: src/gtk/aptitude.glade:389 src/gtk/aptitude.glade:2658
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Remove"
 msgstr "Instal·lat"
 
@@ -3483,33 +3423,28 @@
 
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "Suprimeix el filtre de la llista de paquets"
 
 #: src/gtk/aptitude.glade:649
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "Apply these settings to all active package lists."
 msgstr "Aplica un filtre a la llista de paquets"
 
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "Cerca"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "reinstal·la"
 
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "Err "
 
@@ -3524,19 +3459,16 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "Dependències de %s"
 
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "^Changelog"
 msgid "Changelog"
 msgstr "Registre de modifi^cacions"
 
 #: src/gtk/aptitude.glade:1020
 #, fuzzy
-#| msgid "False"
 msgid "Files"
 msgstr "Fals"
 
@@ -3550,7 +3482,6 @@
 
 #: src/gtk/aptitude.glade:1051
 #, fuzzy
-#| msgid "Tags"
 msgid "tags"
 msgstr "Marcadors"
 
@@ -3573,13 +3504,11 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "Estat"
 
 #: src/gtk/aptitude.glade:1247
 #, fuzzy
-#| msgid "Unknown action type: %s"
 msgid "Group by action type"
 msgstr "El tipus d'acció és desconegut: %s"
 
@@ -3608,13 +3537,11 @@
 
 #: src/gtk/aptitude.glade:1328
 #, fuzzy
-#| msgid "Toggle ^Rejected"
 msgid "Rejected"
 msgstr "Commuta ^rebutjat"
 
 #: src/gtk/aptitude.glade:1343
 #, fuzzy
-#| msgid "Preferences"
 msgid "No preference"
 msgstr "Preferències"
 
@@ -3628,32 +3555,27 @@
 
 #: src/gtk/aptitude.glade:1400
 #, fuzzy
-#| msgid "^Examine Solution"
 msgid "Find a new solution"
 msgstr "^Examina la solució"
 
 #: src/gtk/aptitude.glade:1404
 #, fuzzy
-#| msgid "Select the next solution to the dependency problems."
 msgid "Calculate the next solution that has not yet been generated."
 msgstr "Selecciona la següent solució dels problemes de dependències."
 
 #: src/gtk/aptitude.glade:1419
 #, fuzzy
-#| msgid "Perform the actions contained in the currently selected solution."
 msgid ""
 "Perform the actions in the currently selected solution and close this tab."
 msgstr "Executa les accions definides en la solució seleccionada."
 
 #: src/gtk/aptitude.glade:1576
 #, fuzzy
-#| msgid "Upgrade"
 msgid "Upgrade Summary"
 msgstr "Actualitza"
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "Font del paquet: "
 
@@ -3665,7 +3587,6 @@
 
 #: src/gtk/aptitude.glade:1652
 #, fuzzy
-#| msgid "Manual"
 msgid "Fix Manually"
 msgstr "Manual"
 
@@ -3713,31 +3634,26 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "Trencat"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "No s'ha pogut solucionar els problemes amb els paquets no disponibles"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "^Cerca"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for a package"
 msgid "Search for packages."
 msgstr "Cerca un paquet"
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "Obtingut/s "
 
@@ -3771,19 +3687,16 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "URL a utilitzar per baixar els registres de canvis"
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "És necessària la instal·lació de %s versió %s (%s)"
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -3793,7 +3706,6 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr ""
@@ -3802,13 +3714,11 @@
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "S'està baixant el registre de canvis"
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "URL a utilitzar per baixar els registres de canvis"
 
@@ -3822,7 +3732,6 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "URL a utilitzar per baixar els registres de canvis"
 
@@ -3832,8 +3741,6 @@
 
 #: src/gtk/dashboardtab.cc:414
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] "%d actualitzat"
@@ -3841,13 +3748,11 @@
 
 #: src/gtk/dashboardtab.cc:633
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No upgrades are available."
 msgstr "No instal·lat"
 
 #: src/gtk/dashboardtab.cc:645
 #, fuzzy
-#| msgid "Unable to locate package %s"
 msgid "Unable to calculate an upgrade."
 msgstr "No s'ha pogut ubicar el paquet %s"
 
@@ -3882,7 +3787,6 @@
 
 #: src/gtk/dashboardtab.cc:708
 #, fuzzy, c-format
-#| msgid "Internal error: Default column string is unparsable"
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr ""
 "S'ha produït un error intern: la cadena predeterminada de la columna no es "
@@ -3890,19 +3794,16 @@
 
 #: src/gtk/dependency_chains_tab.cc:78
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: start"
 msgstr "Gestió de les dependències"
 
 #: src/gtk/dependency_chains_tab.cc:82
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: end"
 msgstr "Gestió de les dependències"
 
 #: src/gtk/dependency_chains_tab.cc:86
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: results"
 msgstr "Gestió de les dependències"
 
@@ -3912,7 +3813,6 @@
 
 #: src/gtk/dependency_chains_tab.cc:282
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency chain found."
 msgstr "Gestió de les dependències"
 
@@ -3922,13 +3822,11 @@
 
 #: src/gtk/download.cc:185
 #, fuzzy
-#| msgid "False"
 msgid "Failed"
 msgstr "Fals"
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "S'estan suprimint els fitxers baixats"
 
@@ -3939,13 +3837,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "Progrés total: "
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description"
 msgid "Short Description"
 msgstr "Descripció"
 
@@ -3955,14 +3851,12 @@
 
 #: src/gtk/download.cc:319
 #, fuzzy
-#| msgid "Cleaning while a download is in progress is not allowed"
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr ""
 "La tasca de neteja no es pot realitzar quan s'està realitzant una baixada"
 
 #: src/gtk/download.cc:395 src/gtk/gui.cc:832
 #, fuzzy
-#| msgid "View next display"
 msgid "View Details"
 msgstr "Mostra la visualització següent"
 
@@ -3982,19 +3876,16 @@
 
 #: src/gtk/download.cc:486
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s: %lu/%lu, stalled"
 msgstr "%s; s'instal·larà"
 
 #: src/gtk/download.cc:507
 #, fuzzy, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr " [ %i%% ] (%sB/s, %s restant)"
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "però el %s està per instal·lar."
 
@@ -4008,7 +3899,6 @@
 
 #: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "No s'ha pogut ubicar el paquet %s"
 
@@ -4019,7 +3909,6 @@
 
 #: src/gtk/dpkg_terminal.cc:429
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "%s: Unable to accept a connection: %s"
 msgstr ""
 "No s'ha pogut crear el directori temporal a partir de la plantilla \"%s\": %s"
@@ -4046,80 +3935,67 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "%s versions"
 
 #: src/gtk/entitysummary.cc:123
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Install %s version %s"
 msgstr "Instal·la(%s proveeix %s)"
 
 #: src/gtk/entitysummary.cc:131
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrade to %s version %s"
 msgstr "  Versió de les cwidget: %s\n"
 
 #: src/gtk/entitysummary.cc:142
 #, fuzzy, c-format
-#| msgid "Keep the following packages at their current version:"
 msgid "Don't hold %s at its current version."
 msgstr "Mantín la versió actual dels següents paquets:"
 
 #: src/gtk/entitysummary.cc:145 src/gtk/entitysummary.cc:165
 #: src/gtk/entitysummary.cc:168
 #, fuzzy, c-format
-#| msgid "Canc^el pending actions"
 msgid "Cancel any actions on %s."
 msgstr "Canc^el·la pes accions pendents"
 
 #: src/gtk/entitysummary.cc:150
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the purge of %s."
 msgstr "Cancel·la la supressió de %F"
 
 #: src/gtk/entitysummary.cc:152
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s."
 msgstr "Cancel·la la supressió de %F"
 
 #: src/gtk/entitysummary.cc:157
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the upgrade of %s."
 msgstr "Cancel·la la supressió de %F"
 
 #: src/gtk/entitysummary.cc:159
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s."
 msgstr "Cancel·la la instal·lació de %F"
 
 #: src/gtk/entitysummary.cc:161
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the downgrade of %s."
 msgstr "Cancel·la la supressió de %F"
 
 #: src/gtk/entitysummary.cc:163
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the reinstallation of %s."
 msgstr "Cancel·la la instal·lació de %F"
 
 #: src/gtk/entitysummary.cc:206
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "Remove %s"
 msgstr "Suprimeix(%s)"
 
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "^Purga"
 
@@ -4130,7 +4006,6 @@
 
 #: src/gtk/entitysummary.cc:223
 #, fuzzy, c-format
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Mark %s as automatically installed."
 msgstr "'&M' per marcar els paquets com a instal·lats automàticament"
 
@@ -4141,7 +4016,6 @@
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
 msgid "%s is a virtual package provided by:\n"
 msgstr "\"%s\" és un paquet virtual proporcionat per:\n"
 
@@ -4151,13 +4025,11 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "Font del paquet: "
 
 #: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 #, fuzzy
-#| msgid "ProgName"
 msgid "Name"
 msgstr "NomProg"
 
@@ -4167,13 +4039,11 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "No s'ha pogut obrir el fitxer \"%s\""
 
 #: src/gtk/entityview.cc:412
 #, fuzzy, c-format
-#| msgid "Rejecting the removal of %s"
 msgid "Editing the columns of \"%s\""
 msgstr "S'està rebutjant la supressió de %s"
 
@@ -4187,25 +4057,21 @@
 
 #: src/gtk/entityview.cc:570
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Whether the package is automatically installed."
 msgstr "'&M' per marcar els paquets com a instal·lats automàticament"
 
 #: src/gtk/entityview.cc:576
 #, fuzzy
-#| msgid "Cancel any action on the selected package"
 msgid "The name and description of the package."
 msgstr "Cancel·la qualsevol acció al paquet seleccionat"
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "Versió: "
 
 #: src/gtk/entityview.cc:592
 #, fuzzy
-#| msgid "Check for new versions of packages"
 msgid "The version number of the package."
 msgstr "Verifica si hi ha noves versions dels paquets"
 
@@ -4226,7 +4092,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "no instal·lat"
 
@@ -4236,25 +4101,21 @@
 
 #: src/gtk/gui.cc:82
 #, fuzzy
-#| msgid "unpacked"
 msgid "Unpacked"
 msgstr "desempaquetats"
 
 #: src/gtk/gui.cc:83
 #, fuzzy
-#| msgid "half-config"
 msgid "Half-configured"
 msgstr "configuració parcial"
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "half-install"
 msgid "Half-installed"
 msgstr "instal·lació parcial"
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "no instal·lat (es mantenen els fitxers de configuració)"
 
@@ -4288,7 +4149,6 @@
 
 #: src/gtk/gui.cc:97
 #, fuzzy
-#| msgid "forbidden upgrade"
 msgid "Hold (don't upgrade)"
 msgstr "actualització prohibida"
 
@@ -4307,7 +4167,6 @@
 
 #: src/gtk/gui.cc:290
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "Aplica un filtre a la llista de paquets"
 
@@ -4322,13 +4181,11 @@
 
 #: src/gtk/gui.cc:359
 #, fuzzy, c-format
-#| msgid "List Update"
 msgid "Update %s?"
 msgstr "Actualitza la llista"
 
 #: src/gtk/gui.cc:385
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
@@ -4356,31 +4213,26 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "%s changes"
 msgid "Done applying changes!"
 msgstr "%s modificacions"
 
 #: src/gtk/gui.cc:823
 #, fuzzy
-#| msgid "%s changes"
 msgid "Applying changes..."
 msgstr "%s modificacions"
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "[%s] %s\n"
 msgid "%s: %s"
 msgstr "[%s] %s\n"
 
 #: src/gtk/gui.cc:878
 #, fuzzy, c-format
-#| msgid "No broken packages."
 msgid "Error in package %s"
 msgstr "No hi ha cap paquet trencat."
 
 #: src/gtk/gui.cc:906
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "No s'ha pogut reemplaçar el %s pel nou fitxer de configuració"
 
@@ -4390,25 +4242,21 @@
 
 #: src/gtk/gui.cc:1038
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "No hi ha cap paquet trencat."
 
 #: src/gtk/gui.cc:1071
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "No hi ha cap paquet trencat."
 
 #: src/gtk/gui.cc:1075
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "Resol les dependències"
 
 #: src/gtk/gui.cc:1103
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "No hi ha cap paquet trencat."
@@ -4416,13 +4264,11 @@
 
 #: src/gtk/gui.cc:1147
 #, fuzzy
-#| msgid "%s changes"
 msgid "View changes"
 msgstr "%s modificacions"
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "%s changes"
 msgid "Apply changes"
 msgstr "%s modificacions"
 
@@ -4431,8 +4277,6 @@
 #. font.
 #: src/gtk/gui.cc:1192
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%d package to install"
 msgid_plural "%d packages to install"
 msgstr[0] "%d instal·lació"
@@ -4443,7 +4287,6 @@
 #. font.
 #: src/gtk/gui.cc:1207
 #, fuzzy, c-format
-#| msgid "failed to remove %s"
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "s'ha produït un error en suprimir %s"
@@ -4451,7 +4294,6 @@
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "MidaBaixada"
 
@@ -4466,19 +4308,16 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "not installed"
 msgid "Not implemented"
 msgstr "no instal·lat"
 
 #: src/gtk/gui.cc:1408 src/gtk/gui.cc:1427
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "Instal·lat"
 
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "^Purga"
 
@@ -4496,7 +4335,6 @@
 
 #: src/gtk/gui.cc:1455
 #, fuzzy
-#| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "Manual d'usuari"
 
@@ -4511,7 +4349,6 @@
 
 #: src/gtk/info.cc:161 src/gtk/pkgview.cc:169
 #, fuzzy
-#| msgid "Current status: %F."
 msgid "Current status"
 msgstr "Estat actual: %F."
 
@@ -4521,19 +4358,16 @@
 
 #: src/gtk/info.cc:496
 #, fuzzy
-#| msgid "Not Installed"
 msgid "Not available"
 msgstr "No instal·lat"
 
 #: src/gtk/info.cc:545
 #, fuzzy
-#| msgid "C^ycle Package Information"
 msgid "Package information: version list"
 msgstr "Comm^uta la informació dels paquets"
 
 #: src/gtk/info.cc:555
 #, fuzzy
-#| msgid "Packages which depend on %s"
 msgid "Package information: dependency list"
 msgstr "Paquets dels qual depèn el %s"
 
@@ -4543,7 +4377,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "no"
 
@@ -4557,7 +4390,6 @@
 
 #: src/gtk/packagestab.cc:203
 #, fuzzy, c-format
-#| msgid "No packages matched the pattern \"%ls\"."
 msgid "No packages matched \"%s\"."
 msgstr "No hi ha cap paquet que coincideixi amb el patró \"%ls\"."
 
@@ -4567,31 +4399,26 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "Paquet: "
 
 #: src/gtk/pkgview.cc:224
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed automatically."
 msgstr "%s; s'instal·larà automàticament"
 
 #: src/gtk/pkgview.cc:227
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed automatically."
 msgstr "%s; s'instal·larà automàticament"
 
 #: src/gtk/pkgview.cc:235
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed manually."
 msgstr "%s; s'instal·larà automàticament"
 
 #: src/gtk/pkgview.cc:238
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed manually."
 msgstr "%s; s'instal·larà automàticament"
 
@@ -4601,13 +4428,11 @@
 
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "Cerca"
 
 #: src/gtk/pkgview.cc:718
 #, fuzzy
-#| msgid "Building view"
 msgid "Finalizing view"
 msgstr "S'està construïnt la vista"
 
@@ -4739,13 +4564,11 @@
 
 #: src/gtk/previewtab.cc:179
 #, fuzzy
-#| msgid "Preview"
 msgid "Preview: "
 msgstr "Previsualització"
 
 #: src/gtk/resolver.cc:68
 #, fuzzy, c-format
-#| msgid "Error while dumping resolver state"
 msgid "Error in dependency resolver: %s"
 msgstr "S'ha produït un error en volcar l'estat del sistema de resolució"
 
@@ -4760,7 +4583,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package"
 msgid "Virtual package"
 msgstr "Paquet"
 
@@ -4770,43 +4592,36 @@
 
 #: src/gtk/resolver.cc:377
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Removing %s is rejected."
 msgstr "S'està suprimint %s"
 
 #: src/gtk/resolver.cc:382
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Canceling the installation of %s is rejected."
 msgstr "Cancel·la la instal·lació de %F"
 
 #: src/gtk/resolver.cc:391
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Canceling the removal of %s is rejected."
 msgstr "Cancel·la la supressió de %F"
 
 #: src/gtk/resolver.cc:394
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keeping %s at version %s is rejected."
 msgstr "Mantín %F a la versió %s (%s)"
 
 #: src/gtk/resolver.cc:401
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Installing %s version %s is rejected."
 msgstr "Instal·la(%s proveeix %s)"
 
 #: src/gtk/resolver.cc:407
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrading %s to version %s is rejected."
 msgstr "  Versió de les cwidget: %s\n"
 
 #: src/gtk/resolver.cc:413
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrading %s to version %s is rejected."
 msgstr "%s versions"
 
@@ -4848,7 +4663,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr "%s versions"
@@ -4946,7 +4760,6 @@
 
 #: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862
 #, fuzzy
-#| msgid "Remove the following packages:"
 msgid "Keep the following packages:"
 msgstr "Suprimeix els següents paquets:"
 
@@ -4962,121 +4775,101 @@
 
 #: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900
 #, fuzzy
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "Leave the following dependencies unresolved:"
 msgstr "Deixa les dependències següents pendents de resolució:%n"
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Remove %F [%s (%s)]"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "Suprimeix %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1523
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "Instal·la %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1531
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s"
 msgstr "Cancel·la la instal·lació de %F"
 
 #: src/gtk/resolver.cc:1534
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s"
 msgstr "Cancel·la la supressió de %F"
 
 #: src/gtk/resolver.cc:1537
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "Mantín %F a la versió %s (%s)"
 
 #: src/gtk/resolver.cc:1544
 #, fuzzy, c-format
-#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Actualitza %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1553
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Desactualitza %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>Remove</b> %s"
 msgstr "Suprimeix(%s)"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>remove</b> %s"
 msgstr "Suprimeix(%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "Mantín %F a la versió %s (%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>keep</b> %s at version %s"
 msgstr "Mantín %F a la versió %s (%s)"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr "Cancel·la la instal·lació de %F"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>cancel</b> the installation of %s"
 msgstr "Cancel·la la instal·lació de %F"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>Install</b> %s %s"
 msgstr "Instal·la %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>install</b> %s %s"
 msgstr "Instal·la %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>Downgrade</b> %s to version %s"
 msgstr "  Versió de les cwidget: %s\n"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>downgrade</b> %s to version %s"
 msgstr "  Versió de les cwidget: %s\n"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>Upgrade</b> %s to version %s"
 msgstr "%s versions"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>upgrade</b> %s to version %s"
 msgstr "%s versions"
 
@@ -5092,8 +4885,6 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "%d instal·lació"
@@ -5101,8 +4892,6 @@
 
 #: src/gtk/resolver.cc:1740
 #, fuzzy, c-format
-#| msgid "%d removal"
-#| msgid_plural "%d removals"
 msgid "%s remove"
 msgid_plural "%s removes"
 msgstr[0] "%d supressió"
@@ -5110,8 +4899,6 @@
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "%d keep"
-#| msgid_plural "%d keeps"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "%d mantingut"
@@ -5119,8 +4906,6 @@
 
 #: src/gtk/resolver.cc:1752
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%s upgrade"
 msgid_plural "%s upgrades"
 msgstr[0] "%d actualitzat"
@@ -5128,8 +4913,6 @@
 
 #: src/gtk/resolver.cc:1758
 #, fuzzy, c-format
-#| msgid "%d downgrade"
-#| msgid_plural "%d downgrades"
 msgid "%s downgrade"
 msgid_plural "%s downgrades"
 msgstr[0] "$d desactualitzat"
@@ -5137,7 +4920,6 @@
 
 #: src/gtk/resolver.cc:1764
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "%s unresolved recommendation"
 msgid_plural "%s unresolved recommendations"
 msgstr[0] "Audita les ^recomanacions"
@@ -5145,19 +4927,16 @@
 
 #: src/gtk/resolver.cc:2056
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions yet."
 msgstr "No hi ha més solucions."
 
 #: src/gtk/resolver.cc:2063
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency solution was found."
 msgstr "Gestió de les dependències"
 
 #: src/gtk/resolver.cc:2064
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions."
 msgstr "No hi ha més solucions."
 
@@ -5167,19 +4946,16 @@
 
 #: src/gtk/resolver.cc:2076
 #, fuzzy, c-format
-#| msgid "No more solutions."
 msgid "%u solutions."
 msgstr "No hi ha més solucions."
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "No s'ha pogut obrir el fitxer \"%s\""
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr " [Baixat]"
 
@@ -5229,7 +5005,6 @@
 
 #: src/load_grouppolicy.cc:305
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected ',', '%c', or '('; got '%c'"
 msgstr "S'esperava «,» o «(», s'ha obtingut «%c»"
 
@@ -5334,7 +5109,6 @@
 
 #: src/load_grouppolicy.cc:713
 #, fuzzy, c-format
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected '{', ')', or ',' following '||', got '%s'"
 msgstr "S'esperava «,» o «(» després de «||», s'ha obtingut «%s»"
 
@@ -5463,19 +5237,16 @@
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt versió %d.%d.%d\n"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt versió %d.%d.%d\n"
 
 #: src/main.cc:164
 #, fuzzy, c-format
-#| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Suport d'ept inhabilitat\n"
 
@@ -5523,19 +5294,16 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Instal·la/actualitza els paquets\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Suprimeix els paquets\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr ""
 " purge        - Suprimeix els paquets i els corresponents fitxers de "
@@ -5543,26 +5311,21 @@
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Deixa els paquets retinguts\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Cancel·la l'ordre de retenció d'un paquet\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Marca els paquets com a instal·lats automàticament\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Marca els paquets com a instal·lats manualment\n"
 
@@ -5577,21 +5340,16 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Baixa les llistes dels paquets nous/actualitzables\n"
 
 #: src/main.cc:190
 #, fuzzy, c-format
-#| msgid " safe-upgrade - Perform a safe upgrade\n"
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Realitza una actualització segura\n"
 
 #: src/main.cc:191
 #, fuzzy, c-format
-#| msgid ""
-#| " full-upgrade - Perform an upgrade, possibly installing and removing "
-#| "packages\n"
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
@@ -5601,57 +5359,46 @@
 
 #: src/main.cc:192
 #, fuzzy, c-format
-#| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "«&BD» per a instal·lar les dependències de construcció d'un paquet."
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Oblida quins paquets són \"nous\"\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Cerca un paquet pel seu nom i/o expressió\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " mostra       - Mostra informació detallada d'un paquet\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Suprimeix els fitxers dels paquets baixats\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Suprimeix els fitxers dels paquets baixats antics\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Visualitza un registre de canvis d'un paquet\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Baixa el fitxer .deb d'un paquet\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5689,7 +5436,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             Aquest text d'ajuda\n"
 
@@ -5717,15 +5463,11 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             Pregunta permanentment les confirmacions o accions\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
@@ -5733,9 +5475,6 @@
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5745,9 +5484,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5757,8 +5493,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 ""
@@ -5790,9 +5524,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5800,8 +5531,6 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
@@ -5819,15 +5548,11 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o clau=val   Defineix directament l'opció de configuració 'clau'\n"
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -5866,7 +5591,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "true"
 msgid "trace"
 msgstr "cert"
 
@@ -5880,7 +5604,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "no"
 
@@ -5894,7 +5617,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:377
 #, fuzzy
-#| msgid "Err "
 msgid "error"
 msgstr "Err "
 
@@ -5902,7 +5624,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:380
 #, fuzzy
-#| msgid "false"
 msgid "fatal"
 msgstr "fals"
 
@@ -5923,7 +5644,6 @@
 
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "L'operació %s no és vàlida"
 
@@ -5976,7 +5696,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "Paquet"
 
@@ -5986,7 +5705,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "Tots els paquets"
 
@@ -6006,7 +5724,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -6014,8 +5731,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -6025,7 +5740,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "-u i -i no s'han d'utilitzar amb una ordre"
 
@@ -7278,7 +6992,6 @@
 
 #: src/ui.cc:472
 #, fuzzy, c-format
-#| msgid "Unable to open %ls"
 msgid "Unable to fork: %s"
 msgstr "No s'ha pogut obrir %ls"
 
@@ -7558,9 +7271,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7585,9 +7295,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -8124,19 +7831,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "URL a utilitzar per baixar els registres de canvis"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "URL a utilitzar per baixar els registres de canvis"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "S'està baixant el registre de canvis"
 
Index: aptitude/po/cs.po
===================================================================
--- aptitude.orig/po/cs.po
+++ aptitude/po/cs.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2009-09-05 10:59+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -851,7 +851,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "Soubor změn %s"
 
@@ -1414,7 +1413,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "Whether the package is automatically installed."
 msgid "'a': the package was automatically installed or removed."
 msgstr "Zda je balík instalovaný automaticky."
 
@@ -1546,9 +1544,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy, c-format
-#| msgid ""
-#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: "
-#| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
@@ -1594,10 +1589,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:259
 #, fuzzy
-#| msgid ""
-#| "reject the given package versions; don't display any solutions in which "
-#| "they occur.  Enter UNINST instead of a version to reject removing the "
-#| "package."
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package.  "
@@ -1608,9 +1599,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:261
 #, fuzzy
-#| msgid ""
-#| "accept the given package versions; display only solutions in which they "
-#| "occur.  Enter UNINST instead of a version to accept removing the package."
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package.  "
@@ -1713,31 +1701,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "Ponechat následující závislosti nevyřešené:"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "Prověřit dopo^ručení"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "Již nevyžaduji odstranění balíku %s"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "Prověřit dopo^ručení"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Akce"
 
@@ -1890,14 +1873,12 @@
 
 #: src/cmdline/cmdline_resolver.cc:1201
 #, fuzzy
-#| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Nemohu vyřešit závislosti pro aktualizaci (nebylo nalezeno žádné řešení)."
 
 #: src/cmdline/cmdline_resolver.cc:1207
 #, fuzzy, c-format
-#| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Nemohu vyřešit závislosti pro aktualizaci (%s)."
 
@@ -2302,25 +2283,21 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages:"
 msgid "Package %s:"
 msgstr "Balíky:"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Zdrojový balík: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Archiv"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\".\n"
 msgid "No such package \"%s\"."
 msgstr "Balík „%s“ neexistuje.\n"
 
@@ -2359,7 +2336,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "hledání: Musíte zadat alespoň jeden hledaný term\n"
 
@@ -2514,7 +2490,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[CHYBA]"
 
@@ -2762,7 +2737,6 @@
 
 #: src/generic/apt/aptitude_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Invalid hint \"%s\": expected a tier number, but found nothing."
 msgid ""
 "Invalid hint \"%s\": expected a component name and a number, but found "
 "nothing."
@@ -2770,7 +2744,6 @@
 
 #: src/generic/apt/aptitude_resolver.cc:521
 #, fuzzy, c-format
-#| msgid "Invalid hint \"%s\": expected a tier number, but found nothing."
 msgid ""
 "Invalid hint \"%s\": expected the numeric value following the component "
 "name, but found nothing."
@@ -2783,7 +2756,6 @@
 
 #: src/generic/apt/aptitude_resolver.cc:552
 #, fuzzy, c-format
-#| msgid "Invalid hint \"%s\": expected a target, but found nothing."
 msgid "Invalid hint \"%s\": expected a level, but found nothing."
 msgstr "Neplatná rada „%s“: očekáván cíl, nenalezeno nic."
 
@@ -2817,8 +2789,6 @@
 
 #: src/generic/apt/aptitude_resolver_universe.cc:828
 #, fuzzy, c-format
-#| msgid ""
-#| "Invalid search tier \"%s\" (not \"conflict\", \"minimum\", or an integer)."
 msgid ""
 "Invalid safety level \"%s\" (not \"discard\", \"maximum\", \"minimum\", or "
 "an integer)."
@@ -3067,7 +3037,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "Stahuji balíky"
 
@@ -3180,19 +3149,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "Failed to download the changelog: %s"
 msgid "Failed to download changelogs: %s"
 msgstr "Nepodařilo se stáhnout seznam změn: %s"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "Failed to download the changelog: %s"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "Nepodařilo se stáhnout seznam změn: %s"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "Soubor změn %s"
 
@@ -3237,7 +3203,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Nemohu zpracovat vzor %s"
 
@@ -3252,14 +3217,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "No upgrades are available."
 msgid "No tag descriptions are available."
 msgstr "Žádné aktualizace nejsou dostupné."
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "No upgrades are available."
 msgid "No description available for %s."
 msgstr "Žádné aktualizace nejsou dostupné."
 
@@ -3286,67 +3249,56 @@
 
 #: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got EOF."
 msgstr "Očekáván znak „%c“, obdržen „%c“."
 
 #: src/generic/util/parsers.h:737
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got '%s'."
 msgstr "Očekáván znak „%c“, obdržen „%c“."
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "Za -q= je očekáváno číslo, zadáno %s\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "Chybná akce „%c“\n"
 
 #: src/generic/util/parsers.h:832
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got EOF."
 msgstr "Očekáván znak „%c“, obdržen „%c“."
 
 #: src/generic/util/parsers.h:843
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got '%c'."
 msgstr "Očekáván znak „%c“, obdržen „%c“."
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "Očekáván identifikátor pravidla, obdržen „%c“"
 
 #: src/generic/util/parsers.h:1026
 #, fuzzy
-#| msgid "Expected '{', ')', or ',' following '||', got '%s'"
 msgid "Expected an integer following '-', got EOF."
 msgstr "Očekáván znak „{“, „)“ nebo „,“ následovaný „||“, obdržen „%s“"
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "Očekáván identifikátor pravidla, obdržen „%c“"
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid logger name \"%s\"."
 msgid "Invalid integer: \"%s\"."
 msgstr "Neplatný název „%s“."
 
 #: src/generic/util/parsers.h:1077
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected EOF, got '%c'."
 msgstr "Očekáván znak „%c“, obdržen „%c“."
 
@@ -3360,19 +3312,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "Neočekávaná „)“"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " nebo"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "Neočekávaná „)“"
 
@@ -3383,7 +3332,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "Nemohu vytvořit dočasný adresář dle šablony „%s“: %s"
 
@@ -3745,31 +3693,26 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "Porušený"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "Nemohu opravit kvůli nedostupným balíkům"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "Hledat"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for: "
 msgid "Search for packages."
 msgstr "Hledat: "
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "Mám "
 
@@ -3812,7 +3755,6 @@
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "Vyžaduji instalaci balíku %s verze %s (%s)"
 
@@ -3835,13 +3777,11 @@
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading changelog; please wait..."
 msgid "Downloading the changelog of %s version %s..."
 msgstr "Stahují se změny; čekejte prosím..."
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "Preparing to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "Připravuji se na stažení seznamů změn"
 
@@ -4775,8 +4715,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid ""
-#| "Upgrading %s to version %s is preferred over all un-accpted alternatives."
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr ""
@@ -5080,7 +5018,6 @@
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Solution %s of %s (tier %s)."
 msgid "Solution %s of %s."
 msgstr "Řešení %s z %s (úroveň %s)."
 
@@ -5356,19 +5293,16 @@
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt verze %d.%d.%d\n"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt verze %d.%d.%d\n"
 
 #: src/main.cc:164
 #, fuzzy, c-format
-#| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Podpora Ept zakázána.\n"
 
@@ -5416,44 +5350,36 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Instaluje/aktualizuje balíky\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Odstraní balíky\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Odstraní balíky a jejich konfigurační soubory\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Ochrání balíky před aktualizací\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Zruší ochranu balíku před aktualizací\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Označí balíky, jako že byly instalovány automaticky\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Označí balíky, jako že byly instalovány ručně\n"
 
@@ -5467,21 +5393,16 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Stáhne seznamy nových/aktualizovatelných balíků\n"
 
 #: src/main.cc:190
 #, fuzzy, c-format
-#| msgid " safe-upgrade - Perform a safe upgrade\n"
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Provede bezpečnou aktualizaci\n"
 
 #: src/main.cc:191
 #, fuzzy, c-format
-#| msgid ""
-#| " full-upgrade - Perform an upgrade, possibly installing and removing "
-#| "packages\n"
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
@@ -5491,57 +5412,46 @@
 
 #: src/main.cc:192
 #, fuzzy, c-format
-#| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "„&BD“ pro instalaci závislostí pro sestavení balíku"
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Zapomene, které balíky jsou „nové“\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Hledá balíky podle jména a/nebo výrazu\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Zobrazí podrobné informace o balíku\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Smaže stažené .deb soubory balíků\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Smaže staré stažené .deb soubory balíků\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Zobrazí seznam změn balíku\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Stáhne .deb soubor balíku\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5559,12 +5469,6 @@
 
 #: src/main.cc:203
 #, fuzzy, c-format
-#| msgid ""
-#| " why-not      - Show the manually installed packages that lead to a "
-#| "conflict\n"
-#| "                with the given package, or why one or more packages "
-#| "would\n"
-#| "                lead to a conflict with the given package if installed\n"
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
 "conflict\n"
@@ -5582,7 +5486,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             Tato nápověda\n"
 
@@ -5611,24 +5514,17 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             Vždy vyžaduje potvrzení akcí\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr " -y             Na jednoduché ano/ne otázky odpoví automaticky „ano“\n"
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5637,9 +5533,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5648,8 +5541,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 šířka       Určí šířku zobrazení výsledků hledání\n"
@@ -5678,9 +5569,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5689,8 +5577,6 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
@@ -5698,9 +5584,6 @@
 
 #: src/main.cc:226
 #, fuzzy, c-format
-#| msgid ""
-#| " -q             In command-line mode, suppress the incremental progress\n"
-#| "                indicators.\n"
 msgid ""
 " -q             In command-line mode, suppress the incremental progress.\n"
 "                indicators.\n"
@@ -5708,15 +5591,11 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o klíč=hodn   Nastaví konfigurační volbu nazvanou „klíč“\n"
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -5885,7 +5764,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -5893,8 +5771,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -5902,7 +5778,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "-u a -i nemohou být použity společně s příkazem"
 
@@ -7399,9 +7274,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7423,9 +7295,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7955,19 +7824,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "Preparing to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "Připravuji se na stažení seznamů změn"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "Failed to download the changelog: %s"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "Nepodařilo se stáhnout seznam změn: %s"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading changelogs"
 msgid "Downloading the changelog of %s"
 msgstr "Stahují se změny"
 
Index: aptitude/po/da.po
===================================================================
--- aptitude.orig/po/da.po
+++ aptitude/po/da.po
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.5.9rc2\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2009-09-13 18:12+0200\n"
 "Last-Translator: Morten Bo Johansen <mbj@spamcop.net>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -870,7 +870,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "Ændringslog for %s"
 
@@ -1441,7 +1440,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "Whether the package is automatically installed."
 msgid "'a': the package was automatically installed or removed."
 msgstr "Vælg om pakken er automatisk installeret."
 
@@ -1574,9 +1572,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy, c-format
-#| msgid ""
-#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: "
-#| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
@@ -1624,10 +1619,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:259
 #, fuzzy
-#| msgid ""
-#| "reject the given package versions; don't display any solutions in which "
-#| "they occur.  Enter UNINST instead of a version to reject removing the "
-#| "package."
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package.  "
@@ -1639,9 +1630,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:261
 #, fuzzy
-#| msgid ""
-#| "accept the given package versions; display only solutions in which they "
-#| "occur.  Enter UNINST instead of a version to accept removing the package."
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package.  "
@@ -1746,31 +1734,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "Afinstallér de følgende pakker:"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "Se ^anbefalinger"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "Kræver ikke længere %s afinstalleret"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "Se ^anbefalinger"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Handlinger"
 
@@ -1929,14 +1912,12 @@
 
 #: src/cmdline/cmdline_resolver.cc:1201
 #, fuzzy
-#| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Kunne ikke udrede afhængigheder for opgradering (ingen løsning fundet)."
 
 #: src/cmdline/cmdline_resolver.cc:1207
 #, fuzzy, c-format
-#| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Kunne ikke udrede afhængigheder for opgraderingen (%s)."
 
@@ -2336,25 +2317,21 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages: "
 msgid "Package %s:"
 msgstr "Pakker: "
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Kildepakke: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Arkiv"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\".\n"
 msgid "No such package \"%s\"."
 msgstr "Ingen sådan pakke \"%s\".\n"
 
@@ -2393,7 +2370,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "søg: du skal indtaste mindst én søgeterm\n"
 
@@ -2550,7 +2526,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[FEJL]"
 
@@ -2799,7 +2774,6 @@
 
 #: src/generic/apt/aptitude_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Invalid hint \"%s\": expected a tier number, but found nothing."
 msgid ""
 "Invalid hint \"%s\": expected a component name and a number, but found "
 "nothing."
@@ -2807,7 +2781,6 @@
 
 #: src/generic/apt/aptitude_resolver.cc:521
 #, fuzzy, c-format
-#| msgid "Invalid hint \"%s\": expected a tier number, but found nothing."
 msgid ""
 "Invalid hint \"%s\": expected the numeric value following the component "
 "name, but found nothing."
@@ -2820,7 +2793,6 @@
 
 #: src/generic/apt/aptitude_resolver.cc:552
 #, fuzzy, c-format
-#| msgid "Invalid hint \"%s\": expected a target, but found nothing."
 msgid "Invalid hint \"%s\": expected a level, but found nothing."
 msgstr "Ugyldigt tip \"%s\": forventede et mål, men fandt ingenting."
 
@@ -2855,8 +2827,6 @@
 
 #: src/generic/apt/aptitude_resolver_universe.cc:828
 #, fuzzy, c-format
-#| msgid ""
-#| "Invalid search tier \"%s\" (not \"conflict\", \"minimum\", or an integer)."
 msgid ""
 "Invalid safety level \"%s\" (not \"discard\", \"maximum\", \"minimum\", or "
 "an integer)."
@@ -3108,7 +3078,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "Henter pakker"
 
@@ -3220,19 +3189,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "Failed to download the changelog: %s"
 msgid "Failed to download changelogs: %s"
 msgstr "Kunne ikke hente ændringsloggen til: %s"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "Failed to download the changelog: %s"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "Kunne ikke hente ændringsloggen til: %s"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "Ændringslog for %s"
 
@@ -3277,7 +3243,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Kunne ikke fortolke mønster %s"
 
@@ -3292,14 +3257,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "No upgrades are available."
 msgid "No tag descriptions are available."
 msgstr "Ingen tilgængelige opgraderinger."
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "No upgrades are available."
 msgid "No description available for %s."
 msgstr "Ingen tilgængelige opgraderinger."
 
@@ -3326,67 +3289,56 @@
 
 #: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got EOF."
 msgstr "Forventede '%c', modtog '%c'."
 
 #: src/generic/util/parsers.h:737
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got '%s'."
 msgstr "Forventede '%c', modtog '%c'."
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "Forventede et tal efter -q=, fik %s\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "Forkert tegn \"%c\" til handling\n"
 
 #: src/generic/util/parsers.h:832
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got EOF."
 msgstr "Forventede '%c', modtog '%c'."
 
 #: src/generic/util/parsers.h:843
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got '%c'."
 msgstr "Forventede '%c', modtog '%c'."
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "Forventede metode-identifikator, fik \"%c\""
 
 #: src/generic/util/parsers.h:1026
 #, fuzzy
-#| msgid "Expected '{', ')', or ',' following '||', got '%s'"
 msgid "Expected an integer following '-', got EOF."
 msgstr "Forventede '{', ')', eller ',' efter '||', fik '%s'"
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "Forventede metode-identifikator, fik \"%c\""
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid logger name \"%s\"."
 msgid "Invalid integer: \"%s\"."
 msgstr "Ugyldigt logningsbetegnelse \"%s\"."
 
 #: src/generic/util/parsers.h:1077
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected EOF, got '%c'."
 msgstr "Forventede '%c', modtog '%c'."
 
@@ -3400,19 +3352,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "Uventet ')'"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " eller"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "Uventet ')'"
 
@@ -3423,7 +3372,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "Kan ikke oprette midlertidigt katalog fra skabelon \"%s\": %s"
 
@@ -3790,25 +3738,21 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "Brudte"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "Kan ikke korrigere for utilgængelige pakker"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "^Find"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for: "
 msgid "Search for packages."
 msgstr "Søg efter: "
 
@@ -3855,7 +3799,6 @@
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "Kræver installering af %s version %s (%s)"
 
@@ -3877,13 +3820,11 @@
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading changelog; please wait..."
 msgid "Downloading the changelog of %s version %s..."
 msgstr "Henter ændringslog: vent venligst ..."
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "Preparing to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "Forbereder download af ændringslogfiler"
 
@@ -4812,8 +4753,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid ""
-#| "Upgrading %s to version %s is preferred over all un-accpted alternatives."
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr ""
@@ -5110,7 +5049,6 @@
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Solution %s of %s (tier %s)."
 msgid "Solution %s of %s."
 msgstr "Løsning %s af %s (lag %s)."
 
@@ -5387,19 +5325,16 @@
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt version %d.%d.%d\n"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt version %d.%d.%d\n"
 
 #: src/main.cc:164
 #, fuzzy, c-format
-#| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Ept-understøttelse slået fra.\n"
 
@@ -5447,44 +5382,36 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Installér/opgradér pakker\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Afinstallér pakker\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Afinstallér pakker og deres opsætningsfiler\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Tilbagehold en pakke\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Fortryd tilbageholdelse af en pakke\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Markér pakker som værende automatisk installeret\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Markér pakker som værende manuelt installeret\n"
 
@@ -5499,21 +5426,16 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Hent lister over nye/opgradérbare pakker\n"
 
 #: src/main.cc:190
 #, fuzzy, c-format
-#| msgid " safe-upgrade - Perform a safe upgrade\n"
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade  - udfør en sikker opgradering\n"
 
 #: src/main.cc:191
 #, fuzzy, c-format
-#| msgid ""
-#| " full-upgrade - Perform an upgrade, possibly installing and removing "
-#| "packages\n"
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
@@ -5523,57 +5445,46 @@
 
 #: src/main.cc:192
 #, fuzzy, c-format
-#| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "\"&BD\" for at installere en pakkes byggeafhængigheder."
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Glem hvilke pakker der er \"nye\"\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Søg efter en pakke efter navn og/eller udtryk\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Vis detaljerede oplysninger om en pakke\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Slet hentede pakkefiler\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Slet gamle, hentede pakkefiler\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Vis en pakkes ændringslog\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Hent en pakkes .deb-fil\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5594,12 +5505,6 @@
 
 #: src/main.cc:203
 #, fuzzy, c-format
-#| msgid ""
-#| " why-not      - Show the manually installed packages that lead to a "
-#| "conflict\n"
-#| "                with the given package, or why one or more packages "
-#| "would\n"
-#| "                lead to a conflict with the given package if installed\n"
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
 "conflict\n"
@@ -5618,7 +5523,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             Denne hjælpetekst\n"
 
@@ -5651,24 +5555,17 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             Spørg altid om bekræftelse eller handlinger\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr " -y             Antag at svaret til simple ja/nej-spørgsmål er 'ja'\n"
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5678,9 +5575,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5689,8 +5583,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 ""
@@ -5721,9 +5613,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5731,17 +5620,12 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr " -t [udgave]   Angiv hvilken udgave pakker skal installeres fra\n"
 
 #: src/main.cc:226
 #, fuzzy, c-format
-#| msgid ""
-#| " -q             In command-line mode, suppress the incremental progress\n"
-#| "                indicators.\n"
 msgid ""
 " -q             In command-line mode, suppress the incremental progress.\n"
 "                indicators.\n"
@@ -5750,16 +5634,12 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o nøgle=værdi     Tildel værdi direkte til opsætningstilvalget \"nøgle\"\n"
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -8007,19 +7887,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "Preparing to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "Forbereder download af ændringslogfiler"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "Failed to download the changelog: %s"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "Kunne ikke hente ændringsloggen til: %s"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading changelogs"
 msgid "Downloading the changelog of %s"
 msgstr "Henter ændringslogs"
 
Index: aptitude/po/de.po
===================================================================
--- aptitude.orig/po/de.po
+++ aptitude/po/de.po
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.2.15.5\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2008-10-02 15:13+0200\n"
 "Last-Translator: Jens Seidel <jensseidel@users.sf.net>\n"
 "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -271,9 +271,6 @@
 
 #: src/apt_options.cc:241
 #, fuzzy
-#| msgid ""
-#| "If this option is enabled, the menu bar will only appear when it has been "
-#| "activated by pressing the menu key."
 msgid ""
 "If this option is enabled, then the first view displayed on startup will be "
 "a flat view instead of the default view."
@@ -714,7 +711,6 @@
 
 #: src/cmdline/cmdline_action.cc:212
 #, fuzzy, c-format
-#| msgid "Unable to satisfy the build-depends: %s."
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Kann die Bauabhängigkeiten nicht auflösen: %s."
 
@@ -771,7 +767,6 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr ""
 "%s ist momentan nicht installiert und wird folglich nicht erneut "
@@ -779,7 +774,6 @@
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "»%s« ist bereits in der angeforderten Version (%s) installiert\n"
@@ -885,7 +879,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "ChangeLog für %s"
 
@@ -1059,7 +1052,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "nichts"
 
@@ -1477,7 +1469,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "»&M« zum Markieren von Paketen als automatisch installiert"
 
@@ -1613,9 +1604,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy, c-format
-#| msgid ""
-#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: "
-#| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
@@ -1665,10 +1653,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:259
 #, fuzzy
-#| msgid ""
-#| "reject the given package versions; don't display any solutions in which "
-#| "they occur.  Enter UNINST instead of a version to reject removing the "
-#| "package."
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package.  "
@@ -1680,9 +1664,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:261
 #, fuzzy
-#| msgid ""
-#| "accept the given package versions; display only solutions in which they "
-#| "occur.  Enter UNINST instead of a version to accept removing the package."
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package.  "
@@ -1790,31 +1771,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "Die folgenden Empfehlungen unaufgelöst lassen:"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "^Empfehlungen überprüfen"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "Erfordert nicht länger die Entfernung von %s"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "^Empfehlungen überprüfen"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Aktionen"
 
@@ -1975,7 +1951,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:1201
 #, fuzzy
-#| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Abhängigkeiten für die Aktualisierung können nicht aufgelöst werden (keine "
@@ -1983,7 +1958,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:1207
 #, fuzzy, c-format
-#| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Kann Abhängigkeiten für die Aktualisierung nicht auflösen (%s)!"
 
@@ -2014,13 +1988,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "ist aber nicht installationsfähig"
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "aber %s soll installiert werden."
 
@@ -2119,13 +2091,11 @@
 
 #: src/cmdline/cmdline_show.cc:326
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s%s; will be installed"
 msgstr "%s; wird installiert werden"
 
 #: src/cmdline/cmdline_show.cc:328
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s%s; will be installed automatically"
 msgstr "%s; wird automatisch installiert"
 
@@ -2391,25 +2361,21 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "Pakete"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Quellpaket: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Archiv"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\".\n"
 msgid "No such package \"%s\"."
 msgstr "Kein solches Paket »%s«.\n"
 
@@ -2448,7 +2414,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "search: Sie müssen einen Suchbegriff angeben\n"
 
@@ -2577,7 +2542,6 @@
 
 #: src/cmdline/cmdline_why.cc:1285
 #, fuzzy, c-format
-#| msgid "Packages depending on %s"
 msgid "Packages requiring %s:"
 msgstr "Pakete, die von %s abhängen"
 
@@ -2593,8 +2557,6 @@
 
 #: src/cmdline/cmdline_why.cc:1416
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: this command requires at least one argument (the package to query)."
 msgid ""
 "%s: this command requires at least one argument (the package to query).\n"
 msgstr ""
@@ -2613,7 +2575,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[FEHLER]"
 
@@ -2976,7 +2937,6 @@
 
 #: src/generic/apt/download_update_manager.cc:138
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated quoted string in command: %s"
 msgstr "Nicht begrenzter String nach %s"
 
@@ -3063,7 +3023,6 @@
 
 #: src/generic/apt/dump_packages.cc:674
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create truncated cache: %s."
 msgstr "Das Paket %s konnte nicht gefunden werden"
 
@@ -3186,7 +3145,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "Herunterladen von Paketen"
 
@@ -3224,7 +3182,6 @@
 
 #: src/generic/apt/matching/parse.cc:860
 #, fuzzy, c-format
-#| msgid "Unknown matcher type: \"%s\"."
 msgid "Unknown term type: \"%s\"."
 msgstr "Unbekanntes Schlüsselwort: »%s«."
 
@@ -3232,9 +3189,6 @@
 #. Leave the question marks attached to the string placeholders.
 #: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883
 #, fuzzy, c-format
-#| msgid ""
-#| "The ?%s matcher must be used in a \"wide\" context (a top-level context, "
-#| "or a context enclosed by ?%s)."
 msgid ""
 "The ?%s term must be used in a \"wide\" context (a top-level context, or a "
 "context enclosed by ?%s)."
@@ -3265,7 +3219,6 @@
 
 #: src/generic/apt/matching/parse.cc:1388
 #, fuzzy, c-format
-#| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "Ungültiger Ausdruck"
 
@@ -3303,19 +3256,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "URL für Änderungsprotokolle"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "URL für Änderungsprotokolle"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "ChangeLog für %s"
 
@@ -3361,7 +3311,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Das Zeichen %s konnte nicht verarbeitet werden"
 
@@ -3376,14 +3325,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "Nicht installiert"
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "Nicht installiert"
 
@@ -3410,68 +3357,57 @@
 
 #: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got EOF."
 msgstr "Erwartete »%c«, erhielt »%c«."
 
 #: src/generic/util/parsers.h:737
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got '%s'."
 msgstr "Erwartete »%c«, erhielt »%c«."
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "Nach -q= wurde eine Nummer erwartet, nicht %s\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "Ungültiger Befehlsbuchstabe '%c'\n"
 
 #: src/generic/util/parsers.h:832
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got EOF."
 msgstr "Erwartete »%c«, erhielt »%c«."
 
 #: src/generic/util/parsers.h:843
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got '%c'."
 msgstr "Erwartete »%c«, erhielt »%c«."
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "Erwartete Richtlinienwert, erhielt »%c«"
 
 #: src/generic/util/parsers.h:1026
 #, fuzzy
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected an integer following '-', got EOF."
 msgstr "Erwartete »,« oder »)« nach »||«, erhielt »%s«"
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "Erwartete Richtlinienwert, erhielt »%c«"
 
 #  Should never happen.
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "Ungültige Operation: %s"
 
 #: src/generic/util/parsers.h:1077
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected EOF, got '%c'."
 msgstr "Erwartete »%c«, erhielt »%c«."
 
@@ -3485,19 +3421,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "Unerwartete ')'"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " oder"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "Unerwartete ')'"
 
@@ -3508,7 +3441,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "Kann temporäres Verzeichnis aus Vorlage »%s« nicht erstellen: %s"
 
@@ -3543,7 +3475,6 @@
 
 #: src/gtk/aptitude.glade:19 src/gtk/aptitude.glade:2273
 #, fuzzy
-#| msgid "False"
 msgid "_File"
 msgstr "Falsch"
 
@@ -3612,13 +3543,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "Paket"
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "Ansichten"
 
@@ -3638,7 +3567,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "Hilfe"
 
@@ -3649,7 +3577,6 @@
 
 #: src/gtk/aptitude.glade:345 src/gtk/aptitude.glade:2614
 #, fuzzy
-#| msgid "List Update"
 msgid "Update"
 msgstr "Listenaktualisierung"
 
@@ -3671,7 +3598,6 @@
 
 #: src/gtk/aptitude.glade:389 src/gtk/aptitude.glade:2658
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Remove"
 msgstr "Installiert"
 
@@ -3685,33 +3611,28 @@
 
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "Die Paketliste nicht mehr filtern"
 
 #: src/gtk/aptitude.glade:649
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "Apply these settings to all active package lists."
 msgstr "Einen Filter auf die Paketliste anwenden"
 
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "Suchen"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "neuinst."
 
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "Feh "
 
@@ -3726,19 +3647,16 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "Abhängigkeiten von %s"
 
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "^Changelog"
 msgid "Changelog"
 msgstr "^ChangeLog"
 
 #: src/gtk/aptitude.glade:1020
 #, fuzzy
-#| msgid "False"
 msgid "Files"
 msgstr "Falsch"
 
@@ -3752,7 +3670,6 @@
 
 #: src/gtk/aptitude.glade:1051
 #, fuzzy
-#| msgid "Tags"
 msgid "tags"
 msgstr "Marken"
 
@@ -3775,13 +3692,11 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "Zustand"
 
 #: src/gtk/aptitude.glade:1247
 #, fuzzy
-#| msgid "Unknown action type: %s"
 msgid "Group by action type"
 msgstr "Unbekannter Aktionstyp: %s"
 
@@ -3810,13 +3725,11 @@
 
 #: src/gtk/aptitude.glade:1328
 #, fuzzy
-#| msgid "Toggle ^Rejected"
 msgid "Rejected"
 msgstr "^Zurückgewiesene umschalten"
 
 #: src/gtk/aptitude.glade:1343
 #, fuzzy
-#| msgid "Preferences"
 msgid "No preference"
 msgstr "Einstellungen"
 
@@ -3830,33 +3743,28 @@
 
 #: src/gtk/aptitude.glade:1400
 #, fuzzy
-#| msgid "^Examine Solution"
 msgid "Find a new solution"
 msgstr "Lösung ^untersuchen"
 
 # FIXME: s/to/for/?
 #: src/gtk/aptitude.glade:1404
 #, fuzzy
-#| msgid "Select the next solution to the dependency problems."
 msgid "Calculate the next solution that has not yet been generated."
 msgstr "Die nächste Lösung dieser Abhängigkeitsprobleme wählen."
 
 #: src/gtk/aptitude.glade:1419
 #, fuzzy
-#| msgid "Perform the actions contained in the currently selected solution."
 msgid ""
 "Perform the actions in the currently selected solution and close this tab."
 msgstr "Ausführen der Aktionen der aktuell gewählten Lösung."
 
 #: src/gtk/aptitude.glade:1576
 #, fuzzy
-#| msgid "Upgrade"
 msgid "Upgrade Summary"
 msgstr "Aktualisierung"
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "Quellpaket: "
 
@@ -3868,7 +3776,6 @@
 
 #: src/gtk/aptitude.glade:1652
 #, fuzzy
-#| msgid "Manual"
 msgid "Fix Manually"
 msgstr "Handbuch"
 
@@ -3916,32 +3823,27 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "Kaputt"
 
 # CHECKME
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "Kann dies für nichtverfügbare Pakete nicht korrigieren"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "^Suchen"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for: "
 msgid "Search for packages."
 msgstr "Suche nach: "
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "Habe "
 
@@ -3975,19 +3877,16 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "URL für Änderungsprotokolle"
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "Erfordert die Installation von %s Version %s (%s)"
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -3997,7 +3896,6 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr ""
@@ -4006,13 +3904,11 @@
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "Herunterladen des Changelogs"
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "URL für Änderungsprotokolle"
 
@@ -4026,7 +3922,6 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "URL für Änderungsprotokolle"
 
@@ -4036,8 +3931,6 @@
 
 #: src/gtk/dashboardtab.cc:414
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] "%d Aktualisierung"
@@ -4045,13 +3938,11 @@
 
 #: src/gtk/dashboardtab.cc:633
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No upgrades are available."
 msgstr "Nicht installiert"
 
 #: src/gtk/dashboardtab.cc:645
 #, fuzzy
-#| msgid "Unable to locate package %s"
 msgid "Unable to calculate an upgrade."
 msgstr "Das Paket %s konnte nicht gefunden werden"
 
@@ -4086,25 +3977,21 @@
 
 #: src/gtk/dashboardtab.cc:708
 #, fuzzy, c-format
-#| msgid "Internal error: Default column string is unparsable"
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr "Interner Fehler: Standard-Spalten-Zeichenkette nicht interpretierbar"
 
 #: src/gtk/dependency_chains_tab.cc:78
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: start"
 msgstr "Abhängigkeitsbehandlung"
 
 #: src/gtk/dependency_chains_tab.cc:82
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: end"
 msgstr "Abhängigkeitsbehandlung"
 
 #: src/gtk/dependency_chains_tab.cc:86
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: results"
 msgstr "Abhängigkeitsbehandlung"
 
@@ -4114,7 +4001,6 @@
 
 #: src/gtk/dependency_chains_tab.cc:282
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency chain found."
 msgstr "Abhängigkeitsbehandlung"
 
@@ -4124,13 +4010,11 @@
 
 #: src/gtk/download.cc:185
 #, fuzzy
-#| msgid "False"
 msgid "Failed"
 msgstr "Falsch"
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "Lösche heruntergeladene Dateien"
 
@@ -4141,13 +4025,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "Gesamtfortschritt: "
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description"
 msgid "Short Description"
 msgstr "Beschreibung"
 
@@ -4158,13 +4040,11 @@
 #  Erk!  That's weird!
 #: src/gtk/download.cc:319
 #, fuzzy
-#| msgid "Cleaning while a download is in progress is not allowed"
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr "Aufräumen, während ein Download läuft, ist nicht erlaubt"
 
 #: src/gtk/download.cc:395 src/gtk/gui.cc:832
 #, fuzzy
-#| msgid "View next display"
 msgid "View Details"
 msgstr "Nächste Ansicht zeigen"
 
@@ -4184,19 +4064,16 @@
 
 #: src/gtk/download.cc:486
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s: %lu/%lu, stalled"
 msgstr "%s; wird installiert werden"
 
 #: src/gtk/download.cc:507
 #, fuzzy, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr " [ %i%% ] (%sB/s, %s verbleiben)"
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "aber %s soll installiert werden."
 
@@ -4210,7 +4087,6 @@
 
 #: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "Das Paket %s konnte nicht gefunden werden"
 
@@ -4221,7 +4097,6 @@
 
 #: src/gtk/dpkg_terminal.cc:429
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "%s: Unable to accept a connection: %s"
 msgstr "Kann temporäres Verzeichnis aus Vorlage »%s« nicht erstellen: %s"
 
@@ -4247,80 +4122,67 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "%s Versionen"
 
 #: src/gtk/entitysummary.cc:123
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Install %s version %s"
 msgstr "Installiere(%s stellt %s bereit)"
 
 #: src/gtk/entitysummary.cc:131
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrade to %s version %s"
 msgstr "  cwidget-Version: %s\n"
 
 #: src/gtk/entitysummary.cc:142
 #, fuzzy, c-format
-#| msgid "Keep the following packages at their current version:"
 msgid "Don't hold %s at its current version."
 msgstr "Die folgenden Pakete in ihrer aktuellen Version beibehalten:"
 
 #: src/gtk/entitysummary.cc:145 src/gtk/entitysummary.cc:165
 #: src/gtk/entitysummary.cc:168
 #, fuzzy, c-format
-#| msgid "Canc^el pending actions"
 msgid "Cancel any actions on %s."
 msgstr "Nicht abgeschlossene Aktionen abbre^chen"
 
 #: src/gtk/entitysummary.cc:150
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the purge of %s."
 msgstr "Breche die Entfernung von %F ab"
 
 #: src/gtk/entitysummary.cc:152
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s."
 msgstr "Breche die Entfernung von %F ab"
 
 #: src/gtk/entitysummary.cc:157
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the upgrade of %s."
 msgstr "Breche die Entfernung von %F ab"
 
 #: src/gtk/entitysummary.cc:159
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s."
 msgstr "Breche die Installation von %F ab"
 
 #: src/gtk/entitysummary.cc:161
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the downgrade of %s."
 msgstr "Breche die Entfernung von %F ab"
 
 #: src/gtk/entitysummary.cc:163
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the reinstallation of %s."
 msgstr "Breche die Installation von %F ab"
 
 #: src/gtk/entitysummary.cc:206
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "Remove %s"
 msgstr "Entfernen(%s)"
 
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "^Vollständig entfernen"
 
@@ -4331,19 +4193,16 @@
 
 #: src/gtk/entitysummary.cc:223
 #, fuzzy, c-format
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Mark %s as automatically installed."
 msgstr "»&M« zum Markieren von Paketen als automatisch installiert"
 
 #: src/gtk/entitysummary.cc:228
 #, fuzzy, c-format
-#| msgid "The package \"%s\" is manually installed.\n"
 msgid "Mark %s as manually installed."
 msgstr "Das Paket »%s« wurde manuell installiert.\n"
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
 msgid "%s is a virtual package provided by:\n"
 msgstr "»%s« ist ein virtuelles Paket, das bereitgestellt wird von:\n"
 
@@ -4353,13 +4212,11 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "Quellpaket: "
 
 #: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 #, fuzzy
-#| msgid "ProgName"
 msgid "Name"
 msgstr "ProgName"
 
@@ -4369,13 +4226,11 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "Konnte Datei »%s« nicht öffnen"
 
 #: src/gtk/entityview.cc:412
 #, fuzzy, c-format
-#| msgid "Rejecting the removal of %s"
 msgid "Editing the columns of \"%s\""
 msgstr "Lehne die Entfernung von %s ab"
 
@@ -4389,25 +4244,21 @@
 
 #: src/gtk/entityview.cc:570
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Whether the package is automatically installed."
 msgstr "»&M« zum Markieren von Paketen als automatisch installiert"
 
 #: src/gtk/entityview.cc:576
 #, fuzzy
-#| msgid "Cancel any action on the selected package"
 msgid "The name and description of the package."
 msgstr "Alle Aktionen mit dem gewählten Paket zurücknehmen"
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "Version: "
 
 #: src/gtk/entityview.cc:592
 #, fuzzy
-#| msgid "Check for new versions of packages"
 msgid "The version number of the package."
 msgstr "Nach neuen oder aktualisierten Paketen suchen"
 
@@ -4428,7 +4279,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "nicht installiert"
 
@@ -4438,37 +4288,31 @@
 
 #: src/gtk/gui.cc:82
 #, fuzzy
-#| msgid "unpacked"
 msgid "Unpacked"
 msgstr "entpackt"
 
 #: src/gtk/gui.cc:83
 #, fuzzy
-#| msgid "half-config"
 msgid "Half-configured"
 msgstr "halb-konfig"
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "half-install"
 msgid "Half-installed"
 msgstr "halb-install"
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "nicht installiert (Konfigurationsdateien vorhanden)"
 
 #: src/gtk/gui.cc:86
 #, fuzzy
-#| msgid "triggers-awaited"
 msgid "Triggers awaited"
 msgstr "Auslöser erwartet"
 
 #: src/gtk/gui.cc:87
 #, fuzzy
-#| msgid "triggers-pending"
 msgid "Triggers pending"
 msgstr "Auslöser aktiv"
 
@@ -4494,13 +4338,11 @@
 
 #: src/gtk/gui.cc:97
 #, fuzzy
-#| msgid "forbidden upgrade"
 msgid "Hold (don't upgrade)"
 msgstr "verbotene Aktualisierung"
 
 #: src/gtk/gui.cc:99
 #, fuzzy
-#| msgid "Related Dependencies"
 msgid "Unsatisfied dependencies"
 msgstr "Ähnliche Abhängigkeiten"
 
@@ -4514,13 +4356,11 @@
 
 #: src/gtk/gui.cc:290
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "Einen Filter auf die Paketliste anwenden"
 
 #: src/gtk/gui.cc:298 src/gtk/gui.cc:946
 #, fuzzy
-#| msgid "Downloading..."
 msgid "Download already running."
 msgstr "Ladend..."
 
@@ -4530,13 +4370,11 @@
 
 #: src/gtk/gui.cc:359
 #, fuzzy, c-format
-#| msgid "List Update"
 msgid "Update %s?"
 msgstr "Listenaktualisierung"
 
 #: src/gtk/gui.cc:385
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
@@ -4564,31 +4402,26 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "%s changes"
 msgid "Done applying changes!"
 msgstr "%s Änderungen"
 
 #: src/gtk/gui.cc:823
 #, fuzzy
-#| msgid "%s changes"
 msgid "Applying changes..."
 msgstr "%s Änderungen"
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "s: %F"
 msgid "%s: %s"
 msgstr "s: %F"
 
 #: src/gtk/gui.cc:878
 #, fuzzy, c-format
-#| msgid "No broken packages."
 msgid "Error in package %s"
 msgstr "Keine kaputten Pakete."
 
 #: src/gtk/gui.cc:906
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Konnte %s nicht durch neue Konfigurationsdatei ersetzen"
 
@@ -4598,25 +4431,21 @@
 
 #: src/gtk/gui.cc:1038
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "Keine kaputten Pakete."
 
 #: src/gtk/gui.cc:1071
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "Keine kaputten Pakete."
 
 #: src/gtk/gui.cc:1075
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "Abhängigkeiten auflösen"
 
 #: src/gtk/gui.cc:1103
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Keine Pakete sind kaputt."
@@ -4624,13 +4453,11 @@
 
 #: src/gtk/gui.cc:1147
 #, fuzzy
-#| msgid "%s changes"
 msgid "View changes"
 msgstr "%s Änderungen"
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "%s changes"
 msgid "Apply changes"
 msgstr "%s Änderungen"
 
@@ -4639,8 +4466,6 @@
 #. font.
 #: src/gtk/gui.cc:1192
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%d package to install"
 msgid_plural "%d packages to install"
 msgstr[0] "%d Installation"
@@ -4651,7 +4476,6 @@
 #. font.
 #: src/gtk/gui.cc:1207
 #, fuzzy, c-format
-#| msgid "failed to remove %s"
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "%s konnte nicht entfernt werden"
@@ -4659,7 +4483,6 @@
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "DownloadGröß"
 
@@ -4674,19 +4497,16 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "not installed"
 msgid "Not implemented"
 msgstr "nicht installiert"
 
 #: src/gtk/gui.cc:1408 src/gtk/gui.cc:1427
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "Installiert"
 
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "^Vollständig entfernen"
 
@@ -4704,7 +4524,6 @@
 
 #: src/gtk/gui.cc:1455
 #, fuzzy
-#| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "Benutzerhandbuch"
 
@@ -4719,7 +4538,6 @@
 
 #: src/gtk/info.cc:161 src/gtk/pkgview.cc:169
 #, fuzzy
-#| msgid "Current status: %F."
 msgid "Current status"
 msgstr "Aktueller Status: %F."
 
@@ -4729,19 +4547,16 @@
 
 #: src/gtk/info.cc:496
 #, fuzzy
-#| msgid "Not Installed"
 msgid "Not available"
 msgstr "Nicht installiert"
 
 #: src/gtk/info.cc:545
 #, fuzzy
-#| msgid "C^ycle Package Information"
 msgid "Package information: version list"
 msgstr "Paketinformationen ^umschalten"
 
 #: src/gtk/info.cc:555
 #, fuzzy
-#| msgid "Packages which depend on %s"
 msgid "Package information: dependency list"
 msgstr "Pakete, die von %s abhängen"
 
@@ -4751,7 +4566,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "nein"
 
@@ -4765,7 +4579,6 @@
 
 #: src/gtk/packagestab.cc:203
 #, fuzzy, c-format
-#| msgid "No packages matched the pattern \"%ls\"."
 msgid "No packages matched \"%s\"."
 msgstr "Keine Pakete passen zum Suchmuster »%ls«."
 
@@ -4775,31 +4588,26 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "Paket: "
 
 #: src/gtk/pkgview.cc:224
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed automatically."
 msgstr "%s; wird automatisch installiert"
 
 #: src/gtk/pkgview.cc:227
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed automatically."
 msgstr "%s; wird automatisch installiert"
 
 #: src/gtk/pkgview.cc:235
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed manually."
 msgstr "%s; wird automatisch installiert"
 
 #: src/gtk/pkgview.cc:238
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed manually."
 msgstr "%s; wird automatisch installiert"
 
@@ -4809,13 +4617,11 @@
 
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "Suchen"
 
 #: src/gtk/pkgview.cc:718
 #, fuzzy
-#| msgid "Building view"
 msgid "Finalizing view"
 msgstr "Ansicht aufbauen"
 
@@ -4947,13 +4753,11 @@
 
 #: src/gtk/previewtab.cc:179
 #, fuzzy
-#| msgid "Preview"
 msgid "Preview: "
 msgstr "Vorschau"
 
 #: src/gtk/resolver.cc:68
 #, fuzzy, c-format
-#| msgid "Error while dumping resolver state"
 msgid "Error in dependency resolver: %s"
 msgstr "Fehler beim Ausgeben des Auflösungsstatus"
 
@@ -4968,7 +4772,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package"
 msgid "Virtual package"
 msgstr "Paket"
 
@@ -4978,43 +4781,36 @@
 
 #: src/gtk/resolver.cc:377
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Removing %s is rejected."
 msgstr "Entferne %s"
 
 #: src/gtk/resolver.cc:382
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Canceling the installation of %s is rejected."
 msgstr "Breche die Installation von %F ab"
 
 #: src/gtk/resolver.cc:391
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Canceling the removal of %s is rejected."
 msgstr "Breche die Entfernung von %F ab"
 
 #: src/gtk/resolver.cc:394
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keeping %s at version %s is rejected."
 msgstr "Behalte %F in Version %s (%s) bei"
 
 #: src/gtk/resolver.cc:401
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Installing %s version %s is rejected."
 msgstr "Installiere(%s stellt %s bereit)"
 
 #: src/gtk/resolver.cc:407
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrading %s to version %s is rejected."
 msgstr "  cwidget-Version: %s\n"
 
 #: src/gtk/resolver.cc:413
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrading %s to version %s is rejected."
 msgstr "%s Versionen"
 
@@ -5056,7 +4852,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr "%s Versionen"
@@ -5154,7 +4949,6 @@
 
 #: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862
 #, fuzzy
-#| msgid "Remove the following packages:"
 msgid "Keep the following packages:"
 msgstr "Die folgenden Pakete entfernen:"
 
@@ -5170,121 +4964,101 @@
 
 #: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900
 #, fuzzy
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "Leave the following dependencies unresolved:"
 msgstr "Die folgenden Abhängigkeiten unaufgelöst beibehalten:%n"
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Remove %F [%s (%s)]"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "Entferne %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1523
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "Installiere %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1531
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s"
 msgstr "Breche die Installation von %F ab"
 
 #: src/gtk/resolver.cc:1534
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s"
 msgstr "Breche die Entfernung von %F ab"
 
 #: src/gtk/resolver.cc:1537
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "Behalte %F in Version %s (%s) bei"
 
 #: src/gtk/resolver.cc:1544
 #, fuzzy, c-format
-#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Aktualisiere %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1553
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Deaktualisiere %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>Remove</b> %s"
 msgstr "Entfernen(%s)"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>remove</b> %s"
 msgstr "Entfernen(%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "Behalte %F in Version %s (%s) bei"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>keep</b> %s at version %s"
 msgstr "Behalte %F in Version %s (%s) bei"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr "Breche die Installation von %F ab"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>cancel</b> the installation of %s"
 msgstr "Breche die Installation von %F ab"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>Install</b> %s %s"
 msgstr "Installiere %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>install</b> %s %s"
 msgstr "Installiere %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>Downgrade</b> %s to version %s"
 msgstr "  cwidget-Version: %s\n"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>downgrade</b> %s to version %s"
 msgstr "  cwidget-Version: %s\n"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>Upgrade</b> %s to version %s"
 msgstr "%s Versionen"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>upgrade</b> %s to version %s"
 msgstr "%s Versionen"
 
@@ -5300,8 +5074,6 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "%d Installation"
@@ -5309,8 +5081,6 @@
 
 #: src/gtk/resolver.cc:1740
 #, fuzzy, c-format
-#| msgid "%d removal"
-#| msgid_plural "%d removals"
 msgid "%s remove"
 msgid_plural "%s removes"
 msgstr[0] "%d Entfernung"
@@ -5318,8 +5088,6 @@
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "%d keep"
-#| msgid_plural "%d keeps"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "%d Beibehaltung"
@@ -5327,8 +5095,6 @@
 
 #: src/gtk/resolver.cc:1752
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%s upgrade"
 msgid_plural "%s upgrades"
 msgstr[0] "%d Aktualisierung"
@@ -5336,8 +5102,6 @@
 
 #: src/gtk/resolver.cc:1758
 #, fuzzy, c-format
-#| msgid "%d downgrade"
-#| msgid_plural "%d downgrades"
 msgid "%s downgrade"
 msgid_plural "%s downgrades"
 msgstr[0] "%d Deaktualisierung"
@@ -5345,7 +5109,6 @@
 
 #: src/gtk/resolver.cc:1764
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "%s unresolved recommendation"
 msgid_plural "%s unresolved recommendations"
 msgstr[0] "^Empfehlungen überprüfen"
@@ -5353,19 +5116,16 @@
 
 #: src/gtk/resolver.cc:2056
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions yet."
 msgstr "Keine weiteren Lösungen."
 
 #: src/gtk/resolver.cc:2063
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency solution was found."
 msgstr "Abhängigkeitsbehandlung"
 
 #: src/gtk/resolver.cc:2064
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions."
 msgstr "Keine weiteren Lösungen."
 
@@ -5375,19 +5135,16 @@
 
 #: src/gtk/resolver.cc:2076
 #, fuzzy, c-format
-#| msgid "No more solutions."
 msgid "%u solutions."
 msgstr "Keine weiteren Lösungen."
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "Konnte Datei »%s« nicht öffnen"
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr "[Geladen]"
 
@@ -5437,7 +5194,6 @@
 
 #: src/load_grouppolicy.cc:305
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected ',', '%c', or '('; got '%c'"
 msgstr "Erwartete »,« oder »(«, erhielt »%c«"
 
@@ -5545,7 +5301,6 @@
 
 #: src/load_grouppolicy.cc:713
 #, fuzzy, c-format
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected '{', ')', or ',' following '||', got '%s'"
 msgstr "Erwartete »,« oder »)« nach »||«, erhielt »%s«"
 
@@ -5667,19 +5422,16 @@
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt-Version %d.%d.%d\n"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt-Version %d.%d.%d\n"
 
 #: src/main.cc:164
 #, fuzzy, c-format
-#| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Ept-Unterstützung nicht aktiviert.\n"
 
@@ -5725,44 +5477,36 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install        Installiere/aktualisiere Pakete\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove         Entferne Pakete\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge          Entferne Pakete und ihre Konfigurationsdateien\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold           Pakete auf »zurückhalten« setzen\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold         Einen »hold«-Befehl zurücknehmen\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto       Pakete als automatisch installiert markieren\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto     Pakete als manuell installiert markieren\n"
 
@@ -5776,21 +5520,16 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update         Listen neuer/aktualisierbarer Paketen laden\n"
 
 #: src/main.cc:190
 #, fuzzy, c-format
-#| msgid " safe-upgrade - Perform a safe upgrade\n"
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade   Sichere Aktualisierung durchführen\n"
 
 #: src/main.cc:191
 #, fuzzy, c-format
-#| msgid ""
-#| " full-upgrade - Perform an upgrade, possibly installing and removing "
-#| "packages\n"
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
@@ -5799,57 +5538,46 @@
 
 #: src/main.cc:192
 #, fuzzy, c-format
-#| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "»&BD« zum Installieren der Bauabhängigkeiten eines Pakets."
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new     Vergessen welche Pakete »neu« sind\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search         Pakete nach Namen oder Ausdruck suchen\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show           Details über ein Paket anzeigen\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean          Heruntergeladene Pakete löschen\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean      Alte heruntergeladene Pakete löschen\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog      Änderungsprotokoll eines Pakets\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download       Die .deb-Datei eines Pakets herunterladen\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5870,12 +5598,6 @@
 
 #: src/main.cc:203
 #, fuzzy, c-format
-#| msgid ""
-#| " why-not      - Show the manually installed packages that lead to a "
-#| "conflict\n"
-#| "                with the given package, or why one or more packages "
-#| "would\n"
-#| "                lead to a conflict with the given package if installed\n"
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
 "conflict\n"
@@ -5895,7 +5617,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             Dieser Hilfetext\n"
 
@@ -5925,15 +5646,11 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             Immer zur Bestätigung nachfragen\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
@@ -5942,9 +5659,6 @@
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5953,9 +5667,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5965,8 +5676,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 ""
@@ -5997,9 +5706,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -6009,8 +5715,6 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
@@ -6019,9 +5723,6 @@
 
 #: src/main.cc:226
 #, fuzzy, c-format
-#| msgid ""
-#| " -q             In command-line mode, suppress the incremental progress\n"
-#| "                indicators.\n"
 msgid ""
 " -q             In command-line mode, suppress the incremental progress.\n"
 "                indicators.\n"
@@ -6029,15 +5730,11 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o schl=wert   Die Einstellung 'schl' direkt setzen\n"
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -6077,7 +5774,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "true"
 msgid "trace"
 msgstr "wahr"
 
@@ -6091,7 +5787,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "nein"
 
@@ -6105,7 +5800,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:377
 #, fuzzy
-#| msgid "Err "
 msgid "error"
 msgstr "Feh "
 
@@ -6113,7 +5807,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:380
 #, fuzzy
-#| msgid "false"
 msgid "fatal"
 msgstr "falsch"
 
@@ -6135,7 +5828,6 @@
 #  Should never happen.
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "Ungültige Operation: %s"
 
@@ -6188,7 +5880,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "Paket"
 
@@ -6198,7 +5889,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "Alle Pakete"
 
@@ -6218,7 +5908,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -6226,8 +5915,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -6237,7 +5924,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "-u und -i dürfen nicht mit einem Kommando verwendet werden"
 
@@ -7528,7 +7214,6 @@
 
 #: src/ui.cc:472
 #, fuzzy, c-format
-#| msgid "Unable to open %ls"
 msgid "Unable to fork: %s"
 msgstr "%ls konnte nicht geöffnet werden"
 
@@ -7812,9 +7497,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7839,9 +7521,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -8382,19 +8061,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "URL für Änderungsprotokolle"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "URL für Änderungsprotokolle"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "Herunterladen des Changelogs"
 
Index: aptitude/po/dz.po
===================================================================
--- aptitude.orig/po/dz.po
+++ aptitude/po/dz.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2007-06-14 03:27+0530\n"
 "Last-Translator: Tshewang Norbu <bumthap2006@hotmail.com>\n"
 "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -173,7 +173,6 @@
 
 #: src/apt_options.cc:211
 #, fuzzy
-#| msgid "Display the extended description area by default"
 msgid "Display the information area by default"
 msgstr "སྔོན་སྒྲིག་གིས་བརྒྱ་བསྐྱེད་འབད་ཡོད་པའི་འགྲེལ་བཤད་མངའ་ཁོངས་དེ་ བཀྲམ་སྟོན་འབད།"
 
@@ -186,7 +185,6 @@
 
 #: src/apt_options.cc:217
 #, fuzzy
-#| msgid "The display format for package views"
 msgid "Display tabs for the available views"
 msgstr "ཐུམ་སྒྲིལ་མཐོང་སྣང་ཚུ་གི་དོན་ལུ་ བཀྲམ་སྟོན་རྩ་སྒྲིག"
 
@@ -198,7 +196,6 @@
 
 #: src/apt_options.cc:221
 #, fuzzy
-#| msgid "Display more information about the selected package"
 msgid "Display tabs for the information area"
 msgstr "སེལ་འཐུ་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་དེ་གི་སྐོར་ལས་བརྡ་དོན་ཧེང་བཀལ་བཀྲམ་སྟོན་འབད།"
 
@@ -489,13 +486,11 @@
 
 #: src/apt_options.cc:525
 #, fuzzy
-#| msgid "^UI options"
 msgid "UI options"
 msgstr "ཡུ་ཨའི་གི་གདམ་ཁ།(^M)"
 
 #: src/apt_options.cc:527
 #, fuzzy
-#| msgid "^Dependency handling"
 msgid "Dependency handling"
 msgstr "རྟེན་འབྲེལ་ལེགས་སྐྱོང་འཐབ་ནི།(^D)"
 
@@ -548,7 +543,6 @@
 
 #: src/broken_indicator.cc:371
 #, fuzzy
-#| msgid "Keep the following packages at their current version:"
 msgid "Suggest keeping all packages at their current version."
 msgstr "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་ཁོང་རའི་ད་ལྟོའི་ཐོན་རིམ་གུར་བཞག"
 
@@ -597,13 +591,11 @@
 
 #: src/cmdline/cmdline_action.cc:55
 #, fuzzy, c-format
-#| msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
 msgid "Unable to find the source package for \"%s\".\n"
 msgstr "ཐུམ་སྒྲིལ་ \"%s\"གི་དོན་ལུ་ ཡིག་མཛོད་\"%s\"དེ་དོབ་མ་ཚུགས།\n"
 
 #: src/cmdline/cmdline_action.cc:212
 #, fuzzy, c-format
-#| msgid "Unable to list files in \"%s\""
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "ཡིག་སྣོད་ཚུ་ \"%s\" དེ་ནང་ལུ་ཐོ་བཀོད་མ་ཚུགས།"
 
@@ -658,13 +650,11 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s ད་ལྟོ་གཞི་བཙུགས་མ་འབད་བས། དེ་འབདཝ་ལས་ འ་ནི་དེ་སླར་གཞི་བཙུགས་མི་འབད། \n"
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "%s དེ་ ཞུ་བ་ཕུལ་ཡོད་པའི་ཐོན་རིམ་(%s)གུར་ ཧེ་མ་ལས་འདུག\n"
@@ -765,7 +755,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "%sགི་བསྒྱུར་བཅོས་དྲན་དེབ།"
 
@@ -872,7 +861,6 @@
 #: src/cmdline/cmdline_extract_cache_subset.cc:95
 #: src/cmdline/cmdline_user_tag.cc:133
 #, fuzzy, c-format
-#| msgid "No such package \"%s\""
 msgid "No such package \"%s\".\n"
 msgstr "\"%s\" བཟུམ་གྱི་ཐུམ་སྒྲིལ་མེད།"
 
@@ -929,7 +917,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "ཅི་མེད།"
 
@@ -943,7 +930,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:344
 #, fuzzy
-#| msgid "config-files"
 msgid "Config files"
 msgstr "རིམ་སྒྲིག་- ཡིག་སྣོད།"
 
@@ -1330,7 +1316,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "རང་བཞིན་གྱིས་གཞི་བཙུགས་འབད་དེ་ཡོདཔ་བཟུམ་སྦེ་རྟགས་བཀལ་ནིའི་དོན་ལུ་ '&M'"
 
@@ -1458,9 +1443,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy, c-format
-#| msgid ""
-#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
-#| "n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
@@ -1505,9 +1487,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:259
 #, fuzzy
-#| msgid ""
-#| "reject the given package versions; don't display any solutions in which "
-#| "they occur."
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package.  "
@@ -1518,9 +1497,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:261
 #, fuzzy
-#| msgid ""
-#| "accept the given package versions; display only solutions in which they "
-#| "occur."
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package.  "
@@ -1567,7 +1543,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:351
 #, fuzzy, c-format
-#| msgid "Expected a version after \"%s\""
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "\"%s\" གི་ཤུལ་ལས་ཐོནརིམ་ཅིག་རེ་འདུན་བསྐྱེད་ཅི།"
 
@@ -1623,31 +1598,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "འོག་ལུ་ཡོད་མི་འོས་སྦྱོར་དེ་ཚུ་མོས་མཐུན་མ་འབད་བར་བཞག:"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "རྩིས་ཞིབ་འོས་སྦྱོར།(^R)"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "%s རྩབསྐྲད་གཏང་ནི་དེ་ད་ལས་ཕར་ དགོས་མཁོ་མེད།"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "རྩིས་ཞིབ་འོས་སྦྱོར།(^R)"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "བྱ་བ་ཚུ་སྟོན།"
 
@@ -1713,7 +1683,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:790
 #, fuzzy, c-format
-#| msgid "open: %d; closed: %d; defer: %d; conflict: %d"
 msgid "open: %zd; closed: %zd; defer: %zd; conflict: %zd"
 msgstr "ཁ་ཕྱེ་: %d; ཁ་བསྡམས་ཡོདཔ་: %d; ཕར་འགྱངས: %d;མི་མཐེན་པ་: %d"
 
@@ -1835,13 +1804,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "དེ་འབདཝ་ད་ འདི་གཞི་བཙུགས་འབད་བཏུབ་མི་མེན་པས།"
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "དེ་འབདཝ་ད་%s དེ་གཞི་བཙུགས་འབད་དགོཔ་ཨིན།"
 
@@ -1940,13 +1907,11 @@
 
 #: src/cmdline/cmdline_show.cc:326
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s%s; will be installed"
 msgstr "%s; དེ་གཞི་བཙུགས་འབད་ནི་ཨིན།"
 
 #: src/cmdline/cmdline_show.cc:328
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s%s; will be installed automatically"
 msgstr "%s; དེ་རང་བཞིན་གྱིས་གཞི་་བཙུགས་ནི་ཨིན།"
 
@@ -2123,13 +2088,11 @@
 
 #: src/cmdline/cmdline_user_tag.cc:66
 #, fuzzy, c-format
-#| msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
 msgid "Adding user tag \"%s\" to the package \"%s\".\n"
 msgstr "ཐུམ་སྒྲིལ་\"%s\"གི་དོན་ལུ་ ཐོན་རིམ་ \"%s\" དེ་ཐོབ་མ་ཚུགས།\n"
 
 #: src/cmdline/cmdline_user_tag.cc:73
 #, fuzzy, c-format
-#| msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
 msgid "Removing user tag \"%s\" from the package \"%s\".\n"
 msgstr "ཐུམ་སྒྲིལ་\"%s\"གི་དོན་ལུ་ ཐོན་རིམ་ \"%s\" དེ་ཐོབ་མ་ཚུགས།\n"
 
@@ -2210,25 +2173,21 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "ཐུམ་སྒྲིལ་ཚུ།"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "ཐུམ་སྒྲིལ་གྱི་འབྱུང་ཁུངས:"
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "ཡིག་མཛོད།"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\""
 msgid "No such package \"%s\"."
 msgstr "\"%s\" བཟུམ་གྱི་ཐུམ་སྒྲིལ་མེད།"
 
@@ -2267,19 +2226,16 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "འཚོལ་ཞིབ་འབད: ཁྱོད་ཀྱིས་ཉུང་ཤོས་རང་འཚོལ་ཞིབ་ཀྱི་ལམ་ལུགས་གཅིག་བྱིན་དགོ\n"
 
 #: src/cmdline/cmdline_why.cc:340
 #, fuzzy
-#| msgid "delete"
 msgid "dep_level"
 msgstr "བཏོན་གཏང་།"
 
 #: src/cmdline/cmdline_why.cc:346
 #, fuzzy
-#| msgid "Depends"
 msgid "DependsOnly"
 msgstr "བརྟེནམ་ཨིན།།"
 
@@ -2293,7 +2249,6 @@
 
 #: src/cmdline/cmdline_why.cc:368
 #, fuzzy
-#| msgid "CandVer"
 msgid "Candidate"
 msgstr "CandVer"
 
@@ -2303,7 +2258,6 @@
 
 #: src/cmdline/cmdline_why.cc:374
 #, fuzzy
-#| msgid "Installed"
 msgid "InstallNotCurrent"
 msgstr "གཞི་བཙུགས་འབད་ཡོདཔ།"
 
@@ -2389,19 +2343,16 @@
 
 #: src/cmdline/cmdline_why.cc:1244
 #, fuzzy, c-format
-#| msgid "Unable to find a solution to apply."
 msgid "Unable to find a reason to remove %s.\n"
 msgstr "འཇུག་སྤྱོད་འབད་ནིའི་དོན་ལུ་ཐབས་ཤེས་ཅིག་འཚོལ་མ་འཐོབ།"
 
 #: src/cmdline/cmdline_why.cc:1246
 #, fuzzy, c-format
-#| msgid "Unable to find a solution to apply."
 msgid "Unable to find a reason to install %s.\n"
 msgstr "འཇུག་སྤྱོད་འབད་ནིའི་དོན་ལུ་ཐབས་ཤེས་ཅིག་འཚོལ་མ་འཐོབ།"
 
 #: src/cmdline/cmdline_why.cc:1285
 #, fuzzy, c-format
-#| msgid "Packages depending on %s"
 msgid "Packages requiring %s:"
 msgstr "%sདེ་ལུ་བརྟེན་སྡོད་མི་ཐུམ་སྒྲིལ་ཚུ།"
 
@@ -2435,7 +2386,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[འཛོལ་བ།]"
 
@@ -2453,7 +2403,6 @@
 
 #: src/desc_render.cc:154
 #, fuzzy
-#| msgid "Tags"
 msgid "User Tags"
 msgstr "ངོ་རྟགས་ཚུ།"
 
@@ -2510,7 +2459,6 @@
 
 #: src/download_list.cc:264
 #, fuzzy
-#| msgid "Downloading..."
 msgid "Downloading... "
 msgstr "ཕབ་ལེན་འབད་དོ..."
 
@@ -2579,7 +2527,6 @@
 
 #: src/generic/apt/aptcache.cc:288
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated '\"' in the user-tags list of the package %s."
 msgstr "%sཤུལ་མ་རྩ་གྲོལ་མ་གཏང་མི་ཐད་དོན་གྱི་ཡིག་རྒྱུན།"
 
@@ -2673,9 +2620,6 @@
 
 #: src/generic/apt/apt.cc:453
 #, fuzzy
-#| msgid ""
-#| "Could not lock the cache file.  Opening in read-only mode; any changes "
-#| "you make to the states of packages will NOT be preserved!"
 msgid ""
 "Could not lock the cache file; this usually means that dpkg or another apt "
 "tool is already installing packages.  Opening in read-only mode; any changes "
@@ -2787,7 +2731,6 @@
 
 #: src/generic/apt/download_update_manager.cc:138
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated quoted string in command: %s"
 msgstr "%sཤུལ་མ་རྩ་གྲོལ་མ་གཏང་མི་ཐད་དོན་གྱི་ཡིག་རྒྱུན།"
 
@@ -2824,7 +2767,6 @@
 
 #: src/generic/apt/download_update_manager.cc:371
 #, fuzzy
-#| msgid "Building tag database"
 msgid "Updating debtags database..."
 msgstr "ངོ་རྟགས་གནད་སྡུད་གཞི་རྟེན་བཟོ་བརྩིགས་འབད་དོ།"
 
@@ -2855,7 +2797,6 @@
 #. ForTranslators: "%s update %s" gets replaced by a command line, do not translate it!
 #: src/generic/apt/download_update_manager.cc:412
 #, fuzzy, c-format
-#| msgid "Unable to load debtags vocabulary, perhaps debtags is not installed?"
 msgid ""
 "Updating the debtags database (%s update %s) failed (perhaps debtags is not "
 "installed?): %s"
@@ -2868,7 +2809,6 @@
 
 #: src/generic/apt/dump_packages.cc:674
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create truncated cache: %s."
 msgstr "ཐུམ་སྒྲིལ་%sདེ་ག་ཡོད་འཚོལ་མ་ཚུགས།"
 
@@ -2991,7 +2931,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "ཐུམ་སྒྲིལ་ཚུ་ཕབ་ལེན་འབད་དོ།"
 
@@ -3017,7 +2956,6 @@
 
 #: src/generic/apt/matching/parse.cc:467
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected '%c', got '%c'."
 msgstr "རེ་བ་ཡོད་མི་','ཡང་ན་ '(',ཐོབ་ཡོདཔ།'%c'"
 
@@ -3030,7 +2968,6 @@
 
 #: src/generic/apt/matching/parse.cc:860
 #, fuzzy, c-format
-#| msgid "Unknown pattern type: %c"
 msgid "Unknown term type: \"%s\"."
 msgstr "མ་ཤེས་པའི་དཔེ་གཞི་གྱི་དབྱེ་བ: %c"
 
@@ -3066,7 +3003,6 @@
 
 #: src/generic/apt/matching/parse.cc:1388
 #, fuzzy, c-format
-#| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "གསལ་བརྗོད་གཞི་སྒྲུབ་འབད་ཡོད་མི་དེ་བྱང་ཉེས་ཨིན་པས།"
 
@@ -3105,19 +3041,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "བསྒྱུར་བཅོས་ལོགསི་ ཚུ་ཕབ་ལེན་འབད་ནིའི་དོན་ལུ་ལག་ལེན་འཐབ་་ནི་གི་ཡུ་ཨཱར་ཨེལ།"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "བསྒྱུར་བཅོས་ལོགསི་ ཚུ་ཕབ་ལེན་འབད་ནིའི་དོན་ལུ་ལག་ལེན་འཐབ་་ནི་གི་ཡུ་ཨཱར་ཨེལ།"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "%sགི་བསྒྱུར་བཅོས་དྲན་དེབ།"
 
@@ -3163,7 +3096,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "དཔེ་གཞི་%s་དེ་མིང་དཔྱད་འབད་མ་ཚུགས།"
 
@@ -3178,14 +3110,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "གཞི་བཙུགས་མ་འབད་བས།"
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "གཞི་བཙུགས་མ་འབད་བས།"
 
@@ -3212,43 +3142,36 @@
 
 #: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected '%s', but got EOF."
 msgstr "རེ་བ་ཡོད་མི་','ཡང་ན་ '(',ཐོབ་ཡོདཔ།'%c'"
 
 #: src/generic/util/parsers.h:737
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected '%s', but got '%s'."
 msgstr "རེ་བ་ཡོད་མི་','ཡང་ན་ '(',ཐོབ་ཡོདཔ།'%c'"
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "-q=, got %sདེ་གི་ཤུལ་ལས་ཨང་ཡིག་ཅིག་རེ་བ་བསྐྱེད་ཅི།\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "ཡིག་འབྲུའིི་བྱ་བ་བྱང་ཉེས།'%c'\n"
 
 #: src/generic/util/parsers.h:832
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected %s, but got EOF."
 msgstr "རེ་བ་ཡོད་མི་','ཡང་ན་ '(',ཐོབ་ཡོདཔ།'%c'"
 
 #: src/generic/util/parsers.h:843
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected %s, but got '%c'."
 msgstr "རེ་བ་ཡོད་མི་','ཡང་ན་ '(',ཐོབ་ཡོདཔ།'%c'"
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "རེ་བ་ཡོད་པའི་་སྲིད་བྱུས་ངེས་འཛིན་པ། ཐོབ་ཡོདཔ་'%c'"
 
@@ -3259,19 +3182,16 @@
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "རེ་བ་ཡོད་པའི་་སྲིད་བྱུས་ངེས་འཛིན་པ། ཐོབ་ཡོདཔ་'%c'"
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "ནུས་མེད་བཀོལ་སྤྱོད་ %s"
 
 #: src/generic/util/parsers.h:1077
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected EOF, got '%c'."
 msgstr "རེ་བ་ཡོད་མི་','ཡང་ན་ '(',ཐོབ་ཡོདཔ།'%c'"
 
@@ -3285,19 +3205,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "རེ་འདུན་མེད་མི་')'"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr "ཡང་ན།"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "རེ་འདུན་མེད་མི་')'"
 
@@ -3308,7 +3225,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "\"%s\": %s ནང་ལས་གནས་སྐབས་ཀྱི་སྣོད་འཛིན་གསར་བསྐྲུན་འབད་མི་ཚུགས་པས།"
 
@@ -3408,13 +3324,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "ཐུམ་སྒྲིལ།"
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "མཐོང་སྣང་།"
 
@@ -3434,7 +3348,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "གྲོགས་རམ།"
 
@@ -3445,7 +3358,6 @@
 
 #: src/gtk/aptitude.glade:345 src/gtk/aptitude.glade:2614
 #, fuzzy
-#| msgid "List Update"
 msgid "Update"
 msgstr "དུས་མཐོན་ཐོ་བཀོད་འབད།"
 
@@ -3467,7 +3379,6 @@
 
 #: src/gtk/aptitude.glade:389 src/gtk/aptitude.glade:2658
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Remove"
 msgstr "གཞི་བཙུགས་འབད་ཡོདཔ།"
 
@@ -3481,33 +3392,28 @@
 
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་དེ་ནང་ལས་ཚགས་མ་དེ་སྟོན་གཏང་།"
 
 #: src/gtk/aptitude.glade:649
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "Apply these settings to all active package lists."
 msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་དེ་ལུ་ཚགས་མ་ཅིག་འཇུག་སྤྱོད་འབད།"
 
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "འཚོལ་ཞིབ།"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "སླར་གཞི་བཙུགས་འབད་ཡོདཔ།"
 
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "ཨི་ཨཱར་ཨཱར།"
 
@@ -3522,13 +3428,11 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "%s དེ་གི་རྟེན་འབྲེལ་ཚུ།"
 
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "^Changelog"
 msgid "Changelog"
 msgstr "བསྒྱུར་བཅོས་དྲན་དེབ། (^C)"
 
@@ -3547,7 +3451,6 @@
 
 #: src/gtk/aptitude.glade:1051
 #, fuzzy
-#| msgid "Tags"
 msgid "tags"
 msgstr "ངོ་རྟགས་ཚུ།"
 
@@ -3570,13 +3473,11 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "གནས་ལུགས།"
 
 #: src/gtk/aptitude.glade:1247
 #, fuzzy
-#| msgid "Unknown action type: %s"
 msgid "Group by action type"
 msgstr "ཤེས་པའི་བྱ་བའི་དབྱེ་བ:%s"
 
@@ -3605,7 +3506,6 @@
 
 #: src/gtk/aptitude.glade:1328
 #, fuzzy
-#| msgid "Toggle ^Rejected"
 msgid "Rejected"
 msgstr "སོར་སྟོན་སྣང་མེད་སྦེ་བཞག་ཡོདཔ།(^R)"
 
@@ -3624,32 +3524,27 @@
 
 #: src/gtk/aptitude.glade:1400
 #, fuzzy
-#| msgid "^Examine Solution"
 msgid "Find a new solution"
 msgstr "ཐབས་ཤེས་བརྟག་དཔྱད་འབད།"
 
 #: src/gtk/aptitude.glade:1404
 #, fuzzy
-#| msgid "Select the next solution to the dependency problems."
 msgid "Calculate the next solution that has not yet been generated."
 msgstr "ཤུལ་མམ་གྱི་ཐབས་ཤེས་དེ་རྟེན་འབྲེལ་གྱི་དཀའ་ངལ་དེ་ལུ་སེལ་འཐུ་འབད།"
 
 #: src/gtk/aptitude.glade:1419
 #, fuzzy
-#| msgid "Perform the actions contained in the currently selected solution."
 msgid ""
 "Perform the actions in the currently selected solution and close this tab."
 msgstr "ད་ལྟོ་སེལ་འཐུ་འབད་ཡོད་པའི་ཐབས་ཤེས་ཚུ་ནང་ལུ་ཡོད་པའི་བྱ་བ་ཚུ་ལག་ལེན་འཐབ།"
 
 #: src/gtk/aptitude.glade:1576
 #, fuzzy
-#| msgid "Upgrade"
 msgid "Upgrade Summary"
 msgstr "ཡར་བསྐྱེད།"
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "ཐུམ་སྒྲིལ་གྱི་འབྱུང་ཁུངས:"
 
@@ -3661,7 +3556,6 @@
 
 #: src/gtk/aptitude.glade:1652
 #, fuzzy
-#| msgid "Manual"
 msgid "Fix Manually"
 msgstr "ལག་དེབ།"
 
@@ -3709,31 +3603,26 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "ཆག་སོང་ནུག"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "འཐོབ་མ་ཚུགས་པའི་ཐུམ་སྒྲིལ་ཚུ་གི་དོན་ལུ་ ནོར་བཅོས་འབད་མི་ཚུགས་པས།"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "འཚོལ།(^F)"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for: "
 msgid "Search for packages."
 msgstr "དོན་ལུ་འཚོལ་ཞིབ་འབད:"
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "ཐོབ་ཅི།"
 
@@ -3768,19 +3657,16 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "བསྒྱུར་བཅོས་ལོགསི་ ཚུ་ཕབ་ལེན་འབད་ནིའི་དོན་ལུ་ལག་ལེན་འཐབ་་ནི་གི་ཡུ་ཨཱར་ཨེལ།"
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr " %s ཐོན་རིམ་ %s (%s) གི་གཞི་བཙུགས་དེ་དགོས་ཡོད།"
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -3788,20 +3674,17 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr "ཁྱོད་ཀྱིས་གཞུང་འབྲེལ་གྱི་ཌེ་བི་ཡཱན་ཐུམ་སྒྲིལ་ཚུ་གི་བསྒྱུར་བཅོས་དྲན་དེབ་རྐྱངམ་ཅིག་སྟོན་ཚུགས།"
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "བསྒྱུར་བཅོས་དྲེན་དེབ་ཕབ་ལེན་འབད་དོ།"
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "བསྒྱུར་བཅོས་ལོགསི་ ཚུ་ཕབ་ལེན་འབད་ནིའི་དོན་ལུ་ལག་ལེན་འཐབ་་ནི་གི་ཡུ་ཨཱར་ཨེལ།"
 
@@ -3815,7 +3698,6 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "བསྒྱུར་བཅོས་ལོགསི་ ཚུ་ཕབ་ལེན་འབད་ནིའི་དོན་ལུ་ལག་ལེན་འཐབ་་ནི་གི་ཡུ་ཨཱར་ཨེལ།"
 
@@ -3825,8 +3707,6 @@
 
 #: src/gtk/dashboardtab.cc:414
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] "%d ཡར་བསྐྱེད་འབད།"
@@ -3834,13 +3714,11 @@
 
 #: src/gtk/dashboardtab.cc:633
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No upgrades are available."
 msgstr "གཞི་བཙུགས་མ་འབད་བས།"
 
 #: src/gtk/dashboardtab.cc:645
 #, fuzzy
-#| msgid "Unable to locate package %s"
 msgid "Unable to calculate an upgrade."
 msgstr "ཐུམ་སྒྲིལ་%sདེ་ག་ཡོད་འཚོལ་མ་ཚུགས།"
 
@@ -3875,25 +3753,21 @@
 
 #: src/gtk/dashboardtab.cc:708
 #, fuzzy, c-format
-#| msgid "Internal error: Default column string is unparsable"
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr "ནང་འཁོད་འཛོལ་བ: སྔོན་སྒྲིག་ཀོར་ཐིག་ཡིག་རྒྱུན་དེ་མིང་དཔྱད་འབད་མ་བཏུབ་མི་ཨིན།"
 
 #: src/gtk/dependency_chains_tab.cc:78
 #, fuzzy
-#| msgid "^Dependency handling"
 msgid "Find dependency chains: start"
 msgstr "རྟེན་འབྲེལ་ལེགས་སྐྱོང་འཐབ་ནི།(^D)"
 
 #: src/gtk/dependency_chains_tab.cc:82
 #, fuzzy
-#| msgid "^Dependency handling"
 msgid "Find dependency chains: end"
 msgstr "རྟེན་འབྲེལ་ལེགས་སྐྱོང་འཐབ་ནི།(^D)"
 
 #: src/gtk/dependency_chains_tab.cc:86
 #, fuzzy
-#| msgid "^Dependency handling"
 msgid "Find dependency chains: results"
 msgstr "རྟེན་འབྲེལ་ལེགས་སྐྱོང་འཐབ་ནི།(^D)"
 
@@ -3903,7 +3777,6 @@
 
 #: src/gtk/dependency_chains_tab.cc:282
 #, fuzzy
-#| msgid "^Dependency handling"
 msgid "No dependency chain found."
 msgstr "རྟེན་འབྲེལ་ལེགས་སྐྱོང་འཐབ་ནི།(^D)"
 
@@ -3918,7 +3791,6 @@
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "ཕབ་ལེན་འབད་ཡོད་པའི་ཡིག་སྣོད་ཚུ་བཏོན་གཏང་དོ།"
 
@@ -3929,13 +3801,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "ཡར་འཕེལ་བསྡོམས: "
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description"
 msgid "Short Description"
 msgstr "འགྲེལ་བཤད།"
 
@@ -3945,13 +3815,11 @@
 
 #: src/gtk/download.cc:319
 #, fuzzy
-#| msgid "Cleaning while a download is in progress is not allowed"
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr "ཕབ་ལེན་ཡར་འཕེལ་འབད་བའི་སྒང་ཡོད་མི་དེ་མ་ཆོགཔ་ད་ལུ་གཙང་དག་བཟོ་དོ།"
 
 #: src/gtk/download.cc:395 src/gtk/gui.cc:832
 #, fuzzy
-#| msgid "View next display"
 msgid "View Details"
 msgstr "ཤུལ་མམ་གྱི་བཀྲམ་སྟོན་དེ་སྟོན།"
 
@@ -3971,19 +3839,16 @@
 
 #: src/gtk/download.cc:486
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s: %lu/%lu, stalled"
 msgstr "%s; དེ་གཞི་བཙུགས་འབད་ནི་ཨིན།"
 
 #: src/gtk/download.cc:507
 #, fuzzy, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr " [ %i%% ](%sB/s, %s ལྷག་ལུས།)"
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "དེ་འབདཝ་ད་%s དེ་གཞི་བཙུགས་འབད་དགོཔ་ཨིན།"
 
@@ -3997,7 +3862,6 @@
 
 #: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "ཐུམ་སྒྲིལ་%sདེ་ག་ཡོད་འཚོལ་མ་ཚུགས།"
 
@@ -4008,7 +3872,6 @@
 
 #: src/gtk/dpkg_terminal.cc:429
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "%s: Unable to accept a connection: %s"
 msgstr "\"%s\": %s ནང་ལས་གནས་སྐབས་ཀྱི་སྣོད་འཛིན་གསར་བསྐྲུན་འབད་མི་ཚུགས་པས།"
 
@@ -4034,7 +3897,6 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "%s  ཐོན་རིམ་ཚུ།"
 
@@ -4045,56 +3907,47 @@
 
 #: src/gtk/entitysummary.cc:131
 #, fuzzy, c-format
-#| msgid "libsigc++ version: %s\n"
 msgid "Downgrade to %s version %s"
 msgstr "libsigc++ཐོན་རིམ་: %s\n"
 
 #: src/gtk/entitysummary.cc:142
 #, fuzzy, c-format
-#| msgid "Keep the following packages at their current version:"
 msgid "Don't hold %s at its current version."
 msgstr "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་ཁོང་རའི་ད་ལྟོའི་ཐོན་རིམ་གུར་བཞག"
 
 #: src/gtk/entitysummary.cc:145 src/gtk/entitysummary.cc:165
 #: src/gtk/entitysummary.cc:168
 #, fuzzy, c-format
-#| msgid "Canc^el pending actions"
 msgid "Cancel any actions on %s."
 msgstr "བསྣར་ཏེ་ཡོད་པའི་བྱ་བ་ཚུ་ཆ་མེད་གཏང་།(^e)"
 
 #: src/gtk/entitysummary.cc:150
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the purge of %s."
 msgstr "%F རཙ་བསྐྲད་གཏང་ནིདེ་ཆ་མེད་གཏང་།"
 
 #: src/gtk/entitysummary.cc:152
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s."
 msgstr "%F རཙ་བསྐྲད་གཏང་ནིདེ་ཆ་མེད་གཏང་།"
 
 #: src/gtk/entitysummary.cc:157
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the upgrade of %s."
 msgstr "%F རཙ་བསྐྲད་གཏང་ནིདེ་ཆ་མེད་གཏང་།"
 
 #: src/gtk/entitysummary.cc:159
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s."
 msgstr " %F གཞི་བཙུགས་འབད་ནི་དེ་ཆ་མེད་གཏང་།"
 
 #: src/gtk/entitysummary.cc:161
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the downgrade of %s."
 msgstr "%F རཙ་བསྐྲད་གཏང་ནིདེ་ཆ་མེད་གཏང་།"
 
 #: src/gtk/entitysummary.cc:163
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the reinstallation of %s."
 msgstr " %F གཞི་བཙུགས་འབད་ནི་དེ་ཆ་མེད་གཏང་།"
 
@@ -4105,7 +3958,6 @@
 
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "ཕྱིར་བསྐྲད། (^P)"
 
@@ -4116,7 +3968,6 @@
 
 #: src/gtk/entitysummary.cc:223
 #, fuzzy, c-format
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Mark %s as automatically installed."
 msgstr "རང་བཞིན་གྱིས་གཞི་བཙུགས་འབད་དེ་ཡོདཔ་བཟུམ་སྦེ་རྟགས་བཀལ་ནིའི་དོན་ལུ་ '&M'"
 
@@ -4127,7 +3978,6 @@
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
 msgid "%s is a virtual package provided by:\n"
 msgstr "\"%s\"དེ་ གིས་བྱིན་མི་ བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན:\n"
 
@@ -4137,13 +3987,11 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "ཐུམ་སྒྲིལ་གྱི་འབྱུང་ཁུངས:"
 
 #: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 #, fuzzy
-#| msgid "ProgName"
 msgid "Name"
 msgstr "ལས་རིམ་གྱི་མིང་།"
 
@@ -4153,13 +4001,11 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "ཡིག་སྣོད་\"%s\" དེ་ཁ་ཕྱེ་མ་ཚུགས།"
 
 #: src/gtk/entityview.cc:412
 #, fuzzy, c-format
-#| msgid "Rejecting the removal of %s"
 msgid "Editing the columns of \"%s\""
 msgstr "%s རྩ་བསྐྲད་གཏང་ནི་གི་་ དང་ལེན་སྤང་དོ།"
 
@@ -4173,25 +4019,21 @@
 
 #: src/gtk/entityview.cc:570
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Whether the package is automatically installed."
 msgstr "རང་བཞིན་གྱིས་གཞི་བཙུགས་འབད་དེ་ཡོདཔ་བཟུམ་སྦེ་རྟགས་བཀལ་ནིའི་དོན་ལུ་ '&M'"
 
 #: src/gtk/entityview.cc:576
 #, fuzzy
-#| msgid "Cancel any action on the selected package"
 msgid "The name and description of the package."
 msgstr "བྱ་བ་ག་འབད་རུང་ཅིག་སེལ་འཐུ་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་གུར་ཆ་མེད་གཏང་།"
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "ཐོན་རིམ:"
 
 #: src/gtk/entityview.cc:592
 #, fuzzy
-#| msgid "Check for new versions of packages"
 msgid "The version number of the package."
 msgstr "ཐུམ་སྒྲིལ་ཚུ་གི་ཐོན་རིམ་གསརཔ་ཚུ་གི་དོན་ལུ་ཞིབ་དཔྱད་འབད།"
 
@@ -4212,7 +4054,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "གཞི་བཙུགས་མ་འབད་བས།"
 
@@ -4222,25 +4063,21 @@
 
 #: src/gtk/gui.cc:82
 #, fuzzy
-#| msgid "unpacked"
 msgid "Unpacked"
 msgstr "གམ་ཤུབ་ཡོདཔ།"
 
 #: src/gtk/gui.cc:83
 #, fuzzy
-#| msgid "half-config"
 msgid "Half-configured"
 msgstr "རིམ་སྒྲིག་-ཕྱད་ཀ"
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "half-install"
 msgid "Half-installed"
 msgstr "གཞི་བཙུགས་-ཕྱེ་ཀ"
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "གཞི་བཙུགས་མ་འབད་བས།(རིམ་སྒྲིག་གི་ཡིག་སྣོད་ཚུ་ལུས་འོང་།)"
 
@@ -4274,13 +4111,11 @@
 
 #: src/gtk/gui.cc:97
 #, fuzzy
-#| msgid "forbidden upgrade"
 msgid "Hold (don't upgrade)"
 msgstr "ཡར་བསྐྱེད་བཀག་དམ་འབད་ཡོདཔ།"
 
 #: src/gtk/gui.cc:99
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Unsatisfied dependencies"
 msgstr "རྟེན་འབྲེལ་ཚུ་མོས་མཐུན་བཟོ།"
 
@@ -4294,13 +4129,11 @@
 
 #: src/gtk/gui.cc:290
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་དེ་ལུ་ཚགས་མ་ཅིག་འཇུག་སྤྱོད་འབད།"
 
 #: src/gtk/gui.cc:298 src/gtk/gui.cc:946
 #, fuzzy
-#| msgid "Downloading..."
 msgid "Download already running."
 msgstr "ཕབ་ལེན་འབད་དོ..."
 
@@ -4312,13 +4145,11 @@
 
 #: src/gtk/gui.cc:359
 #, fuzzy, c-format
-#| msgid "List Update"
 msgid "Update %s?"
 msgstr "དུས་མཐོན་ཐོ་བཀོད་འབད།"
 
 #: src/gtk/gui.cc:385
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
@@ -4346,31 +4177,26 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "%s changes"
 msgid "Done applying changes!"
 msgstr "%s བསྒྱུར་བཅོས།"
 
 #: src/gtk/gui.cc:823
 #, fuzzy
-#| msgid "%s changes"
 msgid "Applying changes..."
 msgstr "%s བསྒྱུར་བཅོས།"
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "[%s] %s\n"
 msgid "%s: %s"
 msgstr "[%s] %s\n"
 
 #: src/gtk/gui.cc:878
 #, fuzzy, c-format
-#| msgid "No broken packages."
 msgid "Error in package %s"
 msgstr "ཆག་ཆག་པའི་ཐུམ་སྒྲིལ་ཅིག་ཡང་མེད།"
 
 #: src/gtk/gui.cc:906
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "%sདེ་རིམ་སྒྲིག་གི་ཡིག་སྣོད་གསརཔ་གྱིས་ཚབ་བཙུགས་མ་ཚུགས།"
 
@@ -4380,25 +4206,21 @@
 
 #: src/gtk/gui.cc:1038
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "ཆག་ཆག་པའི་ཐུམ་སྒྲིལ་ཅིག་ཡང་མེད།"
 
 #: src/gtk/gui.cc:1071
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "ཆག་ཆག་པའི་ཐུམ་སྒྲིལ་ཅིག་ཡང་མེད།"
 
 #: src/gtk/gui.cc:1075
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "རྟེན་འབྲེལ་ཚུ་མོས་མཐུན་བཟོ།"
 
 #: src/gtk/gui.cc:1103
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "ཐུམ་སྒྲིལ་ག་ཡང་རྒྱུན་ཆད་འབད་དེ་མིན་འདུག"
@@ -4406,13 +4228,11 @@
 
 #: src/gtk/gui.cc:1147
 #, fuzzy
-#| msgid "%s changes"
 msgid "View changes"
 msgstr "%s བསྒྱུར་བཅོས།"
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "%s changes"
 msgid "Apply changes"
 msgstr "%s བསྒྱུར་བཅོས།"
 
@@ -4421,8 +4241,6 @@
 #. font.
 #: src/gtk/gui.cc:1192
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%d package to install"
 msgid_plural "%d packages to install"
 msgstr[0] "%d གཞི་བཙུགས་འབད་ནི།"
@@ -4433,7 +4251,6 @@
 #. font.
 #: src/gtk/gui.cc:1207
 #, fuzzy, c-format
-#| msgid "failed to remove %s"
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "%sདེ་རྩ་བསྐྲད་གཏང་ནི་ལུ་འཐུས་ཤོར་བྱུང་ནུག"
@@ -4441,7 +4258,6 @@
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "ཕབ་ལེན་གྱི་ཚད།"
 
@@ -4456,19 +4272,16 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "not installed"
 msgid "Not implemented"
 msgstr "གཞི་བཙུགས་མ་འབད་བས།"
 
 #: src/gtk/gui.cc:1408 src/gtk/gui.cc:1427
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "གཞི་བཙུགས་འབད་ཡོདཔ།"
 
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "ཕྱིར་བསྐྲད། (^P)"
 
@@ -4486,7 +4299,6 @@
 
 #: src/gtk/gui.cc:1455
 #, fuzzy
-#| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "ལག་ལེན་པའི་ལག་དེབ།"
 
@@ -4509,7 +4321,6 @@
 
 #: src/gtk/info.cc:496
 #, fuzzy
-#| msgid "Not Installed"
 msgid "Not available"
 msgstr "གཞི་བཙུགས་མ་འབད་བས།"
 
@@ -4519,7 +4330,6 @@
 
 #: src/gtk/info.cc:555
 #, fuzzy
-#| msgid "Packages which depend on %s"
 msgid "Package information: dependency list"
 msgstr "%sདེ་ལུ་བརྟེན་མི་ཐུམ་སྒྲིལ་ཚུ།"
 
@@ -4529,7 +4339,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "མེན།"
 
@@ -4543,7 +4352,6 @@
 
 #: src/gtk/packagestab.cc:203
 #, fuzzy, c-format
-#| msgid "No packages matched the pattern \"%ls\"."
 msgid "No packages matched \"%s\"."
 msgstr "ཐུམ་སྒྲིལ་ག་ཡང་དཔེ་གཞི་ \"%ls\"དེ་དང་མཐུན་སྒྲིག་མིན་འདུག"
 
@@ -4553,31 +4361,26 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "ཐུམ་་སྒྲིལ་:"
 
 #: src/gtk/pkgview.cc:224
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed automatically."
 msgstr "%s; དེ་རང་བཞིན་གྱིས་གཞི་་བཙུགས་ནི་ཨིན།"
 
 #: src/gtk/pkgview.cc:227
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed automatically."
 msgstr "%s; དེ་རང་བཞིན་གྱིས་གཞི་་བཙུགས་ནི་ཨིན།"
 
 #: src/gtk/pkgview.cc:235
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed manually."
 msgstr "%s; དེ་རང་བཞིན་གྱིས་གཞི་་བཙུགས་ནི་ཨིན།"
 
 #: src/gtk/pkgview.cc:238
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed manually."
 msgstr "%s; དེ་རང་བཞིན་གྱིས་གཞི་་བཙུགས་ནི་ཨིན།"
 
@@ -4587,13 +4390,11 @@
 
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "འཚོལ་ཞིབ།"
 
 #: src/gtk/pkgview.cc:718
 #, fuzzy
-#| msgid "Building view"
 msgid "Finalizing view"
 msgstr "མཐོང་སྣང་བཟོ་རྩིག་འབད་དོ།"
 
@@ -4726,13 +4527,11 @@
 
 #: src/gtk/previewtab.cc:179
 #, fuzzy
-#| msgid "Preview"
 msgid "Preview: "
 msgstr "སྔོན་བལྟ།"
 
 #: src/gtk/resolver.cc:68
 #, fuzzy, c-format
-#| msgid "Error while dumping resolver state"
 msgid "Error in dependency resolver: %s"
 msgstr "མོས་མཐུན་བཟོ་མི་གནས་ལུགས་དེ་བཀོག་བཞག་པའི་སྐབས་ལུ་འཛོལ་བ་བྱུང་ནུག"
 
@@ -4747,7 +4546,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package"
 msgid "Virtual package"
 msgstr "ཐུམ་སྒྲིལ།"
 
@@ -4757,25 +4555,21 @@
 
 #: src/gtk/resolver.cc:377
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Removing %s is rejected."
 msgstr "%sདེ་རྩ་བསྐྲད་གཏང་དོ།"
 
 #: src/gtk/resolver.cc:382
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Canceling the installation of %s is rejected."
 msgstr " %F གཞི་བཙུགས་འབད་ནི་དེ་ཆ་མེད་གཏང་།"
 
 #: src/gtk/resolver.cc:391
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Canceling the removal of %s is rejected."
 msgstr "%F རཙ་བསྐྲད་གཏང་ནིདེ་ཆ་མེད་གཏང་།"
 
 #: src/gtk/resolver.cc:394
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keeping %s at version %s is rejected."
 msgstr "%Fདེ་ཐོན་རིམ་%s (%s)གུར་བཞག"
 
@@ -4786,13 +4580,11 @@
 
 #: src/gtk/resolver.cc:407
 #, fuzzy, c-format
-#| msgid "libsigc++ version: %s\n"
 msgid "Downgrading %s to version %s is rejected."
 msgstr "libsigc++ཐོན་རིམ་: %s\n"
 
 #: src/gtk/resolver.cc:413
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrading %s to version %s is rejected."
 msgstr "%s  ཐོན་རིམ་ཚུ།"
 
@@ -4834,7 +4626,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr "%s  ཐོན་རིམ་ཚུ།"
@@ -4907,7 +4698,6 @@
 
 #: src/gtk/resolver.cc:1255 src/solution_fragment.cc:145
 #, fuzzy, c-format
-#| msgid "%s replaces %s"
 msgid "%s breaks %s"
 msgstr "%s དེགིས་%sདེ་ཚབ་བཙུགསཔ་ཨིན།"
 
@@ -4933,7 +4723,6 @@
 
 #: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862
 #, fuzzy
-#| msgid "Remove the following packages:"
 msgid "Keep the following packages:"
 msgstr "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་རཙ་བསྐྲད་གཏང:"
 
@@ -4949,49 +4738,41 @@
 
 #: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900
 #, fuzzy
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "Leave the following dependencies unresolved:"
 msgstr "འོག་ལུ་ཡོད་མི་རྟེན་འབྲེལ་ཚུ་མོས་མཐུན་མ་འབད་བར་་བཞག:%n"
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Remove %F [%s (%s)]"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "%F [%s (%s)] དེ་རྩ་བསྐྲད་གཏང་།"
 
 #: src/gtk/resolver.cc:1523
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "%F [%s (%s)] དེ་གཞི་བཙུགས་འབད།"
 
 #: src/gtk/resolver.cc:1531
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s"
 msgstr " %F གཞི་བཙུགས་འབད་ནི་དེ་ཆ་མེད་གཏང་།"
 
 #: src/gtk/resolver.cc:1534
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s"
 msgstr "%F རཙ་བསྐྲད་གཏང་ནིདེ་ཆ་མེད་གཏང་།"
 
 #: src/gtk/resolver.cc:1537
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "%Fདེ་ཐོན་རིམ་%s (%s)གུར་བཞག"
 
 #: src/gtk/resolver.cc:1544
 #, fuzzy, c-format
-#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "%F [%s (%s) -> %s (%s)] དེ་ཡར་བསྐྱེད་འབད།"
 
 #: src/gtk/resolver.cc:1553
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "%F [%s (%s) -> %s (%s)] དེ་མར་ཕབ་འབད།"
 
@@ -5007,61 +4788,51 @@
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "%Fདེ་ཐོན་རིམ་%s (%s)གུར་བཞག"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>keep</b> %s at version %s"
 msgstr "%Fདེ་ཐོན་རིམ་%s (%s)གུར་བཞག"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr " %F གཞི་བཙུགས་འབད་ནི་དེ་ཆ་མེད་གཏང་།"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>cancel</b> the installation of %s"
 msgstr " %F གཞི་བཙུགས་འབད་ནི་དེ་ཆ་མེད་གཏང་།"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>Install</b> %s %s"
 msgstr "%F [%s (%s)] དེ་གཞི་བཙུགས་འབད།"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>install</b> %s %s"
 msgstr "%F [%s (%s)] དེ་གཞི་བཙུགས་འབད།"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "libsigc++ version: %s\n"
 msgid "<b>Downgrade</b> %s to version %s"
 msgstr "libsigc++ཐོན་རིམ་: %s\n"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "libsigc++ version: %s\n"
 msgid "<b>downgrade</b> %s to version %s"
 msgstr "libsigc++ཐོན་རིམ་: %s\n"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>Upgrade</b> %s to version %s"
 msgstr "%s  ཐོན་རིམ་ཚུ།"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>upgrade</b> %s to version %s"
 msgstr "%s  ཐོན་རིམ་ཚུ།"
 
@@ -5077,8 +4848,6 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "%d གཞི་བཙུགས་འབད་ནི།"
@@ -5086,8 +4855,6 @@
 
 #: src/gtk/resolver.cc:1740
 #, fuzzy, c-format
-#| msgid "%d removal"
-#| msgid_plural "%d removals"
 msgid "%s remove"
 msgid_plural "%s removes"
 msgstr[0] "%d རྩ་བསྐྲད།"
@@ -5095,8 +4862,6 @@
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "%d keep"
-#| msgid_plural "%d keeps"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "%d བདག་འཛིན་སྦེ་བཞག"
@@ -5104,8 +4869,6 @@
 
 #: src/gtk/resolver.cc:1752
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%s upgrade"
 msgid_plural "%s upgrades"
 msgstr[0] "%d ཡར་བསྐྱེད་འབད།"
@@ -5113,8 +4876,6 @@
 
 #: src/gtk/resolver.cc:1758
 #, fuzzy, c-format
-#| msgid "%d downgrade"
-#| msgid_plural "%d downgrades"
 msgid "%s downgrade"
 msgid_plural "%s downgrades"
 msgstr[0] "%d མར་ཕབ་འབད།"
@@ -5122,7 +4883,6 @@
 
 #: src/gtk/resolver.cc:1764
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "%s unresolved recommendation"
 msgid_plural "%s unresolved recommendations"
 msgstr[0] "རྩིས་ཞིབ་འོས་སྦྱོར།(^R)"
@@ -5130,19 +4890,16 @@
 
 #: src/gtk/resolver.cc:2056
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions yet."
 msgstr "ཐབས་ཤེས་དེ་ལས་ལྷག་སྟེ་མེད།"
 
 #: src/gtk/resolver.cc:2063
 #, fuzzy
-#| msgid "^Dependency handling"
 msgid "No dependency solution was found."
 msgstr "རྟེན་འབྲེལ་ལེགས་སྐྱོང་འཐབ་ནི།(^D)"
 
 #: src/gtk/resolver.cc:2064
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions."
 msgstr "ཐབས་ཤེས་དེ་ལས་ལྷག་སྟེ་མེད།"
 
@@ -5152,19 +4909,16 @@
 
 #: src/gtk/resolver.cc:2076
 #, fuzzy, c-format
-#| msgid "No more solutions."
 msgid "%u solutions."
 msgstr "ཐབས་ཤེས་དེ་ལས་ལྷག་སྟེ་མེད།"
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "ཡིག་སྣོད་\"%s\" དེ་ཁ་ཕྱེ་མ་ཚུགས།"
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr "[ཕབ་ལེན་འབད་ཡོདཔ།]"
 
@@ -5214,7 +4968,6 @@
 
 #: src/load_grouppolicy.cc:305
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected ',', '%c', or '('; got '%c'"
 msgstr "རེ་བ་ཡོད་མི་','ཡང་ན་ '(',ཐོབ་ཡོདཔ།'%c'"
 
@@ -5403,21 +5156,16 @@
 
 #: src/main.cc:144
 #, fuzzy
-#| msgid "Compiler: g++ %s\n"
 msgid "Compiled against:\n"
 msgstr "ཕྱོགས་སྒྲིག་པ: g++ %s\n"
 
 #: src/main.cc:145
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "  apt version %d.%d.%d\n"
 msgstr "%Fདེ་ཐོན་རིམ་%s (%s)གུར་བཞག"
 
 #: src/main.cc:148
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "NCurses version: %s\n"
 msgid "  NCurses version: Unknown\n"
 msgstr ""
 "\n"
@@ -5425,9 +5173,6 @@
 
 #: src/main.cc:150
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "NCurses version: %s\n"
 msgid "  NCurses version %s\n"
 msgstr ""
 "\n"
@@ -5435,7 +5180,6 @@
 
 #: src/main.cc:152
 #, fuzzy, c-format
-#| msgid "libsigc++ version: %s\n"
 msgid "  libsigc++ version: %s\n"
 msgstr "libsigc++ཐོན་རིམ་: %s\n"
 
@@ -5451,13 +5195,11 @@
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "%Fདེ་ཐོན་རིམ་%s (%s)གུར་བཞག"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "%Fདེ་ཐོན་རིམ་%s (%s)གུར་བཞག"
 
@@ -5468,9 +5210,6 @@
 
 #: src/main.cc:167
 #, fuzzy
-#| msgid ""
-#| "\n"
-#| "Curses version: %s\n"
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5480,9 +5219,6 @@
 
 #: src/main.cc:168
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "NCurses version: %s\n"
 msgid "  NCurses version: %s\n"
 msgstr ""
 "\n"
@@ -5490,15 +5226,11 @@
 
 #: src/main.cc:169
 #, fuzzy, c-format
-#| msgid "libsigc++ version: %s\n"
 msgid "  cwidget version: %s\n"
 msgstr "libsigc++ཐོན་རིམ་: %s\n"
 
 #: src/main.cc:170
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Curses version: %s\n"
 msgid "  Apt version: %s\n"
 msgstr ""
 "\n"
@@ -5526,45 +5258,37 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr "གཞི་བཙུགས་འབད།  -ཐུམ་སྒྲིལ་ཚུ་གཞི་བཙུགས་དང་ ཡར་བསྐྱེད་འབད།\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr "རྩ་བསྐྲད་གཏང་།  - ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏང་།\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr "ཕྱིར་བསྐྲད་གཏང་།  ་-  ཐུམ་སྒྲིལ་ཚུ་དང་དེ་ཚུ་གི་རིམ་སྒྲིག་ཡིག་སྣོད་ཚུ་རྩ་བསྐྲད་གཏང་།\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr "འཆང་།    - འཆང་ནིའི་གུར་ཐུམ་སྒྲིལ་ཚུ་བཞག\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr "འཆང་མི་དགོ   -  ཐུམ་སྒྲིལ་ཅིག་གི་དོན་ལུ་ འཆང་ནིའི་བརྡ་བཀོད་ཆ་མེད་གཏང་།\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr ""
 "རང་བཞིན་རྟགས་བཀལ-  ཐུམ་སྒྲིལ་ཚུ་རང་བཞིན་གྱིས་ཐོག་ལས་གཞི་བཙུགས་འབད་ཡོད་མི་བཟུམ་སྦེ་རྟགས་བཀལ།\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr ""
 "རང་བཞིན་རྟགས་མ་བཀལ-  ཐུམ་སྒྲིལ་ཚུ་ རང་བཞིན་གྱིས་ཐོག་ལས་རྟགས་བཀལ་ཡོད་མི་བཟུམ་སྦེ་རྟགས་བཀལ།\n"
@@ -5580,21 +5304,16 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr "དུས་མཐུན་བཟོ -    གསརཔ་/ཡར་བསྐྱེད་འབད་བཏུབ་པའི་ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཅིག་ཕབ་་ལེན་འབད།\n"
 
 #: src/main.cc:190
 #, fuzzy, c-format
-#| msgid " safe-upgrade - Perform a safe upgrade\n"
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr "ཉེན་སྲུང་ཡར་བསྐྱེད་- ཉེན་སྲུང་ལྡན་པའི་ཡར་བསྐྱེད་འབད།\n"
 
 #: src/main.cc:191
 #, fuzzy, c-format
-#| msgid ""
-#| " full-upgrade - Perform an upgrade, possibly installing and removing "
-#| "packages\n"
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
@@ -5607,51 +5326,41 @@
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr "བརྗེད་ནི་ - གསརཔ་ -  ཐུམ་སྒྲིལ་ག་ཅི་ཚུ་\"new\" ཨིན་ན་བརྗེད་དགོ\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr "འཛོལ་ཞིབ་འབད་-   ཐུམ་སྒྲིལ་ཚུ་གི་དོན་ལུ་མིང་/ཡང་ན་གསལ་བརྗོད་ཀྱིས་འཛོལ་ཞིབ་འབད།\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr "སྟོན་ -  ཐུམ་སྒྲིལ་ཅིག་གི་སྐོར་ལས་རྒྱས་ཤིང་རྒྱསཔ་སྦེ་ཡོད་མི་བརྡ་དོན་ཚུ་བཀྲམ་སྟོན་འབད།\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr "སེལ -  ཕབ་ལེན་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཡིག་སྣོད་ཚུ་ཀྲེག་གཏང་།\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr "རང་བཞིན་གྱིས་སེལ་ནི་ -  ཕབ་ལེན་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཡིཡག་སྣོད་་རྙིངམ་ཚུ་ཀྲེག་གཏང་།\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr "བསྒྱུར་བཅོས་དྲན་དེབ -  ཐུམ་སྒྲིལ་གྱི་བསྒྱུར་བཅོས་དྲན་དེབ་ཅིག་སྟོན།\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr "ཕབ་ལེན་འབད-  ཐུམ་སྒྲིལ་ཅིག་གི་དོན་ལུ་ཌེབ་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད།\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5683,7 +5392,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr "  -h    འདི་གྲོགས་རམ་ཚིག་ཡིག་ཨིན།\n"
 
@@ -5711,24 +5419,17 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P      ཨ་རྟག་རང་ ངེས་དཔྱད་འབད་ནི་དང་བྱ་བ་ཚུ་གི་དོན་ལུ་ནུས་སྤེལ་འབད།\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr " -y      བཏུབ་/མི་བཏུབ་ཀྱི་དྲི་བའི་ལན་དེ་ 'yes' ཨིན་ཟེར་མནོ་རུང་བཏུབ།\n"
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5738,9 +5439,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5750,8 +5448,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 ""
@@ -5781,9 +5477,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5791,8 +5484,6 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
@@ -5801,9 +5492,6 @@
 
 #: src/main.cc:226
 #, fuzzy, c-format
-#| msgid ""
-#| " -q             In command-line mode, suppress the incremental progress "
-#| "indicators.\n"
 msgid ""
 " -q             In command-line mode, suppress the incremental progress.\n"
 "                indicators.\n"
@@ -5812,15 +5500,11 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o key=val   རིམ་སྒྲིག་གདམ་ཁའི་མིང་'key'ཟེར་མི་དེ་ཐད་ཀར་དུ་གཞི་སྒྲིག་འབད།'\n"
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -5857,7 +5541,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "replaces"
 msgid "trace"
 msgstr "ཚབ་བཙུགསཔ་ཨིན།"
 
@@ -5871,7 +5554,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "མེན།"
 
@@ -5885,7 +5567,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:377
 #, fuzzy
-#| msgid "Err "
 msgid "error"
 msgstr "ཨི་ཨཱར་ཨཱར།"
 
@@ -5913,7 +5594,6 @@
 
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "ནུས་མེད་བཀོལ་སྤྱོད་ %s"
 
@@ -5929,7 +5609,6 @@
 
 #: src/main.cc:762
 #, fuzzy, c-format
-#| msgid "-o requires an argument of the form key=value, got %s"
 msgid "-o requires an argument of the form key=value, got %s\n"
 msgstr "-o དེ་ལུ་རྣམ་པའི་ལྡེ་མིིིག་=གནས་གོང་གི་སྒྲུབ་རྟགས་དེ་དགོས་མཁོ་ཡོདཔ་ཨིན། %s་ ཐོབ་ཅི།"
 
@@ -5967,7 +5646,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "ཐུམ་སྒྲིལ།"
 
@@ -5977,7 +5655,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "ཐུམ་སྒྲིལ་ཆ་མཉམ།"
 
@@ -5997,7 +5674,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -6005,8 +5681,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -6016,7 +5690,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "-u དང་ -i དེ་བརྡ་བཀོད་དང་གཅིག་ཁར་གསལ་བཀོད་མི་འབད་འོང་།"
 
@@ -6032,9 +5705,6 @@
 
 #: src/main.cc:1194 src/main.cc:1267
 #, fuzzy, c-format
-#| msgid ""
-#| "Backtrace:\n"
-#| "%s"
 msgid ""
 "Backtrace:\n"
 "%s\n"
@@ -6671,7 +6341,6 @@
 
 #: src/pkg_info_screen.cc:162
 #, fuzzy, c-format
-#| msgid "Versions"
 msgid "Versions of %s"
 msgstr "ཐོན་རིམ་ཚུ།"
 
@@ -6795,9 +6464,6 @@
 
 #: src/pkg_view.cc:223
 #, fuzzy
-#| msgid ""
-#| "If you select a package, an explanation of its current state will appear "
-#| "in this space."
 msgid ""
 "If you select a package, an explanation of why it should be installed or "
 "removed will appear in this space."
@@ -6818,13 +6484,11 @@
 
 #: src/pkg_view.cc:678
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Related Dependencies"
 msgstr "རྟེན་འབྲེལ་ཚུ་མོས་མཐུན་བཟོ།"
 
 #: src/pkg_view.cc:681
 #, fuzzy
-#| msgid "Installed"
 msgid "Why Installed"
 msgstr "གཞི་བཙུགས་འབད་ཡོདཔ།"
 
@@ -7260,7 +6924,6 @@
 
 #: src/ui.cc:472
 #, fuzzy, c-format
-#| msgid "Unable to open %ls"
 msgid "Unable to fork: %s"
 msgstr "%ls དེ་ཁ་ཕྱེ་མི་ཚུགས་པས།"
 
@@ -7305,11 +6968,6 @@
 
 #: src/ui.cc:981
 #, 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."
 msgid ""
 "Aptitude %s%n%nCopyright 2000-2008 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
@@ -7387,7 +7045,6 @@
 
 #: src/ui.cc:1101
 #, fuzzy, c-format
-#| msgid "View the important changes made in each version of "
 msgid "View the important changes made in each version of %s"
 msgstr "གི་ཐོན་རིམ་རེ་རེའི་ནང་ལུ་བཟོ་ཡོད་མི་གལ་གནད་ཅན་གྱི་བསྒྱུར་བཅོས་དེ་ཚུ་སྟོན།"
 
@@ -7545,9 +7202,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7570,9 +7224,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -8101,19 +7752,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "བསྒྱུར་བཅོས་ལོགསི་ ཚུ་ཕབ་ལེན་འབད་ནིའི་དོན་ལུ་ལག་ལེན་འཐབ་་ནི་གི་ཡུ་ཨཱར་ཨེལ།"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "བསྒྱུར་བཅོས་ལོགསི་ ཚུ་ཕབ་ལེན་འབད་ནིའི་དོན་ལུ་ལག་ལེན་འཐབ་་ནི་གི་ཡུ་ཨཱར་ཨེལ།"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "བསྒྱུར་བཅོས་དྲེན་དེབ་ཕབ་ལེན་འབད་དོ།"
 
Index: aptitude/po/el.po
===================================================================
--- aptitude.orig/po/el.po
+++ aptitude/po/el.po
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2008-09-11 15:53+0200\n"
 "Last-Translator: quad-nrg.net <yodesy@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -278,9 +278,6 @@
 
 #: src/apt_options.cc:241
 #, fuzzy
-#| msgid ""
-#| "If this option is enabled, the menu bar will only appear when it has been "
-#| "activated by pressing the menu key."
 msgid ""
 "If this option is enabled, then the first view displayed on startup will be "
 "a flat view instead of the default view."
@@ -720,7 +717,6 @@
 
 #: src/cmdline/cmdline_action.cc:212
 #, fuzzy, c-format
-#| msgid "Unable to satisfy the build-depends: %s."
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Αδύνατη η ικανοποίηση του build-depends: %s."
 
@@ -777,13 +773,11 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "το %s δεν είναι εγκατεστημένο, άρα δεν θα επανεγκατασταθεί.\n"
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "το %s είναι ήδη εγκατεστημένο και στην αιτούμενη έκδοση (%s)\n"
@@ -887,7 +881,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "Αρχείο Αλλαγής του %s"
 
@@ -1057,7 +1050,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "κανένα"
 
@@ -1476,7 +1468,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "'&M' επισήμανση πακέτων σαν αυτόματα εγκατεστημμένων"
 
@@ -1611,9 +1602,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy, c-format
-#| msgid ""
-#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: "
-#| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
@@ -1660,10 +1648,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:259
 #, fuzzy
-#| msgid ""
-#| "reject the given package versions; don't display any solutions in which "
-#| "they occur.  Enter UNINST instead of a version to reject removing the "
-#| "package."
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package.  "
@@ -1675,9 +1659,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:261
 #, fuzzy
-#| msgid ""
-#| "accept the given package versions; display only solutions in which they "
-#| "occur.  Enter UNINST instead of a version to accept removing the package."
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package.  "
@@ -1788,31 +1769,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "Άφησε τις ακόλουθες συστάσεις ανεπίλυτες:"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "Εξέταση ^Συστάσεων"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "Δεν απαιτείται πλέον η αφαίρεση του πακέτου %s"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "Εξέταση ^Συστάσεων"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Ενέργειες"
 
@@ -1971,14 +1947,12 @@
 
 #: src/cmdline/cmdline_resolver.cc:1201
 #, fuzzy
-#| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Αδύνατη η επίλυση των εξαρτήσεων για την αναβάθμιση (δεν βρέθηκε λύση)."
 
 #: src/cmdline/cmdline_resolver.cc:1207
 #, fuzzy, c-format
-#| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Αδύνατη η επίλυση των εξαρτήσεων για την αναβάθμιση (%s)."
 
@@ -2009,13 +1983,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "αλλά δεν είναι εγκατάστασιμο"
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "αλλά θα εγκατασταθεί το %s."
 
@@ -2114,13 +2086,11 @@
 
 #: src/cmdline/cmdline_show.cc:326
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s%s; will be installed"
 msgstr "%s; θα εγκατασταθεί"
 
 #: src/cmdline/cmdline_show.cc:328
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s%s; will be installed automatically"
 msgstr "το %s; θα εγκατασταθεί αυτόματα"
 
@@ -2383,25 +2353,21 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "Πακέτα"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Πηγαίο Πακέτο: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Αρχείο"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\".\n"
 msgid "No such package \"%s\"."
 msgstr "Δεν υπάρχει τέτοιο πακέτο \"%s\".\n"
 
@@ -2440,7 +2406,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "αναζήτηση: Θα πρέπει να ορίσετε ένα τουλάχιστον αντικείμενο\n"
 
@@ -2564,7 +2529,6 @@
 
 #: src/cmdline/cmdline_why.cc:1285
 #, fuzzy, c-format
-#| msgid "Packages depending on %s"
 msgid "Packages requiring %s:"
 msgstr "Πακέτα που εξαρτώνται από το %s"
 
@@ -2580,8 +2544,6 @@
 
 #: src/cmdline/cmdline_why.cc:1416
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: this command requires at least one argument (the package to query)."
 msgid ""
 "%s: this command requires at least one argument (the package to query).\n"
 msgstr ""
@@ -2600,7 +2562,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[ΣΦΑΛΜΑ]"
 
@@ -2958,7 +2919,6 @@
 
 #: src/generic/apt/download_update_manager.cc:138
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated quoted string in command: %s"
 msgstr "Μη τερματιζόμενη literal συμβολοσειρά μετά το %s"
 
@@ -3043,7 +3003,6 @@
 
 #: src/generic/apt/dump_packages.cc:674
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create truncated cache: %s."
 msgstr "Αδύνατος ο εντοπισμός του πακέτου %s"
 
@@ -3166,7 +3125,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "Μεταφόρτωση πακέτων"
 
@@ -3205,7 +3163,6 @@
 
 #: src/generic/apt/matching/parse.cc:860
 #, fuzzy, c-format
-#| msgid "Unknown matcher type: \"%s\"."
 msgid "Unknown term type: \"%s\"."
 msgstr "Άγνωστος τύπος matcher:\"%s\"."
 
@@ -3213,9 +3170,6 @@
 #. Leave the question marks attached to the string placeholders.
 #: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883
 #, fuzzy, c-format
-#| msgid ""
-#| "The ?%s matcher must be used in a \"wide\" context (a top-level context, "
-#| "or a context enclosed by ?%s)."
 msgid ""
 "The ?%s term must be used in a \"wide\" context (a top-level context, or a "
 "context enclosed by ?%s)."
@@ -3246,7 +3200,6 @@
 
 #: src/generic/apt/matching/parse.cc:1388
 #, fuzzy, c-format
-#| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "Λάθος διαμορφωμένη παράσταση"
 
@@ -3284,19 +3237,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "Διεύθυνση που θα χρησιμοποιηθεί για τη μεταφόρτωση των αρχείων αλλαγών"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "Διεύθυνση που θα χρησιμοποιηθεί για τη μεταφόρτωση των αρχείων αλλαγών"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "Αρχείο Αλλαγής του %s"
 
@@ -3342,7 +3292,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Αδύνατο το parse του προτύπου %s"
 
@@ -3357,14 +3306,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "Μη εγκατεστημένο"
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "Μη εγκατεστημένο"
 
@@ -3391,67 +3338,56 @@
 
 #: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got EOF."
 msgstr "Περίμενα %c', έλαβα '%c'."
 
 #: src/generic/util/parsers.h:737
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got '%s'."
 msgstr "Περίμενα %c', έλαβα '%c'."
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "Περίμενα έναν αριθμό μετά το -q=, έλαβα %s\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "Κακός χαρακτήρας ενέργειας '%c'\n"
 
 #: src/generic/util/parsers.h:832
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got EOF."
 msgstr "Περίμενα %c', έλαβα '%c'."
 
 #: src/generic/util/parsers.h:843
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got '%c'."
 msgstr "Περίμενα %c', έλαβα '%c'."
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "Περίμενα ταυτοποίηση πολιτικής, έλαβα '%c'"
 
 #: src/generic/util/parsers.h:1026
 #, fuzzy
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected an integer following '-', got EOF."
 msgstr "Περίμενα ',' ή ')' μετά το '||', έλαβα '%s'"
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "Περίμενα ταυτοποίηση πολιτικής, έλαβα '%c'"
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "Ακυρη λειτουργία %s"
 
 #: src/generic/util/parsers.h:1077
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected EOF, got '%c'."
 msgstr "Περίμενα %c', έλαβα '%c'."
 
@@ -3465,19 +3401,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "Μή αναμενόμενη ')'"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " ή"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "Μή αναμενόμενη ')'"
 
@@ -3488,7 +3421,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "Αδυναμία δημιοουργίας προσωρινού καταλόγου από το πρότυπο \"%s\": %s"
 
@@ -3523,7 +3455,6 @@
 
 #: src/gtk/aptitude.glade:19 src/gtk/aptitude.glade:2273
 #, fuzzy
-#| msgid "False"
 msgid "_File"
 msgstr "Ψευδές"
 
@@ -3590,13 +3521,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "Πακέτο"
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "Οθόνες"
 
@@ -3616,7 +3545,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "Βοήθεια"
 
@@ -3627,7 +3555,6 @@
 
 #: src/gtk/aptitude.glade:345 src/gtk/aptitude.glade:2614
 #, fuzzy
-#| msgid "List Update"
 msgid "Update"
 msgstr "Αναβάθμιση λίστας"
 
@@ -3649,7 +3576,6 @@
 
 #: src/gtk/aptitude.glade:389 src/gtk/aptitude.glade:2658
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Remove"
 msgstr "Εγκατεστημένο"
 
@@ -3663,33 +3589,28 @@
 
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "Αφαίρεση του φίλτρου από τον κατάλογο των πακέτων"
 
 #: src/gtk/aptitude.glade:649
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "Apply these settings to all active package lists."
 msgstr "Εφαρμογή φίλτρου στον κατάλογο των πακέτων"
 
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "Αναζήτηση"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "επανεγκατάσταση"
 
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "Σφάλμα "
 
@@ -3704,19 +3625,16 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "Εξαρτήσεις του %s"
 
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "^Changelog"
 msgid "Changelog"
 msgstr "Α^ρχείο Αλλαγών"
 
 #: src/gtk/aptitude.glade:1020
 #, fuzzy
-#| msgid "False"
 msgid "Files"
 msgstr "Ψευδές"
 
@@ -3730,7 +3648,6 @@
 
 #: src/gtk/aptitude.glade:1051
 #, fuzzy
-#| msgid "Tags"
 msgid "tags"
 msgstr "Ετικέτες"
 
@@ -3753,13 +3670,11 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "Κατάσταση"
 
 #: src/gtk/aptitude.glade:1247
 #, fuzzy
-#| msgid "Unknown action type: %s"
 msgid "Group by action type"
 msgstr "Άγνωστος τύπος εργασίας: %s"
 
@@ -3788,13 +3703,11 @@
 
 #: src/gtk/aptitude.glade:1328
 #, fuzzy
-#| msgid "Toggle ^Rejected"
 msgid "Rejected"
 msgstr "Αλλαγή επιλογής ^Απορριφθέντων"
 
 #: src/gtk/aptitude.glade:1343
 #, fuzzy
-#| msgid "Preferences"
 msgid "No preference"
 msgstr "Προτιμήσεις"
 
@@ -3808,19 +3721,16 @@
 
 #: src/gtk/aptitude.glade:1400
 #, fuzzy
-#| msgid "^Examine Solution"
 msgid "Find a new solution"
 msgstr "^Εξέταση της λύσης"
 
 #: src/gtk/aptitude.glade:1404
 #, fuzzy
-#| msgid "Select the next solution to the dependency problems."
 msgid "Calculate the next solution that has not yet been generated."
 msgstr "Επέλεξε την επόμενη λύση στα προβλήματα εξαρτήσεων."
 
 #: src/gtk/aptitude.glade:1419
 #, fuzzy
-#| msgid "Perform the actions contained in the currently selected solution."
 msgid ""
 "Perform the actions in the currently selected solution and close this tab."
 msgstr ""
@@ -3828,13 +3738,11 @@
 
 #: src/gtk/aptitude.glade:1576
 #, fuzzy
-#| msgid "Upgrade"
 msgid "Upgrade Summary"
 msgstr "Αναβάθμιση"
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "Πηγαίο Πακέτο: "
 
@@ -3846,7 +3754,6 @@
 
 #: src/gtk/aptitude.glade:1652
 #, fuzzy
-#| msgid "Manual"
 msgid "Fix Manually"
 msgstr "Εγχειρίδιο"
 
@@ -3894,31 +3801,26 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "Σπασμένο"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "Αδυναμία διόρθωσης των μη διαθέσιμων πακέτων"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "^Ευρεση"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for: "
 msgid "Search for packages."
 msgstr "Αναζήτηση του: "
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "Μεταφορτώθηκε το "
 
@@ -3952,19 +3854,16 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "Διεύθυνση που θα χρησιμοποιηθεί για τη μεταφόρτωση των αρχείων αλλαγών"
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "Απαιτείται η εγκατάσταση της έκδοσης %s του πακέτου %s (%s)"
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -3972,20 +3871,17 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr "Μπορείτε να εμφανίσετε ημερολόγια αλλαγών μόνο για επίσημα πακέτα."
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "Μεταφόρτωση Αρχείου Αλλαγών"
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "Διεύθυνση που θα χρησιμοποιηθεί για τη μεταφόρτωση των αρχείων αλλαγών"
 
@@ -3999,7 +3895,6 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "Διεύθυνση που θα χρησιμοποιηθεί για τη μεταφόρτωση των αρχείων αλλαγών"
 
@@ -4009,8 +3904,6 @@
 
 #: src/gtk/dashboardtab.cc:414
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] "%d αναβάθμιση"
@@ -4018,13 +3911,11 @@
 
 #: src/gtk/dashboardtab.cc:633
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No upgrades are available."
 msgstr "Μη εγκατεστημένο"
 
 #: src/gtk/dashboardtab.cc:645
 #, fuzzy
-#| msgid "Unable to locate package %s"
 msgid "Unable to calculate an upgrade."
 msgstr "Αδύνατος ο εντοπισμός του πακέτου %s"
 
@@ -4059,26 +3950,22 @@
 
 #: src/gtk/dashboardtab.cc:708
 #, fuzzy, c-format
-#| msgid "Internal error: Default column string is unparsable"
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr ""
 "Εσωτερικό σφάλμα: Αδύνατη η ανάλυση της προκαθορισμένης στήλης χαρακτήρων"
 
 #: src/gtk/dependency_chains_tab.cc:78
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: start"
 msgstr "Διαχείριση εξαρτήσεων"
 
 #: src/gtk/dependency_chains_tab.cc:82
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: end"
 msgstr "Διαχείριση εξαρτήσεων"
 
 #: src/gtk/dependency_chains_tab.cc:86
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: results"
 msgstr "Διαχείριση εξαρτήσεων"
 
@@ -4088,7 +3975,6 @@
 
 #: src/gtk/dependency_chains_tab.cc:282
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency chain found."
 msgstr "Διαχείριση εξαρτήσεων"
 
@@ -4098,13 +3984,11 @@
 
 #: src/gtk/download.cc:185
 #, fuzzy
-#| msgid "False"
 msgid "Failed"
 msgstr "Ψευδές"
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "Διαγράφονται τα μεταφορτωμένα αρχείων"
 
@@ -4115,13 +3999,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "Συνολική Πρόοδος: "
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description"
 msgid "Short Description"
 msgstr "Περιγραφή"
 
@@ -4131,13 +4013,11 @@
 
 #: src/gtk/download.cc:319
 #, fuzzy
-#| msgid "Cleaning while a download is in progress is not allowed"
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr "Δεν επιτρέπεται εκκαθάριση κατά τη διάρκεια της μεταφόρτωσης"
 
 #: src/gtk/download.cc:395 src/gtk/gui.cc:832
 #, fuzzy
-#| msgid "View next display"
 msgid "View Details"
 msgstr "Εμφάνιση επόμενης οθόνης"
 
@@ -4157,19 +4037,16 @@
 
 #: src/gtk/download.cc:486
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s: %lu/%lu, stalled"
 msgstr "%s; θα εγκατασταθεί"
 
 #: src/gtk/download.cc:507
 #, fuzzy, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr " [ %i%% ] (%sB/s, απομένουν %s)"
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "αλλά θα εγκατασταθεί το %s."
 
@@ -4183,7 +4060,6 @@
 
 #: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "Αδύνατος ο εντοπισμός του πακέτου %s"
 
@@ -4194,7 +4070,6 @@
 
 #: src/gtk/dpkg_terminal.cc:429
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "%s: Unable to accept a connection: %s"
 msgstr "Αδυναμία δημιοουργίας προσωρινού καταλόγου από το πρότυπο \"%s\": %s"
 
@@ -4220,80 +4095,67 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "Εκδόσεις του %s"
 
 #: src/gtk/entitysummary.cc:123
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Install %s version %s"
 msgstr "Εγκατάσταση(%s παρέχει %s)"
 
 #: src/gtk/entitysummary.cc:131
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrade to %s version %s"
 msgstr "  έκδοση cwidget: %s\n"
 
 #: src/gtk/entitysummary.cc:142
 #, fuzzy, c-format
-#| msgid "Keep the following packages at their current version:"
 msgid "Don't hold %s at its current version."
 msgstr "Διατήρησε τα ακόλουθα πακέτα στην τωρινή τους έκδοση:"
 
 #: src/gtk/entitysummary.cc:145 src/gtk/entitysummary.cc:165
 #: src/gtk/entitysummary.cc:168
 #, fuzzy, c-format
-#| msgid "Canc^el pending actions"
 msgid "Cancel any actions on %s."
 msgstr "Ακύ^ρωση των εκκρεμών ενεργειών"
 
 #: src/gtk/entitysummary.cc:150
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the purge of %s."
 msgstr "Ακύρωση της αφαίρεσης του %F"
 
 #: src/gtk/entitysummary.cc:152
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s."
 msgstr "Ακύρωση της αφαίρεσης του %F"
 
 #: src/gtk/entitysummary.cc:157
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the upgrade of %s."
 msgstr "Ακύρωση της αφαίρεσης του %F"
 
 #: src/gtk/entitysummary.cc:159
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s."
 msgstr "Ακύρωση της εγκατάστασης του %F"
 
 #: src/gtk/entitysummary.cc:161
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the downgrade of %s."
 msgstr "Ακύρωση της αφαίρεσης του %F"
 
 #: src/gtk/entitysummary.cc:163
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the reinstallation of %s."
 msgstr "Ακύρωση της εγκατάστασης του %F"
 
 #: src/gtk/entitysummary.cc:206
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "Remove %s"
 msgstr "Αφαίρεση(%s)"
 
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "^Διαγραφή"
 
@@ -4304,7 +4166,6 @@
 
 #: src/gtk/entitysummary.cc:223
 #, fuzzy, c-format
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Mark %s as automatically installed."
 msgstr "'&M' επισήμανση πακέτων σαν αυτόματα εγκατεστημμένων"
 
@@ -4315,7 +4176,6 @@
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
 msgid "%s is a virtual package provided by:\n"
 msgstr "\"%s\" είναι ένα εικονικό πακέτο που παρέχεται από το:\n"
 
@@ -4325,13 +4185,11 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "Πηγαίο Πακέτο: "
 
 #: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 #, fuzzy
-#| msgid "ProgName"
 msgid "Name"
 msgstr "ΟνομΠρογρ"
 
@@ -4341,13 +4199,11 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "Δεν ήταν δυνατό το άνοιγμα του αρχείου \"%s\""
 
 #: src/gtk/entityview.cc:412
 #, fuzzy, c-format
-#| msgid "Rejecting the removal of %s"
 msgid "Editing the columns of \"%s\""
 msgstr "Απόρριψη της αφαίρεσης του πακέτου %s"
 
@@ -4361,25 +4217,21 @@
 
 #: src/gtk/entityview.cc:570
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Whether the package is automatically installed."
 msgstr "'&M' επισήμανση πακέτων σαν αυτόματα εγκατεστημμένων"
 
 #: src/gtk/entityview.cc:576
 #, fuzzy
-#| msgid "Cancel any action on the selected package"
 msgid "The name and description of the package."
 msgstr "Ακύρωση κάθε ενέργειας για το επιλεγμένο πακέτο"
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "Εκδοση: "
 
 #: src/gtk/entityview.cc:592
 #, fuzzy
-#| msgid "Check for new versions of packages"
 msgid "The version number of the package."
 msgstr "Έλεγχος για νέες εκδόσεις πακέτων"
 
@@ -4400,7 +4252,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "μη εγκατεστημένο"
 
@@ -4410,37 +4261,31 @@
 
 #: src/gtk/gui.cc:82
 #, fuzzy
-#| msgid "unpacked"
 msgid "Unpacked"
 msgstr "ξεπακεταρισμένο"
 
 #: src/gtk/gui.cc:83
 #, fuzzy
-#| msgid "half-config"
 msgid "Half-configured"
 msgstr "μισο-ρυθμισμένο"
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "half-install"
 msgid "Half-installed"
 msgstr "μισο-εγκατεστημένο"
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "μη εγκατεστημένο (παραμένουν αρχεία ρυθμίσεων)"
 
 #: src/gtk/gui.cc:86
 #, fuzzy
-#| msgid "triggers-awaited"
 msgid "Triggers awaited"
 msgstr "αναμονή των trigger"
 
 #: src/gtk/gui.cc:87
 #, fuzzy
-#| msgid "triggers-pending"
 msgid "Triggers pending"
 msgstr "εκκρεμούν οι trigger"
 
@@ -4466,13 +4311,11 @@
 
 #: src/gtk/gui.cc:97
 #, fuzzy
-#| msgid "forbidden upgrade"
 msgid "Hold (don't upgrade)"
 msgstr "απαγορευμένη αναβάθμιση"
 
 #: src/gtk/gui.cc:99
 #, fuzzy
-#| msgid "Related Dependencies"
 msgid "Unsatisfied dependencies"
 msgstr "Σχετικές εξαρτήσεις"
 
@@ -4486,7 +4329,6 @@
 
 #: src/gtk/gui.cc:290
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "Εφαρμογή φίλτρου στον κατάλογο των πακέτων"
 
@@ -4501,13 +4343,11 @@
 
 #: src/gtk/gui.cc:359
 #, fuzzy, c-format
-#| msgid "List Update"
 msgid "Update %s?"
 msgstr "Αναβάθμιση λίστας"
 
 #: src/gtk/gui.cc:385
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
@@ -4535,31 +4375,26 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "%s changes"
 msgid "Done applying changes!"
 msgstr "%s αλλαγές"
 
 #: src/gtk/gui.cc:823
 #, fuzzy
-#| msgid "%s changes"
 msgid "Applying changes..."
 msgstr "%s αλλαγές"
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "s: %F"
 msgid "%s: %s"
 msgstr "s: %F"
 
 #: src/gtk/gui.cc:878
 #, fuzzy, c-format
-#| msgid "No broken packages."
 msgid "Error in package %s"
 msgstr "Δεν υπάρχουν \"σπασμένα\" πακέτα."
 
 #: src/gtk/gui.cc:906
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Αδύνατη η αντικατάσταση του %s με νέο αρχείο ρυθμίσεων"
 
@@ -4569,25 +4404,21 @@
 
 #: src/gtk/gui.cc:1038
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "Δεν υπάρχουν \"σπασμένα\" πακέτα."
 
 #: src/gtk/gui.cc:1071
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "Δεν υπάρχουν \"σπασμένα\" πακέτα."
 
 #: src/gtk/gui.cc:1075
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "Επίλυση Εξαρτήσεων"
 
 #: src/gtk/gui.cc:1103
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Δεν υπάρχουν \"σπασμένα\" πακέτα."
@@ -4595,13 +4426,11 @@
 
 #: src/gtk/gui.cc:1147
 #, fuzzy
-#| msgid "%s changes"
 msgid "View changes"
 msgstr "%s αλλαγές"
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "%s changes"
 msgid "Apply changes"
 msgstr "%s αλλαγές"
 
@@ -4610,8 +4439,6 @@
 #. font.
 #: src/gtk/gui.cc:1192
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%d package to install"
 msgid_plural "%d packages to install"
 msgstr[0] "%d εγκατάσταση"
@@ -4622,7 +4449,6 @@
 #. font.
 #: src/gtk/gui.cc:1207
 #, fuzzy, c-format
-#| msgid "failed to remove %s"
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "αποτυχία αφαίρεσης του %s"
@@ -4630,7 +4456,6 @@
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "ΜέγεθοςΛήψης"
 
@@ -4645,19 +4470,16 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "not installed"
 msgid "Not implemented"
 msgstr "μη εγκατεστημένο"
 
 #: src/gtk/gui.cc:1408 src/gtk/gui.cc:1427
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "Εγκατεστημένο"
 
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "^Διαγραφή"
 
@@ -4675,7 +4497,6 @@
 
 #: src/gtk/gui.cc:1455
 #, fuzzy
-#| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "Εγχειρίδιο Χρήσης"
 
@@ -4690,7 +4511,6 @@
 
 #: src/gtk/info.cc:161 src/gtk/pkgview.cc:169
 #, fuzzy
-#| msgid "Current status: %F."
 msgid "Current status"
 msgstr "Τρέχουσα κατάσταση: %F"
 
@@ -4700,19 +4520,16 @@
 
 #: src/gtk/info.cc:496
 #, fuzzy
-#| msgid "Not Installed"
 msgid "Not available"
 msgstr "Μη εγκατεστημένο"
 
 #: src/gtk/info.cc:545
 #, fuzzy
-#| msgid "C^ycle Package Information"
 msgid "Package information: version list"
 msgstr "Κυκλική εναλλαγή Πληροφοριών Πακέτου"
 
 #: src/gtk/info.cc:555
 #, fuzzy
-#| msgid "Packages which depend on %s"
 msgid "Package information: dependency list"
 msgstr "Πακέτα που εξαρτώνται από το %s"
 
@@ -4722,7 +4539,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "όχι"
 
@@ -4736,7 +4552,6 @@
 
 #: src/gtk/packagestab.cc:203
 #, fuzzy, c-format
-#| msgid "No packages matched the pattern \"%ls\"."
 msgid "No packages matched \"%s\"."
 msgstr "Κανένα πακέτο δεν ταιριάζει με το \"%ls\"."
 
@@ -4746,31 +4561,26 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "Πακέτο: "
 
 #: src/gtk/pkgview.cc:224
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed automatically."
 msgstr "το %s; θα εγκατασταθεί αυτόματα"
 
 #: src/gtk/pkgview.cc:227
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed automatically."
 msgstr "το %s; θα εγκατασταθεί αυτόματα"
 
 #: src/gtk/pkgview.cc:235
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed manually."
 msgstr "το %s; θα εγκατασταθεί αυτόματα"
 
 #: src/gtk/pkgview.cc:238
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed manually."
 msgstr "το %s; θα εγκατασταθεί αυτόματα"
 
@@ -4780,13 +4590,11 @@
 
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "Αναζήτηση"
 
 #: src/gtk/pkgview.cc:718
 #, fuzzy
-#| msgid "Building view"
 msgid "Finalizing view"
 msgstr "Δημιουργία εμφάνισης"
 
@@ -4918,13 +4726,11 @@
 
 #: src/gtk/previewtab.cc:179
 #, fuzzy
-#| msgid "Preview"
 msgid "Preview: "
 msgstr "Προεπισκόπηση"
 
 #: src/gtk/resolver.cc:68
 #, fuzzy, c-format
-#| msgid "Error while dumping resolver state"
 msgid "Error in dependency resolver: %s"
 msgstr "Λάθος κατά το \"άδειασμα\" της κατάστασης του resolver"
 
@@ -4939,7 +4745,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package"
 msgid "Virtual package"
 msgstr "Πακέτο"
 
@@ -4949,43 +4754,36 @@
 
 #: src/gtk/resolver.cc:377
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Removing %s is rejected."
 msgstr "Αφαίρεση το %s"
 
 #: src/gtk/resolver.cc:382
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Canceling the installation of %s is rejected."
 msgstr "Ακύρωση της εγκατάστασης του %F"
 
 #: src/gtk/resolver.cc:391
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Canceling the removal of %s is rejected."
 msgstr "Ακύρωση της αφαίρεσης του %F"
 
 #: src/gtk/resolver.cc:394
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keeping %s at version %s is rejected."
 msgstr "Διατήρηση του %F στην έκδοση %s (%s)"
 
 #: src/gtk/resolver.cc:401
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Installing %s version %s is rejected."
 msgstr "Εγκατάσταση(%s παρέχει %s)"
 
 #: src/gtk/resolver.cc:407
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrading %s to version %s is rejected."
 msgstr "  έκδοση cwidget: %s\n"
 
 #: src/gtk/resolver.cc:413
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrading %s to version %s is rejected."
 msgstr "Εκδόσεις του %s"
 
@@ -5027,7 +4825,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr "Εκδόσεις του %s"
@@ -5125,7 +4922,6 @@
 
 #: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862
 #, fuzzy
-#| msgid "Remove the following packages:"
 msgid "Keep the following packages:"
 msgstr "Αφαίρεσε τα ακόλουθα πακέτα:"
 
@@ -5141,121 +4937,101 @@
 
 #: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900
 #, fuzzy
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "Leave the following dependencies unresolved:"
 msgstr "Μην επιλύσεις τις ακόλουθες εξαρτήσεις: %n"
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Remove %F [%s (%s)]"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "Αφαίρεση του %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1523
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "Εγκατάσταση του %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1531
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s"
 msgstr "Ακύρωση της εγκατάστασης του %F"
 
 #: src/gtk/resolver.cc:1534
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s"
 msgstr "Ακύρωση της αφαίρεσης του %F"
 
 #: src/gtk/resolver.cc:1537
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "Διατήρηση του %F στην έκδοση %s (%s)"
 
 #: src/gtk/resolver.cc:1544
 #, fuzzy, c-format
-#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Αναβάθμιση του %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1553
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Υποβάθμιση έκδοσης %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>Remove</b> %s"
 msgstr "Αφαίρεση(%s)"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>remove</b> %s"
 msgstr "Αφαίρεση(%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "Διατήρηση του %F στην έκδοση %s (%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>keep</b> %s at version %s"
 msgstr "Διατήρηση του %F στην έκδοση %s (%s)"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr "Ακύρωση της εγκατάστασης του %F"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>cancel</b> the installation of %s"
 msgstr "Ακύρωση της εγκατάστασης του %F"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>Install</b> %s %s"
 msgstr "Εγκατάσταση του %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>install</b> %s %s"
 msgstr "Εγκατάσταση του %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>Downgrade</b> %s to version %s"
 msgstr "  έκδοση cwidget: %s\n"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>downgrade</b> %s to version %s"
 msgstr "  έκδοση cwidget: %s\n"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>Upgrade</b> %s to version %s"
 msgstr "Εκδόσεις του %s"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>upgrade</b> %s to version %s"
 msgstr "Εκδόσεις του %s"
 
@@ -5271,8 +5047,6 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "%d εγκατάσταση"
@@ -5280,8 +5054,6 @@
 
 #: src/gtk/resolver.cc:1740
 #, fuzzy, c-format
-#| msgid "%d removal"
-#| msgid_plural "%d removals"
 msgid "%s remove"
 msgid_plural "%s removes"
 msgstr[0] "%d αφαίρεση"
@@ -5289,8 +5061,6 @@
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "%d keep"
-#| msgid_plural "%d keeps"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "%d διατήρηση"
@@ -5298,8 +5068,6 @@
 
 #: src/gtk/resolver.cc:1752
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%s upgrade"
 msgid_plural "%s upgrades"
 msgstr[0] "%d αναβάθμιση"
@@ -5307,8 +5075,6 @@
 
 #: src/gtk/resolver.cc:1758
 #, fuzzy, c-format
-#| msgid "%d downgrade"
-#| msgid_plural "%d downgrades"
 msgid "%s downgrade"
 msgid_plural "%s downgrades"
 msgstr[0] "%d υποβαθμίζεται"
@@ -5316,7 +5082,6 @@
 
 #: src/gtk/resolver.cc:1764
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "%s unresolved recommendation"
 msgid_plural "%s unresolved recommendations"
 msgstr[0] "Εξέταση ^Συστάσεων"
@@ -5324,19 +5089,16 @@
 
 #: src/gtk/resolver.cc:2056
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions yet."
 msgstr "Δεν υπάρχουν περισσότερες λύσεις."
 
 #: src/gtk/resolver.cc:2063
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency solution was found."
 msgstr "Διαχείριση εξαρτήσεων"
 
 #: src/gtk/resolver.cc:2064
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions."
 msgstr "Δεν υπάρχουν περισσότερες λύσεις."
 
@@ -5346,19 +5108,16 @@
 
 #: src/gtk/resolver.cc:2076
 #, fuzzy, c-format
-#| msgid "No more solutions."
 msgid "%u solutions."
 msgstr "Δεν υπάρχουν περισσότερες λύσεις."
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "Δεν ήταν δυνατό το άνοιγμα του αρχείου \"%s\""
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr "[Μεταφορτώθηκε]"
 
@@ -5408,7 +5167,6 @@
 
 #: src/load_grouppolicy.cc:305
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected ',', '%c', or '('; got '%c'"
 msgstr "Περίμενα ',' ή '(', έλαβα '%c'"
 
@@ -5516,7 +5274,6 @@
 
 #: src/load_grouppolicy.cc:713
 #, fuzzy, c-format
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected '{', ')', or ',' following '||', got '%s'"
 msgstr "Περίμενα ',' ή ')' μετά το '||', έλαβα '%s'"
 
@@ -5642,19 +5399,16 @@
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  έκδοση apt %d.%d.%d\n"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  έκδοση apt %d.%d.%d\n"
 
 #: src/main.cc:164
 #, fuzzy, c-format
-#| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Απενεργοποίηση υποστήριξης Ept.\n"
 
@@ -5703,44 +5457,36 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Εγκατάσταση/αναβάθμιση πακέτου\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Αφαίρεση πακέτων\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Αφαίρεση πακέτων μαζί με τα αρχεία ρυθμίσεών τους\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Τοποθέτηση πακέτων σε αναμονή\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Ακύρωση της εντολής αναμονή για πακέτο\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr "markauto    - Σήμανση των πακέτων σαν να έχουν εγκατασταθεί αυτόματα\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr ""
 "unmarkauto   - Σήμανση των πακέτων σαν να έχουν εγκατασταθεί χειροκίνητα\n"
@@ -5756,21 +5502,16 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr "update       - Μεταφόρτωση λιστών των νέων/αναβαθμιζόμενων πακέτων\n"
 
 #: src/main.cc:190
 #, fuzzy, c-format
-#| msgid " safe-upgrade - Perform a safe upgrade\n"
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Εκτέλεση μιας ασφαλούς αναβάθμισης\n"
 
 #: src/main.cc:191
 #, fuzzy, c-format
-#| msgid ""
-#| " full-upgrade - Perform an upgrade, possibly installing and removing "
-#| "packages\n"
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
@@ -5780,58 +5521,47 @@
 
 #: src/main.cc:192
 #, fuzzy, c-format
-#| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "'&BD' για να εγκαταστήσετε τις build-εξαρτήσεις ενός πακέτου."
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr "forget-new   - Ξέχασε ποια πακέτα είναι \"νέα\"\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr ""
 " search       - Αναζήτηση ενός πακέτου με βάση το όνομα ή/και έκφραση\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Εμφάνιση λεπτομερειών σχετικά με ένα πακέτο\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Διαγραφή μεταφορτομένων πακέτων\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Διαγραφή παλαιότερα μεταφορτομένων αρχεία πακέτων\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " ημερ. αλλαγών    -Εμφάνισε το ημερολόγιο αλλαγών ενός πακέτου\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Μεταφόρτωση ενός αρχείου .deb για ένα πακέτο\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5853,12 +5583,6 @@
 
 #: src/main.cc:203
 #, fuzzy, c-format
-#| msgid ""
-#| " why-not      - Show the manually installed packages that lead to a "
-#| "conflict\n"
-#| "                with the given package, or why one or more packages "
-#| "would\n"
-#| "                lead to a conflict with the given package if installed\n"
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
 "conflict\n"
@@ -5879,7 +5603,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             Αυτό το κείμενο βοήθειας\n"
 
@@ -5911,15 +5634,11 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr "-P             Να γίνονται πάντα ερωτήσεις επιβεβαίωσης ή ενέργειες\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
@@ -5927,9 +5646,6 @@
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5939,9 +5655,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5951,8 +5664,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 ""
@@ -5986,9 +5697,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5998,8 +5706,6 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
@@ -6008,9 +5714,6 @@
 
 #: src/main.cc:226
 #, fuzzy, c-format
-#| msgid ""
-#| " -q             In command-line mode, suppress the incremental progress\n"
-#| "                indicators.\n"
 msgid ""
 " -q             In command-line mode, suppress the incremental progress.\n"
 "                indicators.\n"
@@ -6021,15 +5724,11 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o key=val     Άμεσος καθορισμός μια παραμέτρου με όνομα 'key'\n"
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -6067,7 +5766,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "true"
 msgid "trace"
 msgstr "αληθές"
 
@@ -6081,7 +5779,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "όχι"
 
@@ -6095,7 +5792,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:377
 #, fuzzy
-#| msgid "Err "
 msgid "error"
 msgstr "Σφάλμα "
 
@@ -6103,7 +5799,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:380
 #, fuzzy
-#| msgid "false"
 msgid "fatal"
 msgstr "ψευδές"
 
@@ -6124,7 +5819,6 @@
 
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "Ακυρη λειτουργία %s"
 
@@ -6177,7 +5871,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "Πακέτο"
 
@@ -6187,7 +5880,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "Όλα πακέτα"
 
@@ -6207,7 +5899,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -6215,8 +5906,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -6226,7 +5915,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "το -u και -i δεν μπορούν να οριστούν στην ίδια εντολή"
 
@@ -7478,7 +7166,6 @@
 
 #: src/ui.cc:472
 #, fuzzy, c-format
-#| msgid "Unable to open %ls"
 msgid "Unable to fork: %s"
 msgstr "Αδύνατο το άνοιγμα του %ls"
 
@@ -7758,9 +7445,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7784,9 +7468,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -8324,19 +8005,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "Διεύθυνση που θα χρησιμοποιηθεί για τη μεταφόρτωση των αρχείων αλλαγών"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "Διεύθυνση που θα χρησιμοποιηθεί για τη μεταφόρτωση των αρχείων αλλαγών"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "Μεταφόρτωση Αρχείου Αλλαγών"
 
Index: aptitude/po/es.po
===================================================================
--- aptitude.orig/po/es.po
+++ aptitude/po/es.po
@@ -20,7 +20,7 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.4.11\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2009-06-15 01:22+0200\n"
 "Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian-l10n-Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -284,9 +284,6 @@
 
 #: src/apt_options.cc:241
 #, fuzzy
-#| msgid ""
-#| "If this option is enabled, the menu bar will only appear when it has been "
-#| "activated by pressing the menu key."
 msgid ""
 "If this option is enabled, then the first view displayed on startup will be "
 "a flat view instead of the default view."
@@ -788,13 +785,11 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s no está instalado actualmente, luego no se reinstala.\n"
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "%s ya está instalado en la versión solicitada (%s)\n"
@@ -899,7 +894,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "Registro de cambios de %s"
 
@@ -1486,7 +1480,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "«&M» para marcar paquetes como instalados automáticamente"
 
@@ -1622,9 +1615,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy, c-format
-#| msgid ""
-#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: "
-#| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
@@ -1672,10 +1662,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:259
 #, fuzzy
-#| msgid ""
-#| "reject the given package versions; don't display any solutions in which "
-#| "they occur.  Enter UNINST instead of a version to reject removing the "
-#| "package."
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package.  "
@@ -1687,9 +1673,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:261
 #, fuzzy
-#| msgid ""
-#| "accept the given package versions; display only solutions in which they "
-#| "occur.  Enter UNINST instead of a version to accept removing the package."
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package.  "
@@ -1795,31 +1778,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "Dejar las siguientes recomendaciones sin resolver:"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "Auditar ^Recomendaciones"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "Ya no se necesita la eliminación de %s"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "Auditar ^Recomendaciones"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Acciones"
 
@@ -1981,7 +1959,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:1201
 #, fuzzy
-#| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Incapaz de resolver las dependencias para la actualización (no se encontró "
@@ -1989,7 +1966,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:1207
 #, fuzzy, c-format
-#| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Incapaz de resolver las dependencias para la actualización (%s)."
 
@@ -2393,25 +2369,21 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "Paquetes"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Paquete fuente: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Archivo"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\".\n"
 msgid "No such package \"%s\"."
 msgstr "No existe el paquete «%s».\n"
 
@@ -2450,7 +2422,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "búsqueda: Debe proporcionar al menos una término de búsqueda\n"
 
@@ -2607,7 +2578,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[ERROR]"
 
@@ -2967,7 +2937,6 @@
 
 #: src/generic/apt/download_update_manager.cc:138
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated quoted string in command: %s"
 msgstr "Cadena literal después de %s sin terminar"
 
@@ -3053,7 +3022,6 @@
 
 #: src/generic/apt/dump_packages.cc:674
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create truncated cache: %s."
 msgstr "No se pudo localizar el paquete %s"
 
@@ -3175,7 +3143,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "Descargando paquetes"
 
@@ -3220,9 +3187,6 @@
 #. Leave the question marks attached to the string placeholders.
 #: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883
 #, fuzzy, c-format
-#| msgid ""
-#| "The ?%s matcher must be used in a \"wide\" context (a top-level context, "
-#| "or a context enclosed by ?%s)."
 msgid ""
 "The ?%s term must be used in a \"wide\" context (a top-level context, or a "
 "context enclosed by ?%s)."
@@ -3293,19 +3257,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "Failed to download the changelog: %s"
 msgid "Failed to download changelogs: %s"
 msgstr "Fallo al descargar el registro de cambios: %s"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "Failed to download the changelog: %s"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "Fallo al descargar el registro de cambios: %s"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "Registro de cambios de %s"
 
@@ -3351,7 +3312,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "No se pudo interpretar el patrón %s"
 
@@ -3366,14 +3326,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "No upgrades are available."
 msgid "No tag descriptions are available."
 msgstr "No hay actualizaciones disponibles."
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "No upgrades are available."
 msgid "No description available for %s."
 msgstr "No hay actualizaciones disponibles."
 
@@ -3400,67 +3358,56 @@
 
 #: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got EOF."
 msgstr "Se esperaba «%c» se encontró «%c»."
 
 #: src/generic/util/parsers.h:737
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got '%s'."
 msgstr "Se esperaba «%c» se encontró «%c»."
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "Se esperaba un número después de -q=, se obtuvo %s\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "Carácter de acción «%c» incorrecto\n"
 
 #: src/generic/util/parsers.h:832
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got EOF."
 msgstr "Se esperaba «%c» se encontró «%c»."
 
 #: src/generic/util/parsers.h:843
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got '%c'."
 msgstr "Se esperaba «%c» se encontró «%c»."
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "Se esperaba un identificador de norma, se encontró «%c»"
 
 #: src/generic/util/parsers.h:1026
 #, fuzzy
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected an integer following '-', got EOF."
 msgstr "Se esperaba «,» o «(» a continuación de «||», se encontró «%s»"
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "Se esperaba un identificador de norma, se encontró «%c»"
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "Operación %s inválida"
 
 #: src/generic/util/parsers.h:1077
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected EOF, got '%c'."
 msgstr "Se esperaba «%c» se encontró «%c»."
 
@@ -3474,19 +3421,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "«)» inesperado"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " o"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "«)» inesperado"
 
@@ -3497,7 +3441,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "No se pudo crear el directorio temporal en base a la plantilla «%s»: %s"
 
@@ -3532,7 +3475,6 @@
 
 #: src/gtk/aptitude.glade:19 src/gtk/aptitude.glade:2273
 #, fuzzy
-#| msgid "False"
 msgid "_File"
 msgstr "Falso"
 
@@ -3599,13 +3541,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "Paquete"
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "Vistas"
 
@@ -3626,7 +3566,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "Ayuda"
 
@@ -3669,7 +3608,6 @@
 
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "Eliminar el filtro de la lista de paquetes"
 
@@ -3710,7 +3648,6 @@
 
 #: src/gtk/aptitude.glade:1020
 #, fuzzy
-#| msgid "False"
 msgid "Files"
 msgstr "Falso"
 
@@ -3780,7 +3717,6 @@
 
 #: src/gtk/aptitude.glade:1343
 #, fuzzy
-#| msgid "Preferences"
 msgid "No preference"
 msgstr "Preferencias"
 
@@ -3802,7 +3738,6 @@
 
 #: src/gtk/aptitude.glade:1419
 #, fuzzy
-#| msgid "Perform the actions contained in the currently selected solution."
 msgid ""
 "Perform the actions in the currently selected solution and close this tab."
 msgstr "Realizar las acciones de la solución seleccionada."
@@ -3871,31 +3806,26 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "Roto"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "Incapaz de corregir los paquetes no disponibles"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "^Buscar"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for a package"
 msgid "Search for packages."
 msgstr "Buscar un paquete"
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "Listo "
 
@@ -3936,13 +3866,11 @@
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "Se necesita la instalación de %s versión %s (%s)"
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -3950,20 +3878,17 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr "Sólo puede ver registros de cambios de paquetes de Debian oficiales."
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading changelog; please wait..."
 msgid "Downloading the changelog of %s version %s..."
 msgstr "Descargando registro de cambios; por favor, espere..."
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "Preparing to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "Preparando para descargar registros de cambios."
 
@@ -4118,7 +4043,6 @@
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "pero se va a instalar %s."
 
@@ -4132,7 +4056,6 @@
 
 #: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "No se pudo localizar el paquete %s"
 
@@ -4168,13 +4091,11 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "%s versiones"
 
 #: src/gtk/entitysummary.cc:123
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Install %s version %s"
 msgstr "Instalar(%s que provee %s)"
 
@@ -4260,7 +4181,6 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "Paquete fuente: "
 
@@ -4274,13 +4194,11 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "No se puede abrir el fichero \"%s\""
 
 #: src/gtk/entityview.cc:412
 #, fuzzy, c-format
-#| msgid "Rejecting the removal of %s"
 msgid "Editing the columns of \"%s\""
 msgstr "Rechazando la eliminación de %s"
 
@@ -4294,7 +4212,6 @@
 
 #: src/gtk/entityview.cc:570
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Whether the package is automatically installed."
 msgstr "«&M» para marcar paquetes como instalados automáticamente"
 
@@ -4347,19 +4264,16 @@
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "sin instalar (permanecen los ficheros de configuración)"
 
 #: src/gtk/gui.cc:86
 #, fuzzy
-#| msgid "triggers-awaited"
 msgid "Triggers awaited"
 msgstr "disparadores-esperando"
 
 #: src/gtk/gui.cc:87
 #, fuzzy
-#| msgid "triggers-pending"
 msgid "Triggers pending"
 msgstr "disparadores-pendientes"
 
@@ -4510,8 +4424,6 @@
 #. font.
 #: src/gtk/gui.cc:1192
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%d package to install"
 msgid_plural "%d packages to install"
 msgstr[0] "%d instalación"
@@ -4522,7 +4434,6 @@
 #. font.
 #: src/gtk/gui.cc:1207
 #, fuzzy, c-format
-#| msgid "failed to remove %s"
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "No se pudo eliminar %s"
@@ -4568,7 +4479,6 @@
 
 #: src/gtk/gui.cc:1455
 #, fuzzy
-#| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "Manual de usuario"
 
@@ -4607,7 +4517,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "no"
 
@@ -4812,7 +4721,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Virtual Packages"
 msgid "Virtual package"
 msgstr "Paquetes virtuales"
 
@@ -4893,7 +4801,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid "Upgrading %s to version %s is rejected."
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr "Actualizar %s a la versión %s es rechazado."
@@ -5012,7 +4919,6 @@
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Remove %F [%s (%s)]"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "Eliminar %F [%s (%s)]"
 
@@ -5038,7 +4944,6 @@
 
 #: src/gtk/resolver.cc:1544
 #, fuzzy, c-format
-#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Actualizar %F [%s (%s) -> %s (%s)]"
 
@@ -5054,43 +4959,36 @@
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>remove</b> %s"
 msgstr "Eliminar(%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "Mantener %F en la versión %s (%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>keep</b> %s at version %s"
 msgstr "Mantener %F en la versión %s (%s)"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %s"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr "Cancelar la instalación de %s"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %s"
 msgid "<b>cancel</b> the installation of %s"
 msgstr "Cancelar la instalación de %s"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>Install</b> %s %s"
 msgstr "Instalar %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>install</b> %s %s"
 msgstr "Instalar %F [%s (%s)]"
 
@@ -5101,7 +4999,6 @@
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>downgrade</b> %s to version %s"
 msgstr " Versión de cwidget: %s\n"
 
@@ -5112,7 +5009,6 @@
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>upgrade</b> %s to version %s"
 msgstr "%s versiones"
 
@@ -5128,8 +5024,6 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "%d instalación"
@@ -5137,8 +5031,6 @@
 
 #: src/gtk/resolver.cc:1740
 #, fuzzy, c-format
-#| msgid "%d removal"
-#| msgid_plural "%d removals"
 msgid "%s remove"
 msgid_plural "%s removes"
 msgstr[0] "%d eliminación"
@@ -5146,8 +5038,6 @@
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "%d keep"
-#| msgid_plural "%d keeps"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "%d mantenido"
@@ -5155,8 +5045,6 @@
 
 #: src/gtk/resolver.cc:1752
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%s upgrade"
 msgid_plural "%s upgrades"
 msgstr[0] "%d actualización"
@@ -5164,8 +5052,6 @@
 
 #: src/gtk/resolver.cc:1758
 #, fuzzy, c-format
-#| msgid "%d downgrade"
-#| msgid_plural "%d downgrades"
 msgid "%s downgrade"
 msgid_plural "%s downgrades"
 msgstr[0] "%d desactualización"
@@ -5173,7 +5059,6 @@
 
 #: src/gtk/resolver.cc:1764
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "%s unresolved recommendation"
 msgid_plural "%s unresolved recommendations"
 msgstr[0] "Auditar ^Recomendaciones"
@@ -5202,7 +5087,6 @@
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "No se puede abrir el fichero \"%s\""
 
@@ -5256,7 +5140,6 @@
 
 #: src/load_grouppolicy.cc:305
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected ',', '%c', or '('; got '%c'"
 msgstr "Se esperaba «,» o «(», se encontró «%c»"
 
@@ -5362,7 +5245,6 @@
 
 #: src/load_grouppolicy.cc:713
 #, fuzzy, c-format
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected '{', ')', or ',' following '||', got '%s'"
 msgstr "Se esperaba «,» o «(» a continuación de «||», se encontró «%s»"
 
@@ -5488,19 +5370,16 @@
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr " versión apt %d.%d.%d\n"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr " versión apt %d.%d.%d\n"
 
 #: src/main.cc:164
 #, fuzzy, c-format
-#| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Desactivado el soporte de Ept.\n"
 
@@ -5549,45 +5428,37 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      -  instala/actualiza paquetes\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       -  elimina paquetes\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr ""
 " purge        - elimina paquetes junto con sus ficheros de configuración\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - bloquea paquetes\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - desbloquea un paquete\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - marca paquetes como instalados manualmente\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - desmarca paquetes como instalados manualmente\n"
 
@@ -5602,21 +5473,16 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - descarga las listas de paquetes nuevos/actualizables\n"
 
 #: src/main.cc:190
 #, fuzzy, c-format
-#| msgid " safe-upgrade - Perform a safe upgrade\n"
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade      - realiza una actualización segura\n"
 
 #: src/main.cc:191
 #, fuzzy, c-format
-#| msgid ""
-#| " full-upgrade - Perform an upgrade, possibly installing and removing "
-#| "packages\n"
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
@@ -5626,58 +5492,47 @@
 
 #: src/main.cc:192
 #, fuzzy, c-format
-#| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "'&BD' para instalar las depedencias para construir un paquete."
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - olvida qué paquetes son \"nuevos\"\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - busca un paquete por nombre y/o expresión\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - muestra información detallada de un paquete\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - elimina los ficheros de paquetes descargados\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr ""
 " autoclean    - elimina los ficheros de paquetes descargados obsoletos\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - muestra el registro de cambios del paquete\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - descarga los ficheros .deb para un paquete\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5698,12 +5553,6 @@
 
 #: src/main.cc:203
 #, fuzzy, c-format
-#| msgid ""
-#| " why-not      - Show the manually installed packages that lead to a "
-#| "conflict\n"
-#| "                with the given package, or why one or more packages "
-#| "would\n"
-#| "                lead to a conflict with the given package if installed\n"
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
 "conflict\n"
@@ -5723,7 +5572,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr "-h              Este texto de ayuda\n"
 
@@ -5755,15 +5603,11 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr "-p              Siempre pide confirmación de las acciones\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
@@ -5772,9 +5616,6 @@
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5784,9 +5625,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5796,8 +5634,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 ""
@@ -5829,9 +5665,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5840,8 +5673,6 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
@@ -5850,9 +5681,6 @@
 
 #: src/main.cc:226
 #, fuzzy, c-format
-#| msgid ""
-#| " -q             In command-line mode, suppress the incremental progress\n"
-#| "                indicators.\n"
 msgid ""
 " -q             In command-line mode, suppress the incremental progress.\n"
 "                indicators.\n"
@@ -5862,7 +5690,6 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o opconf=val     Establecer directamente la opción de configuración "
@@ -5870,9 +5697,6 @@
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -5910,7 +5734,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "true"
 msgid "trace"
 msgstr "verdadero"
 
@@ -5924,7 +5747,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "no"
 
@@ -5963,7 +5785,6 @@
 
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "Operación %s inválida"
 
@@ -6016,7 +5837,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "Paquete"
 
@@ -6026,7 +5846,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "Todos los paquetes"
 
@@ -6046,7 +5865,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -6054,8 +5872,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -6065,7 +5881,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "-u e -i puede que no deban especificarse con una orden"
 
@@ -7322,7 +7137,6 @@
 
 #: src/ui.cc:472
 #, fuzzy, c-format
-#| msgid "Unable to open %ls"
 msgid "Unable to fork: %s"
 msgstr "No se pudo abrir %ls"
 
@@ -7601,9 +7415,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7629,9 +7440,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -8167,19 +7975,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "Preparing to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "Preparando para descargar registros de cambios."
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "Failed to download the changelog: %s"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "Fallo al descargar el registro de cambios: %s"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading changelogs"
 msgid "Downloading the changelog of %s"
 msgstr "Descargando registro de cambios"
 
Index: aptitude/po/eu.po
===================================================================
--- aptitude.orig/po/eu.po
+++ aptitude/po/eu.po
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: aptitude_po_eu\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2008-05-05 22:00+0200\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
 "Language-Team: Basque <itzulpena@euskalgnu.org>\n"
@@ -269,9 +269,6 @@
 
 #: src/apt_options.cc:241
 #, fuzzy
-#| msgid ""
-#| "If this option is enabled, the menu bar will only appear when it has been "
-#| "activated by pressing the menu key."
 msgid ""
 "If this option is enabled, then the first view displayed on startup will be "
 "a flat view instead of the default view."
@@ -711,7 +708,6 @@
 
 #: src/cmdline/cmdline_action.cc:212
 #, fuzzy, c-format
-#| msgid "Unable to satisfy the build-depends: %s."
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Ezin da eraikitze-mendekotasuna bete: %s."
 
@@ -768,13 +764,11 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s ez dago instalatuta, eta, beraz, ez da berrinstalatuko.\n"
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "%s dagoeneko instalatuta dago eskatutako bertsioan (%s)\n"
@@ -877,7 +871,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "%s aldaketen egunkaria"
 
@@ -1044,7 +1037,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "bat ere ez"
 
@@ -1453,7 +1445,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "'&M' markatu automatikoki instalatu izan diren paketeak"
 
@@ -1586,9 +1577,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy, c-format
-#| msgid ""
-#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: "
-#| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
@@ -1635,10 +1623,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:259
 #, fuzzy
-#| msgid ""
-#| "reject the given package versions; don't display any solutions in which "
-#| "they occur.  Enter UNINST instead of a version to reject removing the "
-#| "package."
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package.  "
@@ -1649,9 +1633,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:261
 #, fuzzy
-#| msgid ""
-#| "accept the given package versions; display only solutions in which they "
-#| "occur.  Enter UNINST instead of a version to accept removing the package."
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package.  "
@@ -1755,31 +1736,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "Utzi hurrengo gomendioak konpondu gabe:"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "^Gomendioak Auditatu:"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "Ez da gehiago eskatuko %s kentzea"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "^Gomendioak Auditatu:"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Ekintzak"
 
@@ -1937,7 +1913,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:1201
 #, fuzzy
-#| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Ezin dira bertsio-berritzerako mendekotasunak ebatzi (ez da konponbiderik "
@@ -1945,7 +1920,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:1207
 #, fuzzy, c-format
-#| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Ezin dira bertsio-berritzerako mendekotasunak ebatzi (%s)."
 
@@ -1976,13 +1950,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "baina ez da instalagarria"
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "baina %s instalatu egingo da."
 
@@ -2081,13 +2053,11 @@
 
 #: src/cmdline/cmdline_show.cc:326
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s%s; will be installed"
 msgstr "%s, instalatu egingo da."
 
 #: src/cmdline/cmdline_show.cc:328
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s%s; will be installed automatically"
 msgstr "%s; automatikoki instalatu egingo da"
 
@@ -2351,25 +2321,21 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "Paketeak"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Iturburu-paketea: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Artxiboa"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\".\n"
 msgid "No such package \"%s\"."
 msgstr "Ez dago \"%s\" bezalako paketerik.\n"
 
@@ -2408,7 +2374,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "bilatu: bilaketa-termino bat eman behar duzu gutxienez\n"
 
@@ -2531,7 +2496,6 @@
 
 #: src/cmdline/cmdline_why.cc:1285
 #, fuzzy, c-format
-#| msgid "Packages depending on %s"
 msgid "Packages requiring %s:"
 msgstr "Honen mendeko paketeak: %s"
 
@@ -2547,8 +2511,6 @@
 
 #: src/cmdline/cmdline_why.cc:1416
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: this command requires at least one argument (the package to query)."
 msgid ""
 "%s: this command requires at least one argument (the package to query).\n"
 msgstr ""
@@ -2567,7 +2529,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[ERROREA]"
 
@@ -2920,7 +2881,6 @@
 
 #: src/generic/apt/download_update_manager.cc:138
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated quoted string in command: %s"
 msgstr "Amaitu gabeko kate literala %s(r)en ondoren"
 
@@ -3003,7 +2963,6 @@
 
 #: src/generic/apt/dump_packages.cc:674
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create truncated cache: %s."
 msgstr "Ezin da %s paketea aurkitu"
 
@@ -3125,7 +3084,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "Paketeak deskargatzen"
 
@@ -3163,7 +3121,6 @@
 
 #: src/generic/apt/matching/parse.cc:860
 #, fuzzy, c-format
-#| msgid "Unknown matcher type: \"%s\"."
 msgid "Unknown term type: \"%s\"."
 msgstr "Eredu mota ezezaguna: \"%s\"."
 
@@ -3171,9 +3128,6 @@
 #. Leave the question marks attached to the string placeholders.
 #: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883
 #, fuzzy, c-format
-#| msgid ""
-#| "The ?%s matcher must be used in a \"wide\" context (a top-level context, "
-#| "or a context enclosed by ?%s)."
 msgid ""
 "The ?%s term must be used in a \"wide\" context (a top-level context, or a "
 "context enclosed by ?%s)."
@@ -3204,7 +3158,6 @@
 
 #: src/generic/apt/matching/parse.cc:1388
 #, fuzzy, c-format
-#| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "Gaizki osatutako adierazpena"
 
@@ -3244,19 +3197,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "Aldaketen egunkariak deskargatzeko erabiliko den URLa"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "Aldaketen egunkariak deskargatzeko erabiliko den URLa"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "%s aldaketen egunkaria"
 
@@ -3307,7 +3257,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Ezin da %s eredua analizatu"
 
@@ -3322,14 +3271,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "Ez dago instalatuta"
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "Ez dago instalatuta"
 
@@ -3356,67 +3303,56 @@
 
 #: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got EOF."
 msgstr "'%c' espero zen, '%c' eskuratua."
 
 #: src/generic/util/parsers.h:737
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got '%s'."
 msgstr "'%c' espero zen, '%c' eskuratua."
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "q= -ren ondoren zenbaki bat espero zen, %s eskuratu da\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "Okerreko ekintza-karakterea: '%c'\n"
 
 #: src/generic/util/parsers.h:832
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got EOF."
 msgstr "'%c' espero zen, '%c' eskuratua."
 
 #: src/generic/util/parsers.h:843
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got '%c'."
 msgstr "'%c' espero zen, '%c' eskuratua."
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "Identifikatzaile-araua espero zen, '%c' lortu da"
 
 #: src/generic/util/parsers.h:1026
 #, fuzzy
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected an integer following '-', got EOF."
 msgstr "',' edo ')' espero zen '||' ondoren, '%s' eskuratu da"
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "Identifikatzaile-araua espero zen, '%c' lortu da"
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "Eragiketa baliogabea: %s"
 
 #: src/generic/util/parsers.h:1077
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected EOF, got '%c'."
 msgstr "'%c' espero zen, '%c' eskuratua."
 
@@ -3430,19 +3366,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "Espero ez zen ')'"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " edo"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "Espero ez zen ')'"
 
@@ -3453,7 +3386,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "Ezin da aldi baterako direktorioa \"%s\" txantiloitik sortu: %s"
 
@@ -3488,7 +3420,6 @@
 
 #: src/gtk/aptitude.glade:19 src/gtk/aptitude.glade:2273
 #, fuzzy
-#| msgid "False"
 msgid "_File"
 msgstr "Faltsua"
 
@@ -3553,13 +3484,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "Paketea"
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "Ikuspegiak"
 
@@ -3579,7 +3508,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "Laguntza"
 
@@ -3590,7 +3518,6 @@
 
 #: src/gtk/aptitude.glade:345 src/gtk/aptitude.glade:2614
 #, fuzzy
-#| msgid "List Update"
 msgid "Update"
 msgstr "Zerrendaren eguneraketa"
 
@@ -3612,7 +3539,6 @@
 
 #: src/gtk/aptitude.glade:389 src/gtk/aptitude.glade:2658
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Remove"
 msgstr "Instalatuta"
 
@@ -3626,33 +3552,28 @@
 
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "Kendu iragazkia pakete-zerrendari"
 
 #: src/gtk/aptitude.glade:649
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "Apply these settings to all active package lists."
 msgstr "Ezarri iragazkia pakete-zerrendari"
 
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "Bilatu"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "berrinstalatu"
 
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "Err "
 
@@ -3667,19 +3588,16 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "%s - mendekotasunak"
 
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "^Changelog"
 msgid "Changelog"
 msgstr "^Aldaketa-egunkaria"
 
 #: src/gtk/aptitude.glade:1020
 #, fuzzy
-#| msgid "False"
 msgid "Files"
 msgstr "Faltsua"
 
@@ -3693,7 +3611,6 @@
 
 #: src/gtk/aptitude.glade:1051
 #, fuzzy
-#| msgid "Tags"
 msgid "tags"
 msgstr "Etiketak"
 
@@ -3716,13 +3633,11 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "Egoera"
 
 #: src/gtk/aptitude.glade:1247
 #, fuzzy
-#| msgid "Unknown action type: %s"
 msgid "Group by action type"
 msgstr "Ekintza mota ezezaguna: %s"
 
@@ -3751,13 +3666,11 @@
 
 #: src/gtk/aptitude.glade:1328
 #, fuzzy
-#| msgid "Toggle ^Rejected"
 msgid "Rejected"
 msgstr "Txandakatu ^baztertutakoa"
 
 #: src/gtk/aptitude.glade:1343
 #, fuzzy
-#| msgid "Preferences"
 msgid "No preference"
 msgstr "Hobespenak"
 
@@ -3771,32 +3684,27 @@
 
 #: src/gtk/aptitude.glade:1400
 #, fuzzy
-#| msgid "^Examine Solution"
 msgid "Find a new solution"
 msgstr "^Aztertu irtenbidea"
 
 #: src/gtk/aptitude.glade:1404
 #, fuzzy
-#| msgid "Select the next solution to the dependency problems."
 msgid "Calculate the next solution that has not yet been generated."
 msgstr "Hautatu hurrengo irtenbidea (mendekotasun arazoarena)."
 
 #: src/gtk/aptitude.glade:1419
 #, fuzzy
-#| msgid "Perform the actions contained in the currently selected solution."
 msgid ""
 "Perform the actions in the currently selected solution and close this tab."
 msgstr "Landu ekintzak (irtenbidearen uneko hautapenean daudenak)."
 
 #: src/gtk/aptitude.glade:1576
 #, fuzzy
-#| msgid "Upgrade"
 msgid "Upgrade Summary"
 msgstr "Bertsio-berritu"
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "Iturburu-paketea: "
 
@@ -3808,7 +3716,6 @@
 
 #: src/gtk/aptitude.glade:1652
 #, fuzzy
-#| msgid "Manual"
 msgid "Fix Manually"
 msgstr "Eskuliburua"
 
@@ -3856,25 +3763,21 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "Hautsita"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "Ezin izan dira erabilgarri ez dauden paketeak zuzendu"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "^Bilatu"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for: "
 msgid "Search for packages."
 msgstr "Bilatu hau: "
 
@@ -3912,19 +3815,16 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "Aldaketen egunkariak deskargatzeko erabiliko den URLa"
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "Eskatu %s(r)en %s bertsioa (%s) instalatzea"
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -3933,7 +3833,6 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr ""
@@ -3941,13 +3840,11 @@
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "Aldaketen egunkaria deskargatzen"
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "Aldaketen egunkariak deskargatzeko erabiliko den URLa"
 
@@ -3961,7 +3858,6 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "Aldaketen egunkariak deskargatzeko erabiliko den URLa"
 
@@ -3971,8 +3867,6 @@
 
 #: src/gtk/dashboardtab.cc:414
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] "%d eguneratu"
@@ -3980,13 +3874,11 @@
 
 #: src/gtk/dashboardtab.cc:633
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No upgrades are available."
 msgstr "Ez dago instalatuta"
 
 #: src/gtk/dashboardtab.cc:645
 #, fuzzy
-#| msgid "Unable to locate package %s"
 msgid "Unable to calculate an upgrade."
 msgstr "Ezin da %s paketea aurkitu"
 
@@ -4021,25 +3913,21 @@
 
 #: src/gtk/dashboardtab.cc:708
 #, fuzzy, c-format
-#| msgid "Internal error: Default column string is unparsable"
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr "Barne-errorea: zutabe-kate lehenetsia ez da analizagarria"
 
 #: src/gtk/dependency_chains_tab.cc:78
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: start"
 msgstr "Mendekotasun kudeaketa"
 
 #: src/gtk/dependency_chains_tab.cc:82
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: end"
 msgstr "Mendekotasun kudeaketa"
 
 #: src/gtk/dependency_chains_tab.cc:86
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: results"
 msgstr "Mendekotasun kudeaketa"
 
@@ -4049,7 +3937,6 @@
 
 #: src/gtk/dependency_chains_tab.cc:282
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency chain found."
 msgstr "Mendekotasun kudeaketa"
 
@@ -4059,13 +3946,11 @@
 
 #: src/gtk/download.cc:185
 #, fuzzy
-#| msgid "False"
 msgid "Failed"
 msgstr "Faltsua"
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "Deskargatutako fitxategiak ezabatzen"
 
@@ -4076,13 +3961,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "Progresioa guztira: "
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description"
 msgid "Short Description"
 msgstr "Azalpena"
 
@@ -4092,13 +3975,11 @@
 
 #: src/gtk/download.cc:319
 #, fuzzy
-#| msgid "Cleaning while a download is in progress is not allowed"
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr "Deskarga bat egiten ari den bitartean ezin da garbitu"
 
 #: src/gtk/download.cc:395 src/gtk/gui.cc:832
 #, fuzzy
-#| msgid "View next display"
 msgid "View Details"
 msgstr "Hurrengo pantaila ikusi"
 
@@ -4118,19 +3999,16 @@
 
 #: src/gtk/download.cc:486
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s: %lu/%lu, stalled"
 msgstr "%s, instalatu egingo da."
 
 #: src/gtk/download.cc:507
 #, fuzzy, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr " [ %% %i ] (%sB/s, %s falta)"
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "baina %s instalatu egingo da."
 
@@ -4144,7 +4022,6 @@
 
 #: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "Ezin da %s paketea aurkitu"
 
@@ -4155,7 +4032,6 @@
 
 #: src/gtk/dpkg_terminal.cc:429
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "%s: Unable to accept a connection: %s"
 msgstr "Ezin da aldi baterako direktorioa \"%s\" txantiloitik sortu: %s"
 
@@ -4181,80 +4057,67 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "%s - bertsioak"
 
 #: src/gtk/entitysummary.cc:123
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Install %s version %s"
 msgstr "Instalatu: (%s-ek  %s hornitzen du)"
 
 #: src/gtk/entitysummary.cc:131
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrade to %s version %s"
 msgstr "  cwidget bertsioa: %s\n"
 
 #: src/gtk/entitysummary.cc:142
 #, fuzzy, c-format
-#| msgid "Keep the following packages at their current version:"
 msgid "Don't hold %s at its current version."
 msgstr "Mantendu hurrengo paketeak dauden bezala:"
 
 #: src/gtk/entitysummary.cc:145 src/gtk/entitysummary.cc:165
 #: src/gtk/entitysummary.cc:168
 #, fuzzy, c-format
-#| msgid "Canc^el pending actions"
 msgid "Cancel any actions on %s."
 msgstr "Egiteko dauden ekintzak utzi"
 
 #: src/gtk/entitysummary.cc:150
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the purge of %s."
 msgstr "Bertanb behera utzi %F kentzea"
 
 #: src/gtk/entitysummary.cc:152
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s."
 msgstr "Bertanb behera utzi %F kentzea"
 
 #: src/gtk/entitysummary.cc:157
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the upgrade of %s."
 msgstr "Bertanb behera utzi %F kentzea"
 
 #: src/gtk/entitysummary.cc:159
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s."
 msgstr "Bertan behera utzi %F(r)en instalazioa"
 
 #: src/gtk/entitysummary.cc:161
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the downgrade of %s."
 msgstr "Bertanb behera utzi %F kentzea"
 
 #: src/gtk/entitysummary.cc:163
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the reinstallation of %s."
 msgstr "Bertan behera utzi %F(r)en instalazioa"
 
 #: src/gtk/entitysummary.cc:206
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "Remove %s"
 msgstr "Kendu(%s)"
 
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "^Purgatu"
 
@@ -4265,19 +4128,16 @@
 
 #: src/gtk/entitysummary.cc:223
 #, fuzzy, c-format
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Mark %s as automatically installed."
 msgstr "'&M' markatu automatikoki instalatu izan diren paketeak"
 
 #: src/gtk/entitysummary.cc:228
 #, fuzzy, c-format
-#| msgid "The package \"%s\" is manually installed.\n"
 msgid "Mark %s as manually installed."
 msgstr "\"%s\" paketea eskuz instalaturik dago.\n"
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
 msgid "%s is a virtual package provided by:\n"
 msgstr "\"%s\" pakete birtual bat da, honek hornitua:\n"
 
@@ -4287,13 +4147,11 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "Iturburu-paketea: "
 
 #: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 #, fuzzy
-#| msgid "ProgName"
 msgid "Name"
 msgstr "ProgIzena"
 
@@ -4303,13 +4161,11 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "Ezin izan da \"%s\" fitxategia ireki"
 
 #: src/gtk/entityview.cc:412
 #, fuzzy, c-format
-#| msgid "Rejecting the removal of %s"
 msgid "Editing the columns of \"%s\""
 msgstr "Ezetsi %s kentzea"
 
@@ -4323,25 +4179,21 @@
 
 #: src/gtk/entityview.cc:570
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Whether the package is automatically installed."
 msgstr "'&M' markatu automatikoki instalatu izan diren paketeak"
 
 #: src/gtk/entityview.cc:576
 #, fuzzy
-#| msgid "Cancel any action on the selected package"
 msgid "The name and description of the package."
 msgstr "Bertan behera utzi hautatutako paketeen ekintza"
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "Bertsioa: "
 
 #: src/gtk/entityview.cc:592
 #, fuzzy
-#| msgid "Check for new versions of packages"
 msgid "The version number of the package."
 msgstr "Paketeen bertsio berririk dagoen begiratu"
 
@@ -4362,7 +4214,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "ez dago instalatuta"
 
@@ -4372,37 +4223,31 @@
 
 #: src/gtk/gui.cc:82
 #, fuzzy
-#| msgid "unpacked"
 msgid "Unpacked"
 msgstr "deskonprimituta"
 
 #: src/gtk/gui.cc:83
 #, fuzzy
-#| msgid "half-config"
 msgid "Half-configured"
 msgstr "erdi-konfiguratuta"
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "half-install"
 msgid "Half-installed"
 msgstr "erdi-instalatuta"
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "ez dago instalatuta (konfigurazio-fitxategiak daude)"
 
 #: src/gtk/gui.cc:86
 #, fuzzy
-#| msgid "triggers-awaited"
 msgid "Triggers awaited"
 msgstr "abiarazlea-itxoiten"
 
 #: src/gtk/gui.cc:87
 #, fuzzy
-#| msgid "triggers-pending"
 msgid "Triggers pending"
 msgstr "abiarazlea-faltan"
 
@@ -4428,13 +4273,11 @@
 
 #: src/gtk/gui.cc:97
 #, fuzzy
-#| msgid "forbidden upgrade"
 msgid "Hold (don't upgrade)"
 msgstr "debekatu eguneratzea"
 
 #: src/gtk/gui.cc:99
 #, fuzzy
-#| msgid "Related Dependencies"
 msgid "Unsatisfied dependencies"
 msgstr "Zerikusia duten mendekotasunak"
 
@@ -4448,13 +4291,11 @@
 
 #: src/gtk/gui.cc:290
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "Ezarri iragazkia pakete-zerrendari"
 
 #: src/gtk/gui.cc:298 src/gtk/gui.cc:946
 #, fuzzy
-#| msgid "Downloading... "
 msgid "Download already running."
 msgstr "Deskargatzen..."
 
@@ -4465,13 +4306,11 @@
 
 #: src/gtk/gui.cc:359
 #, fuzzy, c-format
-#| msgid "List Update"
 msgid "Update %s?"
 msgstr "Zerrendaren eguneraketa"
 
 #: src/gtk/gui.cc:385
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
@@ -4499,31 +4338,26 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "%s changes"
 msgid "Done applying changes!"
 msgstr "%s aldaketa"
 
 #: src/gtk/gui.cc:823
 #, fuzzy
-#| msgid "%s changes"
 msgid "Applying changes..."
 msgstr "%s aldaketa"
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "s: %F"
 msgid "%s: %s"
 msgstr "s: %F"
 
 #: src/gtk/gui.cc:878
 #, fuzzy, c-format
-#| msgid "No broken packages."
 msgid "Error in package %s"
 msgstr "Ez dago hautsitako paketerik."
 
 #: src/gtk/gui.cc:906
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Ezin da %s konfigurazio-fitxategi berriarekin ordeztu"
 
@@ -4533,25 +4367,21 @@
 
 #: src/gtk/gui.cc:1038
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "Ez dago hautsitako paketerik."
 
 #: src/gtk/gui.cc:1071
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "Ez dago hautsitako paketerik."
 
 #: src/gtk/gui.cc:1075
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "Ebatzi mendekotasunak"
 
 #: src/gtk/gui.cc:1103
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Ez dago hautsitako paketerik."
@@ -4559,13 +4389,11 @@
 
 #: src/gtk/gui.cc:1147
 #, fuzzy
-#| msgid "%s changes"
 msgid "View changes"
 msgstr "%s aldaketa"
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "%s changes"
 msgid "Apply changes"
 msgstr "%s aldaketa"
 
@@ -4574,8 +4402,6 @@
 #. font.
 #: src/gtk/gui.cc:1192
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%d package to install"
 msgid_plural "%d packages to install"
 msgstr[0] "%d instalatu"
@@ -4586,7 +4412,6 @@
 #. font.
 #: src/gtk/gui.cc:1207
 #, fuzzy, c-format
-#| msgid "failed to remove %s"
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "huts egin du %s kentzean"
@@ -4594,7 +4419,6 @@
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "Deskarga-tamaina"
 
@@ -4609,19 +4433,16 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "not installed"
 msgid "Not implemented"
 msgstr "ez dago instalatuta"
 
 #: src/gtk/gui.cc:1408 src/gtk/gui.cc:1427
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "Instalatuta"
 
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "^Purgatu"
 
@@ -4639,7 +4460,6 @@
 
 #: src/gtk/gui.cc:1455
 #, fuzzy
-#| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "Erabiltzailearen eskuliburua"
 
@@ -4654,7 +4474,6 @@
 
 #: src/gtk/info.cc:161 src/gtk/pkgview.cc:169
 #, fuzzy
-#| msgid "Current status: %F."
 msgid "Current status"
 msgstr "Uneko egoera: %F."
 
@@ -4664,19 +4483,16 @@
 
 #: src/gtk/info.cc:496
 #, fuzzy
-#| msgid "Not Installed"
 msgid "Not available"
 msgstr "Ez dago instalatuta"
 
 #: src/gtk/info.cc:545
 #, fuzzy
-#| msgid "C^ycle Package Information"
 msgid "Package information: version list"
 msgstr "Paketearen informazioaren ^begizta"
 
 #: src/gtk/info.cc:555
 #, fuzzy
-#| msgid "Packages which depend on %s"
 msgid "Package information: dependency list"
 msgstr "Honen mendeko paketeak: %s"
 
@@ -4686,7 +4502,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "ez"
 
@@ -4700,7 +4515,6 @@
 
 #: src/gtk/packagestab.cc:203
 #, fuzzy, c-format
-#| msgid "No packages matched the pattern \"%ls\"."
 msgid "No packages matched \"%s\"."
 msgstr "Ez dago \"%ls\" patroia betetzen duen paketerik."
 
@@ -4710,31 +4524,26 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "Paketea: "
 
 #: src/gtk/pkgview.cc:224
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed automatically."
 msgstr "%s; automatikoki instalatu egingo da"
 
 #: src/gtk/pkgview.cc:227
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed automatically."
 msgstr "%s; automatikoki instalatu egingo da"
 
 #: src/gtk/pkgview.cc:235
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed manually."
 msgstr "%s; automatikoki instalatu egingo da"
 
 #: src/gtk/pkgview.cc:238
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed manually."
 msgstr "%s; automatikoki instalatu egingo da"
 
@@ -4744,13 +4553,11 @@
 
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "Bilatu"
 
 #: src/gtk/pkgview.cc:718
 #, fuzzy
-#| msgid "Building view"
 msgid "Finalizing view"
 msgstr "Ikuspegi-eraikitzea"
 
@@ -4883,13 +4690,11 @@
 
 #: src/gtk/previewtab.cc:179
 #, fuzzy
-#| msgid "Preview"
 msgid "Preview: "
 msgstr "Aurrebista"
 
 #: src/gtk/resolver.cc:68
 #, fuzzy, c-format
-#| msgid "Error while dumping resolver state"
 msgid "Error in dependency resolver: %s"
 msgstr "Errorea ebazpen-egoera iraultzean"
 
@@ -4904,7 +4709,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package"
 msgid "Virtual package"
 msgstr "Paketea"
 
@@ -4914,43 +4718,36 @@
 
 #: src/gtk/resolver.cc:377
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Removing %s is rejected."
 msgstr "%s kentzen"
 
 #: src/gtk/resolver.cc:382
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Canceling the installation of %s is rejected."
 msgstr "Bertan behera utzi %F(r)en instalazioa"
 
 #: src/gtk/resolver.cc:391
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Canceling the removal of %s is rejected."
 msgstr "Bertanb behera utzi %F kentzea"
 
 #: src/gtk/resolver.cc:394
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keeping %s at version %s is rejected."
 msgstr "Mantendu %F %s bertsioan (%s)"
 
 #: src/gtk/resolver.cc:401
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Installing %s version %s is rejected."
 msgstr "Instalatu: (%s-ek  %s hornitzen du)"
 
 #: src/gtk/resolver.cc:407
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrading %s to version %s is rejected."
 msgstr "  cwidget bertsioa: %s\n"
 
 #: src/gtk/resolver.cc:413
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrading %s to version %s is rejected."
 msgstr "%s - bertsioak"
 
@@ -4992,7 +4789,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr "%s - bertsioak"
@@ -5090,7 +4886,6 @@
 
 #: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862
 #, fuzzy
-#| msgid "Remove the following packages:"
 msgid "Keep the following packages:"
 msgstr "Kendu hurrengo paketeak:"
 
@@ -5106,121 +4901,101 @@
 
 #: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900
 #, fuzzy
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "Leave the following dependencies unresolved:"
 msgstr "Utzi honako mendekotasunak ebatzi gabe:%n"
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Remove %F [%s (%s)]"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "Kendu %F  [%s (%s)]"
 
 #: src/gtk/resolver.cc:1523
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "Instalatu %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1531
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s"
 msgstr "Bertan behera utzi %F(r)en instalazioa"
 
 #: src/gtk/resolver.cc:1534
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s"
 msgstr "Bertanb behera utzi %F kentzea"
 
 #: src/gtk/resolver.cc:1537
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "Mantendu %F %s bertsioan (%s)"
 
 #: src/gtk/resolver.cc:1544
 #, fuzzy, c-format
-#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Eguneratu %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1553
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Bertsio-zahartu %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>Remove</b> %s"
 msgstr "Kendu(%s)"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>remove</b> %s"
 msgstr "Kendu(%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "Mantendu %F %s bertsioan (%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>keep</b> %s at version %s"
 msgstr "Mantendu %F %s bertsioan (%s)"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr "Bertan behera utzi %F(r)en instalazioa"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>cancel</b> the installation of %s"
 msgstr "Bertan behera utzi %F(r)en instalazioa"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>Install</b> %s %s"
 msgstr "Instalatu %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>install</b> %s %s"
 msgstr "Instalatu %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>Downgrade</b> %s to version %s"
 msgstr "  cwidget bertsioa: %s\n"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>downgrade</b> %s to version %s"
 msgstr "  cwidget bertsioa: %s\n"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>Upgrade</b> %s to version %s"
 msgstr "%s - bertsioak"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>upgrade</b> %s to version %s"
 msgstr "%s - bertsioak"
 
@@ -5236,8 +5011,6 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "%d instalatu"
@@ -5245,8 +5018,6 @@
 
 #: src/gtk/resolver.cc:1740
 #, fuzzy, c-format
-#| msgid "%d removal"
-#| msgid_plural "%d removals"
 msgid "%s remove"
 msgid_plural "%s removes"
 msgstr[0] "%d kendu"
@@ -5254,8 +5025,6 @@
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "%d keep"
-#| msgid_plural "%d keeps"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "%d mantendu"
@@ -5263,8 +5032,6 @@
 
 #: src/gtk/resolver.cc:1752
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%s upgrade"
 msgid_plural "%s upgrades"
 msgstr[0] "%d eguneratu"
@@ -5272,8 +5039,6 @@
 
 #: src/gtk/resolver.cc:1758
 #, fuzzy, c-format
-#| msgid "%d downgrade"
-#| msgid_plural "%d downgrades"
 msgid "%s downgrade"
 msgid_plural "%s downgrades"
 msgstr[0] "%d aurreko bertsiora itzuli"
@@ -5281,7 +5046,6 @@
 
 #: src/gtk/resolver.cc:1764
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "%s unresolved recommendation"
 msgid_plural "%s unresolved recommendations"
 msgstr[0] "^Gomendioak Auditatu:"
@@ -5289,19 +5053,16 @@
 
 #: src/gtk/resolver.cc:2056
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions yet."
 msgstr "Ez dago irtenbide gehiagorik."
 
 #: src/gtk/resolver.cc:2063
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency solution was found."
 msgstr "Mendekotasun kudeaketa"
 
 #: src/gtk/resolver.cc:2064
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions."
 msgstr "Ez dago irtenbide gehiagorik."
 
@@ -5311,19 +5072,16 @@
 
 #: src/gtk/resolver.cc:2076
 #, fuzzy, c-format
-#| msgid "No more solutions."
 msgid "%u solutions."
 msgstr "Ez dago irtenbide gehiagorik."
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "Ezin izan da \"%s\" fitxategia ireki"
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr "[Deskargatuta]"
 
@@ -5373,7 +5131,6 @@
 
 #: src/load_grouppolicy.cc:305
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected ',', '%c', or '('; got '%c'"
 msgstr "',' edo '(' espero zen, baina '%c' eskuratu da"
 
@@ -5480,7 +5237,6 @@
 
 #: src/load_grouppolicy.cc:713
 #, fuzzy, c-format
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected '{', ')', or ',' following '||', got '%s'"
 msgstr "',' edo ')' espero zen '||' ondoren, '%s' eskuratu da"
 
@@ -5605,19 +5361,16 @@
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt bertsioa %d.%d.%d\n"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt bertsioa %d.%d.%d\n"
 
 #: src/main.cc:164
 #, fuzzy, c-format
-#| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Ept euskarria desgaituta\n"
 
@@ -5666,44 +5419,36 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Instalatu/bertsio-berritu paketeak\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Kendu paketeak\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Kendu paketeak eta konfigurazio-fitxategiak\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Atxiki paketeak\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Utzi paketea atxikitzeari\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Markatu paketeak automatikoki instalatutako gisa\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Markatu paketeak eskuz instalatutako gisa\n"
 
@@ -5718,7 +5463,6 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr ""
 " update       - Deskargatu pakete berrien edo bertsio-berritzeko "
@@ -5726,15 +5470,11 @@
 
 #: src/main.cc:190
 #, fuzzy, c-format
-#| msgid " safe-upgrade - Perform a safe upgrade\n"
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Egin bertsio-berritze segurua\n"
 
 #: src/main.cc:191
 #, fuzzy, c-format
-#| msgid ""
-#| " full-upgrade - Perform an upgrade, possibly installing and removing "
-#| "packages\n"
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
@@ -5744,58 +5484,47 @@
 
 #: src/main.cc:192
 #, fuzzy, c-format
-#| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "'&BD' pakete baten eraikitzeko mendekotasunak instalatzeko."
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Ahaztu zein pakete diren \"berriak\"\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr ""
 " search       - Bilatu pakete bat izenaren eta/edo adierazpenaren arabera\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Bistaratu pakete bati buruzko informazio xehea\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Ezabatu deskargatutako pakete-fitxategiak\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Ezabatu deskargatutako pakete-fitxategi zaharrak\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog   - Ikusi paketearen aldaketa egunkaria\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Deskargatu pakete baten .deb fitxategia\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5817,12 +5546,6 @@
 
 #: src/main.cc:203
 #, fuzzy, c-format
-#| msgid ""
-#| " why-not      - Show the manually installed packages that lead to a "
-#| "conflict\n"
-#| "                with the given package, or why one or more packages "
-#| "would\n"
-#| "                lead to a conflict with the given package if installed\n"
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
 "conflict\n"
@@ -5842,7 +5565,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             Laguntza-testu hau\n"
 
@@ -5871,15 +5593,11 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             Beti eskatu berrespena\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
@@ -5887,9 +5605,6 @@
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5899,9 +5614,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5911,8 +5623,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 width       Zehaztu bilaketa-emaitzak erakusteko zabalera\n"
@@ -5942,9 +5652,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5954,17 +5661,12 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr " -t [release]   Ezarri zein banaketatatik instalatuko diren paketeak\n"
 
 #: src/main.cc:226
 #, fuzzy, c-format
-#| msgid ""
-#| " -q             In command-line mode, suppress the incremental progress\n"
-#| "                indicators.\n"
 msgid ""
 " -q             In command-line mode, suppress the incremental progress.\n"
 "                indicators.\n"
@@ -5974,15 +5676,11 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o key=balioa  'key' aukeraren konfigurazioa ezartzen du zuzenean\n"
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -6021,7 +5719,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "true"
 msgid "trace"
 msgstr "egia"
 
@@ -6035,7 +5732,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "ez"
 
@@ -6049,7 +5745,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:377
 #, fuzzy
-#| msgid "Err "
 msgid "error"
 msgstr "Err "
 
@@ -6057,7 +5752,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:380
 #, fuzzy
-#| msgid "false"
 msgid "fatal"
 msgstr "faltsua"
 
@@ -6078,7 +5772,6 @@
 
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "Eragiketa baliogabea: %s"
 
@@ -6131,7 +5824,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "Paketea"
 
@@ -6141,7 +5833,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "Pakete guztiak"
 
@@ -6161,7 +5852,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -6169,8 +5859,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -6179,7 +5867,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "-u eta -i ezin dira zehaztu komando batekin"
 
@@ -7420,7 +7107,6 @@
 
 #: src/ui.cc:472
 #, fuzzy, c-format
-#| msgid "Unable to open %ls"
 msgid "Unable to fork: %s"
 msgstr "Ezin izan da %ls ireki"
 
@@ -7694,9 +7380,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7720,9 +7403,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -8256,19 +7936,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "Aldaketen egunkariak deskargatzeko erabiliko den URLa"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "Aldaketen egunkariak deskargatzeko erabiliko den URLa"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "Aldaketen egunkaria deskargatzen"
 
Index: aptitude/po/fi.po
===================================================================
--- aptitude.orig/po/fi.po
+++ aptitude/po/fi.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.4.4\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2006-11-05 15:47+0200\n"
 "Last-Translator: Jaakko Kangasharju <ashar@iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -645,13 +645,11 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "Pakettia %s ei ole asennettu, joten sitä ei asenneta uudelleen.\n"
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "Paketin %s pyydetty versio %s on jo asennettuna\n"
@@ -753,7 +751,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "%s:n muutosloki"
 
@@ -914,7 +911,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "ei mitään"
 
@@ -1317,7 +1313,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "'&M' merkitäksesi paketteja automaattisesti asennetuiksi"
 
@@ -1602,31 +1597,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "Jätä suosittelut huomioimatta:"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "Näytä ^suosittelut"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "En enää vaadi paketin %s poistoa"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "Näytä ^suosittelut"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Toiminnot"
 
@@ -1692,7 +1682,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:790
 #, fuzzy, c-format
-#| msgid "open: %d; closed: %d; defer: %d; conflict: %d"
 msgid "open: %zd; closed: %zd; defer: %zd; conflict: %zd"
 msgstr "avoinna: %d; ratkaistu: %d; siirretty: %d; ristiriitoja: %d"
 
@@ -1813,13 +1802,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "mutta se ei ole asennettavissa"
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "mutta %s on määrätty asennettavaksi."
 
@@ -1918,13 +1905,11 @@
 
 #: src/cmdline/cmdline_show.cc:326
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s%s; will be installed"
 msgstr "%s; asennetaan."
 
 #: src/cmdline/cmdline_show.cc:328
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s%s; will be installed automatically"
 msgstr "%s; asennetaan automaattisesti"
 
@@ -2186,19 +2171,16 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "Paketit"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Lähdekoodipaketti: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Arkisto"
 
@@ -2242,7 +2224,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "search: Ainakin yksi hakuehto tarvitaan\n"
 
@@ -2370,7 +2351,6 @@
 
 #: src/cmdline/cmdline_why.cc:1285
 #, fuzzy, c-format
-#| msgid "Packages depending on %s"
 msgid "Packages requiring %s:"
 msgstr "%s:sta riippuvat paketit"
 
@@ -2404,7 +2384,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[VIRHE]"
 
@@ -2749,7 +2728,6 @@
 
 #: src/generic/apt/download_update_manager.cc:138
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated quoted string in command: %s"
 msgstr "Loppumerkitön merkkijono %s:n jäljessä"
 
@@ -2828,7 +2806,6 @@
 
 #: src/generic/apt/dump_packages.cc:674
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create truncated cache: %s."
 msgstr "En löytänyt pakettia %s"
 
@@ -2950,7 +2927,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "Noudan paketteja"
 
@@ -3023,7 +2999,6 @@
 
 #: src/generic/apt/matching/parse.cc:1388
 #, fuzzy, c-format
-#| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "Virheellinen lauseke"
 
@@ -3062,19 +3037,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "URL josta muutoslokit noudetaan"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "URL josta muutoslokit noudetaan"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "%s:n muutosloki"
 
@@ -3119,7 +3091,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "En ymmärrä kaavaa %s"
 
@@ -3134,14 +3105,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "Ei asennettu"
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "Ei asennettu"
 
@@ -3178,13 +3147,11 @@
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "-q=:n jäljessä tarvitaan luku, oli %s\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "Virheellinen komentomerkki '%c'\n"
 
@@ -3200,7 +3167,6 @@
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "Odotin määrittelyn tunnistetta, oli '%c'"
 
@@ -3211,13 +3177,11 @@
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "Odotin määrittelyn tunnistetta, oli '%c'"
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "Virheellinen toiminto %s"
 
@@ -3236,19 +3200,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "Pariton ')'"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " tai"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "Pariton ')'"
 
@@ -3259,7 +3220,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "Tilapäishakemiston luonti kaavasta \"%s\" epäonnistui: %s"
 
@@ -3357,13 +3317,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "Paketti"
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "Näkymät"
 
@@ -3383,7 +3341,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "Apu"
 
@@ -3394,7 +3351,6 @@
 
 #: src/gtk/aptitude.glade:345 src/gtk/aptitude.glade:2614
 #, fuzzy
-#| msgid "List Update"
 msgid "Update"
 msgstr "Luettelopäivitys"
 
@@ -3416,7 +3372,6 @@
 
 #: src/gtk/aptitude.glade:389 src/gtk/aptitude.glade:2658
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Remove"
 msgstr "Asennettu"
 
@@ -3430,33 +3385,28 @@
 
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "Poista pakettiluettelon suodatin"
 
 #: src/gtk/aptitude.glade:649
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "Apply these settings to all active package lists."
 msgstr "Rajoita näkyvien pakettien luetteloa suodattimella"
 
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "Haku"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "asenna uudelleen"
 
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "Virhe "
 
@@ -3471,13 +3421,11 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "%s:n riippuvuudet"
 
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "^Changelog"
 msgid "Changelog"
 msgstr "Muutos^loki"
 
@@ -3496,7 +3444,6 @@
 
 #: src/gtk/aptitude.glade:1051
 #, fuzzy
-#| msgid "Tags"
 msgid "tags"
 msgstr "Merkit"
 
@@ -3519,13 +3466,11 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "Tila"
 
 #: src/gtk/aptitude.glade:1247
 #, fuzzy
-#| msgid "Unknown action type: %s"
 msgid "Group by action type"
 msgstr "Tuntematon toimi: %s"
 
@@ -3554,7 +3499,6 @@
 
 #: src/gtk/aptitude.glade:1328
 #, fuzzy
-#| msgid "Toggle ^Rejected"
 msgid "Rejected"
 msgstr "Hylkäys"
 
@@ -3573,32 +3517,27 @@
 
 #: src/gtk/aptitude.glade:1400
 #, fuzzy
-#| msgid "^Examine Solution"
 msgid "Find a new solution"
 msgstr "^Näytä ratkaisu"
 
 #: src/gtk/aptitude.glade:1404
 #, fuzzy
-#| msgid "Select the next solution to the dependency problems."
 msgid "Calculate the next solution that has not yet been generated."
 msgstr "Näytä seuraava ratkaisu riippuvuusongelmiin."
 
 #: src/gtk/aptitude.glade:1419
 #, fuzzy
-#| msgid "Perform the actions contained in the currently selected solution."
 msgid ""
 "Perform the actions in the currently selected solution and close this tab."
 msgstr "Toteuta valitun ratkaisun toimenpiteet."
 
 #: src/gtk/aptitude.glade:1576
 #, fuzzy
-#| msgid "Upgrade"
 msgid "Upgrade Summary"
 msgstr "Päivitys"
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "Lähdekoodipaketti: "
 
@@ -3610,7 +3549,6 @@
 
 #: src/gtk/aptitude.glade:1652
 #, fuzzy
-#| msgid "Manual"
 msgid "Fix Manually"
 msgstr "Opas"
 
@@ -3658,31 +3596,26 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "Rikki"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "En pystynyt toipumaan pakettien saavuttamattomuudesta"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "^Etsi"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for a package"
 msgid "Search for packages."
 msgstr "Etsi pakettia"
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "Noudettu: "
 
@@ -3717,19 +3650,16 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "URL josta muutoslokit noudetaan"
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "Vaadin paketin %s version %s (%s) asennuksen"
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -3737,20 +3667,17 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr "Vain virallisten Debian-pakettien muutoslokit ovat saatavilla."
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "Noudan muutoslokia"
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "URL josta muutoslokit noudetaan"
 
@@ -3764,7 +3691,6 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "URL josta muutoslokit noudetaan"
 
@@ -3774,8 +3700,6 @@
 
 #: src/gtk/dashboardtab.cc:414
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] "%d päivitys"
@@ -3783,13 +3707,11 @@
 
 #: src/gtk/dashboardtab.cc:633
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No upgrades are available."
 msgstr "Ei asennettu"
 
 #: src/gtk/dashboardtab.cc:645
 #, fuzzy
-#| msgid "Unable to locate package %s"
 msgid "Unable to calculate an upgrade."
 msgstr "En löytänyt pakettia %s"
 
@@ -3824,7 +3746,6 @@
 
 #: src/gtk/dashboardtab.cc:708
 #, fuzzy, c-format
-#| msgid "Internal error: Default column string is unparsable"
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr "Sisäinen virhe: Sarakejonoa ei voi jäsentää"
 
@@ -3863,7 +3784,6 @@
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "Poistan noudettuja tiedostoja"
 
@@ -3874,13 +3794,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "Edistyminen: "
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description"
 msgid "Short Description"
 msgstr "Kuvaus"
 
@@ -3890,13 +3808,11 @@
 
 #: src/gtk/download.cc:319
 #, fuzzy
-#| msgid "Cleaning while a download is in progress is not allowed"
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr "Puhdistusta ei voi tehdä noudon aikana"
 
 #: src/gtk/download.cc:395 src/gtk/gui.cc:832
 #, fuzzy
-#| msgid "View next display"
 msgid "View Details"
 msgstr "Siirry seuraavaan näkymään"
 
@@ -3916,19 +3832,16 @@
 
 #: src/gtk/download.cc:486
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s: %lu/%lu, stalled"
 msgstr "%s; asennetaan."
 
 #: src/gtk/download.cc:507
 #, fuzzy, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr " [ %i%% ] (%sB/s, %s jäljellä)"
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "mutta %s on määrätty asennettavaksi."
 
@@ -3942,7 +3855,6 @@
 
 #: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "En löytänyt pakettia %s"
 
@@ -3953,7 +3865,6 @@
 
 #: src/gtk/dpkg_terminal.cc:429
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "%s: Unable to accept a connection: %s"
 msgstr "Tilapäishakemiston luonti kaavasta \"%s\" epäonnistui: %s"
 
@@ -3979,7 +3890,6 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "%s: versiot"
 
@@ -3995,50 +3905,42 @@
 
 #: src/gtk/entitysummary.cc:142
 #, fuzzy, c-format
-#| msgid "Keep the following packages at their current version:"
 msgid "Don't hold %s at its current version."
 msgstr "Säilytä paketit nykyisessä versiossaan:"
 
 #: src/gtk/entitysummary.cc:145 src/gtk/entitysummary.cc:165
 #: src/gtk/entitysummary.cc:168
 #, fuzzy, c-format
-#| msgid "Canc^el pending actions"
 msgid "Cancel any actions on %s."
 msgstr "^Peruuta komennot"
 
 #: src/gtk/entitysummary.cc:150
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the purge of %s."
 msgstr "Peruuta %F:n poisto"
 
 #: src/gtk/entitysummary.cc:152
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s."
 msgstr "Peruuta %F:n poisto"
 
 #: src/gtk/entitysummary.cc:157
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the upgrade of %s."
 msgstr "Peruuta %F:n poisto"
 
 #: src/gtk/entitysummary.cc:159
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s."
 msgstr "Peruuta %F:n asennus"
 
 #: src/gtk/entitysummary.cc:161
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the downgrade of %s."
 msgstr "Peruuta %F:n poisto"
 
 #: src/gtk/entitysummary.cc:163
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the reinstallation of %s."
 msgstr "Peruuta %F:n asennus"
 
@@ -4049,7 +3951,6 @@
 
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "^Siivoa"
 
@@ -4060,7 +3961,6 @@
 
 #: src/gtk/entitysummary.cc:223
 #, fuzzy, c-format
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Mark %s as automatically installed."
 msgstr "'&M' merkitäksesi paketteja automaattisesti asennetuiksi"
 
@@ -4071,7 +3971,6 @@
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
 msgid "%s is a virtual package provided by:\n"
 msgstr "\"%s\" on näennäispaketti, jonka kattaa\n"
 
@@ -4081,13 +3980,11 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "Lähdekoodipaketti: "
 
 #: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 #, fuzzy
-#| msgid "ProgName"
 msgid "Name"
 msgstr "OhjNimi"
 
@@ -4097,13 +3994,11 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "Tiedoston \"%s\" avaus epäonnistui"
 
 #: src/gtk/entityview.cc:412
 #, fuzzy, c-format
-#| msgid "Rejecting the removal of %s"
 msgid "Editing the columns of \"%s\""
 msgstr "Hylkään paketin %s poiston"
 
@@ -4117,25 +4012,21 @@
 
 #: src/gtk/entityview.cc:570
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Whether the package is automatically installed."
 msgstr "'&M' merkitäksesi paketteja automaattisesti asennetuiksi"
 
 #: src/gtk/entityview.cc:576
 #, fuzzy
-#| msgid "Cancel any action on the selected package"
 msgid "The name and description of the package."
 msgstr "Peruuta valitulle paketille määritetyt toiminnot"
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "Versio: "
 
 #: src/gtk/entityview.cc:592
 #, fuzzy
-#| msgid "Check for new versions of packages"
 msgid "The version number of the package."
 msgstr "Päivitä saatavilla olevien pakettien luettelo"
 
@@ -4156,7 +4047,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "ei asennettu"
 
@@ -4166,25 +4056,21 @@
 
 #: src/gtk/gui.cc:82
 #, fuzzy
-#| msgid "unpacked"
 msgid "Unpacked"
 msgstr "purettu"
 
 #: src/gtk/gui.cc:83
 #, fuzzy
-#| msgid "half-config"
 msgid "Half-configured"
 msgstr "asetus kesken"
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "half-install"
 msgid "Half-installed"
 msgstr "asennus kesken"
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "ei asennettu (asetustiedostot ovat olemassa)"
 
@@ -4218,7 +4104,6 @@
 
 #: src/gtk/gui.cc:97
 #, fuzzy
-#| msgid "forbidden upgrade"
 msgid "Hold (don't upgrade)"
 msgstr "päivitys estetty"
 
@@ -4237,7 +4122,6 @@
 
 #: src/gtk/gui.cc:290
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "Rajoita näkyvien pakettien luetteloa suodattimella"
 
@@ -4252,13 +4136,11 @@
 
 #: src/gtk/gui.cc:359
 #, fuzzy, c-format
-#| msgid "List Update"
 msgid "Update %s?"
 msgstr "Luettelopäivitys"
 
 #: src/gtk/gui.cc:385
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
@@ -4286,31 +4168,26 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "%s changes"
 msgid "Done applying changes!"
 msgstr "%s: muutokset"
 
 #: src/gtk/gui.cc:823
 #, fuzzy
-#| msgid "%s changes"
 msgid "Applying changes..."
 msgstr "%s: muutokset"
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "[%s] %s\n"
 msgid "%s: %s"
 msgstr "[%s] %s\n"
 
 #: src/gtk/gui.cc:878
 #, fuzzy, c-format
-#| msgid "No broken packages."
 msgid "Error in package %s"
 msgstr "Ei rikkinäisiä paketteja."
 
 #: src/gtk/gui.cc:906
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "En pysty korvaamaan %s:a uudella asetustiedostolla"
 
@@ -4320,25 +4197,21 @@
 
 #: src/gtk/gui.cc:1038
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "Ei rikkinäisiä paketteja."
 
 #: src/gtk/gui.cc:1071
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "Ei rikkinäisiä paketteja."
 
 #: src/gtk/gui.cc:1075
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "Selvitä riippuvuudet"
 
 #: src/gtk/gui.cc:1103
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Mikään paketti ei ole rikki."
@@ -4346,13 +4219,11 @@
 
 #: src/gtk/gui.cc:1147
 #, fuzzy
-#| msgid "%s changes"
 msgid "View changes"
 msgstr "%s: muutokset"
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "%s changes"
 msgid "Apply changes"
 msgstr "%s: muutokset"
 
@@ -4361,8 +4232,6 @@
 #. font.
 #: src/gtk/gui.cc:1192
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%d package to install"
 msgid_plural "%d packages to install"
 msgstr[0] "%d asennus"
@@ -4373,7 +4242,6 @@
 #. font.
 #: src/gtk/gui.cc:1207
 #, fuzzy, c-format
-#| msgid "failed to remove %s"
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "%s:n poisto epäonnistui"
@@ -4381,7 +4249,6 @@
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "Haun koko"
 
@@ -4396,19 +4263,16 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "not installed"
 msgid "Not implemented"
 msgstr "ei asennettu"
 
 #: src/gtk/gui.cc:1408 src/gtk/gui.cc:1427
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "Asennettu"
 
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "^Siivoa"
 
@@ -4426,7 +4290,6 @@
 
 #: src/gtk/gui.cc:1455
 #, fuzzy
-#| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "Käyttöopas"
 
@@ -4449,7 +4312,6 @@
 
 #: src/gtk/info.cc:496
 #, fuzzy
-#| msgid "Not Installed"
 msgid "Not available"
 msgstr "Ei asennettu"
 
@@ -4459,7 +4321,6 @@
 
 #: src/gtk/info.cc:555
 #, fuzzy
-#| msgid "Packages which depend on %s"
 msgid "Package information: dependency list"
 msgstr "Paketista %s riippuvat paketit"
 
@@ -4469,7 +4330,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "ei"
 
@@ -4483,7 +4343,6 @@
 
 #: src/gtk/packagestab.cc:203
 #, fuzzy, c-format
-#| msgid "No packages matched the pattern \"%ls\"."
 msgid "No packages matched \"%s\"."
 msgstr "Mikään paketti ei täsmännyt hakuehtoon \"%ls\"."
 
@@ -4493,31 +4352,26 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "Paketti: "
 
 #: src/gtk/pkgview.cc:224
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed automatically."
 msgstr "%s; asennetaan automaattisesti"
 
 #: src/gtk/pkgview.cc:227
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed automatically."
 msgstr "%s; asennetaan automaattisesti"
 
 #: src/gtk/pkgview.cc:235
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed manually."
 msgstr "%s; asennetaan automaattisesti"
 
 #: src/gtk/pkgview.cc:238
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed manually."
 msgstr "%s; asennetaan automaattisesti"
 
@@ -4527,13 +4381,11 @@
 
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "Haku"
 
 #: src/gtk/pkgview.cc:718
 #, fuzzy
-#| msgid "Building view"
 msgid "Finalizing view"
 msgstr "Rakennan näkymää"
 
@@ -4662,13 +4514,11 @@
 
 #: src/gtk/previewtab.cc:179
 #, fuzzy
-#| msgid "Preview"
 msgid "Preview: "
 msgstr "Esikatselu"
 
 #: src/gtk/resolver.cc:68
 #, fuzzy, c-format
-#| msgid "Error while dumping resolver state"
 msgid "Error in dependency resolver: %s"
 msgstr "Selvityksen tilan tallennuksessa tapahtui virhe"
 
@@ -4683,7 +4533,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Virtual Packages"
 msgid "Virtual package"
 msgstr "Näennäispaketit"
 
@@ -4693,25 +4542,21 @@
 
 #: src/gtk/resolver.cc:377
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Removing %s is rejected."
 msgstr "Poistan paketin %s"
 
 #: src/gtk/resolver.cc:382
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Canceling the installation of %s is rejected."
 msgstr "Peruuta %F:n asennus"
 
 #: src/gtk/resolver.cc:391
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Canceling the removal of %s is rejected."
 msgstr "Peruuta %F:n poisto"
 
 #: src/gtk/resolver.cc:394
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keeping %s at version %s is rejected."
 msgstr "Säilytä %F versiossa %s (%s)"
 
@@ -4727,7 +4572,6 @@
 
 #: src/gtk/resolver.cc:413
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrading %s to version %s is rejected."
 msgstr "%s: versiot"
 
@@ -4769,7 +4613,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr "%s: versiot"
@@ -4867,7 +4710,6 @@
 
 #: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862
 #, fuzzy
-#| msgid "Remove the following packages:"
 msgid "Keep the following packages:"
 msgstr "Poista paketit:"
 
@@ -4883,49 +4725,41 @@
 
 #: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900
 #, fuzzy
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "Leave the following dependencies unresolved:"
 msgstr "Jätä riippuvuudet selvittämättä:%n"
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Remove %F [%s (%s)]"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "Poista %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1523
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "Asenna %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1531
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s"
 msgstr "Peruuta %F:n asennus"
 
 #: src/gtk/resolver.cc:1534
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s"
 msgstr "Peruuta %F:n poisto"
 
 #: src/gtk/resolver.cc:1537
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "Säilytä %F versiossa %s (%s)"
 
 #: src/gtk/resolver.cc:1544
 #, fuzzy, c-format
-#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Päivitä %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1553
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Vanhenna %F [%s (%s) -> %s (%s)]"
 
@@ -4941,37 +4775,31 @@
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "Säilytä %F versiossa %s (%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>keep</b> %s at version %s"
 msgstr "Säilytä %F versiossa %s (%s)"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr "Peruuta %F:n asennus"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>cancel</b> the installation of %s"
 msgstr "Peruuta %F:n asennus"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>Install</b> %s %s"
 msgstr "Asenna %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>install</b> %s %s"
 msgstr "Asenna %F [%s (%s)]"
 
@@ -4987,13 +4815,11 @@
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>Upgrade</b> %s to version %s"
 msgstr "%s: versiot"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>upgrade</b> %s to version %s"
 msgstr "%s: versiot"
 
@@ -5009,8 +4835,6 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "%d asennus"
@@ -5018,8 +4842,6 @@
 
 #: src/gtk/resolver.cc:1740
 #, fuzzy, c-format
-#| msgid "%d removal"
-#| msgid_plural "%d removals"
 msgid "%s remove"
 msgid_plural "%s removes"
 msgstr[0] "%d poisto"
@@ -5027,8 +4849,6 @@
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "%d keep"
-#| msgid_plural "%d keeps"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "%d säilytys"
@@ -5036,8 +4856,6 @@
 
 #: src/gtk/resolver.cc:1752
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%s upgrade"
 msgid_plural "%s upgrades"
 msgstr[0] "%d päivitys"
@@ -5045,8 +4863,6 @@
 
 #: src/gtk/resolver.cc:1758
 #, fuzzy, c-format
-#| msgid "%d downgrade"
-#| msgid_plural "%d downgrades"
 msgid "%s downgrade"
 msgid_plural "%s downgrades"
 msgstr[0] "%d vanhennus"
@@ -5054,7 +4870,6 @@
 
 #: src/gtk/resolver.cc:1764
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "%s unresolved recommendation"
 msgid_plural "%s unresolved recommendations"
 msgstr[0] "Näytä ^suosittelut"
@@ -5062,7 +4877,6 @@
 
 #: src/gtk/resolver.cc:2056
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions yet."
 msgstr "Ei muita ratkaisuja"
 
@@ -5073,7 +4887,6 @@
 
 #: src/gtk/resolver.cc:2064
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions."
 msgstr "Ei muita ratkaisuja"
 
@@ -5083,19 +4896,16 @@
 
 #: src/gtk/resolver.cc:2076
 #, fuzzy, c-format
-#| msgid "No more solutions."
 msgid "%u solutions."
 msgstr "Ei muita ratkaisuja"
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "Tiedoston \"%s\" avaus epäonnistui"
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr "[Noudettu]"
 
@@ -5145,7 +4955,6 @@
 
 #: src/load_grouppolicy.cc:305
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected ',', '%c', or '('; got '%c'"
 msgstr "Odotin ',':a tai '(':a, oli '%c'"
 
@@ -5434,44 +5243,36 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Asenna tai päivitä paketteja\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Poista paketteja\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Poista paketteja asetustiedostoineen\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Jäädytä paketteja\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Peruuta paketin jäädytys\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Merkitse paketteja automaattisesti asennetuiksi\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Merkitse paketteja käsin asennetuiksi\n"
 
@@ -5486,7 +5287,6 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Nouda uusien ja päivitettävien pakettien luettelo\n"
 
@@ -5509,51 +5309,41 @@
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Tyhjennä uusien pakettien ryhmä\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Etsi paketteja nimellä tai lausekkeella\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Näytä paketin yksityiskohtaiset tiedot\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Poista noudetut pakettitiedostot\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Poista vanhat noudetut pakettitiedostot\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " muutosloki   - Näytä paketin muutosloki\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Nouda pakettitiedosto\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5584,7 +5374,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             Tämä avustusteksti\n"
 
@@ -5614,24 +5403,17 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             Kysy aina varmistusta tai toimintoa\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr " -y             Vastaa yksinkertaisiin kyllä/ei-kysymyksiin kyllä.\n"
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5639,9 +5421,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5649,8 +5428,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 leveys      Määritä näytön leveys hakutuloksia varten\n"
@@ -5681,9 +5458,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5691,8 +5465,6 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr " -t [julkaisu]   Aseta julkaisu, josta paketit asennetaan\n"
@@ -5706,15 +5478,11 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o avain=arvo  Anna suoraan asetuksen 'avain' arvo\n"
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -5751,7 +5519,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "replaces"
 msgid "trace"
 msgstr ", korvaus: "
 
@@ -5765,7 +5532,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "ei"
 
@@ -5779,7 +5545,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:377
 #, fuzzy
-#| msgid "Err "
 msgid "error"
 msgstr "Virhe "
 
@@ -5807,7 +5572,6 @@
 
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "Virheellinen toiminto %s"
 
@@ -5860,7 +5624,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "Paketti"
 
@@ -5870,7 +5633,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "Kaikki paketit"
 
@@ -5890,7 +5652,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -5898,8 +5659,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -5907,7 +5666,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "Valitsimia -u ja -i ei voi käyttää komennon kanssa"
 
@@ -7157,7 +6915,6 @@
 
 #: src/ui.cc:472
 #, fuzzy, c-format
-#| msgid "Unable to open %ls"
 msgid "Unable to fork: %s"
 msgstr "En pysty avaamaan tiedostoa %ls"
 
@@ -7432,9 +7189,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7457,9 +7211,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7985,19 +7736,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "URL josta muutoslokit noudetaan"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "URL josta muutoslokit noudetaan"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "Noudan muutoslokia"
 
Index: aptitude/po/fr.po
===================================================================
--- aptitude.orig/po/fr.po
+++ aptitude/po/fr.po
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2009-09-25 19:55+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -886,7 +886,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "Liste des modifications de %s"
 
@@ -1477,7 +1476,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "Whether the package is automatically installed."
 msgid "'a': the package was automatically installed or removed."
 msgstr "Indique si le paquet a été installé automatiquement."
 
@@ -1612,9 +1610,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy, c-format
-#| msgid ""
-#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: "
-#| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
@@ -1662,10 +1657,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:259
 #, fuzzy
-#| msgid ""
-#| "reject the given package versions; don't display any solutions in which "
-#| "they occur.  Enter UNINST instead of a version to reject removing the "
-#| "package."
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package.  "
@@ -1677,9 +1668,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:261
 #, fuzzy
-#| msgid ""
-#| "accept the given package versions; display only solutions in which they "
-#| "occur.  Enter UNINST instead of a version to accept removing the package."
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package.  "
@@ -1785,31 +1773,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "Laisser les dépendances suivantes non satisfaites :"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "Voir les ^recommandations"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "La suppression de %s n'est plus demandée"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "Voir les ^recommandations"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Actions"
 
@@ -1971,7 +1954,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:1201
 #, fuzzy
-#| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Impossible de résoudre les dépendances pour la mise à jour (aucune solution "
@@ -1979,7 +1961,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:1207
 #, fuzzy, c-format
-#| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Impossible de résoudre les dépendances pour la mise à jour (%s)."
 
@@ -2384,25 +2365,21 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "Paquets"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Paquet source : "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Archive"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\".\n"
 msgid "No such package \"%s\"."
 msgstr "Le paquet « %s » n'existe pas.\n"
 
@@ -2441,7 +2418,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "search : vous devez donner au moins un terme de recherche\n"
 
@@ -2600,7 +2576,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[ERREUR]"
 
@@ -2862,7 +2837,6 @@
 
 #: src/generic/apt/aptitude_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Invalid hint \"%s\": expected a tier number, but found nothing."
 msgid ""
 "Invalid hint \"%s\": expected a component name and a number, but found "
 "nothing."
@@ -2872,7 +2846,6 @@
 
 #: src/generic/apt/aptitude_resolver.cc:521
 #, fuzzy, c-format
-#| msgid "Invalid hint \"%s\": expected a tier number, but found nothing."
 msgid ""
 "Invalid hint \"%s\": expected the numeric value following the component "
 "name, but found nothing."
@@ -2887,7 +2860,6 @@
 
 #: src/generic/apt/aptitude_resolver.cc:552
 #, fuzzy, c-format
-#| msgid "Invalid hint \"%s\": expected a target, but found nothing."
 msgid "Invalid hint \"%s\": expected a level, but found nothing."
 msgstr ""
 "Astuce « %s » non valable : une cible est attendue, mais aucune n'est "
@@ -2927,8 +2899,6 @@
 
 #: src/generic/apt/aptitude_resolver_universe.cc:828
 #, fuzzy, c-format
-#| msgid ""
-#| "Invalid search tier \"%s\" (not \"conflict\", \"minimum\", or an integer)."
 msgid ""
 "Invalid safety level \"%s\" (not \"discard\", \"maximum\", \"minimum\", or "
 "an integer)."
@@ -3186,7 +3156,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "Téléchargement des paquets"
 
@@ -3300,19 +3269,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "Failed to download the changelog: %s"
 msgid "Failed to download changelogs: %s"
 msgstr "Échec de téléchargement du journal des modifications : %s"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "Failed to download the changelog: %s"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "Échec de téléchargement du journal des modifications : %s"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "Liste des modifications de %s"
 
@@ -3367,7 +3333,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Analyse du motif %s impossible"
 
@@ -3382,14 +3347,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "No upgrades are available."
 msgid "No tag descriptions are available."
 msgstr "Pas de mise à jour disponible."
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "No upgrades are available."
 msgid "No description available for %s."
 msgstr "Pas de mise à jour disponible."
 
@@ -3416,67 +3379,56 @@
 
 #: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got EOF."
 msgstr "« %c » attendu, « %c » reçu."
 
 #: src/generic/util/parsers.h:737
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got '%s'."
 msgstr "« %c » attendu, « %c » reçu."
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "Un nombre est attendu après « -q= » alors que %s a été reçu\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "Le caractère « %c » ne correspond à aucune action connue\n"
 
 #: src/generic/util/parsers.h:832
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got EOF."
 msgstr "« %c » attendu, « %c » reçu."
 
 #: src/generic/util/parsers.h:843
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got '%c'."
 msgstr "« %c » attendu, « %c » reçu."
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "« %c » a été reçu alors qu'un identificateur de règle était attendu"
 
 #: src/generic/util/parsers.h:1026
 #, fuzzy
-#| msgid "Expected '{', ')', or ',' following '||', got '%s'"
 msgid "Expected an integer following '-', got EOF."
 msgstr "Attendu '{', ')', or ',' suivant '||', reçu '%s'"
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "« %c » a été reçu alors qu'un identificateur de règle était attendu"
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid logger name \"%s\"."
 msgid "Invalid integer: \"%s\"."
 msgstr "Journaliser « %s » inconnu."
 
 #: src/generic/util/parsers.h:1077
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected EOF, got '%c'."
 msgstr "« %c » attendu, « %c » reçu."
 
@@ -3490,19 +3442,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "« ) » mal placée"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " ou"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "« ) » mal placée"
 
@@ -3514,7 +3463,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr ""
 "Création impossible du répertoire temporaire à partir du modèle « %s » : %s"
@@ -3888,25 +3836,21 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "Cassé"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "Impossible d'effectuer une correction pour des paquets manquants"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "^Rechercher"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for: "
 msgid "Search for packages."
 msgstr "Rechercher :"
 
@@ -3953,7 +3897,6 @@
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "Demande d'installation de %s, version %s (%s)"
 
@@ -3976,7 +3919,6 @@
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading changelog; please wait..."
 msgid "Downloading the changelog of %s version %s..."
 msgstr ""
 "Téléchargement du fichier du fichier de suivi des modifications, veuillez "
@@ -3984,7 +3926,6 @@
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "Preparing to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "Préparation du téléchargement des fichiers de suivi des modifications"
 
@@ -4922,8 +4863,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid ""
-#| "Upgrading %s to version %s is preferred over all un-accpted alternatives."
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr ""
@@ -5215,7 +5154,6 @@
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Solution %s of %s (tier %s)."
 msgid "Solution %s of %s."
 msgstr "Solution %s de %s (tier %s)."
 
@@ -5499,19 +5437,16 @@
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  version d'APT : %d %d %d\n"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  version d'APT : %d %d %d\n"
 
 #: src/main.cc:164
 #, fuzzy, c-format
-#| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  gestion d'Ept désactivée.\n"
 
@@ -8125,19 +8060,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "Preparing to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "Préparation du téléchargement des fichiers de suivi des modifications"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "Failed to download the changelog: %s"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "Échec de téléchargement du journal des modifications : %s"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading changelogs"
 msgid "Downloading the changelog of %s"
 msgstr "Téléchargement du fichier de suivi des modifications"
 
Index: aptitude/po/gl.po
===================================================================
--- aptitude.orig/po/gl.po
+++ aptitude/po/gl.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2008-04-19 14:12+0100\n"
 "Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -266,9 +266,6 @@
 
 #: src/apt_options.cc:241
 #, fuzzy
-#| msgid ""
-#| "If this option is enabled, the menu bar will only appear when it has been "
-#| "activated by pressing the menu key."
 msgid ""
 "If this option is enabled, then the first view displayed on startup will be "
 "a flat view instead of the default view."
@@ -705,7 +702,6 @@
 
 #: src/cmdline/cmdline_action.cc:212
 #, fuzzy, c-format
-#| msgid "Unable to satisfy the build-depends: %s."
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Non se puideron satisfacer as dependencias de compilación: %s."
 
@@ -762,13 +758,11 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s non está instalado agora, así que non se ha reinstalar.\n"
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "%s xa está instalado na versión solicitada (%s)\n"
@@ -869,7 +863,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "Rexistro de cambios de %s"
 
@@ -1038,7 +1031,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "ningún"
 
@@ -1447,7 +1439,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "\"&M\" para marcar paquetes coma instalados automaticamente"
 
@@ -1581,9 +1572,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy, c-format
-#| msgid ""
-#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: "
-#| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
@@ -1630,10 +1618,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:259
 #, fuzzy
-#| msgid ""
-#| "reject the given package versions; don't display any solutions in which "
-#| "they occur.  Enter UNINST instead of a version to reject removing the "
-#| "package."
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package.  "
@@ -1645,9 +1629,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:261
 #, fuzzy
-#| msgid ""
-#| "accept the given package versions; display only solutions in which they "
-#| "occur.  Enter UNINST instead of a version to accept removing the package."
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package.  "
@@ -1751,31 +1732,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "Deixar sen resolver as seguintes recomendacións:"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "Auditar as ^recomendacións"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "Xa non se require a eliminación de %s"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "Auditar as ^recomendacións"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Accións"
 
@@ -1933,7 +1909,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:1201
 #, fuzzy
-#| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Non se puideron resolver as dependencias para a actualización (non se atopou "
@@ -1941,7 +1916,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:1207
 #, fuzzy, c-format
-#| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Non se puideron resolver as dependencias para a actualización (%s)."
 
@@ -1972,13 +1946,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "pero non é instalable"
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "pero hase instalar %s."
 
@@ -2077,13 +2049,11 @@
 
 #: src/cmdline/cmdline_show.cc:326
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s%s; will be installed"
 msgstr "%s; hase instalar"
 
 #: src/cmdline/cmdline_show.cc:328
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s%s; will be installed automatically"
 msgstr "%s; hase instalar automaticamente"
 
@@ -2347,25 +2317,21 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "Paquetes"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Paquete fonte: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Arquivo"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\".\n"
 msgid "No such package \"%s\"."
 msgstr "Non hai tal paquete \"%s\".\n"
 
@@ -2404,7 +2370,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "busca: Debe fornecer alomenos un termo de busca\n"
 
@@ -2528,7 +2493,6 @@
 
 #: src/cmdline/cmdline_why.cc:1285
 #, fuzzy, c-format
-#| msgid "Packages depending on %s"
 msgid "Packages requiring %s:"
 msgstr "Paquetes que dependen de %s"
 
@@ -2544,8 +2508,6 @@
 
 #: src/cmdline/cmdline_why.cc:1416
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: this command requires at least one argument (the package to query)."
 msgid ""
 "%s: this command requires at least one argument (the package to query).\n"
 msgstr ""
@@ -2564,7 +2526,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[ERRO]"
 
@@ -2920,7 +2881,6 @@
 
 #: src/generic/apt/download_update_manager.cc:138
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated quoted string in command: %s"
 msgstr "Cadea literal sen rematar despois de %s"
 
@@ -3005,7 +2965,6 @@
 
 #: src/generic/apt/dump_packages.cc:674
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create truncated cache: %s."
 msgstr "Non se puido atopar o paquete %s"
 
@@ -3128,7 +3087,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "A descargar os paquetes"
 
@@ -3166,7 +3124,6 @@
 
 #: src/generic/apt/matching/parse.cc:860
 #, fuzzy, c-format
-#| msgid "Unknown matcher type: \"%s\"."
 msgid "Unknown term type: \"%s\"."
 msgstr "Tipo de comparador descoñecido: \"%s\"."
 
@@ -3174,9 +3131,6 @@
 #. Leave the question marks attached to the string placeholders.
 #: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883
 #, fuzzy, c-format
-#| msgid ""
-#| "The ?%s matcher must be used in a \"wide\" context (a top-level context, "
-#| "or a context enclosed by ?%s)."
 msgid ""
 "The ?%s term must be used in a \"wide\" context (a top-level context, or a "
 "context enclosed by ?%s)."
@@ -3207,7 +3161,6 @@
 
 #: src/generic/apt/matching/parse.cc:1388
 #, fuzzy, c-format
-#| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "Expresión mal formada"
 
@@ -3247,19 +3200,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "URL a empregar para descargar os rexistros de cambios"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "URL a empregar para descargar os rexistros de cambios"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "Rexistro de cambios de %s"
 
@@ -3305,7 +3255,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Non se puido analizar o patrón %s"
 
@@ -3320,14 +3269,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "Sen instalar"
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "Sen instalar"
 
@@ -3354,67 +3301,56 @@
 
 #: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got EOF."
 msgstr "Esperábase \"%c\", recibiuse \"%c\"."
 
 #: src/generic/util/parsers.h:737
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got '%s'."
 msgstr "Esperábase \"%c\", recibiuse \"%c\"."
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "Esperábase un número despois de -q=, recibiuse %s\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "Caracter de acción \"%c\" incorrecto\n"
 
 #: src/generic/util/parsers.h:832
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got EOF."
 msgstr "Esperábase \"%c\", recibiuse \"%c\"."
 
 #: src/generic/util/parsers.h:843
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got '%c'."
 msgstr "Esperábase \"%c\", recibiuse \"%c\"."
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "Esperábase un identificador de política, recibiuse \"%c\""
 
 #: src/generic/util/parsers.h:1026
 #, fuzzy
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected an integer following '-', got EOF."
 msgstr "Esperábanse \",\" ou \")\" despois de \"||\", recibiuse \"%s\""
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "Esperábase un identificador de política, recibiuse \"%c\""
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "Operación %s non válida"
 
 #: src/generic/util/parsers.h:1077
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected EOF, got '%c'."
 msgstr "Esperábase \"%c\", recibiuse \"%c\"."
 
@@ -3428,19 +3364,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "Non se esperaba un \")\""
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " ou"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "Non se esperaba un \")\""
 
@@ -3451,7 +3384,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "Non se puido crear o directorio temporal do patrón \"%s\": %s"
 
@@ -3486,7 +3418,6 @@
 
 #: src/gtk/aptitude.glade:19 src/gtk/aptitude.glade:2273
 #, fuzzy
-#| msgid "False"
 msgid "_File"
 msgstr "Falso"
 
@@ -3553,13 +3484,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "Paquete"
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "Vistas"
 
@@ -3579,7 +3508,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "Axuda"
 
@@ -3590,7 +3518,6 @@
 
 #: src/gtk/aptitude.glade:345 src/gtk/aptitude.glade:2614
 #, fuzzy
-#| msgid "List Update"
 msgid "Update"
 msgstr "Actualización das listas"
 
@@ -3612,7 +3539,6 @@
 
 #: src/gtk/aptitude.glade:389 src/gtk/aptitude.glade:2658
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Remove"
 msgstr "Instalado"
 
@@ -3626,33 +3552,28 @@
 
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "Quitar o filtro da lista de paquetes"
 
 #: src/gtk/aptitude.glade:649
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "Apply these settings to all active package lists."
 msgstr "Aplicar un filtro á lista de paquetes"
 
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "Busca"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "reinstalar"
 
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "Err "
 
@@ -3667,19 +3588,16 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "Dependencias de %s"
 
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "^Changelog"
 msgid "Changelog"
 msgstr "^Rexistro de cambios"
 
 #: src/gtk/aptitude.glade:1020
 #, fuzzy
-#| msgid "False"
 msgid "Files"
 msgstr "Falso"
 
@@ -3693,7 +3611,6 @@
 
 #: src/gtk/aptitude.glade:1051
 #, fuzzy
-#| msgid "Tags"
 msgid "tags"
 msgstr "Etiquetas"
 
@@ -3716,13 +3633,11 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "Estado"
 
 #: src/gtk/aptitude.glade:1247
 #, fuzzy
-#| msgid "Unknown action type: %s"
 msgid "Group by action type"
 msgstr "Tipo de acción descoñecido: %s"
 
@@ -3751,13 +3666,11 @@
 
 #: src/gtk/aptitude.glade:1328
 #, fuzzy
-#| msgid "Toggle ^Rejected"
 msgid "Rejected"
 msgstr "Cambiar ^rexeitada"
 
 #: src/gtk/aptitude.glade:1343
 #, fuzzy
-#| msgid "Preferences"
 msgid "No preference"
 msgstr "Preferencias"
 
@@ -3771,32 +3684,27 @@
 
 #: src/gtk/aptitude.glade:1400
 #, fuzzy
-#| msgid "^Examine Solution"
 msgid "Find a new solution"
 msgstr "^Examinar solución"
 
 #: src/gtk/aptitude.glade:1404
 #, fuzzy
-#| msgid "Select the next solution to the dependency problems."
 msgid "Calculate the next solution that has not yet been generated."
 msgstr "Escoller a seguinte solución aos problemas de dependencias."
 
 #: src/gtk/aptitude.glade:1419
 #, fuzzy
-#| msgid "Perform the actions contained in the currently selected solution."
 msgid ""
 "Perform the actions in the currently selected solution and close this tab."
 msgstr "Realizar as accións contidas na solución seleccionada actualmente."
 
 #: src/gtk/aptitude.glade:1576
 #, fuzzy
-#| msgid "Upgrade"
 msgid "Upgrade Summary"
 msgstr "Actualizar"
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "Paquete fonte: "
 
@@ -3808,7 +3716,6 @@
 
 #: src/gtk/aptitude.glade:1652
 #, fuzzy
-#| msgid "Manual"
 msgid "Fix Manually"
 msgstr "Manual"
 
@@ -3856,31 +3763,26 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "Roto"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "Non se puido facer corrixir os paquetes non dispoñibles"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "^Buscar"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for: "
 msgid "Search for packages."
 msgstr "Buscar: "
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "Rcb "
 
@@ -3914,19 +3816,16 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "URL a empregar para descargar os rexistros de cambios"
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "Requírese a instalación de %s versión %s (%s)"
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -3934,20 +3833,17 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr "Só se poden ver rexistros de cambios de paquetes Debian oficiais."
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "A descargar o rexistro de cambios"
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "URL a empregar para descargar os rexistros de cambios"
 
@@ -3961,7 +3857,6 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "URL a empregar para descargar os rexistros de cambios"
 
@@ -3971,8 +3866,6 @@
 
 #: src/gtk/dashboardtab.cc:414
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] "%d actualización"
@@ -3980,13 +3873,11 @@
 
 #: src/gtk/dashboardtab.cc:633
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No upgrades are available."
 msgstr "Sen instalar"
 
 #: src/gtk/dashboardtab.cc:645
 #, fuzzy
-#| msgid "Unable to locate package %s"
 msgid "Unable to calculate an upgrade."
 msgstr "Non se puido atopar o paquete %s"
 
@@ -4021,25 +3912,21 @@
 
 #: src/gtk/dashboardtab.cc:708
 #, fuzzy, c-format
-#| msgid "Internal error: Default column string is unparsable"
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr "Erro interno: A cadea de columnas por defecto non é analizable"
 
 #: src/gtk/dependency_chains_tab.cc:78
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: start"
 msgstr "Xestión de dependencias"
 
 #: src/gtk/dependency_chains_tab.cc:82
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: end"
 msgstr "Xestión de dependencias"
 
 #: src/gtk/dependency_chains_tab.cc:86
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: results"
 msgstr "Xestión de dependencias"
 
@@ -4049,7 +3936,6 @@
 
 #: src/gtk/dependency_chains_tab.cc:282
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency chain found."
 msgstr "Xestión de dependencias"
 
@@ -4059,13 +3945,11 @@
 
 #: src/gtk/download.cc:185
 #, fuzzy
-#| msgid "False"
 msgid "Failed"
 msgstr "Falso"
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "A borrar os ficheiros descargados"
 
@@ -4076,13 +3960,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "Progreso total: "
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description"
 msgid "Short Description"
 msgstr "Descrición"
 
@@ -4092,13 +3974,11 @@
 
 #: src/gtk/download.cc:319
 #, fuzzy
-#| msgid "Cleaning while a download is in progress is not allowed"
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr "Non se permite limpar durante unha descarga"
 
 #: src/gtk/download.cc:395 src/gtk/gui.cc:832
 #, fuzzy
-#| msgid "View next display"
 msgid "View Details"
 msgstr "Ver a seguinte vista"
 
@@ -4118,19 +3998,16 @@
 
 #: src/gtk/download.cc:486
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s: %lu/%lu, stalled"
 msgstr "%s; hase instalar"
 
 #: src/gtk/download.cc:507
 #, fuzzy, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr " [ %i%% ] (%sB/s, %s restantes)"
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "pero hase instalar %s."
 
@@ -4144,7 +4021,6 @@
 
 #: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "Non se puido atopar o paquete %s"
 
@@ -4155,7 +4031,6 @@
 
 #: src/gtk/dpkg_terminal.cc:429
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "%s: Unable to accept a connection: %s"
 msgstr "Non se puido crear o directorio temporal do patrón \"%s\": %s"
 
@@ -4181,80 +4056,67 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "Versións de %s"
 
 #: src/gtk/entitysummary.cc:123
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Install %s version %s"
 msgstr "Instalar(%s fornece %s)"
 
 #: src/gtk/entitysummary.cc:131
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrade to %s version %s"
 msgstr "  Versión de cwidget: %s\n"
 
 #: src/gtk/entitysummary.cc:142
 #, fuzzy, c-format
-#| msgid "Keep the following packages at their current version:"
 msgid "Don't hold %s at its current version."
 msgstr "Conservar os seguintes paquetes na súa versión actual:"
 
 #: src/gtk/entitysummary.cc:145 src/gtk/entitysummary.cc:165
 #: src/gtk/entitysummary.cc:168
 #, fuzzy, c-format
-#| msgid "Canc^el pending actions"
 msgid "Cancel any actions on %s."
 msgstr "^Cancelar as accións pendentes"
 
 #: src/gtk/entitysummary.cc:150
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the purge of %s."
 msgstr "Cancelar a eliminación de %F"
 
 #: src/gtk/entitysummary.cc:152
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s."
 msgstr "Cancelar a eliminación de %F"
 
 #: src/gtk/entitysummary.cc:157
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the upgrade of %s."
 msgstr "Cancelar a eliminación de %F"
 
 #: src/gtk/entitysummary.cc:159
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s."
 msgstr "Cancelar a instalación de %F"
 
 #: src/gtk/entitysummary.cc:161
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the downgrade of %s."
 msgstr "Cancelar a eliminación de %F"
 
 #: src/gtk/entitysummary.cc:163
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the reinstallation of %s."
 msgstr "Cancelar a instalación de %F"
 
 #: src/gtk/entitysummary.cc:206
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "Remove %s"
 msgstr "Eliminar(%s)"
 
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "^Purgar"
 
@@ -4265,19 +4127,16 @@
 
 #: src/gtk/entitysummary.cc:223
 #, fuzzy, c-format
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Mark %s as automatically installed."
 msgstr "\"&M\" para marcar paquetes coma instalados automaticamente"
 
 #: src/gtk/entitysummary.cc:228
 #, fuzzy, c-format
-#| msgid "The package \"%s\" is manually installed.\n"
 msgid "Mark %s as manually installed."
 msgstr "O paquete \"%s\" está instalado manualmente.\n"
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
 msgid "%s is a virtual package provided by:\n"
 msgstr "\"%s\" é un paquete virtual fornecido por:\n"
 
@@ -4287,13 +4146,11 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "Paquete fonte: "
 
 #: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 #, fuzzy
-#| msgid "ProgName"
 msgid "Name"
 msgstr "NomeProg"
 
@@ -4303,13 +4160,11 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "Non se puido abrir o ficheiro \"%s\""
 
 #: src/gtk/entityview.cc:412
 #, fuzzy, c-format
-#| msgid "Rejecting the removal of %s"
 msgid "Editing the columns of \"%s\""
 msgstr "Rexéitase a eliminación de %s"
 
@@ -4323,25 +4178,21 @@
 
 #: src/gtk/entityview.cc:570
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Whether the package is automatically installed."
 msgstr "\"&M\" para marcar paquetes coma instalados automaticamente"
 
 #: src/gtk/entityview.cc:576
 #, fuzzy
-#| msgid "Cancel any action on the selected package"
 msgid "The name and description of the package."
 msgstr "Cancelar calquera acción sobre o paquete seleccionado"
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "Versión: "
 
 #: src/gtk/entityview.cc:592
 #, fuzzy
-#| msgid "Check for new versions of packages"
 msgid "The version number of the package."
 msgstr "Buscar novas versións dos paquetes"
 
@@ -4362,7 +4213,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "sen instalar"
 
@@ -4372,37 +4222,31 @@
 
 #: src/gtk/gui.cc:82
 #, fuzzy
-#| msgid "unpacked"
 msgid "Unpacked"
 msgstr "desempaquetado"
 
 #: src/gtk/gui.cc:83
 #, fuzzy
-#| msgid "half-config"
 msgid "Half-configured"
 msgstr "semiconfig"
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "half-install"
 msgid "Half-installed"
 msgstr "semiinst"
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "sen instalar (pero hai ficheiros de configuración)"
 
 #: src/gtk/gui.cc:86
 #, fuzzy
-#| msgid "triggers-awaited"
 msgid "Triggers awaited"
 msgstr "disparadores-agardando"
 
 #: src/gtk/gui.cc:87
 #, fuzzy
-#| msgid "triggers-pending"
 msgid "Triggers pending"
 msgstr "disparadores-pendentes"
 
@@ -4428,13 +4272,11 @@
 
 #: src/gtk/gui.cc:97
 #, fuzzy
-#| msgid "forbidden upgrade"
 msgid "Hold (don't upgrade)"
 msgstr "actualización prohibida"
 
 #: src/gtk/gui.cc:99
 #, fuzzy
-#| msgid "Related Dependencies"
 msgid "Unsatisfied dependencies"
 msgstr "Dependencias relacionadas:"
 
@@ -4448,13 +4290,11 @@
 
 #: src/gtk/gui.cc:290
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "Aplicar un filtro á lista de paquetes"
 
 #: src/gtk/gui.cc:298 src/gtk/gui.cc:946
 #, fuzzy
-#| msgid "Downloading..."
 msgid "Download already running."
 msgstr "A descargar..."
 
@@ -4465,13 +4305,11 @@
 
 #: src/gtk/gui.cc:359
 #, fuzzy, c-format
-#| msgid "List Update"
 msgid "Update %s?"
 msgstr "Actualización das listas"
 
 #: src/gtk/gui.cc:385
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
@@ -4499,31 +4337,26 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "%s changes"
 msgid "Done applying changes!"
 msgstr "Cambios de %s"
 
 #: src/gtk/gui.cc:823
 #, fuzzy
-#| msgid "%s changes"
 msgid "Applying changes..."
 msgstr "Cambios de %s"
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "s: %F"
 msgid "%s: %s"
 msgstr "s: %F"
 
 #: src/gtk/gui.cc:878
 #, fuzzy, c-format
-#| msgid "No broken packages."
 msgid "Error in package %s"
 msgstr "Non hai paquetes rotos."
 
 #: src/gtk/gui.cc:906
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Non se puido substituír %s co novo ficheiro de configuración"
 
@@ -4533,25 +4366,21 @@
 
 #: src/gtk/gui.cc:1038
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "Non hai paquetes rotos."
 
 #: src/gtk/gui.cc:1071
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "Non hai paquetes rotos."
 
 #: src/gtk/gui.cc:1075
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "Resolver dependencias"
 
 #: src/gtk/gui.cc:1103
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Non hai paquetes rotos."
@@ -4559,13 +4388,11 @@
 
 #: src/gtk/gui.cc:1147
 #, fuzzy
-#| msgid "%s changes"
 msgid "View changes"
 msgstr "Cambios de %s"
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "%s changes"
 msgid "Apply changes"
 msgstr "Cambios de %s"
 
@@ -4574,8 +4401,6 @@
 #. font.
 #: src/gtk/gui.cc:1192
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%d package to install"
 msgid_plural "%d packages to install"
 msgstr[0] "%d instalación"
@@ -4586,7 +4411,6 @@
 #. font.
 #: src/gtk/gui.cc:1207
 #, fuzzy, c-format
-#| msgid "failed to remove %s"
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "non se puido eliminar %s"
@@ -4594,7 +4418,6 @@
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "TamDescarga"
 
@@ -4609,19 +4432,16 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "not installed"
 msgid "Not implemented"
 msgstr "sen instalar"
 
 #: src/gtk/gui.cc:1408 src/gtk/gui.cc:1427
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "Instalado"
 
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "^Purgar"
 
@@ -4639,7 +4459,6 @@
 
 #: src/gtk/gui.cc:1455
 #, fuzzy
-#| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "Manual do usuario"
 
@@ -4654,7 +4473,6 @@
 
 #: src/gtk/info.cc:161 src/gtk/pkgview.cc:169
 #, fuzzy
-#| msgid "Current status: %F."
 msgid "Current status"
 msgstr "Estado actual: %F."
 
@@ -4664,19 +4482,16 @@
 
 #: src/gtk/info.cc:496
 #, fuzzy
-#| msgid "Not Installed"
 msgid "Not available"
 msgstr "Sen instalar"
 
 #: src/gtk/info.cc:545
 #, fuzzy
-#| msgid "C^ycle Package Information"
 msgid "Package information: version list"
 msgstr "Mái^s información dos paquetes"
 
 #: src/gtk/info.cc:555
 #, fuzzy
-#| msgid "Packages which depend on %s"
 msgid "Package information: dependency list"
 msgstr "Paquetes que dependen de %s"
 
@@ -4686,7 +4501,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "non"
 
@@ -4700,7 +4514,6 @@
 
 #: src/gtk/packagestab.cc:203
 #, fuzzy, c-format
-#| msgid "No packages matched the pattern \"%ls\"."
 msgid "No packages matched \"%s\"."
 msgstr "Non hai paquetes que encaixen no patrón \"%ls\"."
 
@@ -4710,31 +4523,26 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "Paquete: "
 
 #: src/gtk/pkgview.cc:224
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed automatically."
 msgstr "%s; hase instalar automaticamente"
 
 #: src/gtk/pkgview.cc:227
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed automatically."
 msgstr "%s; hase instalar automaticamente"
 
 #: src/gtk/pkgview.cc:235
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed manually."
 msgstr "%s; hase instalar automaticamente"
 
 #: src/gtk/pkgview.cc:238
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed manually."
 msgstr "%s; hase instalar automaticamente"
 
@@ -4744,13 +4552,11 @@
 
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "Busca"
 
 #: src/gtk/pkgview.cc:718
 #, fuzzy
-#| msgid "Building view"
 msgid "Finalizing view"
 msgstr "A construir a vista"
 
@@ -4883,13 +4689,11 @@
 
 #: src/gtk/previewtab.cc:179
 #, fuzzy
-#| msgid "Preview"
 msgid "Preview: "
 msgstr "Previsualización"
 
 #: src/gtk/resolver.cc:68
 #, fuzzy, c-format
-#| msgid "Error while dumping resolver state"
 msgid "Error in dependency resolver: %s"
 msgstr "Erro ao verquer o estado do resolvedor"
 
@@ -4904,7 +4708,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package"
 msgid "Virtual package"
 msgstr "Paquete"
 
@@ -4914,43 +4717,36 @@
 
 #: src/gtk/resolver.cc:377
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Removing %s is rejected."
 msgstr "A eliminar %s"
 
 #: src/gtk/resolver.cc:382
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Canceling the installation of %s is rejected."
 msgstr "Cancelar a instalación de %F"
 
 #: src/gtk/resolver.cc:391
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Canceling the removal of %s is rejected."
 msgstr "Cancelar a eliminación de %F"
 
 #: src/gtk/resolver.cc:394
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keeping %s at version %s is rejected."
 msgstr "Conservar %F na versión %s (%s)"
 
 #: src/gtk/resolver.cc:401
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Installing %s version %s is rejected."
 msgstr "Instalar(%s fornece %s)"
 
 #: src/gtk/resolver.cc:407
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrading %s to version %s is rejected."
 msgstr "  Versión de cwidget: %s\n"
 
 #: src/gtk/resolver.cc:413
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrading %s to version %s is rejected."
 msgstr "Versións de %s"
 
@@ -4992,7 +4788,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr "Versións de %s"
@@ -5090,7 +4885,6 @@
 
 #: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862
 #, fuzzy
-#| msgid "Remove the following packages:"
 msgid "Keep the following packages:"
 msgstr "Eliminar os seguintes paquetes:"
 
@@ -5106,121 +4900,101 @@
 
 #: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900
 #, fuzzy
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "Leave the following dependencies unresolved:"
 msgstr "Déixanse sen resolver as seguintes dependencias:%n"
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Remove %F [%s (%s)]"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "Eliminar %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1523
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "Instalar %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1531
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s"
 msgstr "Cancelar a instalación de %F"
 
 #: src/gtk/resolver.cc:1534
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s"
 msgstr "Cancelar a eliminación de %F"
 
 #: src/gtk/resolver.cc:1537
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "Conservar %F na versión %s (%s)"
 
 #: src/gtk/resolver.cc:1544
 #, fuzzy, c-format
-#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Actualizar %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1553
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Desactualizar %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>Remove</b> %s"
 msgstr "Eliminar(%s)"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>remove</b> %s"
 msgstr "Eliminar(%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "Conservar %F na versión %s (%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>keep</b> %s at version %s"
 msgstr "Conservar %F na versión %s (%s)"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr "Cancelar a instalación de %F"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>cancel</b> the installation of %s"
 msgstr "Cancelar a instalación de %F"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>Install</b> %s %s"
 msgstr "Instalar %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>install</b> %s %s"
 msgstr "Instalar %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>Downgrade</b> %s to version %s"
 msgstr "  Versión de cwidget: %s\n"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>downgrade</b> %s to version %s"
 msgstr "  Versión de cwidget: %s\n"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>Upgrade</b> %s to version %s"
 msgstr "Versións de %s"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>upgrade</b> %s to version %s"
 msgstr "Versións de %s"
 
@@ -5236,8 +5010,6 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "%d instalación"
@@ -5245,8 +5017,6 @@
 
 #: src/gtk/resolver.cc:1740
 #, fuzzy, c-format
-#| msgid "%d removal"
-#| msgid_plural "%d removals"
 msgid "%s remove"
 msgid_plural "%s removes"
 msgstr[0] "%d eliminación"
@@ -5254,8 +5024,6 @@
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "%d keep"
-#| msgid_plural "%d keeps"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "%d conservado"
@@ -5263,8 +5031,6 @@
 
 #: src/gtk/resolver.cc:1752
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%s upgrade"
 msgid_plural "%s upgrades"
 msgstr[0] "%d actualización"
@@ -5272,8 +5038,6 @@
 
 #: src/gtk/resolver.cc:1758
 #, fuzzy, c-format
-#| msgid "%d downgrade"
-#| msgid_plural "%d downgrades"
 msgid "%s downgrade"
 msgid_plural "%s downgrades"
 msgstr[0] "%d desactualización"
@@ -5281,7 +5045,6 @@
 
 #: src/gtk/resolver.cc:1764
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "%s unresolved recommendation"
 msgid_plural "%s unresolved recommendations"
 msgstr[0] "Auditar as ^recomendacións"
@@ -5289,19 +5052,16 @@
 
 #: src/gtk/resolver.cc:2056
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions yet."
 msgstr "Non hai máis solucións."
 
 #: src/gtk/resolver.cc:2063
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency solution was found."
 msgstr "Xestión de dependencias"
 
 #: src/gtk/resolver.cc:2064
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions."
 msgstr "Non hai máis solucións."
 
@@ -5311,19 +5071,16 @@
 
 #: src/gtk/resolver.cc:2076
 #, fuzzy, c-format
-#| msgid "No more solutions."
 msgid "%u solutions."
 msgstr "Non hai máis solucións."
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "Non se puido abrir o ficheiro \"%s\""
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr "[Descargado]"
 
@@ -5374,7 +5131,6 @@
 
 #: src/load_grouppolicy.cc:305
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected ',', '%c', or '('; got '%c'"
 msgstr "Esperábanse \",\" ou \"(\", recibiuse \"%c\""
 
@@ -5484,7 +5240,6 @@
 
 #: src/load_grouppolicy.cc:713
 #, fuzzy, c-format
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected '{', ')', or ',' following '||', got '%s'"
 msgstr "Esperábanse \",\" ou \")\" despois de \"||\", recibiuse \"%s\""
 
@@ -5611,19 +5366,16 @@
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt versión %d.%d.%d\n"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt versión %d.%d.%d\n"
 
 #: src/main.cc:164
 #, fuzzy, c-format
-#| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Soporte de ept desactivado.\n"
 
@@ -5671,46 +5423,38 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Instalar/actualizar paquetes\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Eliminar paquetes\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr ""
 " purge        - Eliminar paquetes e os seus ficheiros de configuración\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Reter paquetes\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Cancelar a retención dun paquete\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr ""
 " markauto     - Marcar paquetes coma se fosen instalados automaticamente\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Marcar paquetes coma se fose instalados manualmente\n"
 
@@ -5724,21 +5468,16 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Descargar as listas de paquetes novos/actualizables\n"
 
 #: src/main.cc:190
 #, fuzzy, c-format
-#| msgid " safe-upgrade - Perform a safe upgrade\n"
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Realizar unha actualización segura\n"
 
 #: src/main.cc:191
 #, fuzzy, c-format
-#| msgid ""
-#| " full-upgrade - Perform an upgrade, possibly installing and removing "
-#| "packages\n"
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
@@ -5748,57 +5487,46 @@
 
 #: src/main.cc:192
 #, fuzzy, c-format
-#| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "\"&BD\" para instalar as dependencias de compilación dun paquete."
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Esquecer que paquetes son \"novos\"\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Buscar un paquete por nome e/ou expresión\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Amosar información detallada sobre un paquete\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Borrar os ficheiros de paquetes descargados\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Borrar os ficheiros de paquetes descargados vellos\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Amosar o rexistro de cambios dun paquete\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Descargar o ficheiro .deb dun paquete\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5818,12 +5546,6 @@
 
 #: src/main.cc:203
 #, fuzzy, c-format
-#| msgid ""
-#| " why-not      - Show the manually installed packages that lead to a "
-#| "conflict\n"
-#| "                with the given package, or why one or more packages "
-#| "would\n"
-#| "                lead to a conflict with the given package if installed\n"
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
 "conflict\n"
@@ -5842,7 +5564,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             Este texto de axuda\n"
 
@@ -5871,15 +5592,11 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             Pedir sempre confirmación para as accións\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
@@ -5888,9 +5605,6 @@
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5900,9 +5614,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5911,8 +5622,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 ""
@@ -5943,9 +5652,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5954,8 +5660,6 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
@@ -5963,9 +5667,6 @@
 
 #: src/main.cc:226
 #, fuzzy, c-format
-#| msgid ""
-#| " -q             In command-line mode, suppress the incremental progress\n"
-#| "                indicators.\n"
 msgid ""
 " -q             In command-line mode, suppress the incremental progress.\n"
 "                indicators.\n"
@@ -5975,16 +5676,12 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o clave=valor  Establecer a opción de configuración chamada \"clave\"\n"
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -6022,7 +5719,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "true"
 msgid "trace"
 msgstr "verdadeiro"
 
@@ -6036,7 +5732,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "non"
 
@@ -6050,7 +5745,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:377
 #, fuzzy
-#| msgid "Err "
 msgid "error"
 msgstr "Err "
 
@@ -6058,7 +5752,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:380
 #, fuzzy
-#| msgid "false"
 msgid "fatal"
 msgstr "falso"
 
@@ -6079,7 +5772,6 @@
 
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "Operación %s non válida"
 
@@ -6132,7 +5824,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "Paquete"
 
@@ -6142,7 +5833,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "Tódolos paquetes"
 
@@ -6162,7 +5852,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -6170,8 +5859,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -6181,7 +5868,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "Non se poden indicar -u e -i cunha orde"
 
@@ -7429,7 +7115,6 @@
 
 #: src/ui.cc:472
 #, fuzzy, c-format
-#| msgid "Unable to open %ls"
 msgid "Unable to fork: %s"
 msgstr "Non se puido abrir %ls"
 
@@ -7705,9 +7390,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7729,9 +7411,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -8265,19 +7944,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "URL a empregar para descargar os rexistros de cambios"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "URL a empregar para descargar os rexistros de cambios"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "A descargar o rexistro de cambios"
 
Index: aptitude/po/hu.po
===================================================================
--- aptitude.orig/po/hu.po
+++ aptitude/po/hu.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: aptitude_po_hu\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2006-10-12 20:44+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian@lists.debian.org>\n"
@@ -646,13 +646,11 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "A(z) %s jelenleg nincs telepítve, így nem lesz újratelepítve.\n"
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "A(z) %s kívánt verziója (%s) már telepítve van.\n"
@@ -754,7 +752,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "%s változásnaplója"
 
@@ -915,7 +912,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "semelyik"
 
@@ -1326,7 +1322,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "'&M' csomag megjelölése automatikusan telepítettként"
 
@@ -1614,31 +1609,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "A következő ajánlások figyelmen kívül hagyása:"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "^Ajánlások vizsgálata"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "A(z) %s eltávolítása már nem szükséges"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "^Ajánlások vizsgálata"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Műveletek"
 
@@ -1704,7 +1694,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:790
 #, fuzzy, c-format
-#| msgid "open: %d; closed: %d; defer: %d; conflict: %d"
 msgid "open: %zd; closed: %zd; defer: %zd; conflict: %zd"
 msgstr "nyitott: %d; lezárt %d; elhalasztott: %d; ütközés: %d"
 
@@ -1823,13 +1812,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "de nem telepíthető"
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "de a(z) %s-t telepítve lesz."
 
@@ -1928,13 +1915,11 @@
 
 #: src/cmdline/cmdline_show.cc:326
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s%s; will be installed"
 msgstr "%s; telepítve lesz"
 
 #: src/cmdline/cmdline_show.cc:328
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s%s; will be installed automatically"
 msgstr "%s; automatikusan telepítve lesz"
 
@@ -2197,19 +2182,16 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "Csomagok"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Forráscsomag: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Archívum"
 
@@ -2253,7 +2235,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "keresés: Legalább egy keresési feltételt meg kell adni\n"
 
@@ -2381,7 +2362,6 @@
 
 #: src/cmdline/cmdline_why.cc:1285
 #, fuzzy, c-format
-#| msgid "Packages depending on %s"
 msgid "Packages requiring %s:"
 msgstr "%s-függő csomagok"
 
@@ -2415,7 +2395,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[HIBA]"
 
@@ -2764,7 +2743,6 @@
 
 #: src/generic/apt/download_update_manager.cc:138
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated quoted string in command: %s"
 msgstr "Befejezetlen karakterlánc %s után"
 
@@ -2845,7 +2823,6 @@
 
 #: src/generic/apt/dump_packages.cc:674
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create truncated cache: %s."
 msgstr "Nem találom a(z) %s csomagot"
 
@@ -2967,7 +2944,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "Csomagok letöltése"
 
@@ -3040,7 +3016,6 @@
 
 #: src/generic/apt/matching/parse.cc:1388
 #, fuzzy, c-format
-#| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "Rosszul formázott kifejezés"
 
@@ -3080,19 +3055,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "URL a módosításnaplók letöltéséhez"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "URL a módosításnaplók letöltéséhez"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "%s változásnaplója"
 
@@ -3137,7 +3109,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Nem tudom elemezni a(z) %s mintát"
 
@@ -3152,14 +3123,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "Nincs telepítve"
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "Nincs telepítve"
 
@@ -3196,13 +3165,11 @@
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "-q= után számot kell megadni, nem ezt: %s\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "Rossz műveleti karakter: '%c'\n"
 
@@ -3218,7 +3185,6 @@
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "Csoportosítási elv azonosítót várok e helyett: '%c'"
 
@@ -3229,13 +3195,11 @@
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "Csoportosítási elv azonosítót várok e helyett: '%c'"
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "Érvénytelen művelet: %s"
 
@@ -3254,19 +3218,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "Váratlan ')'"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " vagy"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "Váratlan ')'"
 
@@ -3277,7 +3238,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "Az átmeneti könyvtár létrehozása meghiúsult e sablonból: \"%s\": %s"
 
@@ -3374,13 +3334,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "Csomag"
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "Nézetek"
 
@@ -3400,7 +3358,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "Súgó"
 
@@ -3411,7 +3368,6 @@
 
 #: src/gtk/aptitude.glade:345 src/gtk/aptitude.glade:2614
 #, fuzzy
-#| msgid "List Update"
 msgid "Update"
 msgstr "Lista frissítés"
 
@@ -3433,7 +3389,6 @@
 
 #: src/gtk/aptitude.glade:389 src/gtk/aptitude.glade:2658
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Remove"
 msgstr "Telepített"
 
@@ -3447,33 +3402,28 @@
 
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "Leszedi a csomaglista szűrőjét"
 
 #: src/gtk/aptitude.glade:649
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "Apply these settings to all active package lists."
 msgstr "Szűrőt alkalmaz a csomaglistára"
 
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "Keresés"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "újratelepítés"
 
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "Hib "
 
@@ -3488,13 +3438,11 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "%s függőségei"
 
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "^Changelog"
 msgid "Changelog"
 msgstr "^Munkanapló"
 
@@ -3513,7 +3461,6 @@
 
 #: src/gtk/aptitude.glade:1051
 #, fuzzy
-#| msgid "Tags"
 msgid "tags"
 msgstr "Tag-ek"
 
@@ -3536,13 +3483,11 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "Állapot"
 
 #: src/gtk/aptitude.glade:1247
 #, fuzzy
-#| msgid "Unknown action type: %s"
 msgid "Group by action type"
 msgstr "Ismeretlen művelettípus: %s"
 
@@ -3571,7 +3516,6 @@
 
 #: src/gtk/aptitude.glade:1328
 #, fuzzy
-#| msgid "Toggle ^Rejected"
 msgid "Rejected"
 msgstr "El^dobás"
 
@@ -3590,32 +3534,27 @@
 
 #: src/gtk/aptitude.glade:1400
 #, fuzzy
-#| msgid "^Examine Solution"
 msgid "Find a new solution"
 msgstr "Megoldás vizs^gálata"
 
 #: src/gtk/aptitude.glade:1404
 #, fuzzy
-#| msgid "Select the next solution to the dependency problems."
 msgid "Calculate the next solution that has not yet been generated."
 msgstr "Következő megoldás kijelölése a függőségi problémához"
 
 #: src/gtk/aptitude.glade:1419
 #, fuzzy
-#| msgid "Perform the actions contained in the currently selected solution."
 msgid ""
 "Perform the actions in the currently selected solution and close this tab."
 msgstr "A jelen megoldás műveleteinek végrehajtása"
 
 #: src/gtk/aptitude.glade:1576
 #, fuzzy
-#| msgid "Upgrade"
 msgid "Upgrade Summary"
 msgstr "Frissít"
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "Forráscsomag: "
 
@@ -3627,7 +3566,6 @@
 
 #: src/gtk/aptitude.glade:1652
 #, fuzzy
-#| msgid "Manual"
 msgid "Fix Manually"
 msgstr "Kézikönyv"
 
@@ -3675,31 +3613,26 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "Törött"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "Nem sikerült a nem elérhető csomagokhoz  javítást találni"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "^Keresés"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for: "
 msgid "Search for packages."
 msgstr "Keresés: "
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "Megvan "
 
@@ -3734,19 +3667,16 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "URL a módosításnaplók letöltéséhez"
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "A(z) %s %s (%s) verzió telepítése szükséges"
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -3754,20 +3684,17 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr "Csak a hivatalos Debian csomagok munkanaplói olvashatók."
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "Munkanapló letöltése"
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "URL a módosításnaplók letöltéséhez"
 
@@ -3781,7 +3708,6 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "URL a módosításnaplók letöltéséhez"
 
@@ -3791,8 +3717,6 @@
 
 #: src/gtk/dashboardtab.cc:414
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] "%d frissítés"
@@ -3800,13 +3724,11 @@
 
 #: src/gtk/dashboardtab.cc:633
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No upgrades are available."
 msgstr "Nincs telepítve"
 
 #: src/gtk/dashboardtab.cc:645
 #, fuzzy
-#| msgid "Unable to locate package %s"
 msgid "Unable to calculate an upgrade."
 msgstr "Nem találom a(z) %s csomagot"
 
@@ -3841,7 +3763,6 @@
 
 #: src/gtk/dashboardtab.cc:708
 #, fuzzy, c-format
-#| msgid "Internal error: Default column string is unparsable"
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr "Belső hiba: az alap oszlopszöveg nem elemezhető"
 
@@ -3880,7 +3801,6 @@
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "Letöltött fájlok törlése"
 
@@ -3891,13 +3811,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "Összesen: "
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description"
 msgid "Short Description"
 msgstr "Leírás"
 
@@ -3907,13 +3825,11 @@
 
 #: src/gtk/download.cc:319
 #, fuzzy
-#| msgid "Cleaning while a download is in progress is not allowed"
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr "Tisztítás letöltés alatt nem lehetséges"
 
 #: src/gtk/download.cc:395 src/gtk/gui.cc:832
 #, fuzzy
-#| msgid "View next display"
 msgid "View Details"
 msgstr "A következő nézet megtekintése"
 
@@ -3933,19 +3849,16 @@
 
 #: src/gtk/download.cc:486
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s: %lu/%lu, stalled"
 msgstr "%s; telepítve lesz"
 
 #: src/gtk/download.cc:507
 #, fuzzy, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr " [ %i%% ] (%sB/s, %s van hátra)"
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "de a(z) %s-t telepítve lesz."
 
@@ -3959,7 +3872,6 @@
 
 #: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "Nem találom a(z) %s csomagot"
 
@@ -3970,7 +3882,6 @@
 
 #: src/gtk/dpkg_terminal.cc:429
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "%s: Unable to accept a connection: %s"
 msgstr "Az átmeneti könyvtár létrehozása meghiúsult e sablonból: \"%s\": %s"
 
@@ -3996,7 +3907,6 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "%s verziói"
 
@@ -4012,50 +3922,42 @@
 
 #: src/gtk/entitysummary.cc:142
 #, fuzzy, c-format
-#| msgid "Keep the following packages at their current version:"
 msgid "Don't hold %s at its current version."
 msgstr "Az alábbi csomagok jelenlegi verzión tartása:"
 
 #: src/gtk/entitysummary.cc:145 src/gtk/entitysummary.cc:165
 #: src/gtk/entitysummary.cc:168
 #, fuzzy, c-format
-#| msgid "Canc^el pending actions"
 msgid "Cancel any actions on %s."
 msgstr "Függő műveletek törlés^e"
 
 #: src/gtk/entitysummary.cc:150
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the purge of %s."
 msgstr "A(z) %F törlésének lemondása"
 
 #: src/gtk/entitysummary.cc:152
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s."
 msgstr "A(z) %F törlésének lemondása"
 
 #: src/gtk/entitysummary.cc:157
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the upgrade of %s."
 msgstr "A(z) %F törlésének lemondása"
 
 #: src/gtk/entitysummary.cc:159
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s."
 msgstr "A(z) %F telepítésének lemondása"
 
 #: src/gtk/entitysummary.cc:161
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the downgrade of %s."
 msgstr "A(z) %F törlésének lemondása"
 
 #: src/gtk/entitysummary.cc:163
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the reinstallation of %s."
 msgstr "A(z) %F telepítésének lemondása"
 
@@ -4066,7 +3968,6 @@
 
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "Tör^lés"
 
@@ -4077,7 +3978,6 @@
 
 #: src/gtk/entitysummary.cc:223
 #, fuzzy, c-format
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Mark %s as automatically installed."
 msgstr "'&M' csomag megjelölése automatikusan telepítettként"
 
@@ -4088,7 +3988,6 @@
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
 msgid "%s is a virtual package provided by:\n"
 msgstr "A(z) \"%s\" virtuális csomag, amit biztosít:\n"
 
@@ -4098,13 +3997,11 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "Forráscsomag: "
 
 #: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 #, fuzzy
-#| msgid "ProgName"
 msgid "Name"
 msgstr "ProgNév"
 
@@ -4114,13 +4011,11 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "Nem sikerült megnyitni a(z) \"%s\"-t"
 
 #: src/gtk/entityview.cc:412
 #, fuzzy, c-format
-#| msgid "Rejecting the removal of %s"
 msgid "Editing the columns of \"%s\""
 msgstr "A(z) %s eltávolításának elutasítása"
 
@@ -4134,25 +4029,21 @@
 
 #: src/gtk/entityview.cc:570
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Whether the package is automatically installed."
 msgstr "'&M' csomag megjelölése automatikusan telepítettként"
 
 #: src/gtk/entityview.cc:576
 #, fuzzy
-#| msgid "Cancel any action on the selected package"
 msgid "The name and description of the package."
 msgstr "Minden művelet visszavonása erre a csomagra"
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "Verzió: "
 
 #: src/gtk/entityview.cc:592
 #, fuzzy
-#| msgid "Check for new versions of packages"
 msgid "The version number of the package."
 msgstr "Csomagok új verzióinak keresése"
 
@@ -4173,7 +4064,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "nincs telepítve"
 
@@ -4183,25 +4073,21 @@
 
 #: src/gtk/gui.cc:82
 #, fuzzy
-#| msgid "unpacked"
 msgid "Unpacked"
 msgstr "kicsomagolva"
 
 #: src/gtk/gui.cc:83
 #, fuzzy
-#| msgid "half-config"
 msgid "Half-configured"
 msgstr "félkész beállítás"
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "half-install"
 msgid "Half-installed"
 msgstr "félkész telepítés"
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "nincs telepítve (a beállítófájlok megmaradtak)"
 
@@ -4235,7 +4121,6 @@
 
 #: src/gtk/gui.cc:97
 #, fuzzy
-#| msgid "forbidden upgrade"
 msgid "Hold (don't upgrade)"
 msgstr "tiltott frissítés"
 
@@ -4254,7 +4139,6 @@
 
 #: src/gtk/gui.cc:290
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "Szűrőt alkalmaz a csomaglistára"
 
@@ -4269,13 +4153,11 @@
 
 #: src/gtk/gui.cc:359
 #, fuzzy, c-format
-#| msgid "List Update"
 msgid "Update %s?"
 msgstr "Lista frissítés"
 
 #: src/gtk/gui.cc:385
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
@@ -4303,31 +4185,26 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "%s changes"
 msgid "Done applying changes!"
 msgstr "%s változás"
 
 #: src/gtk/gui.cc:823
 #, fuzzy
-#| msgid "%s changes"
 msgid "Applying changes..."
 msgstr "%s változás"
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "[%s] %s\n"
 msgid "%s: %s"
 msgstr "[%s] %s\n"
 
 #: src/gtk/gui.cc:878
 #, fuzzy, c-format
-#| msgid "No broken packages."
 msgid "Error in package %s"
 msgstr "Nincsenek törött csomagok."
 
 #: src/gtk/gui.cc:906
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Nem sikerült a(z) %s-t az új beállítófájllal helyettesíteni"
 
@@ -4337,25 +4214,21 @@
 
 #: src/gtk/gui.cc:1038
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "Nincsenek törött csomagok."
 
 #: src/gtk/gui.cc:1071
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "Nincsenek törött csomagok."
 
 #: src/gtk/gui.cc:1075
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "Függőségek feloldása"
 
 #: src/gtk/gui.cc:1103
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Nincs törött csomag."
@@ -4363,13 +4236,11 @@
 
 #: src/gtk/gui.cc:1147
 #, fuzzy
-#| msgid "%s changes"
 msgid "View changes"
 msgstr "%s változás"
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "%s changes"
 msgid "Apply changes"
 msgstr "%s változás"
 
@@ -4378,8 +4249,6 @@
 #. font.
 #: src/gtk/gui.cc:1192
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%d package to install"
 msgid_plural "%d packages to install"
 msgstr[0] "%d telepítés"
@@ -4390,7 +4259,6 @@
 #. font.
 #: src/gtk/gui.cc:1207
 #, fuzzy, c-format
-#| msgid "failed to remove %s"
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "nem siketült eltávolítani a(z) %s-t"
@@ -4398,7 +4266,6 @@
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "LetöltésiMéret"
 
@@ -4413,19 +4280,16 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "not installed"
 msgid "Not implemented"
 msgstr "nincs telepítve"
 
 #: src/gtk/gui.cc:1408 src/gtk/gui.cc:1427
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "Telepített"
 
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "Tör^lés"
 
@@ -4443,7 +4307,6 @@
 
 #: src/gtk/gui.cc:1455
 #, fuzzy
-#| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "Felhasználói kézikönyv"
 
@@ -4466,7 +4329,6 @@
 
 #: src/gtk/info.cc:496
 #, fuzzy
-#| msgid "Not Installed"
 msgid "Not available"
 msgstr "Nincs telepítve"
 
@@ -4476,7 +4338,6 @@
 
 #: src/gtk/info.cc:555
 #, fuzzy
-#| msgid "Packages which depend on %s"
 msgid "Package information: dependency list"
 msgstr "%s-függő csomagok"
 
@@ -4486,7 +4347,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "nem"
 
@@ -4500,7 +4360,6 @@
 
 #: src/gtk/packagestab.cc:203
 #, fuzzy, c-format
-#| msgid "No packages matched the pattern \"%ls\"."
 msgid "No packages matched \"%s\"."
 msgstr "Nincs \"%ls\" mintára illeszkedő csomag."
 
@@ -4510,31 +4369,26 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "Csomag: "
 
 #: src/gtk/pkgview.cc:224
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed automatically."
 msgstr "%s; automatikusan telepítve lesz"
 
 #: src/gtk/pkgview.cc:227
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed automatically."
 msgstr "%s; automatikusan telepítve lesz"
 
 #: src/gtk/pkgview.cc:235
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed manually."
 msgstr "%s; automatikusan telepítve lesz"
 
 #: src/gtk/pkgview.cc:238
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed manually."
 msgstr "%s; automatikusan telepítve lesz"
 
@@ -4544,13 +4398,11 @@
 
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "Keresés"
 
 #: src/gtk/pkgview.cc:718
 #, fuzzy
-#| msgid "Building view"
 msgid "Finalizing view"
 msgstr "Nézet készítése"
 
@@ -4683,13 +4535,11 @@
 
 #: src/gtk/previewtab.cc:179
 #, fuzzy
-#| msgid "Preview"
 msgid "Preview: "
 msgstr "Előnézet"
 
 #: src/gtk/resolver.cc:68
 #, fuzzy, c-format
-#| msgid "Error while dumping resolver state"
 msgid "Error in dependency resolver: %s"
 msgstr "Hiba az ütközésfeloldó állapotának mentése közben"
 
@@ -4704,7 +4554,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package"
 msgid "Virtual package"
 msgstr "Csomag"
 
@@ -4714,25 +4563,21 @@
 
 #: src/gtk/resolver.cc:377
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Removing %s is rejected."
 msgstr "%s eltávolítása"
 
 #: src/gtk/resolver.cc:382
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Canceling the installation of %s is rejected."
 msgstr "A(z) %F telepítésének lemondása"
 
 #: src/gtk/resolver.cc:391
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Canceling the removal of %s is rejected."
 msgstr "A(z) %F törlésének lemondása"
 
 #: src/gtk/resolver.cc:394
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keeping %s at version %s is rejected."
 msgstr "A(z) %F %s (%s) verzión tartása"
 
@@ -4748,7 +4593,6 @@
 
 #: src/gtk/resolver.cc:413
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrading %s to version %s is rejected."
 msgstr "%s verziói"
 
@@ -4790,7 +4634,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr "%s verziói"
@@ -4888,7 +4731,6 @@
 
 #: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862
 #, fuzzy
-#| msgid "Remove the following packages:"
 msgid "Keep the following packages:"
 msgstr "Az alábbi csomagok eltávolítása:"
 
@@ -4904,49 +4746,41 @@
 
 #: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900
 #, fuzzy
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "Leave the following dependencies unresolved:"
 msgstr "Az alábbi függőségek feloldatlanul hagyása:%n"
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Remove %F [%s (%s)]"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "Eltávolítás: %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1523
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "Telepítés: %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1531
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s"
 msgstr "A(z) %F telepítésének lemondása"
 
 #: src/gtk/resolver.cc:1534
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s"
 msgstr "A(z) %F törlésének lemondása"
 
 #: src/gtk/resolver.cc:1537
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "A(z) %F %s (%s) verzión tartása"
 
 #: src/gtk/resolver.cc:1544
 #, fuzzy, c-format
-#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "A(z) %F frissítése [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1553
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "A(z) %F visszafejlesztése [%s (%s) -> %s (%s)]"
 
@@ -4962,37 +4796,31 @@
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "A(z) %F %s (%s) verzión tartása"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>keep</b> %s at version %s"
 msgstr "A(z) %F %s (%s) verzión tartása"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr "A(z) %F telepítésének lemondása"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>cancel</b> the installation of %s"
 msgstr "A(z) %F telepítésének lemondása"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>Install</b> %s %s"
 msgstr "Telepítés: %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>install</b> %s %s"
 msgstr "Telepítés: %F [%s (%s)]"
 
@@ -5008,13 +4836,11 @@
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>Upgrade</b> %s to version %s"
 msgstr "%s verziói"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>upgrade</b> %s to version %s"
 msgstr "%s verziói"
 
@@ -5030,8 +4856,6 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "%d telepítés"
@@ -5039,8 +4863,6 @@
 
 #: src/gtk/resolver.cc:1740
 #, fuzzy, c-format
-#| msgid "%d removal"
-#| msgid_plural "%d removals"
 msgid "%s remove"
 msgid_plural "%s removes"
 msgstr[0] "%d eltávolítás"
@@ -5048,8 +4870,6 @@
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "%d keep"
-#| msgid_plural "%d keeps"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "%d visszatartás"
@@ -5057,8 +4877,6 @@
 
 #: src/gtk/resolver.cc:1752
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%s upgrade"
 msgid_plural "%s upgrades"
 msgstr[0] "%d frissítés"
@@ -5066,8 +4884,6 @@
 
 #: src/gtk/resolver.cc:1758
 #, fuzzy, c-format
-#| msgid "%d downgrade"
-#| msgid_plural "%d downgrades"
 msgid "%s downgrade"
 msgid_plural "%s downgrades"
 msgstr[0] "%d visszatérés régebbi verzióra"
@@ -5075,7 +4891,6 @@
 
 #: src/gtk/resolver.cc:1764
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "%s unresolved recommendation"
 msgid_plural "%s unresolved recommendations"
 msgstr[0] "^Ajánlások vizsgálata"
@@ -5083,7 +4898,6 @@
 
 #: src/gtk/resolver.cc:2056
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions yet."
 msgstr "Nincs több megoldás"
 
@@ -5094,7 +4908,6 @@
 
 #: src/gtk/resolver.cc:2064
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions."
 msgstr "Nincs több megoldás"
 
@@ -5104,19 +4917,16 @@
 
 #: src/gtk/resolver.cc:2076
 #, fuzzy, c-format
-#| msgid "No more solutions."
 msgid "%u solutions."
 msgstr "Nincs több megoldás"
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "Nem sikerült megnyitni a(z) \"%s\"-t"
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr "[Letöltve]"
 
@@ -5168,7 +4978,6 @@
 
 #: src/load_grouppolicy.cc:305
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected ',', '%c', or '('; got '%c'"
 msgstr "'%c' helyett ',' vagy '(' kellene"
 
@@ -5461,19 +5270,16 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Csomagok telepítése/frissítése\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Csomagok eltávolítása\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr ""
 " purge        - Csomagok eltávolítása a hozzájuk tartozó beállítófájlokkal "
@@ -5481,26 +5287,21 @@
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Csomagok jelenlegi állapotban tartása\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Visszafogás parancs törlése egy csomagra\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Csomagok megjelölése automatikusan telepítettként\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Csomagok megjelölése manuálisan telepítettként\n"
 
@@ -5513,7 +5314,6 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Az új/frissíthető csomagok listájának letöltése\n"
 
@@ -5538,51 +5338,41 @@
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Elfelejti, hogy mely csomagok  \"újak\"\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Csomag keresése név és/vagy kifejezés alapján\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Részletes információ megjelenítése a csomagokról\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - A letöltött csomagfájlok törlése\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - A régi letöltött csomagfájlok törlése\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Csomag változásnaplójának megjelenítése\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Csomag .deb fájljának letöltése\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5618,7 +5408,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             Ez a súgó\n"
 
@@ -5648,15 +5437,11 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             Mindig kér megerősítést vagy művelet megadását\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
@@ -5665,9 +5450,6 @@
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5677,9 +5459,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5689,8 +5468,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 ""
@@ -5724,9 +5501,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5736,8 +5510,6 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
@@ -5753,16 +5525,12 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o kulcs=érték     A 'kulcs' nevű beállítási opció 'érték'-re állítása\n"
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -5801,7 +5569,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "replaces"
 msgid "trace"
 msgstr "helyettesíti ezt:"
 
@@ -5815,7 +5582,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "nem"
 
@@ -5829,7 +5595,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:377
 #, fuzzy
-#| msgid "Err "
 msgid "error"
 msgstr "Hib "
 
@@ -5857,7 +5622,6 @@
 
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "Érvénytelen művelet: %s"
 
@@ -5910,7 +5674,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "Csomag"
 
@@ -5920,7 +5683,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "Minden csomag"
 
@@ -5940,7 +5702,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -5948,8 +5709,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -5957,7 +5716,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "A -u és a -i nem adható meg parancs mellett"
 
@@ -7200,7 +6958,6 @@
 
 #: src/ui.cc:472
 #, fuzzy, c-format
-#| msgid "Unable to open %ls"
 msgid "Unable to fork: %s"
 msgstr "Nem sikerült megnyitni: %ls"
 
@@ -7480,9 +7237,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7505,9 +7259,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -8042,19 +7793,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "URL a módosításnaplók letöltéséhez"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "URL a módosításnaplók letöltéséhez"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "Munkanapló letöltése"
 
Index: aptitude/po/it.po
===================================================================
--- aptitude.orig/po/it.po
+++ aptitude/po/it.po
@@ -43,7 +43,7 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.4.11.10\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2009-02-23 15:46+0100\n"
 "Last-Translator: Danilo Piazzalunga <danilopiazza@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -304,9 +304,6 @@
 
 #: src/apt_options.cc:241
 #, fuzzy
-#| msgid ""
-#| "If this option is enabled, the menu bar will only appear when it has been "
-#| "activated by pressing the menu key."
 msgid ""
 "If this option is enabled, then the first view displayed on startup will be "
 "a flat view instead of the default view."
@@ -744,7 +741,6 @@
 
 #: src/cmdline/cmdline_action.cc:212
 #, fuzzy, c-format
-#| msgid "Unable to satisfy the build-depends: %s."
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Impossibile soddisfare le dipendenze «Build-Depends»: %s"
 
@@ -801,13 +797,11 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s non è attualmente installato e non verrà quindi reinstallato.\n"
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "%s è già installato e si trova alla versione richiesta (%s)\n"
@@ -911,7 +905,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "ChangeLog di %s"
 
@@ -1078,7 +1071,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "nessuna"
 
@@ -1487,7 +1479,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "\"&M\" per segnare i pacchetti come installati automaticamente"
 
@@ -1620,9 +1611,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy, c-format
-#| msgid ""
-#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: "
-#| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
@@ -1669,10 +1657,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:259
 #, fuzzy
-#| msgid ""
-#| "reject the given package versions; don't display any solutions in which "
-#| "they occur.  Enter UNINST instead of a version to reject removing the "
-#| "package."
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package.  "
@@ -1684,9 +1668,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:261
 #, fuzzy
-#| msgid ""
-#| "accept the given package versions; display only solutions in which they "
-#| "occur.  Enter UNINST instead of a version to accept removing the package."
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package.  "
@@ -1791,31 +1772,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "Lasciare le seguenti dipendenze non soddisfatte:"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "Controlla ^Raccomandati"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "Non è più richiesta la rimozione di %s"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "Controlla ^Raccomandati"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Azioni"
 
@@ -1972,7 +1948,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:1201
 #, fuzzy
-#| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Impossibile risolvere le dipendenze per l'aggiornamento (nessuna soluzione "
@@ -1980,7 +1955,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:1207
 #, fuzzy, c-format
-#| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Impossibile risolvere le dipendenze per l'aggiornamento (%s)."
 
@@ -2011,13 +1985,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "ma non è installabile"
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "ma %s sta per essere installato."
 
@@ -2116,13 +2088,11 @@
 
 #: src/cmdline/cmdline_show.cc:326
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s%s; will be installed"
 msgstr "%s; verrà installato."
 
 #: src/cmdline/cmdline_show.cc:328
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s%s; will be installed automatically"
 msgstr "%s; verrà installato automaticamente"
 
@@ -2390,25 +2360,21 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Package: "
 msgid "Package %s:"
 msgstr "Pacchetto: "
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Pacchetto sorgente: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Archivio"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\".\n"
 msgid "No such package \"%s\"."
 msgstr "Il pacchetto «%s» è inesistente.\n"
 
@@ -2447,7 +2413,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "search: si deve specificare almeno un'espressione di ricerca\n"
 
@@ -2571,7 +2536,6 @@
 
 #: src/cmdline/cmdline_why.cc:1285
 #, fuzzy, c-format
-#| msgid "Packages depending on %s"
 msgid "Packages requiring %s:"
 msgstr "Pacchetti che dipendono da %s"
 
@@ -2587,8 +2551,6 @@
 
 #: src/cmdline/cmdline_why.cc:1416
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: this command requires at least one argument (the package to query)."
 msgid ""
 "%s: this command requires at least one argument (the package to query).\n"
 msgstr ""
@@ -2607,7 +2569,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[ERRORE]"
 
@@ -2967,7 +2928,6 @@
 
 #: src/generic/apt/download_update_manager.cc:138
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated quoted string in command: %s"
 msgstr "Costante stringa non terminata dopo %s"
 
@@ -3054,7 +3014,6 @@
 
 #: src/generic/apt/dump_packages.cc:674
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create truncated cache: %s."
 msgstr "Impossibile trovare il pacchetto %s"
 
@@ -3176,7 +3135,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "Scaricamento dei pacchetti"
 
@@ -3214,7 +3172,6 @@
 
 #: src/generic/apt/matching/parse.cc:860
 #, fuzzy, c-format
-#| msgid "Unknown matcher type: \"%s\"."
 msgid "Unknown term type: \"%s\"."
 msgstr "Tipo di matcher «%s» sconosciuto."
 
@@ -3222,9 +3179,6 @@
 #. Leave the question marks attached to the string placeholders.
 #: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883
 #, fuzzy, c-format
-#| msgid ""
-#| "The ?%s matcher must be used in a \"wide\" context (a top-level context, "
-#| "or a context enclosed by ?%s)."
 msgid ""
 "The ?%s term must be used in a \"wide\" context (a top-level context, or a "
 "context enclosed by ?%s)."
@@ -3255,7 +3209,6 @@
 
 #: src/generic/apt/matching/parse.cc:1388
 #, fuzzy, c-format
-#| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "Espressione non corretta"
 
@@ -3296,19 +3249,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "URL da usare per scaricare i changelog"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "URL da usare per scaricare i changelog"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "ChangeLog di %s"
 
@@ -3355,7 +3305,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Impossibile analizzare il modello %s"
 
@@ -3371,14 +3320,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "No packages are broken."
 msgid "No tag descriptions are available."
 msgstr "Nessun pacchetto difettoso."
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "No description available for %s."
 msgstr "Nessun pacchetto difettoso."
 
@@ -3405,67 +3352,56 @@
 
 #: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got EOF."
 msgstr "È richiesto «%c», non «%c»."
 
 #: src/generic/util/parsers.h:737
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got '%s'."
 msgstr "È richiesto «%c», non «%c»."
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "-q= richiede un argomento numerico, non «%s»\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "Il carattere «%c» non descrive un'azione ammessa\n"
 
 #: src/generic/util/parsers.h:832
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got EOF."
 msgstr "È richiesto «%c», non «%c»."
 
 #: src/generic/util/parsers.h:843
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got '%c'."
 msgstr "È richiesto «%c», non «%c»."
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "È richiesto l'identificativo di un criterio, non «%c»"
 
 #: src/generic/util/parsers.h:1026
 #, fuzzy
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected an integer following '-', got EOF."
 msgstr "Richiesti «,» oppure «)» dopo «||», non «%s»"
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "È richiesto l'identificativo di un criterio, non «%c»"
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "Operazione «%s» non ammessa"
 
 #: src/generic/util/parsers.h:1077
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected EOF, got '%c'."
 msgstr "È richiesto «%c», non «%c»."
 
@@ -3479,19 +3415,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "\")\" non prevista"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " o "
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "\")\" non prevista"
 
@@ -3502,7 +3435,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "Impossibile creare la directory temporanea dal modello «%s»: %s"
 
@@ -3537,7 +3469,6 @@
 
 #: src/gtk/aptitude.glade:19 src/gtk/aptitude.glade:2273
 #, fuzzy
-#| msgid "False"
 msgid "_File"
 msgstr "Falso"
 
@@ -3603,13 +3534,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "Pacchetto"
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "Viste"
 
@@ -3629,7 +3558,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "Aiuto"
 
@@ -3640,7 +3568,6 @@
 
 #: src/gtk/aptitude.glade:345 src/gtk/aptitude.glade:2614
 #, fuzzy
-#| msgid "List Update"
 msgid "Update"
 msgstr "Aggiornamento elenco"
 
@@ -3662,7 +3589,6 @@
 
 #: src/gtk/aptitude.glade:389 src/gtk/aptitude.glade:2658
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Remove"
 msgstr "Installato"
 
@@ -3676,33 +3602,28 @@
 
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "Rimuove il filtro dall'elenco dei pacchetti"
 
 #: src/gtk/aptitude.glade:649
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "Apply these settings to all active package lists."
 msgstr "Applica un filtro all'elenco dei pacchetti"
 
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "Cerca"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "reinstalla"
 
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "Err "
 
@@ -3717,19 +3638,16 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "Dipendenze di %s"
 
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "^Changelog"
 msgid "Changelog"
 msgstr "^Changelog"
 
 #: src/gtk/aptitude.glade:1020
 #, fuzzy
-#| msgid "False"
 msgid "Files"
 msgstr "Falso"
 
@@ -3744,7 +3662,6 @@
 # NdT: Tag/etichette di Debtags
 #: src/gtk/aptitude.glade:1051
 #, fuzzy
-#| msgid "Tags"
 msgid "tags"
 msgstr "Etichette"
 
@@ -3767,13 +3684,11 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "Stato"
 
 #: src/gtk/aptitude.glade:1247
 #, fuzzy
-#| msgid "Unknown action type: %s"
 msgid "Group by action type"
 msgstr "Azione «%s» sconosciuta"
 
@@ -3802,13 +3717,11 @@
 
 #: src/gtk/aptitude.glade:1328
 #, fuzzy
-#| msgid "Toggle ^Rejected"
 msgid "Rejected"
 msgstr "^Rifiuta/autorizza"
 
 #: src/gtk/aptitude.glade:1343
 #, fuzzy
-#| msgid "Preferences"
 msgid "No preference"
 msgstr "Preferenze"
 
@@ -3822,32 +3735,27 @@
 
 #: src/gtk/aptitude.glade:1400
 #, fuzzy
-#| msgid "^Examine Solution"
 msgid "Find a new solution"
 msgstr "^Esamina soluzione"
 
 #: src/gtk/aptitude.glade:1404
 #, fuzzy
-#| msgid "Select the next solution to the dependency problems."
 msgid "Calculate the next solution that has not yet been generated."
 msgstr "Seleziona la soluzione successiva per le dipendenze non soddisfatte."
 
 #: src/gtk/aptitude.glade:1419
 #, fuzzy
-#| msgid "Perform the actions contained in the currently selected solution."
 msgid ""
 "Perform the actions in the currently selected solution and close this tab."
 msgstr "Esegue le azioni contenute nella soluzione proposta."
 
 #: src/gtk/aptitude.glade:1576
 #, fuzzy
-#| msgid "Upgrade"
 msgid "Upgrade Summary"
 msgstr "Aggiornare"
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "Pacchetto sorgente: "
 
@@ -3859,7 +3767,6 @@
 
 #: src/gtk/aptitude.glade:1652
 #, fuzzy
-#| msgid "Manual"
 msgid "Fix Manually"
 msgstr "Manuale"
 
@@ -3907,25 +3814,21 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "Difettoso"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "Impossibile correggere a causa di pacchetti non disponibili"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "^Trova"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for: "
 msgid "Search for packages."
 msgstr "Cerca: "
 
@@ -3963,19 +3866,16 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "URL da usare per scaricare i changelog"
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "Richiesta l'installazione di %s, versione %s (%s)"
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -3983,20 +3883,17 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr "È possibile vedere i changelog solo dei pacchetti Debian ufficiali."
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "Scaricamento del changelog"
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "URL da usare per scaricare i changelog"
 
@@ -4010,7 +3907,6 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "URL da usare per scaricare i changelog"
 
@@ -4020,8 +3916,6 @@
 
 #: src/gtk/dashboardtab.cc:414
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] "%d da aggiornare"
@@ -4029,13 +3923,11 @@
 
 #: src/gtk/dashboardtab.cc:633
 #, fuzzy
-#| msgid "No packages are broken."
 msgid "No upgrades are available."
 msgstr "Nessun pacchetto difettoso."
 
 #: src/gtk/dashboardtab.cc:645
 #, fuzzy
-#| msgid "Unable to locate package %s"
 msgid "Unable to calculate an upgrade."
 msgstr "Impossibile trovare il pacchetto %s"
 
@@ -4070,7 +3962,6 @@
 
 #: src/gtk/dashboardtab.cc:708
 #, fuzzy, c-format
-#| msgid "Internal error: Default column string is unparsable"
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr ""
 "Errore interno: impossibile leggere la stringa delle colonne predefinite"
@@ -4081,7 +3972,6 @@
 
 #: src/gtk/dependency_chains_tab.cc:82
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: end"
 msgstr "Gestione delle dipendenze"
 
@@ -4095,7 +3985,6 @@
 
 #: src/gtk/dependency_chains_tab.cc:282
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency chain found."
 msgstr "Gestione delle dipendenze"
 
@@ -4105,13 +3994,11 @@
 
 #: src/gtk/download.cc:185
 #, fuzzy
-#| msgid "False"
 msgid "Failed"
 msgstr "Falso"
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "Cancellazione dei file scaricati"
 
@@ -4122,13 +4009,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "Avanzamento totale: "
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description"
 msgid "Short Description"
 msgstr "Descrizione"
 
@@ -4138,13 +4023,11 @@
 
 #: src/gtk/download.cc:319
 #, fuzzy
-#| msgid "Cleaning while a download is in progress is not allowed"
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr "Pulire mentre è in corso uno scaricamento non è permesso"
 
 #: src/gtk/download.cc:395 src/gtk/gui.cc:832
 #, fuzzy
-#| msgid "View next display"
 msgid "View Details"
 msgstr "Mostra la vista successiva"
 
@@ -4164,19 +4047,16 @@
 
 #: src/gtk/download.cc:486
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s: %lu/%lu, stalled"
 msgstr "%s; verrà installato."
 
 #: src/gtk/download.cc:507
 #, fuzzy, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr " [ %i%% ] (%sB/s, %s alla fine)"
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "ma %s sta per essere installato."
 
@@ -4190,7 +4070,6 @@
 
 #: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "Impossibile trovare il pacchetto %s"
 
@@ -4201,7 +4080,6 @@
 
 #: src/gtk/dpkg_terminal.cc:429
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "%s: Unable to accept a connection: %s"
 msgstr "Impossibile analizzare il modello %s"
 
@@ -4227,80 +4105,67 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "%s: versioni"
 
 #: src/gtk/entitysummary.cc:123
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Install %s version %s"
 msgstr "Installare(%s fornisce %s)"
 
 #: src/gtk/entitysummary.cc:131
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrade to %s version %s"
 msgstr "  Versione di cwidget: %s\n"
 
 #: src/gtk/entitysummary.cc:142
 #, fuzzy, c-format
-#| msgid "Keep the following packages at their current version:"
 msgid "Don't hold %s at its current version."
 msgstr "Mantenere i seguenti pacchetti alla versione attuale:"
 
 #: src/gtk/entitysummary.cc:145 src/gtk/entitysummary.cc:165
 #: src/gtk/entitysummary.cc:168
 #, fuzzy, c-format
-#| msgid "Canc^el pending actions"
 msgid "Cancel any actions on %s."
 msgstr "Annu^lla azioni in attesa"
 
 #: src/gtk/entitysummary.cc:150
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the purge of %s."
 msgstr "Annullare la rimozione di %F"
 
 #: src/gtk/entitysummary.cc:152
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s."
 msgstr "Annullare la rimozione di %F"
 
 #: src/gtk/entitysummary.cc:157
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the upgrade of %s."
 msgstr "Annullare la rimozione di %F"
 
 #: src/gtk/entitysummary.cc:159
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s."
 msgstr "Annullare l'installazione di %F"
 
 #: src/gtk/entitysummary.cc:161
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the downgrade of %s."
 msgstr "Annullare la rimozione di %F"
 
 #: src/gtk/entitysummary.cc:163
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the reinstallation of %s."
 msgstr "Annullare l'installazione di %F"
 
 #: src/gtk/entitysummary.cc:206
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "Remove %s"
 msgstr "Rimuovere(%s)"
 
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "^Elimina"
 
@@ -4311,19 +4176,16 @@
 
 #: src/gtk/entitysummary.cc:223
 #, fuzzy, c-format
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Mark %s as automatically installed."
 msgstr "\"&M\" per segnare i pacchetti come installati automaticamente"
 
 #: src/gtk/entitysummary.cc:228
 #, fuzzy, c-format
-#| msgid "'&m' to mark packages as manually installed"
 msgid "Mark %s as manually installed."
 msgstr "\"&m\" per segnare i pacchetti come installati manualmente"
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
 msgid "%s is a virtual package provided by:\n"
 msgstr "«%s» è un pacchetto virtuale fornito da:\n"
 
@@ -4333,13 +4195,11 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "Pacchetto sorgente: "
 
 #: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 #, fuzzy
-#| msgid "ProgName"
 msgid "Name"
 msgstr "NomeProg"
 
@@ -4349,13 +4209,11 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "Impossibile aprire il file «%s»"
 
 #: src/gtk/entityview.cc:412
 #, fuzzy, c-format
-#| msgid "Rejecting the removal of %s"
 msgid "Editing the columns of \"%s\""
 msgstr "Rifiutata la rimozione di %s"
 
@@ -4369,25 +4227,21 @@
 
 #: src/gtk/entityview.cc:570
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Whether the package is automatically installed."
 msgstr "\"&M\" per segnare i pacchetti come installati automaticamente"
 
 #: src/gtk/entityview.cc:576
 #, fuzzy
-#| msgid "Cancel any action on the selected package"
 msgid "The name and description of the package."
 msgstr "Annulla ogni azione sul pacchetto selezionato"
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "Versione: "
 
 #: src/gtk/entityview.cc:592
 #, fuzzy
-#| msgid "Check for new versions of packages"
 msgid "The version number of the package."
 msgstr "Cerca nuove versioni dei pacchetti"
 
@@ -4408,7 +4262,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "non installato"
 
@@ -4418,25 +4271,21 @@
 
 #: src/gtk/gui.cc:82
 #, fuzzy
-#| msgid "unpacked"
 msgid "Unpacked"
 msgstr "estratto"
 
 #: src/gtk/gui.cc:83
 #, fuzzy
-#| msgid "half-config"
 msgid "Half-configured"
 msgstr "semi-configurati"
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "half-install"
 msgid "Half-installed"
 msgstr "semi-installati"
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "non installato (file di configurazione presenti)"
 
@@ -4470,13 +4319,11 @@
 
 #: src/gtk/gui.cc:97
 #, fuzzy
-#| msgid "forbidden upgrade"
 msgid "Hold (don't upgrade)"
 msgstr "aggiornamento proibito"
 
 #: src/gtk/gui.cc:99
 #, fuzzy
-#| msgid "Related Dependencies"
 msgid "Unsatisfied dependencies"
 msgstr "Dipendenze simili"
 
@@ -4490,13 +4337,11 @@
 
 #: src/gtk/gui.cc:290
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "Applica un filtro all'elenco dei pacchetti"
 
 #: src/gtk/gui.cc:298 src/gtk/gui.cc:946
 #, fuzzy
-#| msgid "Downloading... "
 msgid "Download already running."
 msgstr "Scaricamento..."
 
@@ -4512,7 +4357,6 @@
 
 #: src/gtk/gui.cc:385
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
@@ -4540,7 +4384,6 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Done applying changes!"
 msgstr "Scaricamento dei pacchetti"
 
@@ -4550,19 +4393,16 @@
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "s: %F"
 msgid "%s: %s"
 msgstr "s: %F"
 
 #: src/gtk/gui.cc:878
 #, fuzzy, c-format
-#| msgid "No such package \"%s\""
 msgid "Error in package %s"
 msgstr "Il pacchetto «%s» è inesistente"
 
 #: src/gtk/gui.cc:906
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Impossibile sostituire %s con il nuovo file di configurazione"
 
@@ -4572,25 +4412,21 @@
 
 #: src/gtk/gui.cc:1038
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "Nessun pacchetto difettoso."
 
 #: src/gtk/gui.cc:1071
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "Nessun pacchetto difettoso."
 
 #: src/gtk/gui.cc:1075
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "Risoluzione delle dipendenze"
 
 #: src/gtk/gui.cc:1103
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Nessun pacchetto difettoso."
@@ -4598,13 +4434,11 @@
 
 #: src/gtk/gui.cc:1147
 #, fuzzy
-#| msgid "%s changes"
 msgid "View changes"
 msgstr "%s: modifiche"
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "%s changes"
 msgid "Apply changes"
 msgstr "%s: modifiche"
 
@@ -4613,8 +4447,6 @@
 #. font.
 #: src/gtk/gui.cc:1192
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%d package to install"
 msgid_plural "%d packages to install"
 msgstr[0] "%d da installare"
@@ -4625,7 +4457,6 @@
 #. font.
 #: src/gtk/gui.cc:1207
 #, fuzzy, c-format
-#| msgid "failed to remove %s"
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "impossibile rimuovere %s"
@@ -4633,7 +4464,6 @@
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "DimScaricamento"
 
@@ -4652,13 +4482,11 @@
 
 #: src/gtk/gui.cc:1408 src/gtk/gui.cc:1427
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "Installato"
 
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "^Elimina"
 
@@ -4676,7 +4504,6 @@
 
 #: src/gtk/gui.cc:1455
 #, fuzzy
-#| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "Manuale utente"
 
@@ -4691,7 +4518,6 @@
 
 #: src/gtk/info.cc:161 src/gtk/pkgview.cc:169
 #, fuzzy
-#| msgid "Current status: %F."
 msgid "Current status"
 msgstr "Stato attuale: %F."
 
@@ -4701,19 +4527,16 @@
 
 #: src/gtk/info.cc:496
 #, fuzzy
-#| msgid "Not Installed"
 msgid "Not available"
 msgstr "Non installato"
 
 #: src/gtk/info.cc:545
 #, fuzzy
-#| msgid "C^ycle Package Information"
 msgid "Package information: version list"
 msgstr "M^odalità delle informazioni"
 
 #: src/gtk/info.cc:555
 #, fuzzy
-#| msgid "Packages which depend on %s"
 msgid "Package information: dependency list"
 msgstr "Pacchetti che dipendono da %s"
 
@@ -4723,7 +4546,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "no"
 
@@ -4737,7 +4559,6 @@
 
 #: src/gtk/packagestab.cc:203
 #, fuzzy, c-format
-#| msgid "No packages matched the pattern \"%ls\"."
 msgid "No packages matched \"%s\"."
 msgstr "Nessun pacchetto corrisponde al modello «%ls»."
 
@@ -4747,31 +4568,26 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "Pacchetto: "
 
 #: src/gtk/pkgview.cc:224
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed automatically."
 msgstr "%s; verrà installato automaticamente"
 
 #: src/gtk/pkgview.cc:227
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed automatically."
 msgstr "%s; verrà installato automaticamente"
 
 #: src/gtk/pkgview.cc:235
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed manually."
 msgstr "%s; verrà installato automaticamente"
 
 #: src/gtk/pkgview.cc:238
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed manually."
 msgstr "%s; verrà installato automaticamente"
 
@@ -4781,13 +4597,11 @@
 
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "Cerca"
 
 #: src/gtk/pkgview.cc:718
 #, fuzzy
-#| msgid "Building view"
 msgid "Finalizing view"
 msgstr "Costruzione della vista"
 
@@ -4921,13 +4735,11 @@
 
 #: src/gtk/previewtab.cc:179
 #, fuzzy
-#| msgid "Preview"
 msgid "Preview: "
 msgstr "Anteprima"
 
 #: src/gtk/resolver.cc:68
 #, fuzzy, c-format
-#| msgid "Error while dumping resolver state"
 msgid "Error in dependency resolver: %s"
 msgstr "Impossibile salvare lo stato del risolutore"
 
@@ -4942,7 +4754,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package"
 msgid "Virtual package"
 msgstr "Pacchetto"
 
@@ -4952,31 +4763,26 @@
 
 #: src/gtk/resolver.cc:377
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Removing %s is rejected."
 msgstr "Rimozione di %s"
 
 #: src/gtk/resolver.cc:382
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Canceling the installation of %s is rejected."
 msgstr "Annullare l'installazione di %F"
 
 #: src/gtk/resolver.cc:391
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Canceling the removal of %s is rejected."
 msgstr "Annullare la rimozione di %F"
 
 #: src/gtk/resolver.cc:394
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keeping %s at version %s is rejected."
 msgstr "Mantenere %F alla versione %s (%s)"
 
 #: src/gtk/resolver.cc:401
 #, fuzzy, c-format
-#| msgid "Installing %s %s (%s)"
 msgid "Installing %s version %s is rejected."
 msgstr "Installazione di %s %s (%s)"
 
@@ -5125,7 +4931,6 @@
 
 #: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862
 #, fuzzy
-#| msgid "Remove the following packages:"
 msgid "Keep the following packages:"
 msgstr "Rimuovere i seguenti pacchetti:"
 
@@ -5141,55 +4946,46 @@
 
 #: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900
 #, fuzzy
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "Leave the following dependencies unresolved:"
 msgstr "Lasciare le seguenti dipendenze non soddisfatte:%n"
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Remove %F [%s (%s)]"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "Rimuovere %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1523
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "Installare %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1531
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s"
 msgstr "Annullare l'installazione di %F"
 
 #: src/gtk/resolver.cc:1534
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s"
 msgstr "Annullare la rimozione di %F"
 
 #: src/gtk/resolver.cc:1537
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "Mantenere %F alla versione %s (%s)"
 
 #: src/gtk/resolver.cc:1544
 #, fuzzy, c-format
-#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Aggiornare %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1553
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Retrocedere (downgrade) %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>Remove</b> %s"
 msgstr "Rimuovere(%s)"
 
@@ -5200,37 +4996,31 @@
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "Mantenere %F alla versione %s (%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>keep</b> %s at version %s"
 msgstr "Mantenere %F alla versione %s (%s)"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr "Annullare l'installazione di %F"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>cancel</b> the installation of %s"
 msgstr "Annullare l'installazione di %F"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>Install</b> %s %s"
 msgstr "Installare %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>install</b> %s %s"
 msgstr "Installare %F [%s (%s)]"
 
@@ -5266,8 +5056,6 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "%d da installare"
@@ -5275,8 +5063,6 @@
 
 #: src/gtk/resolver.cc:1740
 #, fuzzy, c-format
-#| msgid "%d removal"
-#| msgid_plural "%d removals"
 msgid "%s remove"
 msgid_plural "%s removes"
 msgstr[0] "%d da rimuovere"
@@ -5284,8 +5070,6 @@
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "%d keep"
-#| msgid_plural "%d keeps"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "%d da mantenere"
@@ -5293,8 +5077,6 @@
 
 #: src/gtk/resolver.cc:1752
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%s upgrade"
 msgid_plural "%s upgrades"
 msgstr[0] "%d da aggiornare"
@@ -5302,8 +5084,6 @@
 
 #: src/gtk/resolver.cc:1758
 #, fuzzy, c-format
-#| msgid "%d downgrade"
-#| msgid_plural "%d downgrades"
 msgid "%s downgrade"
 msgid_plural "%s downgrades"
 msgstr[0] "%d da retrocedere (downgrade)"
@@ -5311,7 +5091,6 @@
 
 #: src/gtk/resolver.cc:1764
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "%s unresolved recommendation"
 msgid_plural "%s unresolved recommendations"
 msgstr[0] "Controlla ^Raccomandati"
@@ -5319,19 +5098,16 @@
 
 #: src/gtk/resolver.cc:2056
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions yet."
 msgstr "Nessun'altra soluzione."
 
 #: src/gtk/resolver.cc:2063
 #, fuzzy
-#| msgid "No resolution found."
 msgid "No dependency solution was found."
 msgstr "Nessuna soluzione trovata."
 
 #: src/gtk/resolver.cc:2064
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions."
 msgstr "Nessun'altra soluzione."
 
@@ -5341,19 +5117,16 @@
 
 #: src/gtk/resolver.cc:2076
 #, fuzzy, c-format
-#| msgid "No more solutions."
 msgid "%u solutions."
 msgstr "Nessun'altra soluzione."
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "Impossibile aprire il file «%s»"
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr "[Scaricato]"
 
@@ -5404,7 +5177,6 @@
 
 #: src/load_grouppolicy.cc:305
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected ',', '%c', or '('; got '%c'"
 msgstr "È richiesto \",\" oppure \"(\", non «%c»"
 
@@ -5518,7 +5290,6 @@
 
 #: src/load_grouppolicy.cc:713
 #, fuzzy, c-format
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected '{', ')', or ',' following '||', got '%s'"
 msgstr "Richiesti «,» oppure «)» dopo «||», non «%s»"
 
@@ -5642,19 +5413,16 @@
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  Versione di Apt: %d.%d.%d\n"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  Versione di Apt: %d.%d.%d\n"
 
 #: src/main.cc:164
 #, fuzzy, c-format
-#| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Supporto a Ept disabilitato.\n"
 
@@ -5702,44 +5470,36 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Installa/aggiorna pacchetti\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Rimuove pacchetti\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Elimina i pacchetti e i loro file di configurazione\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Imposta i pacchetti come bloccati\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Rimuove il blocco ad un pacchetto bloccato\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Segna i pacchetti come installati automaticamente\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Segna i pacchetti come installati manualmente\n"
 
@@ -5754,21 +5514,16 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Scarica l'elenco dei pacchetti nuovi/da aggiornare\n"
 
 #: src/main.cc:190
 #, fuzzy, c-format
-#| msgid " safe-upgrade - Perform a safe upgrade\n"
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Esegue un aggiornamento sicuro\n"
 
 #: src/main.cc:191
 #, fuzzy, c-format
-#| msgid ""
-#| " full-upgrade - Perform an upgrade, possibly installing and removing "
-#| "packages\n"
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
@@ -5778,57 +5533,46 @@
 
 #: src/main.cc:192
 #, fuzzy, c-format
-#| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "\"&BD\" per installare le dipendenze «Build-Depends» di un pacchetto."
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Dimentica quali pacchetti sono «nuovi»\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Cerca un pacchetto per nome o espressione\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Mostra informazioni dettagliate su un pacchetto\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Cancella i file dei pacchetti scaricati\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Cancella i file dei vecchi pacchetti scaricati\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Mostra il changelog di un pacchetto\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Scarica il file .deb di un pacchetto\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5850,12 +5594,6 @@
 
 #: src/main.cc:203
 #, fuzzy, c-format
-#| msgid ""
-#| " why-not      - Show the manually installed packages that lead to a "
-#| "conflict\n"
-#| "                with the given package, or why one or more packages "
-#| "would\n"
-#| "                lead to a conflict with the given package if installed\n"
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
 "conflict\n"
@@ -5875,7 +5613,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             Questo help\n"
 
@@ -5905,15 +5642,11 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             Chiede sempre conferma prima di un'azione\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
@@ -5921,9 +5654,6 @@
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5934,9 +5664,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5946,8 +5673,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 ""
@@ -5982,9 +5707,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5993,17 +5715,12 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr " -t [release]   Imposta la release da cui installare i pacchetti\n"
 
 #: src/main.cc:226
 #, fuzzy, c-format
-#| msgid ""
-#| " -q             In command-line mode, suppress the incremental progress\n"
-#| "                indicators.\n"
 msgid ""
 " -q             In command-line mode, suppress the incremental progress.\n"
 "                indicators.\n"
@@ -6013,15 +5730,11 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o chiave=val  Imposta l'opzione di configurazione di nome «chiave»\n"
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -6058,7 +5771,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "true"
 msgid "trace"
 msgstr "vero"
 
@@ -6075,7 +5787,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "%s info"
 msgid "info"
 msgstr "%s: informazioni"
 
@@ -6095,7 +5806,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:380
 #, fuzzy
-#| msgid "false"
 msgid "fatal"
 msgstr "falso"
 
@@ -6116,7 +5826,6 @@
 
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "Operazione «%s» non ammessa"
 
@@ -6169,7 +5878,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "Pacchetto"
 
@@ -6179,7 +5887,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "Tutti i pacchetti"
 
@@ -6199,7 +5906,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -6207,8 +5913,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -6217,7 +5921,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "-u e -i non possono essere specificate insieme a un comando"
 
@@ -7479,7 +7182,6 @@
 
 #: src/ui.cc:472
 #, fuzzy, c-format
-#| msgid "Unable to open %ls"
 msgid "Unable to fork: %s"
 msgstr "Impossibile aprire %ls"
 
@@ -7754,9 +7456,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7779,9 +7478,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -8318,19 +8014,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "URL da usare per scaricare i changelog"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "URL da usare per scaricare i changelog"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "Scaricamento del changelog"
 
Index: aptitude/po/ja.po
===================================================================
--- aptitude.orig/po/ja.po
+++ aptitude/po/ja.po
@@ -185,7 +185,7 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.4.1\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2008-05-16 03:35+0900\n"
 "Last-Translator: Noritada Kobayashi <nori1@dolphin.c.u-tokyo.ac.jp>\n"
 "Language-Team: Japanese\n"
@@ -443,9 +443,6 @@
 
 #: src/apt_options.cc:241
 #, fuzzy
-#| msgid ""
-#| "If this option is enabled, the menu bar will only appear when it has been "
-#| "activated by pressing the menu key."
 msgid ""
 "If this option is enabled, then the first view displayed on startup will be "
 "a flat view instead of the default view."
@@ -881,7 +878,6 @@
 
 #: src/cmdline/cmdline_action.cc:212
 #, fuzzy, c-format
-#| msgid "Unable to satisfy the build-depends: %s."
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "依存関係を満たすことができません: %s"
 
@@ -939,13 +935,11 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s は現在インストールされていないので再インストールされません。\n"
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "%s は、要求されたバージョン (%s) で既にインストールされています\n"
@@ -1045,7 +1039,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "%s の変更履歴"
 
@@ -1214,7 +1207,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "なし"
 
@@ -1637,7 +1629,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "'&M': 自動的にインストールされたという印をパッケージに添付"
 
@@ -1772,9 +1763,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy, c-format
-#| msgid ""
-#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: "
-#| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
@@ -1829,10 +1817,6 @@
 # * Case: 'r'
 #: src/cmdline/cmdline_resolver.cc:259
 #, fuzzy
-#| msgid ""
-#| "reject the given package versions; don't display any solutions in which "
-#| "they occur.  Enter UNINST instead of a version to reject removing the "
-#| "package."
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package.  "
@@ -1846,9 +1830,6 @@
 # TRANSLATION-FIXME: ' (' is not necessary
 #: src/cmdline/cmdline_resolver.cc:261
 #, fuzzy
-#| msgid ""
-#| "accept the given package versions; display only solutions in which they "
-#| "occur.  Enter UNINST instead of a version to accept removing the package."
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package.  "
@@ -1953,34 +1934,29 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "以下の推奨パッケージは入れずにおく:"
 
 # * Item
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "推奨を監査 (^R)"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "%s の削除はもはや必須ではありません"
 
 # * Item
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "推奨を監査 (^R)"
 
 # * Menu item on the first line.
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "アクション"
 
@@ -2134,14 +2110,12 @@
 
 #: src/cmdline/cmdline_resolver.cc:1201
 #, fuzzy
-#| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "更新のための依存関係の解決ができません (解決方法が見つかりませんでした)。"
 
 #: src/cmdline/cmdline_resolver.cc:1207
 #, fuzzy, c-format
-#| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "更新のための依存関係の解決ができません (%s)。"
 
@@ -2172,13 +2146,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "[インストール不能です]"
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "[%s がインストール予定となっています]"
 
@@ -2278,13 +2250,11 @@
 
 #: src/cmdline/cmdline_show.cc:326
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s%s; will be installed"
 msgstr "%s インストールされます。"
 
 #: src/cmdline/cmdline_show.cc:328
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s%s; will be installed automatically"
 msgstr "%s 自動的にインストールされます"
 
@@ -2545,25 +2515,21 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "パッケージ"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "ソースパッケージ: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "アーカイブ"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\".\n"
 msgid "No such package \"%s\"."
 msgstr "そのようなパッケージはありません: \"%s\"\n"
 
@@ -2602,7 +2568,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "search: 検索語を少なくとも一つ与えなければなりません\n"
 
@@ -2726,7 +2691,6 @@
 
 #: src/cmdline/cmdline_why.cc:1285
 #, fuzzy, c-format
-#| msgid "Packages depending on %s"
 msgid "Packages requiring %s:"
 msgstr "%s に依存しているパッケージ"
 
@@ -2742,8 +2706,6 @@
 
 #: src/cmdline/cmdline_why.cc:1416
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: this command requires at least one argument (the package to query)."
 msgid ""
 "%s: this command requires at least one argument (the package to query).\n"
 msgstr ""
@@ -2763,7 +2725,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[エラー]"
 
@@ -3118,7 +3079,6 @@
 
 #: src/generic/apt/download_update_manager.cc:138
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated quoted string in command: %s"
 msgstr "%s の後に終端文字のないリテラル文字列があります"
 
@@ -3202,7 +3162,6 @@
 
 #: src/generic/apt/dump_packages.cc:674
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create truncated cache: %s."
 msgstr "パッケージの場所が見つかりません: %s"
 
@@ -3348,7 +3307,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "パッケージをダウンロード中"
 
@@ -3386,7 +3344,6 @@
 
 #: src/generic/apt/matching/parse.cc:860
 #, fuzzy, c-format
-#| msgid "Unknown matcher type: \"%s\"."
 msgid "Unknown term type: \"%s\"."
 msgstr "マッチャの種類が不明です: \"%s\""
 
@@ -3394,9 +3351,6 @@
 #. Leave the question marks attached to the string placeholders.
 #: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883
 #, fuzzy, c-format
-#| msgid ""
-#| "The ?%s matcher must be used in a \"wide\" context (a top-level context, "
-#| "or a context enclosed by ?%s)."
 msgid ""
 "The ?%s term must be used in a \"wide\" context (a top-level context, or a "
 "context enclosed by ?%s)."
@@ -3427,7 +3381,6 @@
 
 #: src/generic/apt/matching/parse.cc:1388
 #, fuzzy, c-format
-#| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "不正な書式です"
 
@@ -3467,19 +3420,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "変更履歴のダウンロードに用いる URL"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "変更履歴のダウンロードに用いる URL"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "%s の変更履歴"
 
@@ -3525,7 +3475,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "パターンをパースできません: %s"
 
@@ -3540,14 +3489,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "インストールされていません"
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "インストールされていません"
 
@@ -3574,68 +3521,57 @@
 
 #: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got EOF."
 msgstr "'%c' を期待しましたが '%c' が与えられました。"
 
 #: src/generic/util/parsers.h:737
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got '%s'."
 msgstr "'%c' を期待しましたが '%c' が与えられました。"
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "-q= の後に番号が期待されますが、%s が与えられました\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "不正なアクション文字です: '%c'\n"
 
 #: src/generic/util/parsers.h:832
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got EOF."
 msgstr "'%c' を期待しましたが '%c' が与えられました。"
 
 #: src/generic/util/parsers.h:843
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got '%c'."
 msgstr "'%c' を期待しましたが '%c' が与えられました。"
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "規則の ID を期待しましたが '%c' が与えられました"
 
 #: src/generic/util/parsers.h:1026
 #, fuzzy
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected an integer following '-', got EOF."
 msgstr "'||' の後に ',' か '(' を期待しましたが '%s' が与えられました"
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "規則の ID を期待しましたが '%c' が与えられました"
 
 #  Should never happen.
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "不正な操作です: %s"
 
 #: src/generic/util/parsers.h:1077
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected EOF, got '%c'."
 msgstr "'%c' を期待しましたが '%c' が与えられました。"
 
@@ -3649,19 +3585,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "想定外の ')' です"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " または"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "想定外の ')' です"
 
@@ -3672,7 +3605,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "テンプレート \"%s\" から一時ディレクトリを作成できません: %s"
 
@@ -3707,7 +3639,6 @@
 
 #: src/gtk/aptitude.glade:19 src/gtk/aptitude.glade:2273
 #, fuzzy
-#| msgid "False"
 msgid "_File"
 msgstr "いいえ"
 
@@ -3781,14 +3712,12 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "パッケージ"
 
 # * Menu item on the first line.
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "表示"
 
@@ -3808,7 +3737,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "ヘルプ"
 
@@ -3820,7 +3748,6 @@
 # * Message used as 'tablabel' for the ui_download_manager.
 #: src/gtk/aptitude.glade:345 src/gtk/aptitude.glade:2614
 #, fuzzy
-#| msgid "List Update"
 msgid "Update"
 msgstr "一覧の更新"
 
@@ -3843,7 +3770,6 @@
 
 #: src/gtk/aptitude.glade:389 src/gtk/aptitude.glade:2658
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Remove"
 msgstr "インストール済み"
 
@@ -3858,14 +3784,12 @@
 # * Description of an item.
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "パッケージ一覧のフィルタを解除します"
 
 # * Description of an item.
 #: src/gtk/aptitude.glade:649
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "Apply these settings to all active package lists."
 msgstr "パッケージ一覧にフィルタをかけます"
 
@@ -3873,20 +3797,17 @@
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "検索"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "再インストール"
 
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "エラー "
 
@@ -3901,20 +3822,17 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "%s の依存関係"
 
 # * Item.
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "^Changelog"
 msgid "Changelog"
 msgstr "変更履歴 (^C)"
 
 #: src/gtk/aptitude.glade:1020
 #, fuzzy
-#| msgid "False"
 msgid "Files"
 msgstr "いいえ"
 
@@ -3928,7 +3846,6 @@
 
 #: src/gtk/aptitude.glade:1051
 #, fuzzy
-#| msgid "Tags"
 msgid "tags"
 msgstr "タグ"
 
@@ -3951,13 +3868,11 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "状態"
 
 #: src/gtk/aptitude.glade:1247
 #, fuzzy
-#| msgid "Unknown action type: %s"
 msgid "Group by action type"
 msgstr "アクションの種類が不明です: %s"
 
@@ -3987,13 +3902,11 @@
 # * Item.
 #: src/gtk/aptitude.glade:1328
 #, fuzzy
-#| msgid "Toggle ^Rejected"
 msgid "Rejected"
 msgstr "拒否する・しないを切り替え (^R)"
 
 #: src/gtk/aptitude.glade:1343
 #, fuzzy
-#| msgid "Preferences"
 msgid "No preference"
 msgstr "設定"
 
@@ -4008,34 +3921,29 @@
 # * Item.
 #: src/gtk/aptitude.glade:1400
 #, fuzzy
-#| msgid "^Examine Solution"
 msgid "Find a new solution"
 msgstr "解決方法の検討 (^E)"
 
 # * Description of an item.
 #: src/gtk/aptitude.glade:1404
 #, fuzzy
-#| msgid "Select the next solution to the dependency problems."
 msgid "Calculate the next solution that has not yet been generated."
 msgstr "依存関係の問題に対して、次の解決方法を選択します。"
 
 # * Description of an item.
 #: src/gtk/aptitude.glade:1419
 #, fuzzy
-#| msgid "Perform the actions contained in the currently selected solution."
 msgid ""
 "Perform the actions in the currently selected solution and close this tab."
 msgstr "現在選択中の解決方法に含まれるアクションを実行します。"
 
 #: src/gtk/aptitude.glade:1576
 #, fuzzy
-#| msgid "Upgrade"
 msgid "Upgrade Summary"
 msgstr "更新"
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "ソースパッケージ: "
 
@@ -4047,7 +3955,6 @@
 
 #: src/gtk/aptitude.glade:1652
 #, fuzzy
-#| msgid "Manual"
 msgid "Fix Manually"
 msgstr "マニュアル"
 
@@ -4095,32 +4002,27 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "依存関係破損"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "入手不可能なパッケージは修正できません"
 
 # * Item.
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "下を検索 (^F)"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for: "
 msgid "Search for packages."
 msgstr "検索: "
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "取得 "
 
@@ -4154,19 +4056,16 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "変更履歴のダウンロードに用いる URL"
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "%s バージョン %s (%s) のインストールを必須としています"
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -4174,20 +4073,17 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr "公式の Debian パッケージのみ変更履歴を閲覧できます。"
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "変更履歴をダウンロードしています"
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "変更履歴のダウンロードに用いる URL"
 
@@ -4201,33 +4097,27 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "変更履歴のダウンロードに用いる URL"
 
 #: src/gtk/dashboardtab.cc:397
 #, fuzzy
-#| msgid "%d upgrades"
 msgid "Available upgrades:"
 msgstr "%d 個 更新"
 
 #: src/gtk/dashboardtab.cc:414
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] "%d 個の更新"
 
 #: src/gtk/dashboardtab.cc:633
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No upgrades are available."
 msgstr "インストールされていません"
 
 #: src/gtk/dashboardtab.cc:645
 #, fuzzy
-#| msgid "Unable to locate package %s"
 msgid "Unable to calculate an upgrade."
 msgstr "パッケージの場所が見つかりません: %s"
 
@@ -4260,25 +4150,21 @@
 
 #: src/gtk/dashboardtab.cc:708
 #, fuzzy, c-format
-#| msgid "Internal error: Default column string is unparsable"
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr "内部エラー: デフォルトの行文字列がパース不可能です"
 
 #: src/gtk/dependency_chains_tab.cc:78
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: start"
 msgstr "依存関係の処理"
 
 #: src/gtk/dependency_chains_tab.cc:82
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: end"
 msgstr "依存関係の処理"
 
 #: src/gtk/dependency_chains_tab.cc:86
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: results"
 msgstr "依存関係の処理"
 
@@ -4288,7 +4174,6 @@
 
 #: src/gtk/dependency_chains_tab.cc:282
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency chain found."
 msgstr "依存関係の処理"
 
@@ -4298,13 +4183,11 @@
 
 #: src/gtk/download.cc:185
 #, fuzzy
-#| msgid "False"
 msgid "Failed"
 msgstr "いいえ"
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "ダウンロードしたファイルを削除しています"
 
@@ -4315,13 +4198,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "全体の進行状況: "
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description"
 msgid "Short Description"
 msgstr "説明"
 
@@ -4331,14 +4212,12 @@
 
 #: src/gtk/download.cc:319
 #, fuzzy
-#| msgid "Cleaning while a download is in progress is not allowed"
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr "ダウンロードが進行している間は廃止されたファイルの消去はできません"
 
 # * Description of an item.
 #: src/gtk/download.cc:395 src/gtk/gui.cc:832
 #, fuzzy
-#| msgid "View next display"
 msgid "View Details"
 msgstr "次の画面を表示します"
 
@@ -4358,19 +4237,16 @@
 
 #: src/gtk/download.cc:486
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s: %lu/%lu, stalled"
 msgstr "%s インストールされます。"
 
 #: src/gtk/download.cc:507
 #, fuzzy, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr " [ %i%% ] (%sB/秒, 残り %s 秒)"
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "[%s がインストール予定となっています]"
 
@@ -4384,7 +4260,6 @@
 
 #: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "パッケージの場所が見つかりません: %s"
 
@@ -4395,7 +4270,6 @@
 
 #: src/gtk/dpkg_terminal.cc:429
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "%s: Unable to accept a connection: %s"
 msgstr "テンプレート \"%s\" から一時ディレクトリを作成できません: %s"
 
@@ -4421,81 +4295,68 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "%s バージョン"
 
 #: src/gtk/entitysummary.cc:123
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Install %s version %s"
 msgstr "インストール(%s 提供 %s)"
 
 #: src/gtk/entitysummary.cc:131
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrade to %s version %s"
 msgstr "  cwidget のバージョン: %s\n"
 
 #: src/gtk/entitysummary.cc:142
 #, fuzzy, c-format
-#| msgid "Keep the following packages at their current version:"
 msgid "Don't hold %s at its current version."
 msgstr "以下のパッケージを現在のバージョンに一時固定する:"
 
 #: src/gtk/entitysummary.cc:145 src/gtk/entitysummary.cc:165
 #: src/gtk/entitysummary.cc:168
 #, fuzzy, c-format
-#| msgid "Canc^el pending actions"
 msgid "Cancel any actions on %s."
 msgstr "未実行アクションの取り消し (^e)"
 
 #: src/gtk/entitysummary.cc:150
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the purge of %s."
 msgstr "%F の削除を取り消す"
 
 #: src/gtk/entitysummary.cc:152
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s."
 msgstr "%F の削除を取り消す"
 
 #: src/gtk/entitysummary.cc:157
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the upgrade of %s."
 msgstr "%F の削除を取り消す"
 
 #: src/gtk/entitysummary.cc:159
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s."
 msgstr "%F のインストールを取り消す"
 
 #: src/gtk/entitysummary.cc:161
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the downgrade of %s."
 msgstr "%F の削除を取り消す"
 
 #: src/gtk/entitysummary.cc:163
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the reinstallation of %s."
 msgstr "%F のインストールを取り消す"
 
 #: src/gtk/entitysummary.cc:206
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "Remove %s"
 msgstr "削除(%s)"
 
 # * Item.
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "完全削除 (^P)"
 
@@ -4506,19 +4367,16 @@
 
 #: src/gtk/entitysummary.cc:223
 #, fuzzy, c-format
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Mark %s as automatically installed."
 msgstr "'&M': 自動的にインストールされたという印をパッケージに添付"
 
 #: src/gtk/entitysummary.cc:228
 #, fuzzy, c-format
-#| msgid "The package \"%s\" is manually installed.\n"
 msgid "Mark %s as manually installed."
 msgstr "パッケージ \"%s\" は手動でインストールされたものです。\n"
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
 msgid "%s is a virtual package provided by:\n"
 msgstr "\"%s\" は、以下のパッケージから提供されている仮想パッケージです:\n"
 
@@ -4528,13 +4386,11 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "ソースパッケージ: "
 
 #: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 #, fuzzy
-#| msgid "ProgName"
 msgid "Name"
 msgstr "名前"
 
@@ -4544,13 +4400,11 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "ファイル \"%s\" が開けません"
 
 #: src/gtk/entityview.cc:412
 #, fuzzy, c-format
-#| msgid "Rejecting the removal of %s"
 msgid "Editing the columns of \"%s\""
 msgstr "%s の削除を拒否しています"
 
@@ -4564,27 +4418,23 @@
 
 #: src/gtk/entityview.cc:570
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Whether the package is automatically installed."
 msgstr "'&M': 自動的にインストールされたという印をパッケージに添付"
 
 # * Description of an item.
 #: src/gtk/entityview.cc:576
 #, fuzzy
-#| msgid "Cancel any action on the selected package"
 msgid "The name and description of the package."
 msgstr "選択中のパッケージへのあらゆるアクションを取り消します"
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "バージョン: "
 
 # * Description of an item.
 #: src/gtk/entityview.cc:592
 #, fuzzy
-#| msgid "Check for new versions of packages"
 msgid "The version number of the package."
 msgstr "パッケージの新しいバージョンがないか確認します"
 
@@ -4605,7 +4455,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "インストールされていません"
 
@@ -4615,37 +4464,31 @@
 
 #: src/gtk/gui.cc:82
 #, fuzzy
-#| msgid "unpacked"
 msgid "Unpacked"
 msgstr "展開済み"
 
 #: src/gtk/gui.cc:83
 #, fuzzy
-#| msgid "half-config"
 msgid "Half-configured"
 msgstr "設定未完了"
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "half-install"
 msgid "Half-installed"
 msgstr "インストール未完了"
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "インストールされていません (設定ファイルは残っています)"
 
 #: src/gtk/gui.cc:86
 #, fuzzy
-#| msgid "triggers-awaited"
 msgid "Triggers awaited"
 msgstr "triggers 待ち"
 
 #: src/gtk/gui.cc:87
 #, fuzzy
-#| msgid "triggers-pending"
 msgid "Triggers pending"
 msgstr "triggers 保留"
 
@@ -4671,13 +4514,11 @@
 
 #: src/gtk/gui.cc:97
 #, fuzzy
-#| msgid "forbidden upgrade"
 msgid "Hold (don't upgrade)"
 msgstr "更新禁止"
 
 #: src/gtk/gui.cc:99
 #, fuzzy
-#| msgid "Related Dependencies"
 msgid "Unsatisfied dependencies"
 msgstr "関連する依存関係"
 
@@ -4692,13 +4533,11 @@
 # * Description of an item.
 #: src/gtk/gui.cc:290
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "パッケージ一覧にフィルタをかけます"
 
 #: src/gtk/gui.cc:298 src/gtk/gui.cc:946
 #, fuzzy
-#| msgid "Downloading... "
 msgid "Download already running."
 msgstr "ダウンロード中... "
 
@@ -4709,13 +4548,11 @@
 # * Message used as 'tablabel' for the ui_download_manager.
 #: src/gtk/gui.cc:359
 #, fuzzy, c-format
-#| msgid "List Update"
 msgid "Update %s?"
 msgstr "一覧の更新"
 
 #: src/gtk/gui.cc:385
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
@@ -4743,31 +4580,26 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "%s changes"
 msgid "Done applying changes!"
 msgstr "%s の変更"
 
 #: src/gtk/gui.cc:823
 #, fuzzy
-#| msgid "%s changes"
 msgid "Applying changes..."
 msgstr "%s の変更"
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "s: %F"
 msgid "%s: %s"
 msgstr "s: %F"
 
 #: src/gtk/gui.cc:878
 #, fuzzy, c-format
-#| msgid "No broken packages."
 msgid "Error in package %s"
 msgstr "依存関係が壊れているパッケージはありません。"
 
 #: src/gtk/gui.cc:906
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "%s を新しい設定ファイルと入れ替えることができません"
 
@@ -4778,38 +4610,32 @@
 
 #: src/gtk/gui.cc:1038
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "依存関係が壊れているパッケージはありません。"
 
 #: src/gtk/gui.cc:1071
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "依存関係が壊れているパッケージはありません。"
 
 #: src/gtk/gui.cc:1075
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "依存関係を解決する"
 
 #: src/gtk/gui.cc:1103
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "依存関係が壊れているパッケージはありません。"
 
 #: src/gtk/gui.cc:1147
 #, fuzzy
-#| msgid "%s changes"
 msgid "View changes"
 msgstr "%s の変更"
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "%s changes"
 msgid "Apply changes"
 msgstr "%s の変更"
 
@@ -4818,8 +4644,6 @@
 #. font.
 #: src/gtk/gui.cc:1192
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%d package to install"
 msgid_plural "%d packages to install"
 msgstr[0] "%d 個のインストール"
@@ -4829,14 +4653,12 @@
 #. font.
 #: src/gtk/gui.cc:1207
 #, fuzzy, c-format
-#| msgid "failed to remove %s"
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "%s を削除できませんでした"
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "ダウンロードサイズ"
 
@@ -4851,20 +4673,17 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "not installed"
 msgid "Not implemented"
 msgstr "インストールされていません"
 
 #: src/gtk/gui.cc:1408 src/gtk/gui.cc:1427
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "インストール済み"
 
 # * Item.
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "完全削除 (^P)"
 
@@ -4882,7 +4701,6 @@
 
 #: src/gtk/gui.cc:1455
 #, fuzzy
-#| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "ユーザマニュアル"
 
@@ -4897,7 +4715,6 @@
 
 #: src/gtk/info.cc:161 src/gtk/pkgview.cc:169
 #, fuzzy
-#| msgid "Current status: %F."
 msgid "Current status"
 msgstr "現在の状態: %F。"
 
@@ -4907,20 +4724,17 @@
 
 #: src/gtk/info.cc:496
 #, fuzzy
-#| msgid "Not Installed"
 msgid "Not available"
 msgstr "インストールされていません"
 
 # * Item.
 #: src/gtk/info.cc:545
 #, fuzzy
-#| msgid "C^ycle Package Information"
 msgid "Package information: version list"
 msgstr "パッケージ情報を切り替える (^Y)"
 
 #: src/gtk/info.cc:555
 #, fuzzy
-#| msgid "Packages which depend on %s"
 msgid "Package information: dependency list"
 msgstr "%s に依存しているパッケージ"
 
@@ -4930,7 +4744,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "no"
 
@@ -4944,7 +4757,6 @@
 
 #: src/gtk/packagestab.cc:203
 #, fuzzy, c-format
-#| msgid "No packages matched the pattern \"%ls\"."
 msgid "No packages matched \"%s\"."
 msgstr "\"%ls\" にマッチするパッケージがありません。"
 
@@ -4954,31 +4766,26 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "パッケージ: "
 
 #: src/gtk/pkgview.cc:224
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed automatically."
 msgstr "%s 自動的にインストールされます"
 
 #: src/gtk/pkgview.cc:227
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed automatically."
 msgstr "%s 自動的にインストールされます"
 
 #: src/gtk/pkgview.cc:235
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed manually."
 msgstr "%s 自動的にインストールされます"
 
 #: src/gtk/pkgview.cc:238
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed manually."
 msgstr "%s 自動的にインストールされます"
 
@@ -4989,13 +4796,11 @@
 # * Menu item on the first line.
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "検索"
 
 #: src/gtk/pkgview.cc:718
 #, fuzzy
-#| msgid "Building view"
 msgid "Finalizing view"
 msgstr "画面を構築しています"
 
@@ -5128,13 +4933,11 @@
 
 #: src/gtk/previewtab.cc:179
 #, fuzzy
-#| msgid "Preview"
 msgid "Preview: "
 msgstr "プレビューする"
 
 #: src/gtk/resolver.cc:68
 #, fuzzy, c-format
-#| msgid "Error while dumping resolver state"
 msgid "Error in dependency resolver: %s"
 msgstr "依存関係解決器の状態のダンプ中にエラーが生じました"
 
@@ -5149,7 +4952,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package"
 msgid "Virtual package"
 msgstr "パッケージ"
 
@@ -5159,43 +4961,36 @@
 
 #: src/gtk/resolver.cc:377
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Removing %s is rejected."
 msgstr "%s を削除しています"
 
 #: src/gtk/resolver.cc:382
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Canceling the installation of %s is rejected."
 msgstr "%F のインストールを取り消す"
 
 #: src/gtk/resolver.cc:391
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Canceling the removal of %s is rejected."
 msgstr "%F の削除を取り消す"
 
 #: src/gtk/resolver.cc:394
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keeping %s at version %s is rejected."
 msgstr "%F をバージョン %s (%s) に一時固定する"
 
 #: src/gtk/resolver.cc:401
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Installing %s version %s is rejected."
 msgstr "インストール(%s 提供 %s)"
 
 #: src/gtk/resolver.cc:407
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrading %s to version %s is rejected."
 msgstr "  cwidget のバージョン: %s\n"
 
 #: src/gtk/resolver.cc:413
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrading %s to version %s is rejected."
 msgstr "%s バージョン"
 
@@ -5237,7 +5032,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr "%s バージョン"
@@ -5331,7 +5125,6 @@
 
 #: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862
 #, fuzzy
-#| msgid "Remove the following packages:"
 msgid "Keep the following packages:"
 msgstr "以下のパッケージを削除する:"
 
@@ -5347,121 +5140,101 @@
 
 #: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900
 #, fuzzy
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "Leave the following dependencies unresolved:"
 msgstr "以下の依存関係を未解決のままにする:%n"
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Remove %F [%s (%s)]"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "%F %s (%s) を削除する"
 
 #: src/gtk/resolver.cc:1523
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "%F %s (%s) をインストールする"
 
 #: src/gtk/resolver.cc:1531
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s"
 msgstr "%F のインストールを取り消す"
 
 #: src/gtk/resolver.cc:1534
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s"
 msgstr "%F の削除を取り消す"
 
 #: src/gtk/resolver.cc:1537
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "%F をバージョン %s (%s) に一時固定する"
 
 #: src/gtk/resolver.cc:1544
 #, fuzzy, c-format
-#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "%F を更新する [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1553
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "%F をダウングレードする [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>Remove</b> %s"
 msgstr "削除(%s)"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>remove</b> %s"
 msgstr "削除(%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "%F をバージョン %s (%s) に一時固定する"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>keep</b> %s at version %s"
 msgstr "%F をバージョン %s (%s) に一時固定する"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr "%F のインストールを取り消す"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>cancel</b> the installation of %s"
 msgstr "%F のインストールを取り消す"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>Install</b> %s %s"
 msgstr "%F %s (%s) をインストールする"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>install</b> %s %s"
 msgstr "%F %s (%s) をインストールする"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>Downgrade</b> %s to version %s"
 msgstr "  cwidget のバージョン: %s\n"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>downgrade</b> %s to version %s"
 msgstr "  cwidget のバージョン: %s\n"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>Upgrade</b> %s to version %s"
 msgstr "%s バージョン"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>upgrade</b> %s to version %s"
 msgstr "%s バージョン"
 
@@ -5477,40 +5250,30 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "%d 個のインストール"
 
 #: src/gtk/resolver.cc:1740
 #, fuzzy, c-format
-#| msgid "%d removal"
-#| msgid_plural "%d removals"
 msgid "%s remove"
 msgid_plural "%s removes"
 msgstr[0] "%d 個の削除"
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "%d keep"
-#| msgid_plural "%d keeps"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "%d 個の一時固定"
 
 #: src/gtk/resolver.cc:1752
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%s upgrade"
 msgid_plural "%s upgrades"
 msgstr[0] "%d 個の更新"
 
 #: src/gtk/resolver.cc:1758
 #, fuzzy, c-format
-#| msgid "%d downgrade"
-#| msgid_plural "%d downgrades"
 msgid "%s downgrade"
 msgid_plural "%s downgrades"
 msgstr[0] "%d 個のダウングレード"
@@ -5518,26 +5281,22 @@
 # * Item
 #: src/gtk/resolver.cc:1764
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "%s unresolved recommendation"
 msgid_plural "%s unresolved recommendations"
 msgstr[0] "推奨を監査 (^R)"
 
 #: src/gtk/resolver.cc:2056
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions yet."
 msgstr "解決方法はこれ以上ありません。"
 
 #: src/gtk/resolver.cc:2063
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency solution was found."
 msgstr "依存関係の処理"
 
 #: src/gtk/resolver.cc:2064
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions."
 msgstr "解決方法はこれ以上ありません。"
 
@@ -5547,19 +5306,16 @@
 
 #: src/gtk/resolver.cc:2076
 #, fuzzy, c-format
-#| msgid "No more solutions."
 msgid "%u solutions."
 msgstr "解決方法はこれ以上ありません。"
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "ファイル \"%s\" が開けません"
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr "[ダウンロード済み]"
 
@@ -5609,7 +5365,6 @@
 
 #: src/load_grouppolicy.cc:305
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected ',', '%c', or '('; got '%c'"
 msgstr "',' か '(' を期待しましたが '%c' が与えられました"
 
@@ -5715,7 +5470,6 @@
 
 #: src/load_grouppolicy.cc:713
 #, fuzzy, c-format
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected '{', ')', or ',' following '||', got '%s'"
 msgstr "'||' の後に ',' か '(' を期待しましたが '%s' が与えられました"
 
@@ -5838,19 +5592,16 @@
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt のバージョン: %d.%d.%d\n"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt のバージョン: %d.%d.%d\n"
 
 #: src/main.cc:164
 #, fuzzy, c-format
-#| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Ept サポート: 無効\n"
 
@@ -5903,43 +5654,36 @@
 # * Description of action in the commandline help.
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - パッケージをインストール・更新します\n"
 
 # * Description of action in the commandline help.
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - パッケージを削除します\n"
 
 # * Description of action in the commandline help.
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - パッケージと設定ファイルを削除します\n"
 
 # * Description of action in the commandline help.
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - パッケージを固定します\n"
 
 # * Description of action in the commandline help.
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - パッケージの固定を解除します\n"
 
 # * Description of action in the commandline help.
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr ""
 " markauto     - 自動的にインストールされたという印をパッケージにつけます\n"
@@ -5947,7 +5691,6 @@
 # * Description of action in the commandline help.
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr ""
 " unmarkauto   - 手動でインストールされたという印をパッケージにつけます\n"
@@ -5965,7 +5708,6 @@
 # * Description of action in the commandline help.
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr ""
 " update       - 新規および更新可能なパッケージの一覧をダウンロードします\n"
@@ -5973,16 +5715,12 @@
 # * Description of action in the commandline help.
 #: src/main.cc:190
 #, fuzzy, c-format
-#| msgid " safe-upgrade - Perform a safe upgrade\n"
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - 安全な更新を行います\n"
 
 # * Description of action in the commandline help.
 #: src/main.cc:191
 #, fuzzy, c-format
-#| msgid ""
-#| " full-upgrade - Perform an upgrade, possibly installing and removing "
-#| "packages\n"
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
@@ -5992,42 +5730,36 @@
 
 #: src/main.cc:192
 #, fuzzy, c-format
-#| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "'&BD': パッケージが構築時依存しているパッケージをインストール"
 
 # * Description of action in the commandline help.
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - どのパッケージが「新規」かの情報を消去します\n"
 
 # * Description of action in the commandline help.
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - 名前や正規表現でパッケージを検索します\n"
 
 # * Description of action in the commandline help.
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - パッケージについての詳細な情報を表示します\n"
 
 # * Description of action in the commandline help.
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - ダウンロード済みのパッケージファイルを消去します\n"
 
 # * Description of action in the commandline help.
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr ""
 " autoclean    - 古い、ダウンロード済みのパッケージファイルを消去します\n"
@@ -6035,23 +5767,18 @@
 # * Description of action in the commandline help.
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - パッケージの変更履歴を表示します\n"
 
 # * Description of action in the commandline help.
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - パッケージ用の .deb ファイルをダウンロードします\n"
 
 # * Description of action in the commandline help.
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -6079,12 +5806,6 @@
 # * Description of action in the commandline help.
 #: src/main.cc:203
 #, fuzzy, c-format
-#| msgid ""
-#| " why-not      - Show the manually installed packages that lead to a "
-#| "conflict\n"
-#| "                with the given package, or why one or more packages "
-#| "would\n"
-#| "                lead to a conflict with the given package if installed\n"
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
 "conflict\n"
@@ -6108,7 +5829,6 @@
 # * Description of action in the commandline help.
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h                このヘルプの文章です。\n"
 
@@ -6143,7 +5863,6 @@
 # * Description of action in the commandline help.
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr ""
 " -P                確認やアクションのために常にプロンプトを出します。\n"
@@ -6151,9 +5870,6 @@
 # * Description of action in the commandline help.
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
@@ -6163,9 +5879,6 @@
 # * Description of action in the commandline help.
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -6177,9 +5890,6 @@
 # * Description of action in the commandline help.
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -6191,8 +5901,6 @@
 # * Description of action in the commandline help.
 #: src/main.cc:219
 #, fuzzy, 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 <幅>           検索結果の表示フォーマットの幅を指定します。\n"
@@ -6231,9 +5939,6 @@
 # * Description of action in the commandline help.
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -6243,8 +5948,6 @@
 # * Description of action in the commandline help.
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
@@ -6253,9 +5956,6 @@
 # * Description of action in the commandline help.
 #: src/main.cc:226
 #, fuzzy, c-format
-#| msgid ""
-#| " -q             In command-line mode, suppress the incremental progress\n"
-#| "                indicators.\n"
 msgid ""
 " -q             In command-line mode, suppress the incremental progress.\n"
 "                indicators.\n"
@@ -6265,7 +5965,6 @@
 # * Description of action in the commandline help.
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o <キー>=<値>    名前「<キー>」をもつ設定オプションを直接設定します。\n"
@@ -6273,9 +5972,6 @@
 # * Description of action in the commandline help.
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -6321,7 +6017,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "true"
 msgid "trace"
 msgstr "はい"
 
@@ -6335,7 +6030,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "no"
 
@@ -6349,7 +6043,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:377
 #, fuzzy
-#| msgid "Err "
 msgid "error"
 msgstr "エラー "
 
@@ -6357,7 +6050,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:380
 #, fuzzy
-#| msgid "false"
 msgid "fatal"
 msgstr "いいえ"
 
@@ -6379,7 +6071,6 @@
 #  Should never happen.
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "不正な操作です: %s"
 
@@ -6432,7 +6123,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "パッケージ"
 
@@ -6442,7 +6132,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "すべてのパッケージ"
 
@@ -6462,7 +6151,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -6470,8 +6158,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -6481,7 +6167,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "-u と -i はコマンドとともに指定してはいけません"
 
@@ -7745,7 +7430,6 @@
 
 #: src/ui.cc:472
 #, fuzzy, c-format
-#| msgid "Unable to open %ls"
 msgid "Unable to fork: %s"
 msgstr "%ls を開けません"
 
@@ -8019,9 +7703,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -8043,9 +7724,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -8683,19 +8361,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "変更履歴のダウンロードに用いる URL"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "変更履歴のダウンロードに用いる URL"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "変更履歴をダウンロードしています"
 
Index: aptitude/po/km.po
===================================================================
--- aptitude.orig/po/km.po
+++ aptitude/po/km.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: aptitude_po_km\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2006-10-06 11:24+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"
@@ -642,13 +642,11 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "បច្ចុប្បន្ន %s មិនត្រូវបានដំឡើង​ឡើយ ដូច្នេះ​វានឹងមិនត្រូវបាន​ដំឡើង​ម្ដងទៀតឡើយ ។\n"
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "%s បានដំឡើងរួច​ហើយ​នៅ​កំណែ​ដែលបានស្នើ​ (%s)\n"
@@ -747,7 +745,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "កំណត់ហេតុ​ការ​ផ្លាស់ប្ដូរ​របស់ %s"
 
@@ -909,7 +906,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "គ្មាន"
 
@@ -1306,7 +1302,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "'&M' ដើម្បី​សម្គាល់​កញ្ចប់​ថា​បាន​ដំឡើង​ដោយ​ស្វ័យប្រវត្តិ"
 
@@ -1585,31 +1580,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "មិន​បាច់​ដោះស្រាយ​ការ​ផ្ដល់​អនុសាសន៍​ខាង​ក្រោម ៖"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "ពិនិត្យ​ការ​ផ្ដល់​អនុសាសន៍"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "លែង​ទាមទារឲ្យ​យក %s ចេញ​ទៀត​ហើយ"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "ពិនិត្យ​ការ​ផ្ដល់​អនុសាសន៍"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "សកម្មភាព​"
 
@@ -1675,7 +1665,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:790
 #, fuzzy, c-format
-#| msgid "open: %d; closed: %d; defer: %d; conflict: %d"
 msgid "open: %zd; closed: %zd; defer: %zd; conflict: %zd"
 msgstr "បើក ៖ %d; បិទ ៖ %d; ពន្យារពេល ៖ %d; ប៉ះទង្គិច ៖ %d"
 
@@ -1794,13 +1783,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "ប៉ុន្តែ​មិន​មាន​វា​ឡើយ"
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "ប៉ុន្តែ %s នឹង​ត្រូវ​បាន​ដំឡើង ។"
 
@@ -1899,13 +1886,11 @@
 
 #: src/cmdline/cmdline_show.cc:326
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s%s; will be installed"
 msgstr "%s; នឹង​ត្រូវ​បាន​ដំឡើង"
 
 #: src/cmdline/cmdline_show.cc:328
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s%s; will be installed automatically"
 msgstr "%s; នឹង​ត្រូវបាន​ដំឡើង​ដោយ​ស្វ័យប្រវត្តិ"
 
@@ -2167,19 +2152,16 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "កញ្ចប់​"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "កញ្ចប់​ប្រភព ៖ "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "ប័ណ្ណសារ"
 
@@ -2223,7 +2205,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "ស្វែងរក​ ៖ អ្នក​ត្រូវ​តែ​ផ្ដល់​យ៉ាង​ហោច​ណាស់​ពាក្យស្វែងរក​មួយ ។\n"
 
@@ -2351,7 +2332,6 @@
 
 #: src/cmdline/cmdline_why.cc:1285
 #, fuzzy, c-format
-#| msgid "Packages depending on %s"
 msgid "Packages requiring %s:"
 msgstr "កញ្ចប់​ដែល​ផ្អែក​លើ %s"
 
@@ -2385,7 +2365,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[កំហុស​]"
 
@@ -2726,7 +2705,6 @@
 
 #: src/generic/apt/download_update_manager.cc:138
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated quoted string in command: %s"
 msgstr "មាន​ខ្សែអក្សរ​ន័យ​ត្រង់​មិន​ទាន់​បាន​បញ្ចប់ នៅ​បន្ទាប់​ពី %s"
 
@@ -2805,7 +2783,6 @@
 
 #: src/generic/apt/dump_packages.cc:674
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create truncated cache: %s."
 msgstr "មិន​អាច​រកទីតាំង​កញ្ចប់ %s"
 
@@ -2927,7 +2904,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "កំពុង​ទាញ​យក​កញ្ចប់​"
 
@@ -3000,7 +2976,6 @@
 
 #: src/generic/apt/matching/parse.cc:1388
 #, fuzzy, c-format
-#| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "កន្សោម​ត្រូវ​បាន​បង្កើត​មិន​ល្អ"
 
@@ -3038,19 +3013,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "URL ដែលត្រូវប្រើ​​ដើម្បី​ទាញ​យក​កំណត់​ហេតុ​ការ​ផ្លាស់ប្ដូរ"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "URL ដែលត្រូវប្រើ​​ដើម្បី​ទាញ​យក​កំណត់​ហេតុ​ការ​ផ្លាស់ប្ដូរ"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "កំណត់ហេតុ​ការ​ផ្លាស់ប្ដូរ​របស់ %s"
 
@@ -3095,7 +3067,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "មិន​អាច​ញែក​លំនាំ %s"
 
@@ -3110,14 +3081,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "មិន​បានដំឡើង​"
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "មិន​បានដំឡើង​"
 
@@ -3154,13 +3123,11 @@
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "បាន​រំពឹង​តម្លៃ​លេខ នៅ​បន្ទាប់​ពី -q=, ប៉ុន្តែ​បែរ​ជា​ជួប %s ទៅ​វិញ\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "តួអក្សរ​អំពើ '%c' មិន​ត្រឹមត្រូវ\n"
 
@@ -3176,7 +3143,6 @@
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "បាន​រំពឹង​ថា​មាន​គ្រឿងសម្គាល់​គោលការណ៍ ប៉ុន្តែ​បែរ​ជា​ជួប '%c' ទៅ​វិញ"
 
@@ -3187,13 +3153,11 @@
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "បាន​រំពឹង​ថា​មាន​គ្រឿងសម្គាល់​គោលការណ៍ ប៉ុន្តែ​បែរ​ជា​ជួប '%c' ទៅ​វិញ"
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "ប្រតិបត្តិការ %s មិន​ត្រឹមត្រូវ"
 
@@ -3212,19 +3176,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "មិន​រំពឹង​ថា​មាន ')'"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " ឬ"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "មិន​រំពឹង​ថា​មាន ')'"
 
@@ -3235,7 +3196,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "មិន​អាច​បង្កើត​ថត​បណ្ដោះ​អាសន្ន​ពី​ពុម្ព \"%s\" ៖ %s"
 
@@ -3332,13 +3292,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "កញ្ចប់​"
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "មើល​"
 
@@ -3358,7 +3316,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "ជំនួយ"
 
@@ -3369,7 +3326,6 @@
 
 #: src/gtk/aptitude.glade:345 src/gtk/aptitude.glade:2614
 #, fuzzy
-#| msgid "List Update"
 msgid "Update"
 msgstr "ធ្វើ​ឲ្យ​បញ្ជី​ទាន់សម័យ"
 
@@ -3391,7 +3347,6 @@
 
 #: src/gtk/aptitude.glade:389 src/gtk/aptitude.glade:2658
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Remove"
 msgstr "បាន​ដំឡើង"
 
@@ -3405,33 +3360,28 @@
 
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "យក​តម្រង​ចេញពី​បញ្ជី​កញ្ចប់​"
 
 #: src/gtk/aptitude.glade:649
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "Apply these settings to all active package lists."
 msgstr "អនុវត្ត​តម្រង​ទៅ​កាន់​បញ្ជី​កញ្ចប់"
 
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "ស្វែងរក"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "ដំឡើងឡើងវិញ"
 
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "Err "
 
@@ -3446,13 +3396,11 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "ភាព​អាស្រ័យ​របស់ %s"
 
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "^Changelog"
 msgid "Changelog"
 msgstr "កំណត់​ហេតុ​ការ​ផ្លាស់ប្ដូរ"
 
@@ -3471,7 +3419,6 @@
 
 #: src/gtk/aptitude.glade:1051
 #, fuzzy
-#| msgid "Tags"
 msgid "tags"
 msgstr "ស្លាក"
 
@@ -3494,13 +3441,11 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "ស្ថាន​​ភាព"
 
 #: src/gtk/aptitude.glade:1247
 #, fuzzy
-#| msgid "Unknown action type: %s"
 msgid "Group by action type"
 msgstr "មិន​ស្គាល់​ប្រភេទ​សកម្មភាព ៖  %s"
 
@@ -3529,7 +3474,6 @@
 
 #: src/gtk/aptitude.glade:1328
 #, fuzzy
-#| msgid "Toggle ^Rejected"
 msgid "Rejected"
 msgstr "បិទបើក ការ​ច្រានចោល"
 
@@ -3548,32 +3492,27 @@
 
 #: src/gtk/aptitude.glade:1400
 #, fuzzy
-#| msgid "^Examine Solution"
 msgid "Find a new solution"
 msgstr "ពិនិត្យ​ដំណោះស្រាយ​"
 
 #: src/gtk/aptitude.glade:1404
 #, fuzzy
-#| msgid "Select the next solution to the dependency problems."
 msgid "Calculate the next solution that has not yet been generated."
 msgstr "ជ្រើស​ដំណោះស្រាយ​បន្ទាប់ ដើម្បី​ដោះស្រាយ​បញ្ហា​ភាព​អាស្រ័យ ។"
 
 #: src/gtk/aptitude.glade:1419
 #, fuzzy
-#| msgid "Perform the actions contained in the currently selected solution."
 msgid ""
 "Perform the actions in the currently selected solution and close this tab."
 msgstr "អនុវត្ត​សកម្មភាព​ដែល​មាន​នៅ​ក្នុង​ដំណោះស្រាយ ដែល​បាន​ជ្រើស​បច្ចុប្បន្ន ។"
 
 #: src/gtk/aptitude.glade:1576
 #, fuzzy
-#| msgid "Upgrade"
 msgid "Upgrade Summary"
 msgstr "ធ្វើ​ឲ្យ​ប្រសើរ"
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "កញ្ចប់​ប្រភព ៖ "
 
@@ -3585,7 +3524,6 @@
 
 #: src/gtk/aptitude.glade:1652
 #, fuzzy
-#| msgid "Manual"
 msgid "Fix Manually"
 msgstr "ដោយ​ដៃ"
 
@@ -3633,31 +3571,26 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "ខូច​"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "មិន​អាច​កែ​កញ្ចប់​ដែល​មិន​មាន​បាន​ឡើយ"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "រក​"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for: "
 msgid "Search for packages."
 msgstr "ស្វែងរក ៖ "
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "បាន "
 
@@ -3692,19 +3625,16 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "URL ដែលត្រូវប្រើ​​ដើម្បី​ទាញ​យក​កំណត់​ហេតុ​ការ​ផ្លាស់ប្ដូរ"
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "ទាមទារ​ឲ្យ​ដំឡើង %s កំណែ %s (%s)"
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -3712,20 +3642,17 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr "អ្នក​អាច​មើល​តែ​កំណត់ហេតុ​ការ​ផ្លាស់ប្ដូរ របស់​កញ្ចប់​ដេបៀន​ផ្លូវការ​ប៉ុណ្ណោះ ។"
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "​​ទាញយក​កំណត់​ហេតុ​ផ្លាស់ប្ដូរ"
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "URL ដែលត្រូវប្រើ​​ដើម្បី​ទាញ​យក​កំណត់​ហេតុ​ការ​ផ្លាស់ប្ដូរ"
 
@@ -3739,7 +3666,6 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "URL ដែលត្រូវប្រើ​​ដើម្បី​ទាញ​យក​កំណត់​ហេតុ​ការ​ផ្លាស់ប្ដូរ"
 
@@ -3749,8 +3675,6 @@
 
 #: src/gtk/dashboardtab.cc:414
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] "%d ធ្វើ​ឲ្យ​ប្រសើរ"
@@ -3758,13 +3682,11 @@
 
 #: src/gtk/dashboardtab.cc:633
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No upgrades are available."
 msgstr "មិន​បានដំឡើង​"
 
 #: src/gtk/dashboardtab.cc:645
 #, fuzzy
-#| msgid "Unable to locate package %s"
 msgid "Unable to calculate an upgrade."
 msgstr "មិន​អាច​រកទីតាំង​កញ្ចប់ %s"
 
@@ -3799,7 +3721,6 @@
 
 #: src/gtk/dashboardtab.cc:708
 #, fuzzy, c-format
-#| msgid "Internal error: Default column string is unparsable"
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr "កំហុស​ខាង​ក្នុង ៖ ខ្សែអក្សរ​ជួរឈរ​លំនាំដើម គឺ​មិន​អាច​ញែក​បាន​ឡើយ"
 
@@ -3838,7 +3759,6 @@
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "កំពុង​លុបឯកសារ​ដែល​បានទាញ​យក​"
 
@@ -3849,13 +3769,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "វឌ្ឍនភាពសរុប ៖ "
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description"
 msgid "Short Description"
 msgstr "ពិពណ៌​នា​"
 
@@ -3865,13 +3783,11 @@
 
 #: src/gtk/download.cc:319
 #, fuzzy
-#| msgid "Cleaning while a download is in progress is not allowed"
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr "មិន​អនុញ្ញាត​ឲ្យ​សម្អាត​ឡើយ ខណៈពេល​កំពុង​តែ​ទាញយក"
 
 #: src/gtk/download.cc:395 src/gtk/gui.cc:832
 #, fuzzy
-#| msgid "View next display"
 msgid "View Details"
 msgstr "មើល​ការ​បង្ហាញ​បន្ទាប់"
 
@@ -3891,19 +3807,16 @@
 
 #: src/gtk/download.cc:486
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s: %lu/%lu, stalled"
 msgstr "%s; នឹង​ត្រូវ​បាន​ដំឡើង"
 
 #: src/gtk/download.cc:507
 #, fuzzy, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr " [ %i%% ] (%s បៃ/វិ., នៅសល់ %s)"
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "ប៉ុន្តែ %s នឹង​ត្រូវ​បាន​ដំឡើង ។"
 
@@ -3917,7 +3830,6 @@
 
 #: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "មិន​អាច​រកទីតាំង​កញ្ចប់ %s"
 
@@ -3928,7 +3840,6 @@
 
 #: src/gtk/dpkg_terminal.cc:429
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "%s: Unable to accept a connection: %s"
 msgstr "មិន​អាច​បង្កើត​ថត​បណ្ដោះ​អាសន្ន​ពី​ពុម្ព \"%s\" ៖ %s"
 
@@ -3954,7 +3865,6 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "%s កំណែ"
 
@@ -3970,50 +3880,42 @@
 
 #: src/gtk/entitysummary.cc:142
 #, fuzzy, c-format
-#| msgid "Keep the following packages at their current version:"
 msgid "Don't hold %s at its current version."
 msgstr "រក្សា​កញ្ចប់​ខាង​ក្រោម​ត្រឹម​កំណែ​បច្ចុប្បន្ន​របស់​ពួកវា​ដដែល ៖"
 
 #: src/gtk/entitysummary.cc:145 src/gtk/entitysummary.cc:165
 #: src/gtk/entitysummary.cc:168
 #, fuzzy, c-format
-#| msgid "Canc^el pending actions"
 msgid "Cancel any actions on %s."
 msgstr "បោះបង់​សកម្មភាព​ដែល​មិន​ទាន់​សម្រេច"
 
 #: src/gtk/entitysummary.cc:150
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the purge of %s."
 msgstr "បោះបង់​ការយកចេញ​នៃ​ %F"
 
 #: src/gtk/entitysummary.cc:152
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s."
 msgstr "បោះបង់​ការយកចេញ​នៃ​ %F"
 
 #: src/gtk/entitysummary.cc:157
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the upgrade of %s."
 msgstr "បោះបង់​ការយកចេញ​នៃ​ %F"
 
 #: src/gtk/entitysummary.cc:159
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s."
 msgstr "បោះបង់ការដំឡើង​នៃ​ %F"
 
 #: src/gtk/entitysummary.cc:161
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the downgrade of %s."
 msgstr "បោះបង់​ការយកចេញ​នៃ​ %F"
 
 #: src/gtk/entitysummary.cc:163
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the reinstallation of %s."
 msgstr "បោះបង់ការដំឡើង​នៃ​ %F"
 
@@ -4024,7 +3926,6 @@
 
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "លុប​បំបាត់"
 
@@ -4035,7 +3936,6 @@
 
 #: src/gtk/entitysummary.cc:223
 #, fuzzy, c-format
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Mark %s as automatically installed."
 msgstr "'&M' ដើម្បី​សម្គាល់​កញ្ចប់​ថា​បាន​ដំឡើង​ដោយ​ស្វ័យប្រវត្តិ"
 
@@ -4046,7 +3946,6 @@
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
 msgid "%s is a virtual package provided by:\n"
 msgstr "\"%s\" ជា​កញ្ចប់​និម្មិត  ​ដែល​បាន​ផ្ដល់​ដោយ ៖\n"
 
@@ -4056,13 +3955,11 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "កញ្ចប់​ប្រភព ៖ "
 
 #: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 #, fuzzy
-#| msgid "ProgName"
 msgid "Name"
 msgstr "ឈ្មោះកម្មវិធី"
 
@@ -4072,13 +3969,11 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "មិន​អាច​បើក​ឯកសារ \"%s\" បាន​ឡើយ"
 
 #: src/gtk/entityview.cc:412
 #, fuzzy, c-format
-#| msgid "Rejecting the removal of %s"
 msgid "Editing the columns of \"%s\""
 msgstr "បដិសេធ​មិន​ឲ្យ​យក %s ចេញ"
 
@@ -4092,25 +3987,21 @@
 
 #: src/gtk/entityview.cc:570
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Whether the package is automatically installed."
 msgstr "'&M' ដើម្បី​សម្គាល់​កញ្ចប់​ថា​បាន​ដំឡើង​ដោយ​ស្វ័យប្រវត្តិ"
 
 #: src/gtk/entityview.cc:576
 #, fuzzy
-#| msgid "Cancel any action on the selected package"
 msgid "The name and description of the package."
 msgstr "បោះបង់​ចោល​សកម្មភាព​ចំពោះ​កញ្ចប់​ដែល​បាន​ជ្រើស"
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "កំណែ ៖ "
 
 #: src/gtk/entityview.cc:592
 #, fuzzy
-#| msgid "Check for new versions of packages"
 msgid "The version number of the package."
 msgstr "ពិនិត្យរក​កំណែ​ថ្មី​របស់​កញ្ចប់"
 
@@ -4131,7 +4022,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "ពុំ​បាន​ដំឡើង​"
 
@@ -4141,25 +4031,21 @@
 
 #: src/gtk/gui.cc:82
 #, fuzzy
-#| msgid "unpacked"
 msgid "Unpacked"
 msgstr "មិន​បាន​ខ្ចប់"
 
 #: src/gtk/gui.cc:83
 #, fuzzy
-#| msgid "half-config"
 msgid "Half-configured"
 msgstr "កំណត់រចនាសម្ព័ន្ធ-ពាក់កណ្ដាល"
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "half-install"
 msgid "Half-installed"
 msgstr "ដំឡើងពាក់កណ្ដាល"
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "មិន​បាន​ដំឡើង (នៅសល់​ឯកសារ​កំណត់រចនាសម្ព័ន្ធ)"
 
@@ -4193,7 +4079,6 @@
 
 #: src/gtk/gui.cc:97
 #, fuzzy
-#| msgid "forbidden upgrade"
 msgid "Hold (don't upgrade)"
 msgstr "ហាម​មិន​ឲ្យ​ធ្វើ​ឲ្យ​ប្រសើរ"
 
@@ -4212,7 +4097,6 @@
 
 #: src/gtk/gui.cc:290
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "អនុវត្ត​តម្រង​ទៅ​កាន់​បញ្ជី​កញ្ចប់"
 
@@ -4227,13 +4111,11 @@
 
 #: src/gtk/gui.cc:359
 #, fuzzy, c-format
-#| msgid "List Update"
 msgid "Update %s?"
 msgstr "ធ្វើ​ឲ្យ​បញ្ជី​ទាន់សម័យ"
 
 #: src/gtk/gui.cc:385
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
@@ -4261,31 +4143,26 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "%s changes"
 msgid "Done applying changes!"
 msgstr "ផ្លាស់ប្ដូរ %s ដង"
 
 #: src/gtk/gui.cc:823
 #, fuzzy
-#| msgid "%s changes"
 msgid "Applying changes..."
 msgstr "ផ្លាស់ប្ដូរ %s ដង"
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "[%s] %s\n"
 msgid "%s: %s"
 msgstr "[%s] %s\n"
 
 #: src/gtk/gui.cc:878
 #, fuzzy, c-format
-#| msgid "No broken packages."
 msgid "Error in package %s"
 msgstr "គ្មាន​កញ្ចប់​ខូច ។"
 
 #: src/gtk/gui.cc:906
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "មិន​អាច​ជំនួស %s ដោយ​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ​ថ្មី​បាន​ឡើយ"
 
@@ -4295,25 +4172,21 @@
 
 #: src/gtk/gui.cc:1038
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "គ្មាន​កញ្ចប់​ខូច ។"
 
 #: src/gtk/gui.cc:1071
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "គ្មាន​កញ្ចប់​ខូច ។"
 
 #: src/gtk/gui.cc:1075
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "ដោះស្រាយ​ភាពអាស្រ័យ​"
 
 #: src/gtk/gui.cc:1103
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "មិន​មាន​កញ្ចប់​ខូច​ឡើយ ។"
@@ -4321,13 +4194,11 @@
 
 #: src/gtk/gui.cc:1147
 #, fuzzy
-#| msgid "%s changes"
 msgid "View changes"
 msgstr "ផ្លាស់ប្ដូរ %s ដង"
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "%s changes"
 msgid "Apply changes"
 msgstr "ផ្លាស់ប្ដូរ %s ដង"
 
@@ -4336,8 +4207,6 @@
 #. font.
 #: src/gtk/gui.cc:1192
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%d package to install"
 msgid_plural "%d packages to install"
 msgstr[0] "%d ដំឡើង"
@@ -4348,7 +4217,6 @@
 #. font.
 #: src/gtk/gui.cc:1207
 #, fuzzy, c-format
-#| msgid "failed to remove %s"
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "បរាជ័យ​ក្នុង​ការ​យក %s ចេញ"
@@ -4356,7 +4224,6 @@
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "ទំហំទាញយក"
 
@@ -4371,19 +4238,16 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "not installed"
 msgid "Not implemented"
 msgstr "ពុំ​បាន​ដំឡើង​"
 
 #: src/gtk/gui.cc:1408 src/gtk/gui.cc:1427
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "បាន​ដំឡើង"
 
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "លុប​បំបាត់"
 
@@ -4401,7 +4265,6 @@
 
 #: src/gtk/gui.cc:1455
 #, fuzzy
-#| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "របៀបប្រើ"
 
@@ -4424,7 +4287,6 @@
 
 #: src/gtk/info.cc:496
 #, fuzzy
-#| msgid "Not Installed"
 msgid "Not available"
 msgstr "មិន​បានដំឡើង​"
 
@@ -4434,7 +4296,6 @@
 
 #: src/gtk/info.cc:555
 #, fuzzy
-#| msgid "Packages which depend on %s"
 msgid "Package information: dependency list"
 msgstr "កញ្ចប់​ដែល​អាស្រ័យ​លើ​%s"
 
@@ -4444,7 +4305,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "ទេ"
 
@@ -4458,7 +4318,6 @@
 
 #: src/gtk/packagestab.cc:203
 #, fuzzy, c-format
-#| msgid "No packages matched the pattern \"%ls\"."
 msgid "No packages matched \"%s\"."
 msgstr "មិន​មាន​កញ្ចប់​ណា​ដូច​លំនាំ \"%ls\" ឡើយ ។"
 
@@ -4468,31 +4327,26 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "កញ្ចប់ ៖ "
 
 #: src/gtk/pkgview.cc:224
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed automatically."
 msgstr "%s; នឹង​ត្រូវបាន​ដំឡើង​ដោយ​ស្វ័យប្រវត្តិ"
 
 #: src/gtk/pkgview.cc:227
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed automatically."
 msgstr "%s; នឹង​ត្រូវបាន​ដំឡើង​ដោយ​ស្វ័យប្រវត្តិ"
 
 #: src/gtk/pkgview.cc:235
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed manually."
 msgstr "%s; នឹង​ត្រូវបាន​ដំឡើង​ដោយ​ស្វ័យប្រវត្តិ"
 
 #: src/gtk/pkgview.cc:238
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed manually."
 msgstr "%s; នឹង​ត្រូវបាន​ដំឡើង​ដោយ​ស្វ័យប្រវត្តិ"
 
@@ -4502,13 +4356,11 @@
 
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "ស្វែងរក"
 
 #: src/gtk/pkgview.cc:718
 #, fuzzy
-#| msgid "Building view"
 msgid "Finalizing view"
 msgstr "ទិដ្ឋភាព​បង្កើត"
 
@@ -4637,13 +4489,11 @@
 
 #: src/gtk/previewtab.cc:179
 #, fuzzy
-#| msgid "Preview"
 msgid "Preview: "
 msgstr "មើល​ជា​​​មុន"
 
 #: src/gtk/resolver.cc:68
 #, fuzzy, c-format
-#| msgid "Error while dumping resolver state"
 msgid "Error in dependency resolver: %s"
 msgstr "មាន​កំហុស ខណៈពេល​បោះចោល​ស្ថានភាព​របស់​កម្មវិធី​ដោះស្រាយ"
 
@@ -4658,7 +4508,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package"
 msgid "Virtual package"
 msgstr "កញ្ចប់​"
 
@@ -4668,25 +4517,21 @@
 
 #: src/gtk/resolver.cc:377
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Removing %s is rejected."
 msgstr "កំពុង​យក %s ចេញ"
 
 #: src/gtk/resolver.cc:382
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Canceling the installation of %s is rejected."
 msgstr "បោះបង់ការដំឡើង​នៃ​ %F"
 
 #: src/gtk/resolver.cc:391
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Canceling the removal of %s is rejected."
 msgstr "បោះបង់​ការយកចេញ​នៃ​ %F"
 
 #: src/gtk/resolver.cc:394
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keeping %s at version %s is rejected."
 msgstr "រក្សា %F ត្រឹម​កំណែ %s (%s)"
 
@@ -4702,7 +4547,6 @@
 
 #: src/gtk/resolver.cc:413
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrading %s to version %s is rejected."
 msgstr "%s កំណែ"
 
@@ -4744,7 +4588,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr "%s កំណែ"
@@ -4842,7 +4685,6 @@
 
 #: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862
 #, fuzzy
-#| msgid "Remove the following packages:"
 msgid "Keep the following packages:"
 msgstr "យក​កញ្ចប់​ខាង​ក្រោម​ចេញ ៖"
 
@@ -4858,49 +4700,41 @@
 
 #: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900
 #, fuzzy
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "Leave the following dependencies unresolved:"
 msgstr "មិន​បាច់​ដោះស្រាយ​ភាព​អាស្រ័យ​ដូច​តទៅ​នេះ ៖ %n"
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Remove %F [%s (%s)]"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "យក %F ចេញ [%s (%s)]"
 
 #: src/gtk/resolver.cc:1523
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "ដំឡើង %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1531
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s"
 msgstr "បោះបង់ការដំឡើង​នៃ​ %F"
 
 #: src/gtk/resolver.cc:1534
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s"
 msgstr "បោះបង់​ការយកចេញ​នៃ​ %F"
 
 #: src/gtk/resolver.cc:1537
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "រក្សា %F ត្រឹម​កំណែ %s (%s)"
 
 #: src/gtk/resolver.cc:1544
 #, fuzzy, c-format
-#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "ធ្វើ​ឲ្យ %F ប្រសើរ [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1553
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "បន្ទាប %F [%s (%s) -> %s (%s)]"
 
@@ -4916,37 +4750,31 @@
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "រក្សា %F ត្រឹម​កំណែ %s (%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>keep</b> %s at version %s"
 msgstr "រក្សា %F ត្រឹម​កំណែ %s (%s)"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr "បោះបង់ការដំឡើង​នៃ​ %F"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>cancel</b> the installation of %s"
 msgstr "បោះបង់ការដំឡើង​នៃ​ %F"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>Install</b> %s %s"
 msgstr "ដំឡើង %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>install</b> %s %s"
 msgstr "ដំឡើង %F [%s (%s)]"
 
@@ -4962,13 +4790,11 @@
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>Upgrade</b> %s to version %s"
 msgstr "%s កំណែ"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>upgrade</b> %s to version %s"
 msgstr "%s កំណែ"
 
@@ -4984,8 +4810,6 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "%d ដំឡើង"
@@ -4993,8 +4817,6 @@
 
 #: src/gtk/resolver.cc:1740
 #, fuzzy, c-format
-#| msgid "%d removal"
-#| msgid_plural "%d removals"
 msgid "%s remove"
 msgid_plural "%s removes"
 msgstr[0] "%d ​យក​ចេញ"
@@ -5002,8 +4824,6 @@
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "%d keep"
-#| msgid_plural "%d keeps"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "%d រក្សា​ទុក"
@@ -5011,8 +4831,6 @@
 
 #: src/gtk/resolver.cc:1752
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%s upgrade"
 msgid_plural "%s upgrades"
 msgstr[0] "%d ធ្វើ​ឲ្យ​ប្រសើរ"
@@ -5020,8 +4838,6 @@
 
 #: src/gtk/resolver.cc:1758
 #, fuzzy, c-format
-#| msgid "%d downgrade"
-#| msgid_plural "%d downgrades"
 msgid "%s downgrade"
 msgid_plural "%s downgrades"
 msgstr[0] "%d បន្ទាប"
@@ -5029,7 +4845,6 @@
 
 #: src/gtk/resolver.cc:1764
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "%s unresolved recommendation"
 msgid_plural "%s unresolved recommendations"
 msgstr[0] "ពិនិត្យ​ការ​ផ្ដល់​អនុសាសន៍"
@@ -5037,7 +4852,6 @@
 
 #: src/gtk/resolver.cc:2056
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions yet."
 msgstr "មិន​មាន​ដំណោះស្រាយ​ផ្សេង​ឡើយ ។"
 
@@ -5048,7 +4862,6 @@
 
 #: src/gtk/resolver.cc:2064
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions."
 msgstr "មិន​មាន​ដំណោះស្រាយ​ផ្សេង​ឡើយ ។"
 
@@ -5058,19 +4871,16 @@
 
 #: src/gtk/resolver.cc:2076
 #, fuzzy, c-format
-#| msgid "No more solutions."
 msgid "%u solutions."
 msgstr "មិន​មាន​ដំណោះស្រាយ​ផ្សេង​ឡើយ ។"
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "មិន​អាច​បើក​ឯកសារ \"%s\" បាន​ឡើយ"
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr "[បានទាញយក]"
 
@@ -5120,7 +4930,6 @@
 
 #: src/load_grouppolicy.cc:305
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected ',', '%c', or '('; got '%c'"
 msgstr "បាន​រំពឹង ',' ឬ '(' ប៉ុន្តែ​បែរ​ជា​ជួប '%c' ទៅ​វិញ"
 
@@ -5408,44 +5217,36 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - ដំឡើង ឬ ធ្វើ​ឲ្យ​កញ្ចប់​ទាន់សម័យ\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - យក​កញ្ចប់​ចេញ\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - យក​កញ្ចប់ និង ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ​របស់​ពួក​វា​ចេញ\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - ដាក់​កញ្ចប់​នៅ​ក្នុង​ស្ថានភាព​រង់ចាំ\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - បោះបង់​ពាក្យបញ្ជា hold សម្រាប់​កញ្ចប់​មួយ\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - សម្គាល់​កញ្ចប់​ថា​ត្រូវ​បាន​ដំឡើង​ដោយ​ស្វ័យប្រវត្តិ\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - សម្គាល់​កញ្ចប់​ថា​ត្រូវ​បាន​ដំឡើង​ដោយ​ដៃ\n"
 
@@ -5459,7 +5260,6 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - ទាញយក​បញ្ជី​កញ្ចប់​ថ្មី/អាច​ធ្វើ​ឲ្យ​ទាន់សម័យ​បាន\n"
 
@@ -5482,51 +5282,41 @@
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - បំភ្លេច​កញ្ចប់​ដែល \"ថ្មី\"\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - ស្វែងរក​កញ្ចប់​មួយ​តាម​រយៈ​ឈ្មោះ និង/ឬ កន្សោម\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - បង្ហាញ​ព័ត៌មាន​លម្អិត​អំពី​កញ្ចប់​មួយ\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - លុប​ឯកសារ​កញ្ចប់​ដែល​បាន​ទាញយក\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - លុប​ឯកសារ​កញ្ចប់​ចាស់ៗ​ដែល​បាន​ទាញយក\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - មើល​កំណត់ហេតុ​ការ​ផ្លាស់ប្ដូរ​របស់​កញ្ចប់​មួយ\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - ទាញយក​ឯកសារ .deb របស់​កញ្ចប់​មួយ\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5556,7 +5346,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             អត្ថបទ​ជំនួយ​នេះ\n"
 
@@ -5584,24 +5373,17 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             សាកសួរ​ជានិច្ច មុន​នឹង​ធ្វើ​អ្វី​មួយ\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr " -y             សន្មត​ថា​ចម្លើយ​របស់​សំណួរ បាទ/ចាស ឬ ទេ ធម្មតាៗ​គឺ​ជា 'បាទ/ចាស'\n"
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5609,9 +5391,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5619,8 +5398,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 ទទឹង       បញ្ជាក់ទទឹងដើម្បី​ធ្វើ​ទ្រង់ទ្រាយ​លទ្ធផល​ស្វែងរក\n"
@@ -5648,9 +5425,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5658,8 +5432,6 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr " -t [ការចេញផ្សាយ]   កំណត់​ការ​ចេញផ្សាយ ដែល​គួរ​ដំឡើង​កញ្ចប់​ពី\n"
@@ -5673,15 +5445,11 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o កូនសោ=តម្លៃ     កំណត់​ដោយ​ផ្ទាល់​នូវ​ជម្រើស​ការ​កំណត់​រចនាសម្ព័ន្ធ ដែល​មាន​ឈ្មោះ 'កូនសោ'\n"
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -5718,7 +5486,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "replaces"
 msgid "trace"
 msgstr "ជំនួស​"
 
@@ -5732,7 +5499,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "ទេ"
 
@@ -5746,7 +5512,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:377
 #, fuzzy
-#| msgid "Err "
 msgid "error"
 msgstr "Err "
 
@@ -5774,7 +5539,6 @@
 
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "ប្រតិបត្តិការ %s មិន​ត្រឹមត្រូវ"
 
@@ -5827,7 +5591,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "កញ្ចប់​"
 
@@ -5837,7 +5600,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "កញ្ចប់​ទាំង​អស់"
 
@@ -5857,7 +5619,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -5865,8 +5626,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -5874,7 +5633,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "មិន​គួរ​បញ្ជាក់ -u និង -i ជាមួយ​ពាក្យបញ្ជា​ឡើយ"
 
@@ -7080,7 +6838,6 @@
 
 #: src/ui.cc:472
 #, fuzzy, c-format
-#| msgid "Unable to open %ls"
 msgid "Unable to fork: %s"
 msgstr "មិន​អាច​បើក​ %ls"
 
@@ -7348,9 +7105,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7371,9 +7125,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7898,19 +7649,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "URL ដែលត្រូវប្រើ​​ដើម្បី​ទាញ​យក​កំណត់​ហេតុ​ការ​ផ្លាស់ប្ដូរ"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "URL ដែលត្រូវប្រើ​​ដើម្បី​ទាញ​យក​កំណត់​ហេតុ​ការ​ផ្លាស់ប្ដូរ"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "​​ទាញយក​កំណត់​ហេតុ​ផ្លាស់ប្ដូរ"
 
Index: aptitude/po/ku.po
===================================================================
--- aptitude.orig/po/ku.po
+++ aptitude/po/ku.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2008-09-01 16:03+0200\n"
 "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
 "Language-Team: Kurdish <ubuntu-l10n-kur@lists.ubuntu.com>\n"
@@ -719,7 +719,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "Cancel"
 msgid "Changelog download failed: %s"
 msgstr "Betal"
 
@@ -876,7 +875,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "tune"
 
@@ -1538,13 +1536,11 @@
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "Tawsiye"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Çalakî"
 
@@ -1727,13 +1723,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "lê sazkirina wê ne gengaz e"
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "le %s dê were sazkirin."
 
@@ -1832,13 +1826,11 @@
 
 #: src/cmdline/cmdline_show.cc:326
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s%s; will be installed"
 msgstr "%s; dê were sazkirin"
 
 #: src/cmdline/cmdline_show.cc:328
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s%s; will be installed automatically"
 msgstr "le %s dê were sazkirin."
 
@@ -2100,25 +2092,21 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "Pakêt"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Pakêta Çavkaniyê:"
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Arşîv"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\".\n"
 msgid "No such package \"%s\"."
 msgstr "Pakêteke wusa tune \"%s\".\n"
 
@@ -2311,7 +2299,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[ÇEWTÎ]"
 
@@ -2838,7 +2825,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Filtering packages"
 msgstr "Pakêtên şikestî tune."
 
@@ -2946,19 +2932,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "Downloading "
 msgid "Failed to download changelogs: %s"
 msgstr "Tê daxistin "
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "Downloading "
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "Tê daxistin "
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "Cancel"
 msgid "Changelog of %s"
 msgstr "Betal"
 
@@ -3003,7 +2986,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Downloading "
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Tê daxistin "
 
@@ -3018,14 +3000,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "No packages are broken."
 msgid "No tag descriptions are available."
 msgstr "Pakêtên şikestî tune"
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "No description available for %s."
 msgstr "Pakêtên şikestî tune"
 
@@ -3116,13 +3096,11 @@
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " an"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Upgrade"
 msgid "Unexpected %s"
 msgstr "Bilindkirin"
 
@@ -3167,7 +3145,6 @@
 
 #: src/gtk/aptitude.glade:19 src/gtk/aptitude.glade:2273
 #, fuzzy
-#| msgid "False"
 msgid "_File"
 msgstr "Şaş"
 
@@ -3228,13 +3205,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "Pakêt"
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "Bergeh"
 
@@ -3254,7 +3229,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "Alîkarî"
 
@@ -3265,7 +3239,6 @@
 
 #: src/gtk/aptitude.glade:345 src/gtk/aptitude.glade:2614
 #, fuzzy
-#| msgid "Upgrade"
 msgid "Update"
 msgstr "Bilindkirin"
 
@@ -3287,7 +3260,6 @@
 
 #: src/gtk/aptitude.glade:389 src/gtk/aptitude.glade:2658
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Remove"
 msgstr "Sazkirî"
 
@@ -3310,13 +3282,11 @@
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "Lê bigere"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "dîsa sazkirin"
 
@@ -3336,19 +3306,16 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Depends"
 msgid "Dependencies"
 msgstr "Bindest e"
 
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "Cancel"
 msgid "Changelog"
 msgstr "Betal"
 
 #: src/gtk/aptitude.glade:1020
 #, fuzzy
-#| msgid "False"
 msgid "Files"
 msgstr "Şaş"
 
@@ -3362,7 +3329,6 @@
 
 #: src/gtk/aptitude.glade:1051
 #, fuzzy
-#| msgid "Tags"
 msgid "tags"
 msgstr "Etîket"
 
@@ -3385,7 +3351,6 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "Rewş"
 
@@ -3422,7 +3387,6 @@
 
 #: src/gtk/aptitude.glade:1343
 #, fuzzy
-#| msgid "Preferences"
 msgid "No preference"
 msgstr "Vebijêrk"
 
@@ -3449,13 +3413,11 @@
 
 #: src/gtk/aptitude.glade:1576
 #, fuzzy
-#| msgid "Upgrade"
 msgid "Upgrade Summary"
 msgstr "Bilindkirin"
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "Pakêta Çavkaniyê:"
 
@@ -3513,31 +3475,26 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "Şikestî"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Upgrade the following packages:"
 msgid "Explore the available packages."
 msgstr "Ev paketan bilind bike:"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "^Lêgerîn"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for: "
 msgid "Search for packages."
 msgstr "Lê bigere:"
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "Stand "
 
@@ -3571,7 +3528,6 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "Downloading "
 msgid "Failed to download the changelog: %s"
 msgstr "Tê daxistin "
 
@@ -3595,13 +3551,11 @@
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading "
 msgid "Downloading the changelog of %s version %s..."
 msgstr "Tê daxistin "
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "Downloading "
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "Tê daxistin "
 
@@ -3623,8 +3577,6 @@
 
 #: src/gtk/dashboardtab.cc:414
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] "%d bilindkirin"
@@ -3632,7 +3584,6 @@
 
 #: src/gtk/dashboardtab.cc:633
 #, fuzzy
-#| msgid "No packages are broken."
 msgid "No upgrades are available."
 msgstr "Pakêtên şikestî tune"
 
@@ -3700,14 +3651,11 @@
 
 #: src/gtk/download.cc:185
 #, fuzzy
-#| msgid "False"
 msgid "Failed"
 msgstr "Şaş"
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "%d downgrade"
-#| msgid_plural "%d downgrades"
 msgid "Already downloaded"
 msgstr "%d nizmkirin"
 
@@ -3718,13 +3666,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "Pêşkeftina gişti:"
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description: "
 msgid "Short Description"
 msgstr "Rave: "
 
@@ -3756,7 +3702,6 @@
 
 #: src/gtk/download.cc:486
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s: %lu/%lu, stalled"
 msgstr "%s; dê were sazkirin"
 
@@ -3767,7 +3712,6 @@
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "le %s dê were sazkirin."
 
@@ -3816,80 +3760,67 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "%s guherto"
 
 #: src/gtk/entitysummary.cc:123
 #, fuzzy, c-format
-#| msgid "Installing %s %s (%s)"
 msgid "Install %s version %s"
 msgstr "%s %s (%s) tên sazkirin"
 
 #: src/gtk/entitysummary.cc:131
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrade to %s version %s"
 msgstr "%F  nizim bike [%s (%s) -> %s (%s)]"
 
 #: src/gtk/entitysummary.cc:142
 #, fuzzy, c-format
-#| msgid "Keep the following packages at their current version:"
 msgid "Don't hold %s at its current version."
 msgstr "Ev pakêtan di guhartoya xwe de bihêle:"
 
 #: src/gtk/entitysummary.cc:145 src/gtk/entitysummary.cc:165
 #: src/gtk/entitysummary.cc:168
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel any actions on %s."
 msgstr "Sazkirina %F betal bike"
 
 #: src/gtk/entitysummary.cc:150
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the purge of %s."
 msgstr "Rakirina %F betal bike"
 
 #: src/gtk/entitysummary.cc:152
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s."
 msgstr "Rakirina %F betal bike"
 
 #: src/gtk/entitysummary.cc:157
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the upgrade of %s."
 msgstr "Rakirina %F betal bike"
 
 #: src/gtk/entitysummary.cc:159
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s."
 msgstr "Sazkirina %F betal bike"
 
 #: src/gtk/entitysummary.cc:161
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the downgrade of %s."
 msgstr "Rakirina %F betal bike"
 
 #: src/gtk/entitysummary.cc:163
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the reinstallation of %s."
 msgstr "Sazkirina %F betal bike"
 
 #: src/gtk/entitysummary.cc:206
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "Remove %s"
 msgstr "Rakirin(%s)"
 
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "^Tam rakirin"
 
@@ -3900,7 +3831,6 @@
 
 #: src/gtk/entitysummary.cc:223
 #, fuzzy, c-format
-#| msgid "Automatically Installed"
 msgid "Mark %s as automatically installed."
 msgstr "Bixweber hatiye sazkirin"
 
@@ -3911,7 +3841,6 @@
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid " which is a virtual package."
 msgid "%s is a virtual package provided by:\n"
 msgstr " ku paketeke farazî (virtual) ye."
 
@@ -3921,7 +3850,6 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "Pakêta Çavkaniyê:"
 
@@ -3935,7 +3863,6 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Versions of %s"
 msgid "Columns of \"%s\":"
 msgstr "Guhertoyên %s"
 
@@ -3963,7 +3890,6 @@
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "Guherto: "
 
@@ -3988,7 +3914,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "ne sazkirî"
 
@@ -4006,7 +3931,6 @@
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "installed"
 msgid "Half-installed"
 msgstr "sazkirî"
 
@@ -4044,7 +3968,6 @@
 
 #: src/gtk/gui.cc:97
 #, fuzzy
-#| msgid "forbidden upgrade"
 msgid "Hold (don't upgrade)"
 msgstr "bilindkirina qedexe"
 
@@ -4075,7 +3998,6 @@
 
 #: src/gtk/gui.cc:359
 #, fuzzy, c-format
-#| msgid "Upgrade"
 msgid "Update %s?"
 msgstr "Bilindkirin"
 
@@ -4108,25 +4030,21 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "%s changes"
 msgid "Done applying changes!"
 msgstr "%s guhartin"
 
 #: src/gtk/gui.cc:823
 #, fuzzy
-#| msgid "%s changes"
 msgid "Applying changes..."
 msgstr "%s guhartin"
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "[%s] %s\n"
 msgid "%s: %s"
 msgstr "[%s] %s\n"
 
 #: src/gtk/gui.cc:878
 #, fuzzy, c-format
-#| msgid "No broken packages."
 msgid "Error in package %s"
 msgstr "Pakêtên şikestî tune."
 
@@ -4141,13 +4059,11 @@
 
 #: src/gtk/gui.cc:1038
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "Pakêtên şikestî tune."
 
 #: src/gtk/gui.cc:1071
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "Pakêtên şikestî tune."
 
@@ -4157,7 +4073,6 @@
 
 #: src/gtk/gui.cc:1103
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Pakêtên şikestî tune"
@@ -4165,13 +4080,11 @@
 
 #: src/gtk/gui.cc:1147
 #, fuzzy
-#| msgid "%s changes"
 msgid "View changes"
 msgstr "%s guhartin"
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "%s changes"
 msgid "Apply changes"
 msgstr "%s guhartin"
 
@@ -4180,8 +4093,6 @@
 #. font.
 #: src/gtk/gui.cc:1192
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%d package to install"
 msgid_plural "%d packages to install"
 msgstr[0] "%d sazkirin"
@@ -4192,7 +4103,6 @@
 #. font.
 #: src/gtk/gui.cc:1207
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "Pakêtên şikestî tune"
@@ -4200,7 +4110,6 @@
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "Downloaded %sB in %s (%sB/s)."
 msgid "Download size: %sB."
 msgstr "%sB di (%sB/ç) de %s hatin daxistin."
 
@@ -4215,19 +4124,16 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "not installed"
 msgid "Not implemented"
 msgstr "ne sazkirî"
 
 #: src/gtk/gui.cc:1408 src/gtk/gui.cc:1427
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "Sazkirî"
 
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "^Tam rakirin"
 
@@ -4258,7 +4164,6 @@
 
 #: src/gtk/info.cc:161 src/gtk/pkgview.cc:169
 #, fuzzy
-#| msgid "Current status: %F."
 msgid "Current status"
 msgstr "Rewşa niha: %F"
 
@@ -4284,7 +4189,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "na"
 
@@ -4298,7 +4202,6 @@
 
 #: src/gtk/packagestab.cc:203
 #, fuzzy, c-format
-#| msgid "No such package \"%s\".\n"
 msgid "No packages matched \"%s\"."
 msgstr "Pakêteke wusa tune \"%s\".\n"
 
@@ -4308,7 +4211,6 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "Pakêt: "
 
@@ -4319,19 +4221,16 @@
 
 #: src/gtk/pkgview.cc:227
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s is being installed automatically."
 msgstr "le %s dê were sazkirin."
 
 #: src/gtk/pkgview.cc:235
 #, fuzzy, c-format
-#| msgid "but %s is installed."
 msgid "%s was installed manually."
 msgstr "lê %s sazkirî ye."
 
 #: src/gtk/pkgview.cc:238
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s is being installed manually."
 msgstr "le %s dê were sazkirin."
 
@@ -4341,7 +4240,6 @@
 
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "Lê bigere"
 
@@ -4441,7 +4339,6 @@
 
 #: src/gtk/previewtab.cc:179
 #, fuzzy
-#| msgid "Preview"
 msgid "Preview: "
 msgstr "Pêşdîtin"
 
@@ -4461,7 +4358,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package"
 msgid "Virtual package"
 msgstr "Pakêt"
 
@@ -4471,43 +4367,36 @@
 
 #: src/gtk/resolver.cc:377
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Removing %s is rejected."
 msgstr "%s tê rakirin"
 
 #: src/gtk/resolver.cc:382
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Canceling the installation of %s is rejected."
 msgstr "Sazkirina %F betal bike"
 
 #: src/gtk/resolver.cc:391
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Canceling the removal of %s is rejected."
 msgstr "Rakirina %F betal bike"
 
 #: src/gtk/resolver.cc:394
 #, fuzzy, c-format
-#| msgid "  Apt version: %s\n"
 msgid "Keeping %s at version %s is rejected."
 msgstr "Guhertoya Apt: %s\n"
 
 #: src/gtk/resolver.cc:401
 #, fuzzy, c-format
-#| msgid "Installing %s %s (%s)"
 msgid "Installing %s version %s is rejected."
 msgstr "%s %s (%s) tên sazkirin"
 
 #: src/gtk/resolver.cc:407
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrading %s to version %s is rejected."
 msgstr "%F  nizim bike [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:413
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrading %s to version %s is rejected."
 msgstr "%s guherto"
 
@@ -4549,7 +4438,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr "%s guherto"
@@ -4647,7 +4535,6 @@
 
 #: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862
 #, fuzzy
-#| msgid "Remove the following packages:"
 msgid "Keep the following packages:"
 msgstr "Ev paketan rake:"
 
@@ -4663,121 +4550,101 @@
 
 #: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900
 #, fuzzy
-#| msgid "Remove the following packages:"
 msgid "Leave the following dependencies unresolved:"
 msgstr "Ev paketan rake:"
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Remove %F [%s (%s)]"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "%F [%s (%s)] rake"
 
 #: src/gtk/resolver.cc:1523
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "%F [%s (%s)] saz bike"
 
 #: src/gtk/resolver.cc:1531
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s"
 msgstr "Sazkirina %F betal bike"
 
 #: src/gtk/resolver.cc:1534
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s"
 msgstr "Rakirina %F betal bike"
 
 #: src/gtk/resolver.cc:1537
 #, fuzzy, c-format
-#| msgid "  Apt version: %s\n"
 msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "Guhertoya Apt: %s\n"
 
 #: src/gtk/resolver.cc:1544
 #, fuzzy, c-format
-#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "%F bilind bike [%s (%s) -> %s (%s)] "
 
 #: src/gtk/resolver.cc:1553
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "%F  nizim bike [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>Remove</b> %s"
 msgstr "Rakirin(%s)"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>remove</b> %s"
 msgstr "Rakirin(%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "  Apt version: %s\n"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "Guhertoya Apt: %s\n"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "  Apt version: %s\n"
 msgid "<b>keep</b> %s at version %s"
 msgstr "Guhertoya Apt: %s\n"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr "Sazkirina %F betal bike"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>cancel</b> the installation of %s"
 msgstr "Sazkirina %F betal bike"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>Install</b> %s %s"
 msgstr "%F [%s (%s)] saz bike"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>install</b> %s %s"
 msgstr "%F [%s (%s)] saz bike"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "<b>Downgrade</b> %s to version %s"
 msgstr "%F  nizim bike [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "<b>downgrade</b> %s to version %s"
 msgstr "%F  nizim bike [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>Upgrade</b> %s to version %s"
 msgstr "%s guherto"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>upgrade</b> %s to version %s"
 msgstr "%s guherto"
 
@@ -4793,8 +4660,6 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "%d sazkirin"
@@ -4802,8 +4667,6 @@
 
 #: src/gtk/resolver.cc:1740
 #, fuzzy, c-format
-#| msgid "%d removal"
-#| msgid_plural "%d removals"
 msgid "%s remove"
 msgid_plural "%s removes"
 msgstr[0] "%d rakirin"
@@ -4811,8 +4674,6 @@
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "%d keep"
-#| msgid_plural "%d keeps"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "%d hêlan"
@@ -4820,8 +4681,6 @@
 
 #: src/gtk/resolver.cc:1752
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%s upgrade"
 msgid_plural "%s upgrades"
 msgstr[0] "%d bilindkirin"
@@ -4829,8 +4688,6 @@
 
 #: src/gtk/resolver.cc:1758
 #, fuzzy, c-format
-#| msgid "%d downgrade"
-#| msgid_plural "%d downgrades"
 msgid "%s downgrade"
 msgid_plural "%s downgrades"
 msgstr[0] "%d nizmkirin"
@@ -4838,7 +4695,6 @@
 
 #: src/gtk/resolver.cc:1764
 #, fuzzy, c-format
-#| msgid "Recommendations"
 msgid "%s unresolved recommendation"
 msgid_plural "%s unresolved recommendations"
 msgstr[0] "Tawsiye"
@@ -4846,19 +4702,16 @@
 
 #: src/gtk/resolver.cc:2056
 #, fuzzy
-#| msgid "No resolution found."
 msgid "No solutions yet."
 msgstr "Çareserî nehat dîtin."
 
 #: src/gtk/resolver.cc:2063
 #, fuzzy
-#| msgid "No resolution found."
 msgid "No dependency solution was found."
 msgstr "Çareserî nehat dîtin."
 
 #: src/gtk/resolver.cc:2064
 #, fuzzy
-#| msgid "No resolution found."
 msgid "No solutions."
 msgstr "Çareserî nehat dîtin."
 
@@ -4868,19 +4721,16 @@
 
 #: src/gtk/resolver.cc:2076
 #, fuzzy, c-format
-#| msgid "No resolution found."
 msgid "%u solutions."
 msgstr "Çareserî nehat dîtin."
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Versions of %s"
 msgid "Solution %s of %s."
 msgstr "Guhertoyên %s"
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr "[Hatiye daxistin]"
 
@@ -5149,13 +4999,11 @@
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "  Apt version: %s\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "Guhertoya Apt: %s\n"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "  Apt version: %s\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "Guhertoya Apt: %s\n"
 
@@ -5209,7 +5057,6 @@
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid "No broken packages."
 msgid " remove       - Remove packages.\n"
 msgstr "Pakêtên şikestî tune."
 
@@ -5230,7 +5077,6 @@
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid "Automatically Installed"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr "Bixweber hatiye sazkirin"
 
@@ -5472,7 +5318,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "true"
 msgid "trace"
 msgstr "rast"
 
@@ -5486,7 +5331,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "na"
 
@@ -5506,7 +5350,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:380
 #, fuzzy
-#| msgid "false"
 msgid "fatal"
 msgstr "şaş"
 
@@ -5579,7 +5422,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "Pakêt"
 
@@ -5589,7 +5431,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "Hemû Pakêt"
 
@@ -7561,19 +7402,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "Downloading "
 msgid "Preparing to download the changelog of %s"
 msgstr "Tê daxistin "
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "Downloading "
 msgid "Failed to download the changelog of %s: %s"
 msgstr "Tê daxistin "
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading "
 msgid "Downloading the changelog of %s"
 msgstr "Tê daxistin "
 
Index: aptitude/po/lt.po
===================================================================
--- aptitude.orig/po/lt.po
+++ aptitude/po/lt.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: aptitude_lt\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2008-08-25 12:12+0300\n"
 "Last-Translator: Darius Žitkevičius <skystis@gmail.com>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -258,9 +258,6 @@
 
 #: src/apt_options.cc:241
 #, fuzzy
-#| msgid ""
-#| "If this option is enabled, the menu bar will only appear when it has been "
-#| "activated by pressing the menu key."
 msgid ""
 "If this option is enabled, then the first view displayed on startup will be "
 "a flat view instead of the default view."
@@ -687,7 +684,6 @@
 
 #: src/cmdline/cmdline_action.cc:212
 #, fuzzy, c-format
-#| msgid "Unable to satisfy the build-depends: %s."
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Nepavyko patenkinti build-depends: %s."
 
@@ -744,13 +740,11 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s šiuo metu nėra įdiegtas, todėl negali būti įdiegtas iš naujo.\n"
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "tinkama paketo %s versija (%s) jau įdiegta\n"
@@ -852,7 +846,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "Pasikeitimų sąrašas paketui %s"
 
@@ -1017,7 +1010,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "nieko"
 
@@ -1420,7 +1412,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "'&M' kad pažymėti kaip automatiška įdiegtus"
 
@@ -1553,9 +1544,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy, c-format
-#| msgid ""
-#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: "
-#| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
@@ -1601,10 +1589,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:259
 #, fuzzy
-#| msgid ""
-#| "reject the given package versions; don't display any solutions in which "
-#| "they occur.  Enter UNINST instead of a version to reject removing the "
-#| "package."
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package.  "
@@ -1615,9 +1599,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:261
 #, fuzzy
-#| msgid ""
-#| "accept the given package versions; display only solutions in which they "
-#| "occur.  Enter UNINST instead of a version to accept removing the package."
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package.  "
@@ -1719,31 +1700,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "Šias rekomendacijas palikti neišspręstas:"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "Patikrinti ^rekomendacijas"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "%s pašalinimas nebėra būtinas"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "Patikrinti ^rekomendacijas"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Veiksmai"
 
@@ -1898,13 +1874,11 @@
 
 #: src/cmdline/cmdline_resolver.cc:1201
 #, fuzzy
-#| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr "Nepavyksta išspręsti atnaujinimo priklausomybių (sprendimas nerastas)."
 
 #: src/cmdline/cmdline_resolver.cc:1207
 #, fuzzy, c-format
-#| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Nepavyksta išspręsti atnaujinimo priklausomybių (%s)."
 
@@ -1935,13 +1909,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "tačiau jis negali būti įdiegtas"
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "tačiau %s bus įdiegtas"
 
@@ -2041,13 +2013,11 @@
 
 #: src/cmdline/cmdline_show.cc:326
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s%s; will be installed"
 msgstr "%s; bus įdiegtas"
 
 #: src/cmdline/cmdline_show.cc:328
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s%s; will be installed automatically"
 msgstr "%s; bus įdiegtas automatiškai"
 
@@ -2316,25 +2286,21 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "Paketai"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Kilęs iš paketo: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Archyvas"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\".\n"
 msgid "No such package \"%s\"."
 msgstr "Nėra tokio paketo „%s“.\n"
 
@@ -2373,7 +2339,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "paieška: Jūs turite įvesti bent vieną paieškos žodį\n"
 
@@ -2497,7 +2462,6 @@
 
 #: src/cmdline/cmdline_why.cc:1285
 #, fuzzy, c-format
-#| msgid "Packages depending on %s"
 msgid "Packages requiring %s:"
 msgstr "Paketai, kuriems reikia %s"
 
@@ -2513,8 +2477,6 @@
 
 #: src/cmdline/cmdline_why.cc:1416
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: this command requires at least one argument (the package to query)."
 msgid ""
 "%s: this command requires at least one argument (the package to query).\n"
 msgstr "%s: ši komanda reikalauja bent vieno argumento (paketo užklausai)."
@@ -2532,7 +2494,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[KLAIDA]"
 
@@ -2884,7 +2845,6 @@
 
 #: src/generic/apt/download_update_manager.cc:138
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated quoted string in command: %s"
 msgstr "Neuždarytas reiškinys po %s"
 
@@ -2969,7 +2929,6 @@
 
 #: src/generic/apt/dump_packages.cc:674
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create truncated cache: %s."
 msgstr "Nepavyko surasti paketą %s"
 
@@ -3092,7 +3051,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "Gaunu paketus"
 
@@ -3130,7 +3088,6 @@
 
 #: src/generic/apt/matching/parse.cc:860
 #, fuzzy, c-format
-#| msgid "Unknown matcher type: \"%s\"."
 msgid "Unknown term type: \"%s\"."
 msgstr "Nežinomas derinio tipas:„%s“."
 
@@ -3166,7 +3123,6 @@
 
 #: src/generic/apt/matching/parse.cc:1388
 #, fuzzy, c-format
-#| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "Blogai suformuotas reiškinys"
 
@@ -3204,19 +3160,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "URL adresas, iš kur paimami pakeitimų žurnalai"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "URL adresas, iš kur paimami pakeitimų žurnalai"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "Pasikeitimų sąrašas paketui %s"
 
@@ -3261,7 +3214,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Nepavyko interpretuoti derinio %s"
 
@@ -3276,14 +3228,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "Neįdiegtas"
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "Neįdiegtas"
 
@@ -3310,19 +3260,16 @@
 
 #: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got EOF."
 msgstr "Tikėtasi '%c', gauta '%c'."
 
 #: src/generic/util/parsers.h:737
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got '%s'."
 msgstr "Tikėtasi '%c', gauta '%c'."
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr ""
 "Po -q=\n"
@@ -3330,49 +3277,41 @@
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "Netinkamas veiksmo simbolis „%c“\n"
 
 #: src/generic/util/parsers.h:832
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got EOF."
 msgstr "Tikėtasi '%c', gauta '%c'."
 
 #: src/generic/util/parsers.h:843
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got '%c'."
 msgstr "Tikėtasi '%c', gauta '%c'."
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "Tikėtasi taisyklų aprašo, gauta '%c'"
 
 #: src/generic/util/parsers.h:1026
 #, fuzzy
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected an integer following '-', got EOF."
 msgstr "Tikėtasi ',' arba '(', ir '||' gauta '%s'"
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "Tikėtasi taisyklų aprašo, gauta '%c'"
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "Klaidingas veiksmas %s"
 
 #: src/generic/util/parsers.h:1077
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected EOF, got '%c'."
 msgstr "Tikėtasi '%c', gauta '%c'."
 
@@ -3386,19 +3325,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "Netikėtas „)“"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " arba"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "Netikėtas „)“"
 
@@ -3409,7 +3345,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "Iš šablono \"%s\": %s nepavyko sukurti laikino aplanko"
 
@@ -3444,7 +3379,6 @@
 
 #: src/gtk/aptitude.glade:19 src/gtk/aptitude.glade:2273
 #, fuzzy
-#| msgid "False"
 msgid "_File"
 msgstr "Ne"
 
@@ -3509,13 +3443,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "Paketas"
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "Rodymas"
 
@@ -3535,7 +3467,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "Pagalba"
 
@@ -3546,7 +3477,6 @@
 
 #: src/gtk/aptitude.glade:345 src/gtk/aptitude.glade:2614
 #, fuzzy
-#| msgid "List Update"
 msgid "Update"
 msgstr "Atnaujinimų sąrašas"
 
@@ -3568,7 +3498,6 @@
 
 #: src/gtk/aptitude.glade:389 src/gtk/aptitude.glade:2658
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Remove"
 msgstr "Įdiegtas"
 
@@ -3582,33 +3511,28 @@
 
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "Nebenaudoti paketų sąrašo filtro"
 
 #: src/gtk/aptitude.glade:649
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "Apply these settings to all active package lists."
 msgstr "Pritaikyti filtrą paketų sąrašui"
 
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "Paieška"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "įdiegti iš naujo"
 
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "Kld "
 
@@ -3623,19 +3547,16 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "Paketo %s priklausomybės."
 
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "^Changelog"
 msgid "Changelog"
 msgstr " Pakeitimų ^sąrašas"
 
 #: src/gtk/aptitude.glade:1020
 #, fuzzy
-#| msgid "False"
 msgid "Files"
 msgstr "Ne"
 
@@ -3649,7 +3570,6 @@
 
 #: src/gtk/aptitude.glade:1051
 #, fuzzy
-#| msgid "Tags"
 msgid "tags"
 msgstr "Žymės"
 
@@ -3672,13 +3592,11 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "Būsena"
 
 #: src/gtk/aptitude.glade:1247
 #, fuzzy
-#| msgid "Unknown action type: %s"
 msgid "Group by action type"
 msgstr "Nežinomas veiksmo tipas: %s"
 
@@ -3707,13 +3625,11 @@
 
 #: src/gtk/aptitude.glade:1328
 #, fuzzy
-#| msgid "Toggle ^Rejected"
 msgid "Rejected"
 msgstr "Keisti ^Atmestas"
 
 #: src/gtk/aptitude.glade:1343
 #, fuzzy
-#| msgid "Preferences"
 msgid "No preference"
 msgstr "Nustatymai"
 
@@ -3727,32 +3643,27 @@
 
 #: src/gtk/aptitude.glade:1400
 #, fuzzy
-#| msgid "^Examine Solution"
 msgid "Find a new solution"
 msgstr "^Peržiūrėti sprendimą"
 
 #: src/gtk/aptitude.glade:1404
 #, fuzzy
-#| msgid "Select the next solution to the dependency problems."
 msgid "Calculate the next solution that has not yet been generated."
 msgstr "Pasirinkite sekantį priklausomybių problemų sprendimą."
 
 #: src/gtk/aptitude.glade:1419
 #, fuzzy
-#| msgid "Perform the actions contained in the currently selected solution."
 msgid ""
 "Perform the actions in the currently selected solution and close this tab."
 msgstr "Atlikti veiksmus, kurie numatyti pažymėtame sprendime."
 
 #: src/gtk/aptitude.glade:1576
 #, fuzzy
-#| msgid "Upgrade"
 msgid "Upgrade Summary"
 msgstr "atnaujinti"
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "Kilęs iš paketo: "
 
@@ -3764,7 +3675,6 @@
 
 #: src/gtk/aptitude.glade:1652
 #, fuzzy
-#| msgid "Manual"
 msgid "Fix Manually"
 msgstr "Rankinis"
 
@@ -3812,25 +3722,21 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "Blogas"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "Negaliu sutvarkyti neegzistuojančių paketų"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "^Rasti"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for: "
 msgid "Search for packages."
 msgstr "Ieškoti: "
 
@@ -3868,19 +3774,16 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "URL adresas, iš kur paimami pakeitimų žurnalai"
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "Būtinas %s versijos %s (%s) įdiegimas"
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -3888,20 +3791,17 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr "Oficialių Debian paketų pakeitimų sąrašą galima tik skaityti."
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "Gaunu pakeitimų sąrašą"
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "URL adresas, iš kur paimami pakeitimų žurnalai"
 
@@ -3915,7 +3815,6 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "URL adresas, iš kur paimami pakeitimų žurnalai"
 
@@ -3925,8 +3824,6 @@
 
 #: src/gtk/dashboardtab.cc:414
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] "%d atnaujinamas"
@@ -3935,13 +3832,11 @@
 
 #: src/gtk/dashboardtab.cc:633
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No upgrades are available."
 msgstr "Neįdiegtas"
 
 #: src/gtk/dashboardtab.cc:645
 #, fuzzy
-#| msgid "Unable to locate package %s"
 msgid "Unable to calculate an upgrade."
 msgstr "Nepavyko surasti paketą %s"
 
@@ -3978,25 +3873,21 @@
 
 #: src/gtk/dashboardtab.cc:708
 #, fuzzy, c-format
-#| msgid "Internal error: Default column string is unparsable"
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr "Vidinė klaida: nesuprantama stulpelio eilutė"
 
 #: src/gtk/dependency_chains_tab.cc:78
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: start"
 msgstr "Priklausomybių tvarkymas"
 
 #: src/gtk/dependency_chains_tab.cc:82
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: end"
 msgstr "Priklausomybių tvarkymas"
 
 #: src/gtk/dependency_chains_tab.cc:86
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: results"
 msgstr "Priklausomybių tvarkymas"
 
@@ -4006,7 +3897,6 @@
 
 #: src/gtk/dependency_chains_tab.cc:282
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency chain found."
 msgstr "Priklausomybių tvarkymas"
 
@@ -4016,13 +3906,11 @@
 
 #: src/gtk/download.cc:185
 #, fuzzy
-#| msgid "False"
 msgid "Failed"
 msgstr "Ne"
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "Trinu gautas bylas"
 
@@ -4033,13 +3921,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "Visas progresas: "
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description"
 msgid "Short Description"
 msgstr "Aprašymas"
 
@@ -4049,13 +3935,11 @@
 
 #: src/gtk/download.cc:319
 #, fuzzy
-#| msgid "Cleaning while a download is in progress is not allowed"
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr "Valymas tuo metu, kai gaunami paketai, draudžiamas"
 
 #: src/gtk/download.cc:395 src/gtk/gui.cc:832
 #, fuzzy
-#| msgid "View next display"
 msgid "View Details"
 msgstr "Pereiti į sekantį ekraną"
 
@@ -4075,19 +3959,16 @@
 
 #: src/gtk/download.cc:486
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s: %lu/%lu, stalled"
 msgstr "%s; bus įdiegtas"
 
 #: src/gtk/download.cc:507
 #, fuzzy, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr " [ %i%% ] (%sB/s, liko %s)"
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "tačiau %s bus įdiegtas"
 
@@ -4101,7 +3982,6 @@
 
 #: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "Nepavyko surasti paketą %s"
 
@@ -4112,7 +3992,6 @@
 
 #: src/gtk/dpkg_terminal.cc:429
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "%s: Unable to accept a connection: %s"
 msgstr "Iš šablono \"%s\": %s nepavyko sukurti laikino aplanko"
 
@@ -4138,80 +4017,67 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "%s versijos"
 
 #: src/gtk/entitysummary.cc:123
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Install %s version %s"
 msgstr "Diegti(%s pateikia %s)"
 
 #: src/gtk/entitysummary.cc:131
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrade to %s version %s"
 msgstr "  cwidget versija: %s\n"
 
 #: src/gtk/entitysummary.cc:142
 #, fuzzy, c-format
-#| msgid "Keep the following packages at their current version:"
 msgid "Don't hold %s at its current version."
 msgstr "Palikti šių paketu dabartinesversijas:"
 
 #: src/gtk/entitysummary.cc:145 src/gtk/entitysummary.cc:165
 #: src/gtk/entitysummary.cc:168
 #, fuzzy, c-format
-#| msgid "Canc^el pending actions"
 msgid "Cancel any actions on %s."
 msgstr "Atšaukti ^visus veiksmus"
 
 #: src/gtk/entitysummary.cc:150
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the purge of %s."
 msgstr "Atšaukti %F pašalinimą"
 
 #: src/gtk/entitysummary.cc:152
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s."
 msgstr "Atšaukti %F pašalinimą"
 
 #: src/gtk/entitysummary.cc:157
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the upgrade of %s."
 msgstr "Atšaukti %F pašalinimą"
 
 #: src/gtk/entitysummary.cc:159
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s."
 msgstr "Nutraukti %F diegimą"
 
 #: src/gtk/entitysummary.cc:161
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the downgrade of %s."
 msgstr "Atšaukti %F pašalinimą"
 
 #: src/gtk/entitysummary.cc:163
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the reinstallation of %s."
 msgstr "Nutraukti %F diegimą"
 
 #: src/gtk/entitysummary.cc:206
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "Remove %s"
 msgstr "Šalinti(%s)"
 
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "iš^naikinti"
 
@@ -4222,19 +4088,16 @@
 
 #: src/gtk/entitysummary.cc:223
 #, fuzzy, c-format
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Mark %s as automatically installed."
 msgstr "'&M' kad pažymėti kaip automatiška įdiegtus"
 
 #: src/gtk/entitysummary.cc:228
 #, fuzzy, c-format
-#| msgid "'&m' to mark packages as manually installed"
 msgid "Mark %s as manually installed."
 msgstr "'&m' kad pažymėti kaip įdiegti rankiniu būdų"
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
 msgid "%s is a virtual package provided by:\n"
 msgstr "„%s“ yra virtualus paketas pateiktas:\n"
 
@@ -4244,13 +4107,11 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "Kilęs iš paketo: "
 
 #: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 #, fuzzy
-#| msgid "ProgName"
 msgid "Name"
 msgstr "ProgPav"
 
@@ -4260,13 +4121,11 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "Negaliu atidaryti bylos „%s“"
 
 #: src/gtk/entityview.cc:412
 #, fuzzy, c-format
-#| msgid "Rejecting the removal of %s"
 msgid "Editing the columns of \"%s\""
 msgstr "%s pašalinimas atmestas"
 
@@ -4280,25 +4139,21 @@
 
 #: src/gtk/entityview.cc:570
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Whether the package is automatically installed."
 msgstr "'&M' kad pažymėti kaip automatiška įdiegtus"
 
 #: src/gtk/entityview.cc:576
 #, fuzzy
-#| msgid "Cancel any action on the selected package"
 msgid "The name and description of the package."
 msgstr "Atšaukti šiam paketui visus veiksmus"
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "Versija: "
 
 #: src/gtk/entityview.cc:592
 #, fuzzy
-#| msgid "Check for new versions of packages"
 msgid "The version number of the package."
 msgstr "Ieškoti naujų paketų versijų"
 
@@ -4319,7 +4174,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "neįdiegtas"
 
@@ -4329,25 +4183,21 @@
 
 #: src/gtk/gui.cc:82
 #, fuzzy
-#| msgid "unpacked"
 msgid "Unpacked"
 msgstr "išspaustas"
 
 #: src/gtk/gui.cc:83
 #, fuzzy
-#| msgid "half-config"
 msgid "Half-configured"
 msgstr "dalinai sudderinti"
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "half-install"
 msgid "Half-installed"
 msgstr "dalinai įdiegti"
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "neįdiegtas (lieka konfigūracijos bylos)"
 
@@ -4381,13 +4231,11 @@
 
 #: src/gtk/gui.cc:97
 #, fuzzy
-#| msgid "forbidden upgrade"
 msgid "Hold (don't upgrade)"
 msgstr "uždraustas atnaujinimas"
 
 #: src/gtk/gui.cc:99
 #, fuzzy
-#| msgid "Related Dependencies"
 msgid "Unsatisfied dependencies"
 msgstr "Susijusios Priklausomybės"
 
@@ -4401,13 +4249,11 @@
 
 #: src/gtk/gui.cc:290
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "Pritaikyti filtrą paketų sąrašui"
 
 #: src/gtk/gui.cc:298 src/gtk/gui.cc:946
 #, fuzzy
-#| msgid "Downloading... "
 msgid "Download already running."
 msgstr "Gaunu... "
 
@@ -4417,13 +4263,11 @@
 
 #: src/gtk/gui.cc:359
 #, fuzzy, c-format
-#| msgid "List Update"
 msgid "Update %s?"
 msgstr "Atnaujinimų sąrašas"
 
 #: src/gtk/gui.cc:385
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
@@ -4451,31 +4295,26 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "%s changes"
 msgid "Done applying changes!"
 msgstr "%s pakeitimų"
 
 #: src/gtk/gui.cc:823
 #, fuzzy
-#| msgid "%s changes"
 msgid "Applying changes..."
 msgstr "%s pakeitimų"
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "s: %F"
 msgid "%s: %s"
 msgstr "s: %F"
 
 #: src/gtk/gui.cc:878
 #, fuzzy, c-format
-#| msgid "No broken packages."
 msgid "Error in package %s"
 msgstr "Nėra blogų paketų."
 
 #: src/gtk/gui.cc:906
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Negaliu pakeisti bylos %s nauja konfigūracijos byla"
 
@@ -4485,25 +4324,21 @@
 
 #: src/gtk/gui.cc:1038
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "Nėra blogų paketų."
 
 #: src/gtk/gui.cc:1071
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "Nėra blogų paketų."
 
 #: src/gtk/gui.cc:1075
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "Išspręsti priklausomybes"
 
 #: src/gtk/gui.cc:1103
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Bėra blogų paketų."
@@ -4512,13 +4347,11 @@
 
 #: src/gtk/gui.cc:1147
 #, fuzzy
-#| msgid "%s changes"
 msgid "View changes"
 msgstr "%s pakeitimų"
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "%s changes"
 msgid "Apply changes"
 msgstr "%s pakeitimų"
 
@@ -4527,8 +4360,6 @@
 #. font.
 #: src/gtk/gui.cc:1192
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%d package to install"
 msgid_plural "%d packages to install"
 msgstr[0] "%d diegiamas"
@@ -4540,7 +4371,6 @@
 #. font.
 #: src/gtk/gui.cc:1207
 #, fuzzy, c-format
-#| msgid "failed to remove %s"
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "Nepavyko pašalinti %s"
@@ -4549,7 +4379,6 @@
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "Reikia atsisiųsti"
 
@@ -4564,19 +4393,16 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "not installed"
 msgid "Not implemented"
 msgstr "neįdiegtas"
 
 #: src/gtk/gui.cc:1408 src/gtk/gui.cc:1427
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "Įdiegtas"
 
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "iš^naikinti"
 
@@ -4594,7 +4420,6 @@
 
 #: src/gtk/gui.cc:1455
 #, fuzzy
-#| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "Naudotojo instrukcijos"
 
@@ -4609,7 +4434,6 @@
 
 #: src/gtk/info.cc:161 src/gtk/pkgview.cc:169
 #, fuzzy
-#| msgid "Current status: %F."
 msgid "Current status"
 msgstr "Dabartinė būsena: %F."
 
@@ -4619,19 +4443,16 @@
 
 #: src/gtk/info.cc:496
 #, fuzzy
-#| msgid "Not Installed"
 msgid "Not available"
 msgstr "Neįdiegtas"
 
 #: src/gtk/info.cc:545
 #, fuzzy
-#| msgid "C^ycle Package Information"
 msgid "Package information: version list"
 msgstr "^Keisti paketo informaciją"
 
 #: src/gtk/info.cc:555
 #, fuzzy
-#| msgid "Packages which depend on %s"
 msgid "Package information: dependency list"
 msgstr "Paketai, kuriems reikia %s"
 
@@ -4641,7 +4462,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "ne"
 
@@ -4655,7 +4475,6 @@
 
 #: src/gtk/packagestab.cc:203
 #, fuzzy, c-format
-#| msgid "No packages matched the pattern \"%ls\"."
 msgid "No packages matched \"%s\"."
 msgstr "Nei vienas paketas neatitiko derinio „%ls“."
 
@@ -4665,31 +4484,26 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "Paketas: "
 
 #: src/gtk/pkgview.cc:224
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed automatically."
 msgstr "%s; bus įdiegtas automatiškai"
 
 #: src/gtk/pkgview.cc:227
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed automatically."
 msgstr "%s; bus įdiegtas automatiškai"
 
 #: src/gtk/pkgview.cc:235
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed manually."
 msgstr "%s; bus įdiegtas automatiškai"
 
 #: src/gtk/pkgview.cc:238
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed manually."
 msgstr "%s; bus įdiegtas automatiškai"
 
@@ -4699,13 +4513,11 @@
 
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "Paieška"
 
 #: src/gtk/pkgview.cc:718
 #, fuzzy
-#| msgid "Building view"
 msgid "Finalizing view"
 msgstr "Kuriu vaizdą"
 
@@ -4833,13 +4645,11 @@
 
 #: src/gtk/previewtab.cc:179
 #, fuzzy
-#| msgid "Preview"
 msgid "Preview: "
 msgstr "Peržiūra"
 
 #: src/gtk/resolver.cc:68
 #, fuzzy, c-format
-#| msgid "Error while dumping resolver state"
 msgid "Error in dependency resolver: %s"
 msgstr "Klaida iškraunant sprendimų būseną"
 
@@ -4854,7 +4664,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package"
 msgid "Virtual package"
 msgstr "Paketas"
 
@@ -4864,43 +4673,36 @@
 
 #: src/gtk/resolver.cc:377
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Removing %s is rejected."
 msgstr "Šalinamas %s"
 
 #: src/gtk/resolver.cc:382
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Canceling the installation of %s is rejected."
 msgstr "Nutraukti %F diegimą"
 
 #: src/gtk/resolver.cc:391
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Canceling the removal of %s is rejected."
 msgstr "Atšaukti %F pašalinimą"
 
 #: src/gtk/resolver.cc:394
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keeping %s at version %s is rejected."
 msgstr "Palikti %F versiją %s (%s)"
 
 #: src/gtk/resolver.cc:401
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Installing %s version %s is rejected."
 msgstr "Diegti(%s pateikia %s)"
 
 #: src/gtk/resolver.cc:407
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrading %s to version %s is rejected."
 msgstr "  cwidget versija: %s\n"
 
 #: src/gtk/resolver.cc:413
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrading %s to version %s is rejected."
 msgstr "%s versijos"
 
@@ -4942,7 +4744,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr "%s versijos"
@@ -5044,7 +4845,6 @@
 
 #: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862
 #, fuzzy
-#| msgid "Remove the following packages:"
 msgid "Keep the following packages:"
 msgstr "Pašalinti šiuos paketus:"
 
@@ -5060,121 +4860,101 @@
 
 #: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900
 #, fuzzy
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "Leave the following dependencies unresolved:"
 msgstr "Palikti šias priklausomybes neišspręstas:%n"
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Remove %F [%s (%s)]"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "Pašalint %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1523
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "Įdiegti %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1531
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s"
 msgstr "Nutraukti %F diegimą"
 
 #: src/gtk/resolver.cc:1534
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s"
 msgstr "Atšaukti %F pašalinimą"
 
 #: src/gtk/resolver.cc:1537
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "Palikti %F versiją %s (%s)"
 
 #: src/gtk/resolver.cc:1544
 #, fuzzy, c-format
-#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Atnaujini %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1553
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Pasendinti %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>Remove</b> %s"
 msgstr "Šalinti(%s)"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>remove</b> %s"
 msgstr "Šalinti(%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "Palikti %F versiją %s (%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>keep</b> %s at version %s"
 msgstr "Palikti %F versiją %s (%s)"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr "Nutraukti %F diegimą"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>cancel</b> the installation of %s"
 msgstr "Nutraukti %F diegimą"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>Install</b> %s %s"
 msgstr "Įdiegti %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>install</b> %s %s"
 msgstr "Įdiegti %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>Downgrade</b> %s to version %s"
 msgstr "  cwidget versija: %s\n"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>downgrade</b> %s to version %s"
 msgstr "  cwidget versija: %s\n"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>Upgrade</b> %s to version %s"
 msgstr "%s versijos"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>upgrade</b> %s to version %s"
 msgstr "%s versijos"
 
@@ -5190,8 +4970,6 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "%d diegiamas"
@@ -5200,8 +4978,6 @@
 
 #: src/gtk/resolver.cc:1740
 #, fuzzy, c-format
-#| msgid "%d removal"
-#| msgid_plural "%d removals"
 msgid "%s remove"
 msgid_plural "%s removes"
 msgstr[0] "%d šalinamas"
@@ -5210,8 +4986,6 @@
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "%d keep"
-#| msgid_plural "%d keeps"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "%d paliekamas"
@@ -5220,8 +4994,6 @@
 
 #: src/gtk/resolver.cc:1752
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%s upgrade"
 msgid_plural "%s upgrades"
 msgstr[0] "%d atnaujinamas"
@@ -5230,8 +5002,6 @@
 
 #: src/gtk/resolver.cc:1758
 #, fuzzy, c-format
-#| msgid "%d downgrade"
-#| msgid_plural "%d downgrades"
 msgid "%s downgrade"
 msgid_plural "%s downgrades"
 msgstr[0] "%d pasendintas"
@@ -5240,7 +5010,6 @@
 
 #: src/gtk/resolver.cc:1764
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "%s unresolved recommendation"
 msgid_plural "%s unresolved recommendations"
 msgstr[0] "Patikrinti ^rekomendacijas"
@@ -5249,19 +5018,16 @@
 
 #: src/gtk/resolver.cc:2056
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions yet."
 msgstr "Sprendimų nebėra."
 
 #: src/gtk/resolver.cc:2063
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency solution was found."
 msgstr "Priklausomybių tvarkymas"
 
 #: src/gtk/resolver.cc:2064
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions."
 msgstr "Sprendimų nebėra."
 
@@ -5271,19 +5037,16 @@
 
 #: src/gtk/resolver.cc:2076
 #, fuzzy, c-format
-#| msgid "No more solutions."
 msgid "%u solutions."
 msgstr "Sprendimų nebėra."
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "Negaliu atidaryti bylos „%s“"
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr "[Gautas]"
 
@@ -5333,7 +5096,6 @@
 
 #: src/load_grouppolicy.cc:305
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected ',', '%c', or '('; got '%c'"
 msgstr "Tikėtasi ',' arba '(', gauta '%c'"
 
@@ -5441,7 +5203,6 @@
 
 #: src/load_grouppolicy.cc:713
 #, fuzzy, c-format
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected '{', ')', or ',' following '||', got '%s'"
 msgstr "Tikėtasi ',' arba '(', ir '||' gauta '%s'"
 
@@ -5563,19 +5324,16 @@
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt versija %d.%d.%d\n"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt versija %d.%d.%d\n"
 
 #: src/main.cc:164
 #, fuzzy, c-format
-#| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Ept palaikymas išjungtas.\n"
 
@@ -5623,39 +5381,32 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Įdiegti/atnaujinti paketus\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Pašalinti paketus\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr ""
 " purge        - Pašalinti paketus ir jų konfigūracijos bylas (išvalyti)\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Sulaikyti paketų atnaujinimą\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Atšaukti paketų sulaikymą\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr ""
 " markauto     - Pažymėti paketus taip, kad atrodytu jog jie įdiegti "
@@ -5663,7 +5414,6 @@
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr ""
 " unmarkauto   - Pažymėti paketus taip, kad atrodytu jog jie įdiegti rankiniu "
@@ -5678,21 +5428,16 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Atsisiųsti naują paketų sąrašą\n"
 
 #: src/main.cc:190
 #, fuzzy, c-format
-#| msgid " safe-upgrade - Perform a safe upgrade\n"
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Vykdyti saugų atnaujinimą\n"
 
 #: src/main.cc:191
 #, fuzzy, c-format
-#| msgid ""
-#| " full-upgrade - Perform an upgrade, possibly installing and removing "
-#| "packages\n"
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
@@ -5702,57 +5447,46 @@
 
 #: src/main.cc:192
 #, fuzzy, c-format
-#| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "'&BD' kad įdiegti kompiliavimo priklausomybes paketui."
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Užmiršti kurie paketai yra „nauji“\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Paketo paieška pagal pavadinimą ir/arba išraišką\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Rodyti detalią paketo informaciją\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Pašalinti gautų paketų bylas\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Pašalinti senas gautas paketų bylas\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Žiūrėti paketo pakeitimų sąrašą\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Gauti paketo .deb bylą\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5772,12 +5506,6 @@
 
 #: src/main.cc:203
 #, fuzzy, c-format
-#| msgid ""
-#| " why-not      - Show the manually installed packages that lead to a "
-#| "conflict\n"
-#| "                with the given package, or why one or more packages "
-#| "would\n"
-#| "                lead to a conflict with the given package if installed\n"
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
 "conflict\n"
@@ -5797,7 +5525,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             Ši pagalbos informacija\n"
 
@@ -5827,24 +5554,17 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             Visada klausti veiksmų patvirtinimo\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr " -y             Į klausimus taip/ne automatiškai atsakyti „taip“\n"
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5854,9 +5574,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5866,8 +5583,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 plotis      Nuodyti ekrano plotį, paieškos rezultatų formavimui\n"
@@ -5895,9 +5610,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5907,17 +5619,12 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr " -t [release]   Nustatyti iš kurių paketų diegti.\n"
 
 #: src/main.cc:226
 #, fuzzy, c-format
-#| msgid ""
-#| " -q             In command-line mode, suppress the incremental progress\n"
-#| "                indicators.\n"
 msgid ""
 " -q             In command-line mode, suppress the incremental progress.\n"
 "                indicators.\n"
@@ -5926,15 +5633,11 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o raktas=reikšmė      Tiesiogiai siųsti parametrą „raktas“\n"
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -5974,7 +5677,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "true"
 msgid "trace"
 msgstr "tesinga"
 
@@ -5988,7 +5690,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "ne"
 
@@ -6002,7 +5703,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:377
 #, fuzzy
-#| msgid "Err "
 msgid "error"
 msgstr "Kld "
 
@@ -6010,7 +5710,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:380
 #, fuzzy
-#| msgid "false"
 msgid "fatal"
 msgstr "klaidinga"
 
@@ -6031,7 +5730,6 @@
 
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "Klaidingas veiksmas %s"
 
@@ -6088,7 +5786,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "Paketas"
 
@@ -6098,7 +5795,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "Visi paketai"
 
@@ -6118,7 +5814,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -6126,8 +5821,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -6135,7 +5828,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "-u ir -i negali būti nurodyti su komanda"
 
@@ -7363,7 +7055,6 @@
 
 #: src/ui.cc:472
 #, fuzzy, c-format
-#| msgid "Unable to open %ls"
 msgid "Unable to fork: %s"
 msgstr "Nepavyko atidaryti %ls"
 
@@ -7638,9 +7329,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7662,9 +7350,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -8196,19 +7881,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "URL adresas, iš kur paimami pakeitimų žurnalai"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "URL adresas, iš kur paimami pakeitimų žurnalai"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "Gaunu pakeitimų sąrašą"
 
Index: aptitude/po/mr.po
===================================================================
--- aptitude.orig/po/mr.po
+++ aptitude/po/mr.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2008-08-22 10:20+0200\n"
 "Last-Translator: Priti Patil <prithisd@gmail.com>\n"
 "Language-Team: <janabhaaratii@cdacmumbai.in>\n"
@@ -646,13 +646,11 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s सध्या संस्थापित केलेला नाही, म्हणून तो पुनर्संस्थापित होणार नाही. \n"
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "विनंती केलेल्या व्हर्जन वर(आवृत्ती वर)(%s),%s आधीच संस्थापित केलेला आहे.\n"
@@ -749,7 +747,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "%s च्या बदलनोंदी"
 
@@ -911,7 +908,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "काहीही नाही"
 
@@ -1308,7 +1304,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "'&M'स्वयंचलितपणे संस्थापित अशी खूण पॅकेजेसवर करण्यासाठी"
 
@@ -1588,31 +1583,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "खालील न सोडवलेली रेकमेंडेशन्स सोडुन द्या"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "आॅडिट ^शिफारसी"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "%sकाढून टाकण्याची यापुढे गरज नाही"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "आॅडिट ^शिफारसी"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "क्रिया"
 
@@ -1678,7 +1668,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:790
 #, fuzzy, c-format
-#| msgid "open: %d; closed: %d; defer: %d; conflict: %d"
 msgid "open: %zd; closed: %zd; defer: %zd; conflict: %zd"
 msgstr "उघडा %d; बंद केलेः%d; लांबणीवर टाका (प्रलंबित ठेवा)ः %d विरोध (बेबनाव)ः %d "
 
@@ -1798,13 +1787,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "परंतु ते संस्थापनीय नाही"
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "परंतु %s संस्थापित करायचे आहे.  "
 
@@ -1903,13 +1890,11 @@
 
 #: src/cmdline/cmdline_show.cc:326
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s%s; will be installed"
 msgstr "%s;संस्थापित करण्यात येईल"
 
 #: src/cmdline/cmdline_show.cc:328
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s%s; will be installed automatically"
 msgstr "%s;स्वयंचलितपणे संस्थापित केले जाईल"
 
@@ -2168,19 +2153,16 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "पॅकेजेस"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "उद्गमस्त्रोत पॅकेजः"
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "फाइलसंच"
 
@@ -2224,7 +2206,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "शोधाः तुम्ही किमान एक तरी शोधसंज्ञा पुरवायला हवी \n"
 
@@ -2352,7 +2333,6 @@
 
 #: src/cmdline/cmdline_why.cc:1285
 #, fuzzy, c-format
-#| msgid "Packages depending on %s"
 msgid "Packages requiring %s:"
 msgstr "%sवर अवलंबून असणारी पॅकेजेस"
 
@@ -2386,7 +2366,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[ERROR] (चूक)"
 
@@ -2738,7 +2717,6 @@
 
 #: src/generic/apt/download_update_manager.cc:138
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated quoted string in command: %s"
 msgstr "%sनंतर रहित न केलेला शब्दशः अक्षरसंच"
 
@@ -2817,7 +2795,6 @@
 
 #: src/generic/apt/dump_packages.cc:674
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create truncated cache: %s."
 msgstr "%s पॅकेजची जागा शोधण्यास असमर्थ"
 
@@ -2938,7 +2915,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "पॅकेजेस डाउनलोड करत आहे"
 
@@ -3011,7 +2987,6 @@
 
 #: src/generic/apt/matching/parse.cc:1388
 #, fuzzy, c-format
-#| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "वाईट तऱ्हेने तयार झालेली अभिव्यक्ती"
 
@@ -3049,19 +3024,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "बदल नोंदी उतरवून घेण्यासाठी यूआरएल(URL) वापरावीत"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "बदल नोंदी उतरवून घेण्यासाठी यूआरएल(URL) वापरावीत"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "%s च्या बदलनोंदी"
 
@@ -3106,7 +3078,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "%sनमुन्यातील लहान परस्परसंबध (पार्स) दाखवण्यास असमर्थ"
 
@@ -3121,14 +3092,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "संस्थापित केले नाही"
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "संस्थापित केले नाही"
 
@@ -3165,13 +3134,11 @@
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "-q नंतर एक क्रमंाक अपेक्षित आहे. %sे मिळाले \n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "वाईट कृती अक्षर '%c'\n"
 
@@ -3187,7 +3154,6 @@
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "अपेक्षित धोरण अोळखणारा, '%c'मिळाले."
 
@@ -3198,13 +3164,11 @@
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "अपेक्षित धोरण अोळखणारा, '%c'मिळाले."
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "अवैध क्रिया %s"
 
@@ -3223,19 +3187,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "अनपेक्षित ')'"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr "किंवा"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "अनपेक्षित ')'"
 
@@ -3246,7 +3207,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "\"%s\":%sनमुन्यातुन तात्पुरती संचयिका निर्माण करण्यास असमर्थ"
 
@@ -3342,13 +3302,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "पॅकेज"
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "दृष्ये"
 
@@ -3368,7 +3326,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "मदत"
 
@@ -3379,7 +3336,6 @@
 
 #: src/gtk/aptitude.glade:345 src/gtk/aptitude.glade:2614
 #, fuzzy
-#| msgid "List Update"
 msgid "Update"
 msgstr "सुधारणांची यादी करा"
 
@@ -3401,7 +3357,6 @@
 
 #: src/gtk/aptitude.glade:389 src/gtk/aptitude.glade:2658
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Remove"
 msgstr "संस्थापित केले"
 
@@ -3415,33 +3370,28 @@
 
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "पॅकेज यादीमधून गाळणी फिल्टर काढून टाका."
 
 #: src/gtk/aptitude.glade:649
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "Apply these settings to all active package lists."
 msgstr "पॅकेज यादीला गाळणी फिल्टर वापरा."
 
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "शोध"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "पुनर्संस्थापित करा"
 
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "Err"
 
@@ -3456,13 +3406,11 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "%s ची परावलंबित्वे "
 
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "^Changelog"
 msgid "Changelog"
 msgstr "चेंजलाॅग"
 
@@ -3481,7 +3429,6 @@
 
 #: src/gtk/aptitude.glade:1051
 #, fuzzy
-#| msgid "Tags"
 msgid "tags"
 msgstr "टॅग्ज (खुणेच्या पट्ट्या)"
 
@@ -3504,13 +3451,11 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "स्थिती (अवस्था)"
 
 #: src/gtk/aptitude.glade:1247
 #, fuzzy
-#| msgid "Unknown action type: %s"
 msgid "Group by action type"
 msgstr "अज्ञात कृती प्रकार ः %s"
 
@@ -3539,7 +3484,6 @@
 
 #: src/gtk/aptitude.glade:1328
 #, fuzzy
-#| msgid "Toggle ^Rejected"
 msgid "Rejected"
 msgstr "टाॅगल परतवले नापसंत"
 
@@ -3558,32 +3502,27 @@
 
 #: src/gtk/aptitude.glade:1400
 #, fuzzy
-#| msgid "^Examine Solution"
 msgid "Find a new solution"
 msgstr "उत्तराचे परिक्षण"
 
 #: src/gtk/aptitude.glade:1404
 #, fuzzy
-#| msgid "Select the next solution to the dependency problems."
 msgid "Calculate the next solution that has not yet been generated."
 msgstr "डिपेंडन्सी प्रश्नाला पुढील उत्तर निवडा."
 
 #: src/gtk/aptitude.glade:1419
 #, fuzzy
-#| msgid "Perform the actions contained in the currently selected solution."
 msgid ""
 "Perform the actions in the currently selected solution and close this tab."
 msgstr "आत्ता निवडलेल्या उत्तरावर क्रिया करण्यास सुरुवात करा."
 
 #: src/gtk/aptitude.glade:1576
 #, fuzzy
-#| msgid "Upgrade"
 msgid "Upgrade Summary"
 msgstr "दर्जा उंचवा (पुढील सुधारित आवृत्ती)"
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "उद्गमस्त्रोत पॅकेजः"
 
@@ -3595,7 +3534,6 @@
 
 #: src/gtk/aptitude.glade:1652
 #, fuzzy
-#| msgid "Manual"
 msgid "Fix Manually"
 msgstr "पुस्तिका"
 
@@ -3643,31 +3581,26 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "भंगलेले (खंडित)"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "अनुपलब्ध पॅकेजेससाठी योग्य ते करण्यात असमर्थ"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "शोधा"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for: "
 msgid "Search for packages."
 msgstr "ह्यासाठी शोधाः"
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "मिळाले"
 
@@ -3702,19 +3635,16 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "बदल नोंदी उतरवून घेण्यासाठी यूआरएल(URL) वापरावीत"
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "%sची आवृत्ती %s (%s)संस्थापित करण्याची गरज आहे."
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -3722,20 +3652,17 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr "तुम्ही फक्त डेबियन पॅकेजेसचे चेंजलाॅग्ज बघू शकाल."
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "चेंजलाॅग डाऊनलोड होत आहे."
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "बदल नोंदी उतरवून घेण्यासाठी यूआरएल(URL) वापरावीत"
 
@@ -3749,7 +3676,6 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "बदल नोंदी उतरवून घेण्यासाठी यूआरएल(URL) वापरावीत"
 
@@ -3765,13 +3691,11 @@
 
 #: src/gtk/dashboardtab.cc:633
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No upgrades are available."
 msgstr "संस्थापित केले नाही"
 
 #: src/gtk/dashboardtab.cc:645
 #, fuzzy
-#| msgid "Unable to locate package %s"
 msgid "Unable to calculate an upgrade."
 msgstr "%s पॅकेजची जागा शोधण्यास असमर्थ"
 
@@ -3804,7 +3728,6 @@
 
 #: src/gtk/dashboardtab.cc:708
 #, fuzzy, c-format
-#| msgid "Internal error: Default column string is unparsable"
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr "अंतर्गत त्रुटीः मूलभूत स्तंभ अक्षरसंच लहान परस्परसंबंधात विभागता येण्यासारखा नाही"
 
@@ -3843,7 +3766,6 @@
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "डाउनलोडेड फाईल्स मिटवत आहे."
 
@@ -3854,13 +3776,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "एकूण प्रगती"
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description"
 msgid "Short Description"
 msgstr "वर्णन"
 
@@ -3870,13 +3790,11 @@
 
 #: src/gtk/download.cc:319
 #, fuzzy
-#| msgid "Cleaning while a download is in progress is not allowed"
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr "डाऊनलोड होत असताना सफाई करणे परवाणगी प्राप्त नाही."
 
 #: src/gtk/download.cc:395 src/gtk/gui.cc:832
 #, fuzzy
-#| msgid "View next display"
 msgid "View Details"
 msgstr "पुढील दृष्य दाखवा."
 
@@ -3896,19 +3814,16 @@
 
 #: src/gtk/download.cc:486
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s: %lu/%lu, stalled"
 msgstr "%s;संस्थापित करण्यात येईल"
 
 #: src/gtk/download.cc:507
 #, fuzzy, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr "[ %i%% ] (%sB/s, %s उरले आहे)"
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "परंतु %s संस्थापित करायचे आहे.  "
 
@@ -3922,7 +3837,6 @@
 
 #: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "%s पॅकेजची जागा शोधण्यास असमर्थ"
 
@@ -3933,7 +3847,6 @@
 
 #: src/gtk/dpkg_terminal.cc:429
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "%s: Unable to accept a connection: %s"
 msgstr "\"%s\":%sनमुन्यातुन तात्पुरती संचयिका निर्माण करण्यास असमर्थ"
 
@@ -3959,7 +3872,6 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "%sआवृत्त्या"
 
@@ -3975,50 +3887,42 @@
 
 #: src/gtk/entitysummary.cc:142
 #, fuzzy, c-format
-#| msgid "Keep the following packages at their current version:"
 msgid "Don't hold %s at its current version."
 msgstr "खालील पॅकेजेस त्यांच्या चालू आवृत्तीत ठेवा"
 
 #: src/gtk/entitysummary.cc:145 src/gtk/entitysummary.cc:165
 #: src/gtk/entitysummary.cc:168
 #, fuzzy, c-format
-#| msgid "Canc^el pending actions"
 msgid "Cancel any actions on %s."
 msgstr "कॅन्सल राहीलेल्या क्रिया"
 
 #: src/gtk/entitysummary.cc:150
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the purge of %s."
 msgstr " %Fचे काढून टाकणे थांबवा."
 
 #: src/gtk/entitysummary.cc:152
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s."
 msgstr " %Fचे काढून टाकणे थांबवा."
 
 #: src/gtk/entitysummary.cc:157
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the upgrade of %s."
 msgstr " %Fचे काढून टाकणे थांबवा."
 
 #: src/gtk/entitysummary.cc:159
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s."
 msgstr " %F चे संस्थापित करणे थांबवा "
 
 #: src/gtk/entitysummary.cc:161
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the downgrade of %s."
 msgstr " %Fचे काढून टाकणे थांबवा."
 
 #: src/gtk/entitysummary.cc:163
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the reinstallation of %s."
 msgstr " %F चे संस्थापित करणे थांबवा "
 
@@ -4029,7 +3933,6 @@
 
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "^स्वच्छ करा"
 
@@ -4040,7 +3943,6 @@
 
 #: src/gtk/entitysummary.cc:223
 #, fuzzy, c-format
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Mark %s as automatically installed."
 msgstr "'&M'स्वयंचलितपणे संस्थापित अशी खूण पॅकेजेसवर करण्यासाठी"
 
@@ -4051,7 +3953,6 @@
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
 msgid "%s is a virtual package provided by:\n"
 msgstr ""
 "\"%s\" हे आभासी पॅकेज ः\n"
@@ -4063,13 +3964,11 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "उद्गमस्त्रोत पॅकेजः"
 
 #: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 #, fuzzy
-#| msgid "ProgName"
 msgid "Name"
 msgstr "आज्ञावलीचे नाव (ProgName)"
 
@@ -4079,13 +3978,11 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "\"%s\" फाइल उघडता आली नाही."
 
 #: src/gtk/entityview.cc:412
 #, fuzzy, c-format
-#| msgid "Rejecting the removal of %s"
 msgid "Editing the columns of \"%s\""
 msgstr "%s काढून टाकण्यास नकार देत आहे"
 
@@ -4099,25 +3996,21 @@
 
 #: src/gtk/entityview.cc:570
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Whether the package is automatically installed."
 msgstr "'&M'स्वयंचलितपणे संस्थापित अशी खूण पॅकेजेसवर करण्यासाठी"
 
 #: src/gtk/entityview.cc:576
 #, fuzzy
-#| msgid "Cancel any action on the selected package"
 msgid "The name and description of the package."
 msgstr " निवडलेल्या पॅकेजवरिल कुठलिही क्रिया रद्द करा. "
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "आवृत्ती"
 
 #: src/gtk/entityview.cc:592
 #, fuzzy
-#| msgid "Check for new versions of packages"
 msgid "The version number of the package."
 msgstr "पॅकेजेसच्या नवीन आवृत्तींसाठी परिक्षण करा"
 
@@ -4138,7 +4031,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "संस्थापित केले नाही"
 
@@ -4148,25 +4040,21 @@
 
 #: src/gtk/gui.cc:82
 #, fuzzy
-#| msgid "unpacked"
 msgid "Unpacked"
 msgstr "अनवेष्टीत (गठ्ठ्यातुन सुटे न केलेले)"
 
 #: src/gtk/gui.cc:83
 #, fuzzy
-#| msgid "half-config"
 msgid "Half-configured"
 msgstr "अर्ध संरचित"
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "half-install"
 msgid "Half-installed"
 msgstr "अर्ध संस्थापित"
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "असंस्थापित (संस्थापित न केलेले) (संरचना फाइल्स तशाच रहातात)"
 
@@ -4200,7 +4088,6 @@
 
 #: src/gtk/gui.cc:97
 #, fuzzy
-#| msgid "forbidden upgrade"
 msgid "Hold (don't upgrade)"
 msgstr "मनाई केलेली (निषिद्ध) सुधारित आवृत्ती"
 
@@ -4219,7 +4106,6 @@
 
 #: src/gtk/gui.cc:290
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "पॅकेज यादीला गाळणी फिल्टर वापरा."
 
@@ -4234,13 +4120,11 @@
 
 #: src/gtk/gui.cc:359
 #, fuzzy, c-format
-#| msgid "List Update"
 msgid "Update %s?"
 msgstr "सुधारणांची यादी करा"
 
 #: src/gtk/gui.cc:385
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
@@ -4268,31 +4152,26 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "%s changes"
 msgid "Done applying changes!"
 msgstr "%s बदलं"
 
 #: src/gtk/gui.cc:823
 #, fuzzy
-#| msgid "%s changes"
 msgid "Applying changes..."
 msgstr "%s बदलं"
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "[%s] %s\n"
 msgid "%s: %s"
 msgstr "[%s] %s\n"
 
 #: src/gtk/gui.cc:878
 #, fuzzy, c-format
-#| msgid "No broken packages."
 msgid "Error in package %s"
 msgstr "तुटलेली पॅकेजेस नाहीत"
 
 #: src/gtk/gui.cc:906
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "%sच्या बदली नवीन संरचना फाइल टाकण्यात असमर्थ"
 
@@ -4302,38 +4181,32 @@
 
 #: src/gtk/gui.cc:1038
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "तुटलेली पॅकेजेस नाहीत"
 
 #: src/gtk/gui.cc:1071
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "तुटलेली पॅकेजेस नाहीत"
 
 #: src/gtk/gui.cc:1075
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "डिपेंडंसीज  अवलंबित्वे"
 
 #: src/gtk/gui.cc:1103
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "कुठलेही पॅकेजेस तुटलेले नाहीत"
 
 #: src/gtk/gui.cc:1147
 #, fuzzy
-#| msgid "%s changes"
 msgid "View changes"
 msgstr "%s बदलं"
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "%s changes"
 msgid "Apply changes"
 msgstr "%s बदलं"
 
@@ -4342,8 +4215,6 @@
 #. font.
 #: src/gtk/gui.cc:1192
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%d package to install"
 msgid_plural "%d packages to install"
 msgstr[0] "%d संस्थपित करा"
@@ -4353,14 +4224,12 @@
 #. font.
 #: src/gtk/gui.cc:1207
 #, fuzzy, c-format
-#| msgid "failed to remove %s"
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "%s काढून टाकण्यात अपयश"
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "उतरवून घेण्याचा आकार (डाउनलोड आकार)"
 
@@ -4375,19 +4244,16 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "not installed"
 msgid "Not implemented"
 msgstr "संस्थापित केले नाही"
 
 #: src/gtk/gui.cc:1408 src/gtk/gui.cc:1427
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "संस्थापित केले"
 
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "^स्वच्छ करा"
 
@@ -4405,7 +4271,6 @@
 
 #: src/gtk/gui.cc:1455
 #, fuzzy
-#| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "उपयोजन पुस्तिका"
 
@@ -4428,7 +4293,6 @@
 
 #: src/gtk/info.cc:496
 #, fuzzy
-#| msgid "Not Installed"
 msgid "Not available"
 msgstr "संस्थापित केले नाही"
 
@@ -4447,7 +4311,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "नाही"
 
@@ -4461,7 +4324,6 @@
 
 #: src/gtk/packagestab.cc:203
 #, fuzzy, c-format
-#| msgid "No packages matched the pattern \"%ls\"."
 msgid "No packages matched \"%s\"."
 msgstr "\"%ls\" ह्या नमुन्याशी कोणतही पॅकेज जुळलं नाही."
 
@@ -4471,31 +4333,26 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "पॅकेज"
 
 #: src/gtk/pkgview.cc:224
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed automatically."
 msgstr "%s;स्वयंचलितपणे संस्थापित केले जाईल"
 
 #: src/gtk/pkgview.cc:227
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed automatically."
 msgstr "%s;स्वयंचलितपणे संस्थापित केले जाईल"
 
 #: src/gtk/pkgview.cc:235
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed manually."
 msgstr "%s;स्वयंचलितपणे संस्थापित केले जाईल"
 
 #: src/gtk/pkgview.cc:238
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed manually."
 msgstr "%s;स्वयंचलितपणे संस्थापित केले जाईल"
 
@@ -4505,13 +4362,11 @@
 
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "शोध"
 
 #: src/gtk/pkgview.cc:718
 #, fuzzy
-#| msgid "Building view"
 msgid "Finalizing view"
 msgstr "दृष्य बांधत आहे"
 
@@ -4643,13 +4498,11 @@
 
 #: src/gtk/previewtab.cc:179
 #, fuzzy
-#| msgid "Preview"
 msgid "Preview: "
 msgstr "पुन्हा बघा"
 
 #: src/gtk/resolver.cc:68
 #, fuzzy, c-format
-#| msgid "Error while dumping resolver state"
 msgid "Error in dependency resolver: %s"
 msgstr "रिझाॅल्वर स्थिती पाठवत असताना त्रुटी"
 
@@ -4664,7 +4517,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package"
 msgid "Virtual package"
 msgstr "पॅकेज"
 
@@ -4674,25 +4526,21 @@
 
 #: src/gtk/resolver.cc:377
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Removing %s is rejected."
 msgstr " %s काढून टाकत आहे"
 
 #: src/gtk/resolver.cc:382
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Canceling the installation of %s is rejected."
 msgstr " %F चे संस्थापित करणे थांबवा "
 
 #: src/gtk/resolver.cc:391
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Canceling the removal of %s is rejected."
 msgstr " %Fचे काढून टाकणे थांबवा."
 
 #: src/gtk/resolver.cc:394
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keeping %s at version %s is rejected."
 msgstr "  %F %s(%s) आवृत्तीत ठेवा"
 
@@ -4708,7 +4556,6 @@
 
 #: src/gtk/resolver.cc:413
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrading %s to version %s is rejected."
 msgstr "%sआवृत्त्या"
 
@@ -4750,7 +4597,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr "%sआवृत्त्या"
@@ -4844,7 +4690,6 @@
 
 #: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862
 #, fuzzy
-#| msgid "Remove the following packages:"
 msgid "Keep the following packages:"
 msgstr "खालील पॅकेजेस काढून टाका."
 
@@ -4860,13 +4705,11 @@
 
 #: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900
 #, fuzzy
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "Leave the following dependencies unresolved:"
 msgstr "खालील अवलंबीते रिझाॅल्व न करता सोडून द्या %n"
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Remove %F [%s (%s)]"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "%F (%s (%s)) काढून टाका"
 
@@ -4877,31 +4720,26 @@
 
 #: src/gtk/resolver.cc:1531
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s"
 msgstr " %F चे संस्थापित करणे थांबवा "
 
 #: src/gtk/resolver.cc:1534
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s"
 msgstr " %Fचे काढून टाकणे थांबवा."
 
 #: src/gtk/resolver.cc:1537
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "  %F %s(%s) आवृत्तीत ठेवा"
 
 #: src/gtk/resolver.cc:1544
 #, fuzzy, c-format
-#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "पुढील आवृत्तीत %F[%s (%s) ->%s(%s)] करा"
 
 #: src/gtk/resolver.cc:1553
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr " डाऊनग्रेड %F [%s (%s) -> %s (%s)]"
 
@@ -4917,25 +4755,21 @@
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "  %F %s(%s) आवृत्तीत ठेवा"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>keep</b> %s at version %s"
 msgstr "  %F %s(%s) आवृत्तीत ठेवा"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr " %F चे संस्थापित करणे थांबवा "
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>cancel</b> the installation of %s"
 msgstr " %F चे संस्थापित करणे थांबवा "
 
@@ -4961,13 +4795,11 @@
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>Upgrade</b> %s to version %s"
 msgstr "%sआवृत्त्या"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>upgrade</b> %s to version %s"
 msgstr "%sआवृत्त्या"
 
@@ -4983,24 +4815,18 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "%d संस्थपित करा"
 
 #: src/gtk/resolver.cc:1740
 #, fuzzy, c-format
-#| msgid "%d removal"
-#| msgid_plural "%d removals"
 msgid "%s remove"
 msgid_plural "%s removes"
 msgstr[0] "%d काढून टाकणे"
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "%d keep"
-#| msgid_plural "%d keeps"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "%d ठेवा"
@@ -5019,14 +4845,12 @@
 
 #: src/gtk/resolver.cc:1764
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "%s unresolved recommendation"
 msgid_plural "%s unresolved recommendations"
 msgstr[0] "आॅडिट ^शिफारसी"
 
 #: src/gtk/resolver.cc:2056
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions yet."
 msgstr "आणखी उत्तरे नाहीत"
 
@@ -5037,7 +4861,6 @@
 
 #: src/gtk/resolver.cc:2064
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions."
 msgstr "आणखी उत्तरे नाहीत"
 
@@ -5047,19 +4870,16 @@
 
 #: src/gtk/resolver.cc:2076
 #, fuzzy, c-format
-#| msgid "No more solutions."
 msgid "%u solutions."
 msgstr "आणखी उत्तरे नाहीत"
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "\"%s\" फाइल उघडता आली नाही."
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr "(डाउनलोडेड) (उतरवून घेतले)"
 
@@ -5109,7 +4929,6 @@
 
 #: src/load_grouppolicy.cc:305
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected ',', '%c', or '('; got '%c'"
 msgstr "अपेक्षित, 'किंवा'(',%cमिळाले"
 
@@ -5404,44 +5223,36 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr "संस्थापित करा - पॅकेजेस संस्थापित करा / सुधारित आवृत्ती काढा \n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr "काढून टाका - पॅकेजेस काढून टाका\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr "शुध्द व साफ करा - पॅकेजेस व त्यांच्या संरचना फाइल्स काढून टाका\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr "तसेच धरून ठेवा - पॅकेजेस तशीच धरून ठेवा\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr "धरून ठेवू नका - पॅकेजसाठीची धरून ठेवा आज्ञा रद्द करा\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr "स्वयंची खूण करा - पॅकेजेस स्वयंचलितपणे संस्थापित झाल्याची खूण करा \n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr "स्वयंची खूण करू नका - पॅकेजेस हाताने संस्थापित झाल्याची खूण करा\n"
 
@@ -5454,7 +5265,6 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr ""
 "अद्ययावत करा - नवीन /दर्जा वाढवण्याक्षम पॅकेजेसच्या सूची उतरवून घ्या (डाउनलोड करा)\n"
@@ -5480,52 +5290,42 @@
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr "नवीन विसरून जा - कोणती पॅकेजेस \"new(नवीन)\" आहेत ता विसरून जा \n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr "शोधा - पॅकेजसाठी नावानुसार आणि / किंवा अभिव्यक्तीनुसार शोध घ्या \n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr "दाखवा - पॅकेजविषयीची तपशीलवार (विस्तृत) माहिती प्रदर्शित करा \n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr ""
 "स्वच्छ करा (साफ करा) - उतरवून घेतलेल्या (डाउललोड केलेल्या) पॅकेज फाइल्स खोडून टाका\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr "स्वयंसफाई करा - जुन्या उतरवून घेतलेल्या पॅकेज फाइल्स खोडून टाका\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr "बदलनोंद - पॅकेजमधील बदलनोंदीचे दृश्य दाखवा\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr "डाउनलोड करा (उतरवून घ्या) - पॅकेजसाठी .debफाइल उतरवून घ्या \n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5556,7 +5356,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr "-hहे मजकुरासाठी मदत करते \n"
 
@@ -5586,24 +5385,17 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr "-p   खात्री करून घेण्यासाठी किंवा कृतींसाठी नेहमीच तत्पर \n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr "-y   साध्या होय /नाही प्रश्नांसाठी उत्तर होय आहे असे गृहीत धरा \n"
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5613,9 +5405,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5623,8 +5412,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 शोधनिकाल नमुन्यात मांडण्यासाठी दृश्यमाध्यमाची रूंदी नमूद करा.\n"
@@ -5652,9 +5439,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5662,8 +5446,6 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
@@ -5679,15 +5461,11 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr "-o key=val (कळ =मूल्य) key नावाचा संरचना पर्याय थेट स्थापित करा \n"
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -5724,7 +5502,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "replaces"
 msgid "trace"
 msgstr "पुनः ठेवणे"
 
@@ -5738,7 +5515,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "नाही"
 
@@ -5752,7 +5528,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:377
 #, fuzzy
-#| msgid "Err "
 msgid "error"
 msgstr "Err"
 
@@ -5780,7 +5555,6 @@
 
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "अवैध क्रिया %s"
 
@@ -5833,7 +5607,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "पॅकेज"
 
@@ -5843,7 +5616,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "सर्व पॅकेजेस"
 
@@ -5863,7 +5635,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -5871,8 +5642,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -5880,7 +5649,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "आज्ञेसोबत  -u व -i नमूद केले नसेलही "
 
@@ -7097,7 +6865,6 @@
 
 #: src/ui.cc:472
 #, fuzzy, c-format
-#| msgid "Unable to open %ls"
 msgid "Unable to fork: %s"
 msgstr " %LS ला उघडण्यात असमर्थ"
 
@@ -7373,9 +7140,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7396,9 +7160,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7925,19 +7686,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "बदल नोंदी उतरवून घेण्यासाठी यूआरएल(URL) वापरावीत"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "बदल नोंदी उतरवून घेण्यासाठी यूआरएल(URL) वापरावीत"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "चेंजलाॅग डाऊनलोड होत आहे."
 
Index: aptitude/po/nb.po
===================================================================
--- aptitude.orig/po/nb.po
+++ aptitude/po/nb.po
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: aptitude_nb\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2008-09-01 15:03+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -272,9 +272,6 @@
 
 #: src/apt_options.cc:241
 #, fuzzy
-#| msgid ""
-#| "If this option is enabled, the menu bar will only appear when it has been "
-#| "activated by pressing the menu key."
 msgid ""
 "If this option is enabled, then the first view displayed on startup will be "
 "a flat view instead of the default view."
@@ -705,7 +702,6 @@
 
 #: src/cmdline/cmdline_action.cc:212
 #, fuzzy, c-format
-#| msgid "Unable to satisfy the build-depends: %s."
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Klarte ikke tilfredsstille byggeavhengighetene: «%s»."
 
@@ -762,13 +758,11 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s er ikke installert nå, så den blir ikke re-installert.\n"
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "%s er allerede installert og er av den ønskede versjonen (%s)\n"
@@ -868,7 +862,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "Endringslogg for %s"
 
@@ -1036,7 +1029,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "ingen"
 
@@ -1442,7 +1434,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr " '&M' for å merke pakker som automatisk installert"
 
@@ -1575,9 +1566,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy, c-format
-#| msgid ""
-#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: "
-#| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
@@ -1623,10 +1611,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:259
 #, fuzzy
-#| msgid ""
-#| "reject the given package versions; don't display any solutions in which "
-#| "they occur.  Enter UNINST instead of a version to reject removing the "
-#| "package."
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package.  "
@@ -1637,9 +1621,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:261
 #, fuzzy
-#| msgid ""
-#| "accept the given package versions; display only solutions in which they "
-#| "occur.  Enter UNINST instead of a version to accept removing the package."
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package.  "
@@ -1743,31 +1724,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "La følgende anbefalinger være uløste:"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "Revider ^Anbefalinger"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "Ikke lenger nødvendig å fjerne %s"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "Revider ^Anbefalinger"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Handlinger"
 
@@ -1922,14 +1898,12 @@
 
 #: src/cmdline/cmdline_resolver.cc:1201
 #, fuzzy
-#| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Klarte ikke løse opp avhengigheter for oppgraderingen (ingen løsning funnet)."
 
 #: src/cmdline/cmdline_resolver.cc:1207
 #, fuzzy, c-format
-#| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Klarte ikke å løse opp avhengigheter for oppgraderingen (%s)."
 
@@ -1960,13 +1934,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "men lar seg ikke installere"
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "men %s blir installert."
 
@@ -2065,13 +2037,11 @@
 
 #: src/cmdline/cmdline_show.cc:326
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s%s; will be installed"
 msgstr "%s, vil bli installert"
 
 #: src/cmdline/cmdline_show.cc:328
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s%s; will be installed automatically"
 msgstr "%s, vil bli installert automatisk"
 
@@ -2333,25 +2303,21 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "Pakker"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Kildepakke: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Arkiv"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\".\n"
 msgid "No such package \"%s\"."
 msgstr "Pakken «%s» finnes ikke.\n"
 
@@ -2390,7 +2356,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "søk: Du må oppgi minst ett søkeord\n"
 
@@ -2515,7 +2480,6 @@
 
 #: src/cmdline/cmdline_why.cc:1285
 #, fuzzy, c-format
-#| msgid "Packages depending on %s"
 msgid "Packages requiring %s:"
 msgstr "Pakker som er avhengige av %s"
 
@@ -2531,8 +2495,6 @@
 
 #: src/cmdline/cmdline_why.cc:1416
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: this command requires at least one argument (the package to query)."
 msgid ""
 "%s: this command requires at least one argument (the package to query).\n"
 msgstr ""
@@ -2551,7 +2513,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[FEIL]"
 
@@ -2896,7 +2857,6 @@
 
 #: src/generic/apt/download_update_manager.cc:138
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated quoted string in command: %s"
 msgstr "Streng etter %s er ikke avsluttet"
 
@@ -2979,7 +2939,6 @@
 
 #: src/generic/apt/dump_packages.cc:674
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create truncated cache: %s."
 msgstr "Klarte ikke å finne pakka %s"
 
@@ -3102,7 +3061,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "Laster ned pakker"
 
@@ -3140,7 +3098,6 @@
 
 #: src/generic/apt/matching/parse.cc:860
 #, fuzzy, c-format
-#| msgid "Unknown matcher type: \"%s\"."
 msgid "Unknown term type: \"%s\"."
 msgstr "Ukjent mønstertype: «%s»."
 
@@ -3148,9 +3105,6 @@
 #. Leave the question marks attached to the string placeholders.
 #: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883
 #, fuzzy, c-format
-#| msgid ""
-#| "The ?%s matcher must be used in a \"wide\" context (a top-level context, "
-#| "or a context enclosed by ?%s)."
 msgid ""
 "The ?%s term must be used in a \"wide\" context (a top-level context, or a "
 "context enclosed by ?%s)."
@@ -3181,7 +3135,6 @@
 
 #: src/generic/apt/matching/parse.cc:1388
 #, fuzzy, c-format
-#| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "Dårlig utformet uttrykk"
 
@@ -3220,19 +3173,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "Nettadresse som changelogs skal hentes fra"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "Nettadresse som changelogs skal hentes fra"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "Endringslogg for %s"
 
@@ -3278,7 +3228,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Klarte ikke å tolke mønsteret %s"
 
@@ -3293,14 +3242,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "Ikke installert"
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "Ikke installert"
 
@@ -3327,67 +3274,56 @@
 
 #: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got EOF."
 msgstr "Ventet «%c», fikk «%c»."
 
 #: src/generic/util/parsers.h:737
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got '%s'."
 msgstr "Ventet «%c», fikk «%c»."
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "Forventet et tall etter -q=, fikk %s\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "Feil handlingstegn «%c»\n"
 
 #: src/generic/util/parsers.h:832
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got EOF."
 msgstr "Ventet «%c», fikk «%c»."
 
 #: src/generic/util/parsers.h:843
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got '%c'."
 msgstr "Ventet «%c», fikk «%c»."
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "Ventet praksis-identifikasjon, fikk «%c»"
 
 #: src/generic/util/parsers.h:1026
 #, fuzzy
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected an integer following '-', got EOF."
 msgstr "Ventet «,» eller «)» etter «||», fikk «%s»"
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "Ventet praksis-identifikasjon, fikk «%c»"
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "Ugyldig operasjon %s"
 
 #: src/generic/util/parsers.h:1077
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected EOF, got '%c'."
 msgstr "Ventet «%c», fikk «%c»."
 
@@ -3401,19 +3337,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "Uventet «)»"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " eller"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "Uventet «)»"
 
@@ -3424,7 +3357,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "Klarte ikke opprette midlertidig mappe fra malen «%s»: %s"
 
@@ -3459,7 +3391,6 @@
 
 #: src/gtk/aptitude.glade:19 src/gtk/aptitude.glade:2273
 #, fuzzy
-#| msgid "False"
 msgid "_File"
 msgstr "Usann"
 
@@ -3524,13 +3455,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "Pakke"
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "Visninger"
 
@@ -3550,7 +3479,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "Hjelp"
 
@@ -3561,7 +3489,6 @@
 
 #: src/gtk/aptitude.glade:345 src/gtk/aptitude.glade:2614
 #, fuzzy
-#| msgid "List Update"
 msgid "Update"
 msgstr "Listeoppdatering"
 
@@ -3583,7 +3510,6 @@
 
 #: src/gtk/aptitude.glade:389 src/gtk/aptitude.glade:2658
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Remove"
 msgstr "installertI"
 
@@ -3597,33 +3523,28 @@
 
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "Fjern filtrering av pakkelista"
 
 #: src/gtk/aptitude.glade:649
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "Apply these settings to all active package lists."
 msgstr "Bruk et filter på pakkelista"
 
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "Søk"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "installer på nytt"
 
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "Feil "
 
@@ -3638,19 +3559,16 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "Avhengigheter av %s"
 
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "^Changelog"
 msgid "Changelog"
 msgstr "^Endringslogg"
 
 #: src/gtk/aptitude.glade:1020
 #, fuzzy
-#| msgid "False"
 msgid "Files"
 msgstr "Usann"
 
@@ -3664,7 +3582,6 @@
 
 #: src/gtk/aptitude.glade:1051
 #, fuzzy
-#| msgid "Tags"
 msgid "tags"
 msgstr "Merker"
 
@@ -3687,13 +3604,11 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "Tilstand"
 
 #: src/gtk/aptitude.glade:1247
 #, fuzzy
-#| msgid "Unknown action type: %s"
 msgid "Group by action type"
 msgstr "Ukjent handlingstype: %s"
 
@@ -3722,13 +3637,11 @@
 
 #: src/gtk/aptitude.glade:1328
 #, fuzzy
-#| msgid "Toggle ^Rejected"
 msgid "Rejected"
 msgstr "Slå av/på ^Avvist"
 
 #: src/gtk/aptitude.glade:1343
 #, fuzzy
-#| msgid "Preferences"
 msgid "No preference"
 msgstr "Innstillinger"
 
@@ -3742,32 +3655,27 @@
 
 #: src/gtk/aptitude.glade:1400
 #, fuzzy
-#| msgid "^Examine Solution"
 msgid "Find a new solution"
 msgstr "^Undersøk løsning"
 
 #: src/gtk/aptitude.glade:1404
 #, fuzzy
-#| msgid "Select the next solution to the dependency problems."
 msgid "Calculate the next solution that has not yet been generated."
 msgstr "Velg den neste løsningen på avhengighetsproblemene."
 
 #: src/gtk/aptitude.glade:1419
 #, fuzzy
-#| msgid "Perform the actions contained in the currently selected solution."
 msgid ""
 "Perform the actions in the currently selected solution and close this tab."
 msgstr "Utfør de handlingene som er inneholdt i den løsningen som nå er valgt."
 
 #: src/gtk/aptitude.glade:1576
 #, fuzzy
-#| msgid "Upgrade"
 msgid "Upgrade Summary"
 msgstr "Oppgrader"
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "Kildepakke: "
 
@@ -3779,7 +3687,6 @@
 
 #: src/gtk/aptitude.glade:1652
 #, fuzzy
-#| msgid "Manual"
 msgid "Fix Manually"
 msgstr "Håndbok"
 
@@ -3827,31 +3734,26 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "Ødelagt"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "Ikke i stand til å korrigere for utilgjengelige pakker"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "^Finn"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for a package"
 msgid "Search for packages."
 msgstr "Søk etter en pakke"
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "Fikk "
 
@@ -3885,19 +3787,16 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "Nettadresse som changelogs skal hentes fra"
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "Krever at %s versjon %s (%s) installeres"
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -3905,20 +3804,17 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr "Du kan bare se på endringslogger til offisielle Debian-pakker."
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "Laster ned endringslogg"
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "Nettadresse som changelogs skal hentes fra"
 
@@ -3932,7 +3828,6 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "Nettadresse som changelogs skal hentes fra"
 
@@ -3942,8 +3837,6 @@
 
 #: src/gtk/dashboardtab.cc:414
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] "%d oppgradert"
@@ -3951,13 +3844,11 @@
 
 #: src/gtk/dashboardtab.cc:633
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No upgrades are available."
 msgstr "Ikke installert"
 
 #: src/gtk/dashboardtab.cc:645
 #, fuzzy
-#| msgid "Unable to locate package %s"
 msgid "Unable to calculate an upgrade."
 msgstr "Klarte ikke å finne pakka %s"
 
@@ -3992,25 +3883,21 @@
 
 #: src/gtk/dashboardtab.cc:708
 #, fuzzy, c-format
-#| msgid "Internal error: Default column string is unparsable"
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr "Intern feil: Standard kolonnestreng er uleselig"
 
 #: src/gtk/dependency_chains_tab.cc:78
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: start"
 msgstr "Håndtering av avhengigheter"
 
 #: src/gtk/dependency_chains_tab.cc:82
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: end"
 msgstr "Håndtering av avhengigheter"
 
 #: src/gtk/dependency_chains_tab.cc:86
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: results"
 msgstr "Håndtering av avhengigheter"
 
@@ -4020,7 +3907,6 @@
 
 #: src/gtk/dependency_chains_tab.cc:282
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency chain found."
 msgstr "Håndtering av avhengigheter"
 
@@ -4030,13 +3916,11 @@
 
 #: src/gtk/download.cc:185
 #, fuzzy
-#| msgid "False"
 msgid "Failed"
 msgstr "Usann"
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "Sletter nedlastede filer"
 
@@ -4047,13 +3931,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "Totalt utført: "
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description"
 msgid "Short Description"
 msgstr "Beskrivelse"
 
@@ -4063,13 +3945,11 @@
 
 #: src/gtk/download.cc:319
 #, fuzzy
-#| msgid "Cleaning while a download is in progress is not allowed"
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr "Du kan ikke slette nedlastede filer mens nedlasting foregår"
 
 #: src/gtk/download.cc:395 src/gtk/gui.cc:832
 #, fuzzy
-#| msgid "View next display"
 msgid "View Details"
 msgstr "Vis neste skjermbilde"
 
@@ -4089,19 +3969,16 @@
 
 #: src/gtk/download.cc:486
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s: %lu/%lu, stalled"
 msgstr "%s, vil bli installert"
 
 #: src/gtk/download.cc:507
 #, fuzzy, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr " [ %i%% ] (%sB/s, %s igjen)"
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "men %s blir installert."
 
@@ -4115,7 +3992,6 @@
 
 #: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "Klarte ikke å finne pakka %s"
 
@@ -4126,7 +4002,6 @@
 
 #: src/gtk/dpkg_terminal.cc:429
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "%s: Unable to accept a connection: %s"
 msgstr "Klarte ikke opprette midlertidig mappe fra malen «%s»: %s"
 
@@ -4152,80 +4027,67 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "%s-versjoner"
 
 #: src/gtk/entitysummary.cc:123
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Install %s version %s"
 msgstr "Installerer(%s skaffer %s)"
 
 #: src/gtk/entitysummary.cc:131
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrade to %s version %s"
 msgstr "  cwidget-versjon: %s\n"
 
 #: src/gtk/entitysummary.cc:142
 #, fuzzy, c-format
-#| msgid "Keep the following packages at their current version:"
 msgid "Don't hold %s at its current version."
 msgstr "Behold disse pakkene i nåværende versjon:"
 
 #: src/gtk/entitysummary.cc:145 src/gtk/entitysummary.cc:165
 #: src/gtk/entitysummary.cc:168
 #, fuzzy, c-format
-#| msgid "Canc^el pending actions"
 msgid "Cancel any actions on %s."
 msgstr "Kans^eller utestående handlinger"
 
 #: src/gtk/entitysummary.cc:150
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the purge of %s."
 msgstr "Avbryt fjerning av %F"
 
 #: src/gtk/entitysummary.cc:152
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s."
 msgstr "Avbryt fjerning av %F"
 
 #: src/gtk/entitysummary.cc:157
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the upgrade of %s."
 msgstr "Avbryt fjerning av %F"
 
 #: src/gtk/entitysummary.cc:159
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s."
 msgstr "Avbryt installasjonen av %F"
 
 #: src/gtk/entitysummary.cc:161
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the downgrade of %s."
 msgstr "Avbryt fjerning av %F"
 
 #: src/gtk/entitysummary.cc:163
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the reinstallation of %s."
 msgstr "Avbryt installasjonen av %F"
 
 #: src/gtk/entitysummary.cc:206
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "Remove %s"
 msgstr "Fjern(%s)"
 
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "^Slett helt"
 
@@ -4236,19 +4098,16 @@
 
 #: src/gtk/entitysummary.cc:223
 #, fuzzy, c-format
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Mark %s as automatically installed."
 msgstr " '&M' for å merke pakker som automatisk installert"
 
 #: src/gtk/entitysummary.cc:228
 #, fuzzy, c-format
-#| msgid "The package \"%s\" is manually installed.\n"
 msgid "Mark %s as manually installed."
 msgstr "Pakken «%s» ble manuelt installert.\n"
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
 msgid "%s is a virtual package provided by:\n"
 msgstr "«%s» er en virtuell pakke som behøves av:\n"
 
@@ -4258,13 +4117,11 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "Kildepakke: "
 
 #: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 #, fuzzy
-#| msgid "ProgName"
 msgid "Name"
 msgstr "ProgNavn"
 
@@ -4274,13 +4131,11 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "Klarte ikke å åpne fila «%s»"
 
 #: src/gtk/entityview.cc:412
 #, fuzzy, c-format
-#| msgid "Rejecting the removal of %s"
 msgid "Editing the columns of \"%s\""
 msgstr "Avviser fjerning av %s"
 
@@ -4294,25 +4149,21 @@
 
 #: src/gtk/entityview.cc:570
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Whether the package is automatically installed."
 msgstr " '&M' for å merke pakker som automatisk installert"
 
 #: src/gtk/entityview.cc:576
 #, fuzzy
-#| msgid "Cancel any action on the selected package"
 msgid "The name and description of the package."
 msgstr "Opphev alle handlinger med den valgte pakken"
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "Versjon: "
 
 #: src/gtk/entityview.cc:592
 #, fuzzy
-#| msgid "Check for new versions of packages"
 msgid "The version number of the package."
 msgstr "Se etter nye versjoner av pakkene"
 
@@ -4333,7 +4184,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "ikke installert"
 
@@ -4343,37 +4193,31 @@
 
 #: src/gtk/gui.cc:82
 #, fuzzy
-#| msgid "unpacked"
 msgid "Unpacked"
 msgstr "utpakket"
 
 #: src/gtk/gui.cc:83
 #, fuzzy
-#| msgid "half-config"
 msgid "Half-configured"
 msgstr "halv-oppsett"
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "half-install"
 msgid "Half-installed"
 msgstr "halv-inst"
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "ikke installert (oppsettsfiler gjenstår)"
 
 #: src/gtk/gui.cc:86
 #, fuzzy
-#| msgid "triggers-awaited"
 msgid "Triggers awaited"
 msgstr "utløsere-forventet"
 
 #: src/gtk/gui.cc:87
 #, fuzzy
-#| msgid "triggers-pending"
 msgid "Triggers pending"
 msgstr "utløsere-utestående"
 
@@ -4399,13 +4243,11 @@
 
 #: src/gtk/gui.cc:97
 #, fuzzy
-#| msgid "forbidden upgrade"
 msgid "Hold (don't upgrade)"
 msgstr "forbudt oppgradering"
 
 #: src/gtk/gui.cc:99
 #, fuzzy
-#| msgid "Related Dependencies"
 msgid "Unsatisfied dependencies"
 msgstr "Relaterte avhengigheter"
 
@@ -4419,7 +4261,6 @@
 
 #: src/gtk/gui.cc:290
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "Bruk et filter på pakkelista"
 
@@ -4435,13 +4276,11 @@
 
 #: src/gtk/gui.cc:359
 #, fuzzy, c-format
-#| msgid "List Update"
 msgid "Update %s?"
 msgstr "Listeoppdatering"
 
 #: src/gtk/gui.cc:385
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
@@ -4469,31 +4308,26 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "%s changes"
 msgid "Done applying changes!"
 msgstr "%s endringer"
 
 #: src/gtk/gui.cc:823
 #, fuzzy
-#| msgid "%s changes"
 msgid "Applying changes..."
 msgstr "%s endringer"
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "s: %F"
 msgid "%s: %s"
 msgstr "s: %F"
 
 #: src/gtk/gui.cc:878
 #, fuzzy, c-format
-#| msgid "No broken packages."
 msgid "Error in package %s"
 msgstr "Ingen ødelagte pakker."
 
 #: src/gtk/gui.cc:906
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Klarte ikke å bytte ut %s med ny oppsettsfil"
 
@@ -4503,25 +4337,21 @@
 
 #: src/gtk/gui.cc:1038
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "Ingen ødelagte pakker."
 
 #: src/gtk/gui.cc:1071
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "Ingen ødelagte pakker."
 
 #: src/gtk/gui.cc:1075
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "Løs opp avhengigheter"
 
 #: src/gtk/gui.cc:1103
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Ingen pakker er skadet."
@@ -4529,13 +4359,11 @@
 
 #: src/gtk/gui.cc:1147
 #, fuzzy
-#| msgid "%s changes"
 msgid "View changes"
 msgstr "%s endringer"
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "%s changes"
 msgid "Apply changes"
 msgstr "%s endringer"
 
@@ -4544,8 +4372,6 @@
 #. font.
 #: src/gtk/gui.cc:1192
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%d package to install"
 msgid_plural "%d packages to install"
 msgstr[0] "%d installert"
@@ -4556,7 +4382,6 @@
 #. font.
 #: src/gtk/gui.cc:1207
 #, fuzzy, c-format
-#| msgid "failed to remove %s"
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "klarte ikke å fjerne %s"
@@ -4564,7 +4389,6 @@
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "NedlastingsStr"
 
@@ -4579,19 +4403,16 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "not installed"
 msgid "Not implemented"
 msgstr "ikke installert"
 
 #: src/gtk/gui.cc:1408 src/gtk/gui.cc:1427
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "installertI"
 
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "^Slett helt"
 
@@ -4609,7 +4430,6 @@
 
 #: src/gtk/gui.cc:1455
 #, fuzzy
-#| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "Brukerhåndbok"
 
@@ -4624,7 +4444,6 @@
 
 #: src/gtk/info.cc:161 src/gtk/pkgview.cc:169
 #, fuzzy
-#| msgid "Current status: %F."
 msgid "Current status"
 msgstr "Gjeldende status: %F."
 
@@ -4634,19 +4453,16 @@
 
 #: src/gtk/info.cc:496
 #, fuzzy
-#| msgid "Not Installed"
 msgid "Not available"
 msgstr "Ikke installert"
 
 #: src/gtk/info.cc:545
 #, fuzzy
-#| msgid "C^ycle Package Information"
 msgid "Package information: version list"
 msgstr "Sir^kuler pakkeinformasjon"
 
 #: src/gtk/info.cc:555
 #, fuzzy
-#| msgid "Packages which depend on %s"
 msgid "Package information: dependency list"
 msgstr "Pakker som er avhengige av %s"
 
@@ -4656,7 +4472,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "ingen"
 
@@ -4670,7 +4485,6 @@
 
 #: src/gtk/packagestab.cc:203
 #, fuzzy, c-format
-#| msgid "No packages matched the pattern \"%ls\"."
 msgid "No packages matched \"%s\"."
 msgstr "Ingen pakker passet med mønsteret «%ls»."
 
@@ -4680,31 +4494,26 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "Pakke: "
 
 #: src/gtk/pkgview.cc:224
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed automatically."
 msgstr "%s, vil bli installert automatisk"
 
 #: src/gtk/pkgview.cc:227
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed automatically."
 msgstr "%s, vil bli installert automatisk"
 
 #: src/gtk/pkgview.cc:235
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed manually."
 msgstr "%s, vil bli installert automatisk"
 
 #: src/gtk/pkgview.cc:238
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed manually."
 msgstr "%s, vil bli installert automatisk"
 
@@ -4714,13 +4523,11 @@
 
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "Søk"
 
 #: src/gtk/pkgview.cc:718
 #, fuzzy
-#| msgid "Building view"
 msgid "Finalizing view"
 msgstr "Bygger visning"
 
@@ -4852,13 +4659,11 @@
 
 #: src/gtk/previewtab.cc:179
 #, fuzzy
-#| msgid "Preview"
 msgid "Preview: "
 msgstr "Forhåndsvisning"
 
 #: src/gtk/resolver.cc:68
 #, fuzzy, c-format
-#| msgid "Error while dumping resolver state"
 msgid "Error in dependency resolver: %s"
 msgstr "Feil under dumping av løsermotorens tilstand"
 
@@ -4873,7 +4678,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package"
 msgid "Virtual package"
 msgstr "Pakke"
 
@@ -4883,43 +4687,36 @@
 
 #: src/gtk/resolver.cc:377
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Removing %s is rejected."
 msgstr "Fjerner  %s"
 
 #: src/gtk/resolver.cc:382
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Canceling the installation of %s is rejected."
 msgstr "Avbryt installasjonen av %F"
 
 #: src/gtk/resolver.cc:391
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Canceling the removal of %s is rejected."
 msgstr "Avbryt fjerning av %F"
 
 #: src/gtk/resolver.cc:394
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keeping %s at version %s is rejected."
 msgstr "Behold %F i versjon %s(%s)"
 
 #: src/gtk/resolver.cc:401
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Installing %s version %s is rejected."
 msgstr "Installerer(%s skaffer %s)"
 
 #: src/gtk/resolver.cc:407
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrading %s to version %s is rejected."
 msgstr "  cwidget-versjon: %s\n"
 
 #: src/gtk/resolver.cc:413
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrading %s to version %s is rejected."
 msgstr "%s-versjoner"
 
@@ -4961,7 +4758,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr "%s-versjoner"
@@ -5059,7 +4855,6 @@
 
 #: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862
 #, fuzzy
-#| msgid "Remove the following packages:"
 msgid "Keep the following packages:"
 msgstr "Fjern disse pakkene:"
 
@@ -5075,121 +4870,101 @@
 
 #: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900
 #, fuzzy
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "Leave the following dependencies unresolved:"
 msgstr "La følgende avhengigheter være uløste:%n"
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Remove %F [%s (%s)]"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "Fjern %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1523
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "Installer %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1531
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s"
 msgstr "Avbryt installasjonen av %F"
 
 #: src/gtk/resolver.cc:1534
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s"
 msgstr "Avbryt fjerning av %F"
 
 #: src/gtk/resolver.cc:1537
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "Behold %F i versjon %s(%s)"
 
 #: src/gtk/resolver.cc:1544
 #, fuzzy, c-format
-#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Oppgrader %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1553
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Nedgrader %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>Remove</b> %s"
 msgstr "Fjern(%s)"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>remove</b> %s"
 msgstr "Fjern(%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "Behold %F i versjon %s(%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>keep</b> %s at version %s"
 msgstr "Behold %F i versjon %s(%s)"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr "Avbryt installasjonen av %F"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>cancel</b> the installation of %s"
 msgstr "Avbryt installasjonen av %F"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>Install</b> %s %s"
 msgstr "Installer %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>install</b> %s %s"
 msgstr "Installer %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>Downgrade</b> %s to version %s"
 msgstr "  cwidget-versjon: %s\n"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>downgrade</b> %s to version %s"
 msgstr "  cwidget-versjon: %s\n"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>Upgrade</b> %s to version %s"
 msgstr "%s-versjoner"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>upgrade</b> %s to version %s"
 msgstr "%s-versjoner"
 
@@ -5205,8 +4980,6 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "%d installert"
@@ -5214,8 +4987,6 @@
 
 #: src/gtk/resolver.cc:1740
 #, fuzzy, c-format
-#| msgid "%d removal"
-#| msgid_plural "%d removals"
 msgid "%s remove"
 msgid_plural "%s removes"
 msgstr[0] "%d fjernet"
@@ -5223,8 +4994,6 @@
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "%d keep"
-#| msgid_plural "%d keeps"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "%d beholdt"
@@ -5232,8 +5001,6 @@
 
 #: src/gtk/resolver.cc:1752
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%s upgrade"
 msgid_plural "%s upgrades"
 msgstr[0] "%d oppgradert"
@@ -5241,8 +5008,6 @@
 
 #: src/gtk/resolver.cc:1758
 #, fuzzy, c-format
-#| msgid "%d downgrade"
-#| msgid_plural "%d downgrades"
 msgid "%s downgrade"
 msgid_plural "%s downgrades"
 msgstr[0] "%d nedgradert"
@@ -5250,7 +5015,6 @@
 
 #: src/gtk/resolver.cc:1764
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "%s unresolved recommendation"
 msgid_plural "%s unresolved recommendations"
 msgstr[0] "Revider ^Anbefalinger"
@@ -5258,19 +5022,16 @@
 
 #: src/gtk/resolver.cc:2056
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions yet."
 msgstr "Ingen flere løsninger."
 
 #: src/gtk/resolver.cc:2063
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency solution was found."
 msgstr "Håndtering av avhengigheter"
 
 #: src/gtk/resolver.cc:2064
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions."
 msgstr "Ingen flere løsninger."
 
@@ -5280,19 +5041,16 @@
 
 #: src/gtk/resolver.cc:2076
 #, fuzzy, c-format
-#| msgid "No more solutions."
 msgid "%u solutions."
 msgstr "Ingen flere løsninger."
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "Klarte ikke å åpne fila «%s»"
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr "[Nedlastet]"
 
@@ -5342,7 +5100,6 @@
 
 #: src/load_grouppolicy.cc:305
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected ',', '%c', or '('; got '%c'"
 msgstr "Ventet «,» eller «(», fikk «%c»"
 
@@ -5447,7 +5204,6 @@
 
 #: src/load_grouppolicy.cc:713
 #, fuzzy, c-format
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected '{', ')', or ',' following '||', got '%s'"
 msgstr "Ventet «,» eller «)» etter «||», fikk «%s»"
 
@@ -5568,19 +5324,16 @@
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt versjon %d.%d.%d\n"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt versjon %d.%d.%d\n"
 
 #: src/main.cc:164
 #, fuzzy, c-format
-#| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Ept-støtte deaktivert.\n"
 
@@ -5629,44 +5382,36 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Installer/oppgrader pakker\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Fjerner pakker\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Fjerner pakker og oppsettsfilene deres\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Beholder pakkevalget\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Fjern en hold-kommando for en pakke\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Merk pakker som automatisk installert k\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Merk pakker som manuelt installert\n"
 
@@ -5680,21 +5425,16 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Last ned listene over nye/oppgraderbare pakker\n"
 
 #: src/main.cc:190
 #, fuzzy, c-format
-#| msgid " safe-upgrade - Perform a safe upgrade\n"
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Utfør en trygg oppgradering\n"
 
 #: src/main.cc:191
 #, fuzzy, c-format
-#| msgid ""
-#| " full-upgrade - Perform an upgrade, possibly installing and removing "
-#| "packages\n"
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
@@ -5704,57 +5444,46 @@
 
 #: src/main.cc:192
 #, fuzzy, c-format
-#| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "«&BD» for å installere byggeavhengighetene for en pakke."
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Glem hvilke pakker som er «nye»\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Søk etter en pakke utifra navn og/eller uttrykk\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Vis detaljert informasjon om en pakke\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Slett nedlastede pakkefiler\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Slett eldre nedlastede pakkefiler\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " endringslogg    - Vis en pakkes endringslogg\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Les ned .deb-fila til en pakke\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5775,12 +5504,6 @@
 
 #: src/main.cc:203
 #, fuzzy, c-format
-#| msgid ""
-#| " why-not      - Show the manually installed packages that lead to a "
-#| "conflict\n"
-#| "                with the given package, or why one or more packages "
-#| "would\n"
-#| "                lead to a conflict with the given package if installed\n"
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
 "conflict\n"
@@ -5800,7 +5523,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             Denne hjelpeteksten\n"
 
@@ -5829,24 +5551,17 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             Spør alltid om bekreftelse eller handlinger\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr " -y             Forutsett at svaret på enkle ja/nei-spørsmål er «Ja»\n"
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5855,9 +5570,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5866,8 +5578,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 ""
@@ -5897,9 +5607,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5907,17 +5614,12 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr " -t [slippversjon]  Angi hvilken versjon pakker skal installeres fra\n"
 
 #: src/main.cc:226
 #, fuzzy, c-format
-#| msgid ""
-#| " -q             In command-line mode, suppress the incremental progress\n"
-#| "                indicators.\n"
 msgid ""
 " -q             In command-line mode, suppress the incremental progress.\n"
 "                indicators.\n"
@@ -5926,15 +5628,11 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o nøkkel=verdi  Sett direkte oppsettsvalget «nøkkel»\n"
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -5971,7 +5669,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "true"
 msgid "trace"
 msgstr "sann"
 
@@ -5985,7 +5682,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "ingen"
 
@@ -5999,7 +5695,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:377
 #, fuzzy
-#| msgid "Err "
 msgid "error"
 msgstr "Feil "
 
@@ -6007,7 +5702,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:380
 #, fuzzy
-#| msgid "false"
 msgid "fatal"
 msgstr "usann"
 
@@ -6028,7 +5722,6 @@
 
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "Ugyldig operasjon %s"
 
@@ -6081,7 +5774,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "Pakke"
 
@@ -6091,7 +5783,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "Alle pakkene"
 
@@ -6111,7 +5802,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -6119,8 +5809,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -6128,7 +5816,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "-u og -i kan ikke oppgis med en kommando"
 
@@ -7368,7 +7055,6 @@
 
 #: src/ui.cc:472
 #, fuzzy, c-format
-#| msgid "Unable to open %ls"
 msgid "Unable to fork: %s"
 msgstr "Klarte ikke å åpne %ls"
 
@@ -7642,9 +7328,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7667,9 +7350,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -8202,19 +7882,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "Nettadresse som changelogs skal hentes fra"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "Nettadresse som changelogs skal hentes fra"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "Laster ned endringslogg"
 
Index: aptitude/po/ne.po
===================================================================
--- aptitude.orig/po/ne.po
+++ aptitude/po/ne.po
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: aptitude_po_ne\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2007-08-05 17:09+0545\n"
 "Last-Translator: Nabin Gautam <nabin@mpp.org.np>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -175,7 +175,6 @@
 
 #: src/apt_options.cc:211
 #, fuzzy
-#| msgid "Display the extended description area by default"
 msgid "Display the information area by default"
 msgstr "पूर्वनिर्धारण द्वारा विस्तारित वर्णन क्षेत्रलाई प्रदर्शन गर्नुहोस्"
 
@@ -188,7 +187,6 @@
 
 #: src/apt_options.cc:217
 #, fuzzy
-#| msgid "The display format for package views"
 msgid "Display tabs for the available views"
 msgstr "प्याकेज दृश्यहरुको लागि प्रदर्शित ढाँचा"
 
@@ -200,7 +198,6 @@
 
 #: src/apt_options.cc:221
 #, fuzzy
-#| msgid "Display more information about the selected package"
 msgid "Display tabs for the information area"
 msgstr "चयन गरिएको प्याकेज बारेमा बढि सूचना प्रर्दशन गर्नुहोस्"
 
@@ -485,13 +482,11 @@
 
 #: src/apt_options.cc:525
 #, fuzzy
-#| msgid "^UI options"
 msgid "UI options"
 msgstr "^UI विकल्पहरू"
 
 #: src/apt_options.cc:527
 #, fuzzy
-#| msgid "^Dependency handling"
 msgid "Dependency handling"
 msgstr "^निर्भरता ह्यान्डलिङ्"
 
@@ -544,7 +539,6 @@
 
 #: src/broken_indicator.cc:371
 #, fuzzy
-#| msgid "Keep the following packages at their current version:"
 msgid "Suggest keeping all packages at their current version."
 msgstr "निम्न प्याकेजहरू हालको संस्करणमा राख्नुहोस्:"
 
@@ -593,13 +587,11 @@
 
 #: src/cmdline/cmdline_action.cc:55
 #, fuzzy, c-format
-#| msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
 msgid "Unable to find the source package for \"%s\".\n"
 msgstr "प्याकेज \"%s\" को लागि एउटा संग्रह \"%s\" फेला पार्न असक्षम भयो\n"
 
 #: src/cmdline/cmdline_action.cc:212
 #, fuzzy, c-format
-#| msgid "Unable to list files in \"%s\""
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "फाइलहरुमा \"%s\" सूचीबद्ध असक्षम"
 
@@ -656,13 +648,11 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s हालै स्थापना गरिएको होइन, त्यसैले यो पुन: स्थापना हुने छैन ।\n"
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "%s अनुरोध गरिएको संस्करण (%s) मा पहिल्यै स्थापना भयो\n"
@@ -762,7 +752,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "%s को लग परिवर्तन गर्नुहोस्"
 
@@ -865,7 +854,6 @@
 #: src/cmdline/cmdline_extract_cache_subset.cc:95
 #: src/cmdline/cmdline_user_tag.cc:133
 #, fuzzy, c-format
-#| msgid "No such package \"%s\""
 msgid "No such package \"%s\".\n"
 msgstr "कुनै त्यस्तो प्याकेज छैन \"%s\""
 
@@ -923,7 +911,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "कुनै पनि होइन"
 
@@ -937,7 +924,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:344
 #, fuzzy
-#| msgid "config-files"
 msgid "Config files"
 msgstr "कनफिगरेसन-फाइलहरू"
 
@@ -1159,9 +1145,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:805
 #, fuzzy, c-format
-#| msgid ""
-#| "No packages found -- enter zero or more roots of the search followed by "
-#| "the package to justify."
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
 "package to justify.\n"
@@ -1329,7 +1312,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "'&M' प्याकेजहरू म्यानुल्ली स्थापना भएकोमा चिनो गर्न"
 
@@ -1457,9 +1439,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy, c-format
-#| msgid ""
-#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
-#| "n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
@@ -1504,9 +1483,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:259
 #, fuzzy
-#| msgid ""
-#| "reject the given package versions; don't display any solutions in which "
-#| "they occur."
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package.  "
@@ -1517,9 +1493,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:261
 #, fuzzy
-#| msgid ""
-#| "accept the given package versions; display only solutions in which they "
-#| "occur."
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package.  "
@@ -1565,7 +1538,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:351
 #, fuzzy, c-format
-#| msgid "Expected a version after \"%s\""
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "\"%s\" पछि एउटा संस्करण अपेक्षित गर्दछ"
 
@@ -1621,31 +1593,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "निम्न सिफारिशहरू विचार नगरि छोड्नुहोस्:"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "सिफारिशहरू लेखा जाँच्नुहोस्"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr " %s को हटाइ धेरै लामो आवश्यक छैन"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "सिफारिशहरू लेखा जाँच्नुहोस्"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "कार्यहरू"
 
@@ -1711,7 +1678,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:790
 #, fuzzy, c-format
-#| msgid "open: %d; closed: %d; defer: %d; conflict: %d"
 msgid "open: %zd; closed: %zd; defer: %zd; conflict: %zd"
 msgstr "खोल्नुहोस्: %d; बन्द भयो: %d; विलम्ब गर्नु: %d; द्वन्द: %d"
 
@@ -1832,13 +1798,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "तर यो स्थापना योग्य छैन"
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "तर  %s स्थापना हुनुपर्छ ।"
 
@@ -1937,13 +1901,11 @@
 
 #: src/cmdline/cmdline_show.cc:326
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s%s; will be installed"
 msgstr "%s; स्थापना हुनेछ "
 
 #: src/cmdline/cmdline_show.cc:328
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s%s; will be installed automatically"
 msgstr "%s; स्वत: रूपमा स्थापना हुनेछ"
 
@@ -2120,13 +2082,11 @@
 
 #: src/cmdline/cmdline_user_tag.cc:66
 #, fuzzy, c-format
-#| msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
 msgid "Adding user tag \"%s\" to the package \"%s\".\n"
 msgstr "प्याकेज \"%s\" को लागि एउटा संस्करण \"%s\" फेला पार्न असक्षम भयो\n"
 
 #: src/cmdline/cmdline_user_tag.cc:73
 #, fuzzy, c-format
-#| msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
 msgid "Removing user tag \"%s\" from the package \"%s\".\n"
 msgstr "प्याकेज \"%s\" को लागि एउटा संस्करण \"%s\" फेला पार्न असक्षम भयो\n"
 
@@ -2207,25 +2167,21 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "प्याकेजहरू"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "स्रोत प्याकेज:"
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "संग्रह"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\""
 msgid "No such package \"%s\"."
 msgstr "कुनै त्यस्तो प्याकेज छैन \"%s\""
 
@@ -2264,19 +2220,16 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "खोज्नुहोस्: तपाईँले कम्तिमा एउटा खोज शब्द उपलब्ध गर्नुहोस्\n"
 
 #: src/cmdline/cmdline_why.cc:340
 #, fuzzy
-#| msgid "delete"
 msgid "dep_level"
 msgstr "मेट्नुहोस्"
 
 #: src/cmdline/cmdline_why.cc:346
 #, fuzzy
-#| msgid "Depends"
 msgid "DependsOnly"
 msgstr "निर्भर गर्दछ"
 
@@ -2290,7 +2243,6 @@
 
 #: src/cmdline/cmdline_why.cc:368
 #, fuzzy
-#| msgid "CandVer"
 msgid "Candidate"
 msgstr "CandVer"
 
@@ -2300,7 +2252,6 @@
 
 #: src/cmdline/cmdline_why.cc:374
 #, fuzzy
-#| msgid "Installed"
 msgid "InstallNotCurrent"
 msgstr "स्थापना भयो"
 
@@ -2386,19 +2337,16 @@
 
 #: src/cmdline/cmdline_why.cc:1244
 #, fuzzy, c-format
-#| msgid "Unable to find a solution to apply."
 msgid "Unable to find a reason to remove %s.\n"
 msgstr "लागू गर्ने समस्या फेला पार्न असक्षम"
 
 #: src/cmdline/cmdline_why.cc:1246
 #, fuzzy, c-format
-#| msgid "Unable to find a solution to apply."
 msgid "Unable to find a reason to install %s.\n"
 msgstr "लागू गर्ने समस्या फेला पार्न असक्षम"
 
 #: src/cmdline/cmdline_why.cc:1285
 #, fuzzy, c-format
-#| msgid "Packages depending on %s"
 msgid "Packages requiring %s:"
 msgstr "%s मा निर्भर हुने प्याकेजहरू"
 
@@ -2432,7 +2380,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[ERROR]"
 
@@ -2450,7 +2397,6 @@
 
 #: src/desc_render.cc:154
 #, fuzzy
-#| msgid "Tags"
 msgid "User Tags"
 msgstr "ट्यागहरू"
 
@@ -2507,7 +2453,6 @@
 
 #: src/download_list.cc:264
 #, fuzzy
-#| msgid "Downloading..."
 msgid "Downloading... "
 msgstr "डाउनलोड हुदैछ..."
 
@@ -2576,7 +2521,6 @@
 
 #: src/generic/apt/aptcache.cc:288
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated '\"' in the user-tags list of the package %s."
 msgstr "%s पछि वास्तविक स्ट्रिङ टर्मिनेट भएन"
 
@@ -2668,9 +2612,6 @@
 
 #: src/generic/apt/apt.cc:453
 #, fuzzy
-#| msgid ""
-#| "Could not lock the cache file.  Opening in read-only mode; any changes "
-#| "you make to the states of packages will NOT be preserved!"
 msgid ""
 "Could not lock the cache file; this usually means that dpkg or another apt "
 "tool is already installing packages.  Opening in read-only mode; any changes "
@@ -2780,7 +2721,6 @@
 
 #: src/generic/apt/download_update_manager.cc:138
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated quoted string in command: %s"
 msgstr "%s पछि वास्तविक स्ट्रिङ टर्मिनेट भएन"
 
@@ -2817,7 +2757,6 @@
 
 #: src/generic/apt/download_update_manager.cc:371
 #, fuzzy
-#| msgid "Building tag database"
 msgid "Updating debtags database..."
 msgstr "ट्याग डेटाबेस निर्माण गरिदैछ"
 
@@ -2848,7 +2787,6 @@
 #. ForTranslators: "%s update %s" gets replaced by a command line, do not translate it!
 #: src/generic/apt/download_update_manager.cc:412
 #, fuzzy, c-format
-#| msgid "Unable to load debtags vocabulary, perhaps debtags is not installed?"
 msgid ""
 "Updating the debtags database (%s update %s) failed (perhaps debtags is not "
 "installed?): %s"
@@ -2861,7 +2799,6 @@
 
 #: src/generic/apt/dump_packages.cc:674
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create truncated cache: %s."
 msgstr "प्याकेज %s स्थानिय गर्न असक्षम भयो "
 
@@ -2983,7 +2920,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "प्याकेजहरू डाउनलोड गर्दै"
 
@@ -3009,7 +2945,6 @@
 
 #: src/generic/apt/matching/parse.cc:467
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected '%c', got '%c'."
 msgstr "अपेक्षित ',' वा '(', ले '%c' प्राप्त गर्यो"
 
@@ -3022,7 +2957,6 @@
 
 #: src/generic/apt/matching/parse.cc:860
 #, fuzzy, c-format
-#| msgid "Unknown pattern type: %c"
 msgid "Unknown term type: \"%s\"."
 msgstr "अज्ञात बान्की प्रकार: %c"
 
@@ -3058,7 +2992,6 @@
 
 #: src/generic/apt/matching/parse.cc:1388
 #, fuzzy, c-format
-#| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "खराब ढाँचाबद्ध अभिव्यक्ति"
 
@@ -3096,19 +3029,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "परिवर्तन लगहरू डाउनलोड गर्न URL प्रयोग गर्नुहोस्"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "परिवर्तन लगहरू डाउनलोड गर्न URL प्रयोग गर्नुहोस्"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "%s को लग परिवर्तन गर्नुहोस्"
 
@@ -3153,7 +3083,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "बान्की %s पद वर्णन गर्न असक्षम भयो"
 
@@ -3168,14 +3097,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "स्थापना गरिएको छैन"
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "स्थापना गरिएको छैन"
 
@@ -3202,43 +3129,36 @@
 
 #: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected '%s', but got EOF."
 msgstr "अपेक्षित ',' वा '(', ले '%c' प्राप्त गर्यो"
 
 #: src/generic/util/parsers.h:737
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected '%s', but got '%s'."
 msgstr "अपेक्षित ',' वा '(', ले '%c' प्राप्त गर्यो"
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "-q= पछि अपेक्षित एउटा नम्बर, %s प्राप्त गर्यो\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "खराब कार्य क्यारेक्टर '%c'\n"
 
 #: src/generic/util/parsers.h:832
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected %s, but got EOF."
 msgstr "अपेक्षित ',' वा '(', ले '%c' प्राप्त गर्यो"
 
 #: src/generic/util/parsers.h:843
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected %s, but got '%c'."
 msgstr "अपेक्षित ',' वा '(', ले '%c' प्राप्त गर्यो"
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "अपेक्षित नीति परिचयकर्ता, ले '%c' प्राप्त गर्यो"
 
@@ -3249,19 +3169,16 @@
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "अपेक्षित नीति परिचयकर्ता, ले '%c' प्राप्त गर्यो"
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "अवैध सञ्चालन %s"
 
 #: src/generic/util/parsers.h:1077
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected EOF, got '%c'."
 msgstr "अपेक्षित ',' वा '(', ले '%c' प्राप्त गर्यो"
 
@@ -3275,19 +3192,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "अनपेक्षित ')'"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " वा"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "अनपेक्षित ')'"
 
@@ -3298,7 +3212,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "\"%s\" टेम्प्लेटबाट अस्थायी डाइरेक्ट्री सिर्जना गर्न असफल भयो: %s"
 
@@ -3396,13 +3309,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "प्याकेज "
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "दृश्यहरू"
 
@@ -3422,7 +3333,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "मद्दत"
 
@@ -3433,7 +3343,6 @@
 
 #: src/gtk/aptitude.glade:345 src/gtk/aptitude.glade:2614
 #, fuzzy
-#| msgid "List Update"
 msgid "Update"
 msgstr "सूची अद्यावधिक"
 
@@ -3455,7 +3364,6 @@
 
 #: src/gtk/aptitude.glade:389 src/gtk/aptitude.glade:2658
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Remove"
 msgstr "स्थापना भयो"
 
@@ -3469,33 +3377,28 @@
 
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "फिल्टरलाई प्याकेज सूचीबाट हटाउनुहोस्"
 
 #: src/gtk/aptitude.glade:649
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "Apply these settings to all active package lists."
 msgstr "प्याकेज सूचीमा फिल्टर लागू गर्नुहोस्"
 
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "खोज्नुहोस्"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "पुन:स्थापना गर्नुहोस्"
 
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "Err "
 
@@ -3510,13 +3413,11 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "%s को निर्भरताहरू"
 
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "^Changelog"
 msgid "Changelog"
 msgstr "^परिवर्तनलग"
 
@@ -3535,7 +3436,6 @@
 
 #: src/gtk/aptitude.glade:1051
 #, fuzzy
-#| msgid "Tags"
 msgid "tags"
 msgstr "ट्यागहरू"
 
@@ -3558,13 +3458,11 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "राज्य"
 
 #: src/gtk/aptitude.glade:1247
 #, fuzzy
-#| msgid "Unknown action type: %s"
 msgid "Group by action type"
 msgstr "अज्ञात कार्य प्रकार: %s"
 
@@ -3593,7 +3491,6 @@
 
 #: src/gtk/aptitude.glade:1328
 #, fuzzy
-#| msgid "Toggle ^Rejected"
 msgid "Rejected"
 msgstr "टगल अस्वीकृत"
 
@@ -3612,32 +3509,27 @@
 
 #: src/gtk/aptitude.glade:1400
 #, fuzzy
-#| msgid "^Examine Solution"
 msgid "Find a new solution"
 msgstr "^समाधान परिक्षण गर्नुहोस्"
 
 #: src/gtk/aptitude.glade:1404
 #, fuzzy
-#| msgid "Select the next solution to the dependency problems."
 msgid "Calculate the next solution that has not yet been generated."
 msgstr "निर्भरता समस्याहरुको पछिल्लो समाधान चयन गर्नुहोस्"
 
 #: src/gtk/aptitude.glade:1419
 #, fuzzy
-#| msgid "Perform the actions contained in the currently selected solution."
 msgid ""
 "Perform the actions in the currently selected solution and close this tab."
 msgstr "हालमा चयन गरिएको समाधानमा समाहित कार्यहरू पुरा गर्नुहोस्"
 
 #: src/gtk/aptitude.glade:1576
 #, fuzzy
-#| msgid "Upgrade"
 msgid "Upgrade Summary"
 msgstr "स्तर वृद्धि गर्नुहोस्"
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "स्रोत प्याकेज:"
 
@@ -3649,7 +3541,6 @@
 
 #: src/gtk/aptitude.glade:1652
 #, fuzzy
-#| msgid "Manual"
 msgid "Fix Manually"
 msgstr "म्यानुअल"
 
@@ -3697,31 +3588,26 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "भाँचिएको"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "उपलब्ध नभएको प्याकेजहरुका लागि सुधार गर्न सकिएन "
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "फेला पार्नुहोस्"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for: "
 msgid "Search for packages."
 msgstr "को लागि खोजी गर्नुहोस्:"
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "प्राप्त गर्नुहोस्"
 
@@ -3756,19 +3642,16 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "परिवर्तन लगहरू डाउनलोड गर्न URL प्रयोग गर्नुहोस्"
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "%s (%s) संस्करण %s को स्थापना आवश्यक गरिदैछ"
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -3776,20 +3659,17 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr "तपाईँले आधिकारिक डेविएन प्याकेजहरुको परिवर्तनलग मात्र हर्न सक्नुहुन्छ ।"
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "परिवर्तनलग डाउनलोड गर्दै"
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "परिवर्तन लगहरू डाउनलोड गर्न URL प्रयोग गर्नुहोस्"
 
@@ -3803,7 +3683,6 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "परिवर्तन लगहरू डाउनलोड गर्न URL प्रयोग गर्नुहोस्"
 
@@ -3813,8 +3692,6 @@
 
 #: src/gtk/dashboardtab.cc:414
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] "%d स्तरवृद्धि गर्नुहोस्"
@@ -3822,13 +3699,11 @@
 
 #: src/gtk/dashboardtab.cc:633
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No upgrades are available."
 msgstr "स्थापना गरिएको छैन"
 
 #: src/gtk/dashboardtab.cc:645
 #, fuzzy
-#| msgid "Unable to locate package %s"
 msgid "Unable to calculate an upgrade."
 msgstr "प्याकेज %s स्थानिय गर्न असक्षम भयो "
 
@@ -3863,25 +3738,21 @@
 
 #: src/gtk/dashboardtab.cc:708
 #, fuzzy, c-format
-#| msgid "Internal error: Default column string is unparsable"
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr "आन्तरिक त्रुटि: पूर्वनिर्धारण स्तम्भ स्ट्रिङ पद वर्णन गर्न अयोग्य छ"
 
 #: src/gtk/dependency_chains_tab.cc:78
 #, fuzzy
-#| msgid "^Dependency handling"
 msgid "Find dependency chains: start"
 msgstr "^निर्भरता ह्यान्डलिङ्"
 
 #: src/gtk/dependency_chains_tab.cc:82
 #, fuzzy
-#| msgid "^Dependency handling"
 msgid "Find dependency chains: end"
 msgstr "^निर्भरता ह्यान्डलिङ्"
 
 #: src/gtk/dependency_chains_tab.cc:86
 #, fuzzy
-#| msgid "^Dependency handling"
 msgid "Find dependency chains: results"
 msgstr "^निर्भरता ह्यान्डलिङ्"
 
@@ -3891,7 +3762,6 @@
 
 #: src/gtk/dependency_chains_tab.cc:282
 #, fuzzy
-#| msgid "^Dependency handling"
 msgid "No dependency chain found."
 msgstr "^निर्भरता ह्यान्डलिङ्"
 
@@ -3906,7 +3776,6 @@
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "डाउनलोड फाइलहरू मेट्दैछ"
 
@@ -3917,13 +3786,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "जम्मा प्रगति:"
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description"
 msgid "Short Description"
 msgstr "वर्णनश"
 
@@ -3933,13 +3800,11 @@
 
 #: src/gtk/download.cc:319
 #, fuzzy
-#| msgid "Cleaning while a download is in progress is not allowed"
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr "डाउनलोड प्रगतिमा हदै गर्दा खालि गर्न अनुमति छैन"
 
 #: src/gtk/download.cc:395 src/gtk/gui.cc:832
 #, fuzzy
-#| msgid "View next display"
 msgid "View Details"
 msgstr "पछिल्लो प्रर्दशन हेर्नुहोस्"
 
@@ -3959,19 +3824,16 @@
 
 #: src/gtk/download.cc:486
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s: %lu/%lu, stalled"
 msgstr "%s; स्थापना हुनेछ "
 
 #: src/gtk/download.cc:507
 #, fuzzy, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr " [ %i%% ] (%sB/s, %s बाँकी)"
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "तर  %s स्थापना हुनुपर्छ ।"
 
@@ -3985,7 +3847,6 @@
 
 #: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "प्याकेज %s स्थानिय गर्न असक्षम भयो "
 
@@ -3996,7 +3857,6 @@
 
 #: src/gtk/dpkg_terminal.cc:429
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "%s: Unable to accept a connection: %s"
 msgstr "\"%s\" टेम्प्लेटबाट अस्थायी डाइरेक्ट्री सिर्जना गर्न असफल भयो: %s"
 
@@ -4022,7 +3882,6 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "%s संस्करणहरू"
 
@@ -4033,56 +3892,47 @@
 
 #: src/gtk/entitysummary.cc:131
 #, fuzzy, c-format
-#| msgid "libsigc++ version: %s\n"
 msgid "Downgrade to %s version %s"
 msgstr "libsigc++ version: %s\n"
 
 #: src/gtk/entitysummary.cc:142
 #, fuzzy, c-format
-#| msgid "Keep the following packages at their current version:"
 msgid "Don't hold %s at its current version."
 msgstr "निम्न प्याकेजहरू हालको संस्करणमा राख्नुहोस्:"
 
 #: src/gtk/entitysummary.cc:145 src/gtk/entitysummary.cc:165
 #: src/gtk/entitysummary.cc:168
 #, fuzzy, c-format
-#| msgid "Canc^el pending actions"
 msgid "Cancel any actions on %s."
 msgstr "विचारधिन कार्यहरू रद्द गर्नुहोस्"
 
 #: src/gtk/entitysummary.cc:150
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the purge of %s."
 msgstr " %Fको हटाउने रद्द गर्नुहोस्"
 
 #: src/gtk/entitysummary.cc:152
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s."
 msgstr " %Fको हटाउने रद्द गर्नुहोस्"
 
 #: src/gtk/entitysummary.cc:157
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the upgrade of %s."
 msgstr " %Fको हटाउने रद्द गर्नुहोस्"
 
 #: src/gtk/entitysummary.cc:159
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s."
 msgstr "%F को स्थापना रद्द गर्नुहोस्"
 
 #: src/gtk/entitysummary.cc:161
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the downgrade of %s."
 msgstr " %Fको हटाउने रद्द गर्नुहोस्"
 
 #: src/gtk/entitysummary.cc:163
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the reinstallation of %s."
 msgstr "%F को स्थापना रद्द गर्नुहोस्"
 
@@ -4093,7 +3943,6 @@
 
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "^सफा गर्नुहोस्"
 
@@ -4104,7 +3953,6 @@
 
 #: src/gtk/entitysummary.cc:223
 #, fuzzy, c-format
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Mark %s as automatically installed."
 msgstr "'&M' प्याकेजहरू म्यानुल्ली स्थापना भएकोमा चिनो गर्न"
 
@@ -4115,7 +3963,6 @@
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
 msgid "%s is a virtual package provided by:\n"
 msgstr "\"%s\" द्वारा उपलब्ध गराइएको अवास्तविक प्याकेज हो:\n"
 
@@ -4125,13 +3972,11 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "स्रोत प्याकेज:"
 
 #: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 #, fuzzy
-#| msgid "ProgName"
 msgid "Name"
 msgstr "कार्यक्रम नाम"
 
@@ -4141,13 +3986,11 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "फाइल \"%s\" खोल्न सकिएन"
 
 #: src/gtk/entityview.cc:412
 #, fuzzy, c-format
-#| msgid "Rejecting the removal of %s"
 msgid "Editing the columns of \"%s\""
 msgstr "%s लाई हटाइलाई अस्वीकार गरिदै"
 
@@ -4161,25 +4004,21 @@
 
 #: src/gtk/entityview.cc:570
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Whether the package is automatically installed."
 msgstr "'&M' प्याकेजहरू म्यानुल्ली स्थापना भएकोमा चिनो गर्न"
 
 #: src/gtk/entityview.cc:576
 #, fuzzy
-#| msgid "Cancel any action on the selected package"
 msgid "The name and description of the package."
 msgstr "चयन गरिएको प्याकेजबाट कुनै कार्य रद्द गर्नुहोस्"
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "संस्करण:"
 
 #: src/gtk/entityview.cc:592
 #, fuzzy
-#| msgid "Check for new versions of packages"
 msgid "The version number of the package."
 msgstr "प्याकेजहरुको नयाँ संस्करणका लागि जाँच गर्नुहोस्"
 
@@ -4200,7 +4039,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "स्थापना भएन"
 
@@ -4210,25 +4048,21 @@
 
 #: src/gtk/gui.cc:82
 #, fuzzy
-#| msgid "unpacked"
 msgid "Unpacked"
 msgstr "प्याक नभएको"
 
 #: src/gtk/gui.cc:83
 #, fuzzy
-#| msgid "half-config"
 msgid "Half-configured"
 msgstr "आधा-कनफिगरेसन"
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "half-install"
 msgid "Half-installed"
 msgstr "आधा-स्थापना"
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "स्थापना भएन (कनफिगरेसन फाइलहरू बाँकी छ)"
 
@@ -4262,13 +4096,11 @@
 
 #: src/gtk/gui.cc:97
 #, fuzzy
-#| msgid "forbidden upgrade"
 msgid "Hold (don't upgrade)"
 msgstr "निषेधित स्तर वृद्धि गर्नुहोस्"
 
 #: src/gtk/gui.cc:99
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Unsatisfied dependencies"
 msgstr "निर्भरताहरू पुन समाधान गर्नुहोस्"
 
@@ -4282,13 +4114,11 @@
 
 #: src/gtk/gui.cc:290
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "प्याकेज सूचीमा फिल्टर लागू गर्नुहोस्"
 
 #: src/gtk/gui.cc:298 src/gtk/gui.cc:946
 #, fuzzy
-#| msgid "Downloading..."
 msgid "Download already running."
 msgstr "डाउनलोड हुदैछ..."
 
@@ -4298,13 +4128,11 @@
 
 #: src/gtk/gui.cc:359
 #, fuzzy, c-format
-#| msgid "List Update"
 msgid "Update %s?"
 msgstr "सूची अद्यावधिक"
 
 #: src/gtk/gui.cc:385
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
@@ -4332,31 +4160,26 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "%s changes"
 msgid "Done applying changes!"
 msgstr "%s परिवर्तनहरू"
 
 #: src/gtk/gui.cc:823
 #, fuzzy
-#| msgid "%s changes"
 msgid "Applying changes..."
 msgstr "%s परिवर्तनहरू"
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "[%s] %s\n"
 msgid "%s: %s"
 msgstr "[%s] %s\n"
 
 #: src/gtk/gui.cc:878
 #, fuzzy, c-format
-#| msgid "No broken packages."
 msgid "Error in package %s"
 msgstr "कुनै पनि बिग्रिएका प्याकेजहरू छैन ।"
 
 #: src/gtk/gui.cc:906
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "नयाँ कनफिगरेसन फाइल संग %s बदल्न असक्षम भयो"
 
@@ -4366,25 +4189,21 @@
 
 #: src/gtk/gui.cc:1038
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "कुनै पनि बिग्रिएका प्याकेजहरू छैन ।"
 
 #: src/gtk/gui.cc:1071
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "कुनै पनि बिग्रिएका प्याकेजहरू छैन ।"
 
 #: src/gtk/gui.cc:1075
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "निर्भरताहरू पुन समाधान गर्नुहोस्"
 
 #: src/gtk/gui.cc:1103
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "कुनै पनि प्याकेजहरू बिग्रिएको छैन ।"
@@ -4392,13 +4211,11 @@
 
 #: src/gtk/gui.cc:1147
 #, fuzzy
-#| msgid "%s changes"
 msgid "View changes"
 msgstr "%s परिवर्तनहरू"
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "%s changes"
 msgid "Apply changes"
 msgstr "%s परिवर्तनहरू"
 
@@ -4407,8 +4224,6 @@
 #. font.
 #: src/gtk/gui.cc:1192
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%d package to install"
 msgid_plural "%d packages to install"
 msgstr[0] "%d स्थापना गर्नुहोस्"
@@ -4419,7 +4234,6 @@
 #. font.
 #: src/gtk/gui.cc:1207
 #, fuzzy, c-format
-#| msgid "failed to remove %s"
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "%s हटाउन असफल "
@@ -4427,7 +4241,6 @@
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "साइज डाउनलोड गर्नुहोस्"
 
@@ -4442,19 +4255,16 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "not installed"
 msgid "Not implemented"
 msgstr "स्थापना भएन"
 
 #: src/gtk/gui.cc:1408 src/gtk/gui.cc:1427
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "स्थापना भयो"
 
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "^सफा गर्नुहोस्"
 
@@ -4472,7 +4282,6 @@
 
 #: src/gtk/gui.cc:1455
 #, fuzzy
-#| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "म्यानुअल प्रयोग गर्नुहोस्"
 
@@ -4495,7 +4304,6 @@
 
 #: src/gtk/info.cc:496
 #, fuzzy
-#| msgid "Not Installed"
 msgid "Not available"
 msgstr "स्थापना गरिएको छैन"
 
@@ -4505,7 +4313,6 @@
 
 #: src/gtk/info.cc:555
 #, fuzzy
-#| msgid "Packages which depend on %s"
 msgid "Package information: dependency list"
 msgstr "%s मा भर पर्ने प्याकेजहरू"
 
@@ -4515,7 +4322,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "होइन"
 
@@ -4529,7 +4335,6 @@
 
 #: src/gtk/packagestab.cc:203
 #, fuzzy, c-format
-#| msgid "No packages matched the pattern \"%ls\"."
 msgid "No packages matched \"%s\"."
 msgstr "बान्की \"%ls\" संग कुनै प्याकेजहरू मेल खाएन ।"
 
@@ -4539,31 +4344,26 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "प्याकेज:"
 
 #: src/gtk/pkgview.cc:224
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed automatically."
 msgstr "%s; स्वत: रूपमा स्थापना हुनेछ"
 
 #: src/gtk/pkgview.cc:227
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed automatically."
 msgstr "%s; स्वत: रूपमा स्थापना हुनेछ"
 
 #: src/gtk/pkgview.cc:235
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed manually."
 msgstr "%s; स्वत: रूपमा स्थापना हुनेछ"
 
 #: src/gtk/pkgview.cc:238
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed manually."
 msgstr "%s; स्वत: रूपमा स्थापना हुनेछ"
 
@@ -4573,13 +4373,11 @@
 
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "खोज्नुहोस्"
 
 #: src/gtk/pkgview.cc:718
 #, fuzzy
-#| msgid "Building view"
 msgid "Finalizing view"
 msgstr "दृश्य निर्माण गरिदैछ"
 
@@ -4708,13 +4506,11 @@
 
 #: src/gtk/previewtab.cc:179
 #, fuzzy
-#| msgid "Preview"
 msgid "Preview: "
 msgstr "पूर्वावलोकन"
 
 #: src/gtk/resolver.cc:68
 #, fuzzy, c-format
-#| msgid "Error while dumping resolver state"
 msgid "Error in dependency resolver: %s"
 msgstr "पुन समाधान गर्ने स्थिति डम्प गर्दा त्रुटि"
 
@@ -4729,7 +4525,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package"
 msgid "Virtual package"
 msgstr "प्याकेज "
 
@@ -4739,25 +4534,21 @@
 
 #: src/gtk/resolver.cc:377
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Removing %s is rejected."
 msgstr "%s हटाउदै"
 
 #: src/gtk/resolver.cc:382
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Canceling the installation of %s is rejected."
 msgstr "%F को स्थापना रद्द गर्नुहोस्"
 
 #: src/gtk/resolver.cc:391
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Canceling the removal of %s is rejected."
 msgstr " %Fको हटाउने रद्द गर्नुहोस्"
 
 #: src/gtk/resolver.cc:394
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keeping %s at version %s is rejected."
 msgstr "राख्नुहोस् %F at version %s (%s)"
 
@@ -4768,13 +4559,11 @@
 
 #: src/gtk/resolver.cc:407
 #, fuzzy, c-format
-#| msgid "libsigc++ version: %s\n"
 msgid "Downgrading %s to version %s is rejected."
 msgstr "libsigc++ version: %s\n"
 
 #: src/gtk/resolver.cc:413
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrading %s to version %s is rejected."
 msgstr "%s संस्करणहरू"
 
@@ -4816,7 +4605,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr "%s संस्करणहरू"
@@ -4889,7 +4677,6 @@
 
 #: src/gtk/resolver.cc:1255 src/solution_fragment.cc:145
 #, fuzzy, c-format
-#| msgid "%s replaces %s"
 msgid "%s breaks %s"
 msgstr "%s बदल्नुहोस् %s"
 
@@ -4915,7 +4702,6 @@
 
 #: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862
 #, fuzzy
-#| msgid "Remove the following packages:"
 msgid "Keep the following packages:"
 msgstr "निम्न प्याकेजहरू हटाउनुहोस्:"
 
@@ -4931,49 +4717,41 @@
 
 #: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900
 #, fuzzy
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "Leave the following dependencies unresolved:"
 msgstr "निम्न निर्भरताहरू विचाररहितमा छाड्नुहोस्:%n"
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Remove %F [%s (%s)]"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "हटाउनुहोस् %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1523
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "स्थापना गर्नुहोस् %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1531
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s"
 msgstr "%F को स्थापना रद्द गर्नुहोस्"
 
 #: src/gtk/resolver.cc:1534
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s"
 msgstr " %Fको हटाउने रद्द गर्नुहोस्"
 
 #: src/gtk/resolver.cc:1537
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "राख्नुहोस् %F at version %s (%s)"
 
 #: src/gtk/resolver.cc:1544
 #, fuzzy, c-format
-#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "उन्नति %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1553
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "अवनति %F [%s (%s) -> %s (%s)]"
 
@@ -4989,61 +4767,51 @@
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "राख्नुहोस् %F at version %s (%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>keep</b> %s at version %s"
 msgstr "राख्नुहोस् %F at version %s (%s)"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr "%F को स्थापना रद्द गर्नुहोस्"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>cancel</b> the installation of %s"
 msgstr "%F को स्थापना रद्द गर्नुहोस्"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>Install</b> %s %s"
 msgstr "स्थापना गर्नुहोस् %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>install</b> %s %s"
 msgstr "स्थापना गर्नुहोस् %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "libsigc++ version: %s\n"
 msgid "<b>Downgrade</b> %s to version %s"
 msgstr "libsigc++ version: %s\n"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "libsigc++ version: %s\n"
 msgid "<b>downgrade</b> %s to version %s"
 msgstr "libsigc++ version: %s\n"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>Upgrade</b> %s to version %s"
 msgstr "%s संस्करणहरू"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>upgrade</b> %s to version %s"
 msgstr "%s संस्करणहरू"
 
@@ -5059,8 +4827,6 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "%d स्थापना गर्नुहोस्"
@@ -5068,8 +4834,6 @@
 
 #: src/gtk/resolver.cc:1740
 #, fuzzy, c-format
-#| msgid "%d removal"
-#| msgid_plural "%d removals"
 msgid "%s remove"
 msgid_plural "%s removes"
 msgstr[0] "%d हटाइएको"
@@ -5077,8 +4841,6 @@
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "%d keep"
-#| msgid_plural "%d keeps"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "%d राख्नुहोस्"
@@ -5086,8 +4848,6 @@
 
 #: src/gtk/resolver.cc:1752
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%s upgrade"
 msgid_plural "%s upgrades"
 msgstr[0] "%d स्तरवृद्धि गर्नुहोस्"
@@ -5095,8 +4855,6 @@
 
 #: src/gtk/resolver.cc:1758
 #, fuzzy, c-format
-#| msgid "%d downgrade"
-#| msgid_plural "%d downgrades"
 msgid "%s downgrade"
 msgid_plural "%s downgrades"
 msgstr[0] "%d स्तरकम गर्नुहोस्"
@@ -5104,7 +4862,6 @@
 
 #: src/gtk/resolver.cc:1764
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "%s unresolved recommendation"
 msgid_plural "%s unresolved recommendations"
 msgstr[0] "सिफारिशहरू लेखा जाँच्नुहोस्"
@@ -5112,19 +4869,16 @@
 
 #: src/gtk/resolver.cc:2056
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions yet."
 msgstr "बढि समाधानहरू छैन ।"
 
 #: src/gtk/resolver.cc:2063
 #, fuzzy
-#| msgid "^Dependency handling"
 msgid "No dependency solution was found."
 msgstr "^निर्भरता ह्यान्डलिङ्"
 
 #: src/gtk/resolver.cc:2064
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions."
 msgstr "बढि समाधानहरू छैन ।"
 
@@ -5134,19 +4888,16 @@
 
 #: src/gtk/resolver.cc:2076
 #, fuzzy, c-format
-#| msgid "No more solutions."
 msgid "%u solutions."
 msgstr "बढि समाधानहरू छैन ।"
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "फाइल \"%s\" खोल्न सकिएन"
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr "[डाउनलोड भयो]"
 
@@ -5196,7 +4947,6 @@
 
 #: src/load_grouppolicy.cc:305
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected ',', '%c', or '('; got '%c'"
 msgstr "अपेक्षित ',' वा '(', ले '%c' प्राप्त गर्यो"
 
@@ -5384,21 +5134,16 @@
 
 #: src/main.cc:144
 #, fuzzy
-#| msgid "Compiler: g++ %s\n"
 msgid "Compiled against:\n"
 msgstr "कम्पाइलर: g++ %s\n"
 
 #: src/main.cc:145
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "  apt version %d.%d.%d\n"
 msgstr "राख्नुहोस् %F at version %s (%s)"
 
 #: src/main.cc:148
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "NCurses version: %s\n"
 msgid "  NCurses version: Unknown\n"
 msgstr ""
 "\n"
@@ -5406,9 +5151,6 @@
 
 #: src/main.cc:150
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "NCurses version: %s\n"
 msgid "  NCurses version %s\n"
 msgstr ""
 "\n"
@@ -5416,7 +5158,6 @@
 
 #: src/main.cc:152
 #, fuzzy, c-format
-#| msgid "libsigc++ version: %s\n"
 msgid "  libsigc++ version: %s\n"
 msgstr "libsigc++ version: %s\n"
 
@@ -5432,13 +5173,11 @@
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "राख्नुहोस् %F at version %s (%s)"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "राख्नुहोस् %F at version %s (%s)"
 
@@ -5449,9 +5188,6 @@
 
 #: src/main.cc:167
 #, fuzzy
-#| msgid ""
-#| "\n"
-#| "Curses version: %s\n"
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5461,9 +5197,6 @@
 
 #: src/main.cc:168
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "NCurses version: %s\n"
 msgid "  NCurses version: %s\n"
 msgstr ""
 "\n"
@@ -5471,15 +5204,11 @@
 
 #: src/main.cc:169
 #, fuzzy, c-format
-#| msgid "libsigc++ version: %s\n"
 msgid "  cwidget version: %s\n"
 msgstr "libsigc++ version: %s\n"
 
 #: src/main.cc:170
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Curses version: %s\n"
 msgid "  Apt version: %s\n"
 msgstr ""
 "\n"
@@ -5506,44 +5235,36 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr "स्थापना गर्नुहोस्        - प्याकेजहरू स्थापना/अद्यावधिक गर्नुहोस्\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr "हटाउनुहोस्        प्याकेजहरू हटाउनुहोस्\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr "निर्मल गर्नुहोस्          - प्याकेजहरू र तिनीहरुको कनफिगरेसन हटाउनुहोस्\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr "समाउनुहोस्        समाउनेमा प्याकेजहरू सार्नुहोस्\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - एउटा प्याकेजको लागि समातिएका आदेश रद्द गर्नुहोस्\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - मार्क गरिएका प्याकेजहरू स्वत: स्थापना भयो\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - मार्क गरिएका प्याकेजहरू म्यानुल्ली स्थापना भयो\n"
 
@@ -5556,21 +5277,16 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr "अद्यावधिक गर्नुहोस्       नयाँ/स्तरवृद्धि गर्न सकिने प्याकेजहरू डाउनलोड गर्नुहोस्\n"
 
 #: src/main.cc:190
 #, fuzzy, c-format
-#| msgid " safe-upgrade - Perform a safe upgrade\n"
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr "सुरक्षित स्तरबृद्धि - सुरक्षित स्तरबृद्धि सम्पादन गर्नुहोस्\n"
 
 #: src/main.cc:191
 #, fuzzy, c-format
-#| msgid ""
-#| " full-upgrade - Perform an upgrade, possibly installing and removing "
-#| "packages\n"
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
@@ -5584,51 +5300,41 @@
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr "नयाँ-बिर्सनुहोस्   - बिर्सने प्याकेज \"new\"\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr "खोजी गर्नुहोस्      नाम र/वा अभिव्यक्ति द्वारा प्याकेजको खोजी गर्नुहोस्\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr "देखाउनुहोस्            - एउटा प्याकेजको बारेमा विस्तृत जानकारी प्रदर्शन गर्नुहोस्\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " सफा गर्नुहोस्       - डाउनलोड गरिएको प्याकेज फाइलहरू मेट्नुहोस्\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr "स्वत सफा गर्नुहोस्   - पुरानो डाउनलोड गरिएका प्याकेज फाइलहरू मेट्नुहोस्\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " लग परिवर्तन गर्नुहोस्    - प्याकेजको लग परिवर्तन हेर्नुहोस्\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr "डाउनलोड गर्नुहोस्    - एउटा प्याकेजको लागि deb फाइल डाउनलोड गर्नुहोस्\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5660,7 +5366,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             यो मद्दत पाठ\n"
 
@@ -5690,24 +5395,17 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             यकिन वा कार्यहरुको लागि सधै प्रोम्प्ट गर्नुहोस्\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr " -y             मान्नुहोस् कि साधारण हो/होइन प्रश्नको उत्तर 'हो' हो\n"
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5717,9 +5415,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5728,8 +5423,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 ""
@@ -5758,9 +5451,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5768,17 +5458,12 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr " -t [release]   स्थापना हुन लागेको प्याकेजहरू बाट विमोचन सेट गर्नुहोस्\n"
 
 #: src/main.cc:226
 #, fuzzy, c-format
-#| msgid ""
-#| " -q             In command-line mode, suppress the incremental progress "
-#| "indicators.\n"
 msgid ""
 " -q             In command-line mode, suppress the incremental progress.\n"
 "                indicators.\n"
@@ -5786,15 +5471,11 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o key=val     'कुञ्जी' नामकरण गरिएको कनफिगरेसन विकल्प सिधै सेट गर्नुहोस्\n"
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -5831,7 +5512,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "replaces"
 msgid "trace"
 msgstr "बदल्छ"
 
@@ -5845,7 +5525,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "होइन"
 
@@ -5859,7 +5538,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:377
 #, fuzzy
-#| msgid "Err "
 msgid "error"
 msgstr "Err "
 
@@ -5887,7 +5565,6 @@
 
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "अवैध सञ्चालन %s"
 
@@ -5903,7 +5580,6 @@
 
 #: src/main.cc:762
 #, fuzzy, c-format
-#| msgid "-o requires an argument of the form key=value, got %s"
 msgid "-o requires an argument of the form key=value, got %s\n"
 msgstr "-o लाई कुञ्जी=मानको रुपमा एउटा तर्कको आवश्यकता छ, %s प्राप्त गर्यो"
 
@@ -5941,7 +5617,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "प्याकेज "
 
@@ -5951,7 +5626,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "सबै प्याकेजहरू"
 
@@ -5971,7 +5645,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -5979,8 +5652,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -5988,7 +5659,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "-u र -i आदेश संग निर्दिष्ट हुने छैन"
 
@@ -6004,9 +5674,6 @@
 
 #: src/main.cc:1194 src/main.cc:1267
 #, fuzzy, c-format
-#| msgid ""
-#| "Backtrace:\n"
-#| "%s"
 msgid ""
 "Backtrace:\n"
 "%s\n"
@@ -6643,7 +6310,6 @@
 
 #: src/pkg_info_screen.cc:162
 #, fuzzy, c-format
-#| msgid "Versions"
 msgid "Versions of %s"
 msgstr "संस्करणहरू"
 
@@ -6766,9 +6432,6 @@
 
 #: src/pkg_view.cc:223
 #, fuzzy
-#| msgid ""
-#| "If you select a package, an explanation of its current state will appear "
-#| "in this space."
 msgid ""
 "If you select a package, an explanation of why it should be installed or "
 "removed will appear in this space."
@@ -6787,13 +6450,11 @@
 
 #: src/pkg_view.cc:678
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Related Dependencies"
 msgstr "निर्भरताहरू पुन समाधान गर्नुहोस्"
 
 #: src/pkg_view.cc:681
 #, fuzzy
-#| msgid "Installed"
 msgid "Why Installed"
 msgstr "स्थापना भयो"
 
@@ -7209,7 +6870,6 @@
 
 #: src/ui.cc:472
 #, fuzzy, c-format
-#| msgid "Unable to open %ls"
 msgid "Unable to fork: %s"
 msgstr "खोल्न असक्षम %ls"
 
@@ -7254,11 +6914,6 @@
 
 #: src/ui.cc:981
 #, 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."
 msgid ""
 "Aptitude %s%n%nCopyright 2000-2008 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
@@ -7336,7 +6991,6 @@
 
 #: src/ui.cc:1101
 #, fuzzy, c-format
-#| msgid "View the important changes made in each version of "
 msgid "View the important changes made in each version of %s"
 msgstr "प्रत्येक संस्करणमा गरिएका महत्वपुर्ण परिवर्तनहरू हर्नुहोस्"
 
@@ -7493,9 +7147,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7516,9 +7167,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -8045,19 +7693,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "परिवर्तन लगहरू डाउनलोड गर्न URL प्रयोग गर्नुहोस्"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "परिवर्तन लगहरू डाउनलोड गर्न URL प्रयोग गर्नुहोस्"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "परिवर्तनलग डाउनलोड गर्दै"
 
Index: aptitude/po/nl.po
===================================================================
--- aptitude.orig/po/nl.po
+++ aptitude/po/nl.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2008-09-05 23:04+0200\n"
 "Last-Translator: Frans Pop <elendil@planet.nl>\n"
 "Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -254,9 +254,6 @@
 
 #: src/apt_options.cc:241
 #, fuzzy
-#| msgid ""
-#| "If this option is enabled, the menu bar will only appear when it has been "
-#| "activated by pressing the menu key."
 msgid ""
 "If this option is enabled, then the first view displayed on startup will be "
 "a flat view instead of the default view."
@@ -621,7 +618,6 @@
 
 #: src/cmdline/cmdline_action.cc:212
 #, fuzzy, c-format
-#| msgid "Unable to satisfy the build-depends: %s."
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Kan de 'build-depends' niet voldoen: %s."
 
@@ -678,7 +674,6 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr ""
 "%s is op dit moment niet geïnstalleerd, dus zal het niet opnieuw worden "
@@ -686,7 +681,6 @@
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "%s is reeds geïnstalleerd met de gevraagde versie (%s)\n"
@@ -792,7 +786,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "ChangeLog van %s"
 
@@ -958,7 +951,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "geen"
 
@@ -1382,7 +1374,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr " '&M' om pakketten als automatisch geïnstalleerd te markeren"
 
@@ -1515,9 +1506,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy, c-format
-#| msgid ""
-#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: "
-#| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
@@ -1564,10 +1552,6 @@
 # FJP: does this make sense?
 #: src/cmdline/cmdline_resolver.cc:259
 #, fuzzy
-#| msgid ""
-#| "reject the given package versions; don't display any solutions in which "
-#| "they occur.  Enter UNINST instead of a version to reject removing the "
-#| "package."
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package.  "
@@ -1579,9 +1563,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:261
 #, fuzzy
-#| msgid ""
-#| "accept the given package versions; display only solutions in which they "
-#| "occur.  Enter UNINST instead of a version to accept removing the package."
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package.  "
@@ -1686,31 +1667,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "Laat de volgende aanbevelingen onopgelost:"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "Onderzoek ^Aanbevelingen"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "Vereist niet langer het verwijderen van %s"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "Onderzoek ^Aanbevelingen"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Acties"
 
@@ -1863,7 +1839,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:1201
 #, fuzzy
-#| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Kan afhankelijkheden voor de opwaardering niet oplossen: geen oplossing "
@@ -1871,7 +1846,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:1207
 #, fuzzy, c-format
-#| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Kan afhankelijkheden voor de opwaardering niet oplossen (%s)."
 
@@ -1902,13 +1876,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "maar het is niet installeerbaar"
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "maar %s wordt geïnstalleerd."
 
@@ -2007,13 +1979,11 @@
 
 #: src/cmdline/cmdline_show.cc:326
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s%s; will be installed"
 msgstr "%s; zal worden geïnstalleerd."
 
 #: src/cmdline/cmdline_show.cc:328
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s%s; will be installed automatically"
 msgstr "%s; zal automatisch worden geïnstalleerd"
 
@@ -2277,25 +2247,21 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "Pakketten"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Bronpakket: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Archief"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\".\n"
 msgid "No such package \"%s\"."
 msgstr "Pakket \"%s\" bestaat niet.\n"
 
@@ -2334,7 +2300,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "zoeken: U moet minstens één zoekterm opgeven\n"
 
@@ -2457,7 +2422,6 @@
 
 #: src/cmdline/cmdline_why.cc:1285
 #, fuzzy, c-format
-#| msgid "Packages depending on %s"
 msgid "Packages requiring %s:"
 msgstr "Pakketten die afhangen van %s"
 
@@ -2473,8 +2437,6 @@
 
 #: src/cmdline/cmdline_why.cc:1416
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: this command requires at least one argument (the package to query)."
 msgid ""
 "%s: this command requires at least one argument (the package to query).\n"
 msgstr ""
@@ -2493,7 +2455,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[FOUT]"
 
@@ -2849,7 +2810,6 @@
 
 #: src/generic/apt/download_update_manager.cc:138
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated quoted string in command: %s"
 msgstr "Niet-afgesloten letterlijke string na %s"
 
@@ -2932,7 +2892,6 @@
 
 #: src/generic/apt/dump_packages.cc:674
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create truncated cache: %s."
 msgstr "Kan pakket %s niet localiseren"
 
@@ -3055,7 +3014,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "Ophalen pakketten"
 
@@ -3093,7 +3051,6 @@
 
 #: src/generic/apt/matching/parse.cc:860
 #, fuzzy, c-format
-#| msgid "Unknown matcher type: \"%s\"."
 msgid "Unknown term type: \"%s\"."
 msgstr "Onbekend type vergelijker: \"%s\"."
 
@@ -3101,9 +3058,6 @@
 #. Leave the question marks attached to the string placeholders.
 #: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883
 #, fuzzy, c-format
-#| msgid ""
-#| "The ?%s matcher must be used in a \"wide\" context (a top-level context, "
-#| "or a context enclosed by ?%s)."
 msgid ""
 "The ?%s term must be used in a \"wide\" context (a top-level context, or a "
 "context enclosed by ?%s)."
@@ -3134,7 +3088,6 @@
 
 #: src/generic/apt/matching/parse.cc:1388
 #, fuzzy, c-format
-#| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "Slecht gevormde expressie"
 
@@ -3174,19 +3127,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "Te gebruiken URL voor het ophalen van changelogs"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "Te gebruiken URL voor het ophalen van changelogs"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "ChangeLog van %s"
 
@@ -3231,7 +3181,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Kan patroon %s niet ontleden"
 
@@ -3246,14 +3195,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "Niet-geïnstalleerd"
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "Niet-geïnstalleerd"
 
@@ -3280,67 +3227,56 @@
 
 #: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got EOF."
 msgstr "Verwachtte '%c', kreeg '%c'"
 
 #: src/generic/util/parsers.h:737
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got '%s'."
 msgstr "Verwachtte '%c', kreeg '%c'"
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "Verwachtte een getal na -q=, got %s\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "Slecht actiekarakter '%c'\n"
 
 #: src/generic/util/parsers.h:832
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got EOF."
 msgstr "Verwachtte '%c', kreeg '%c'"
 
 #: src/generic/util/parsers.h:843
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got '%c'."
 msgstr "Verwachtte '%c', kreeg '%c'"
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "Verwachtte beleid, kreeg '%c'"
 
 #: src/generic/util/parsers.h:1026
 #, fuzzy
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected an integer following '-', got EOF."
 msgstr "Verwachtte ',' of ')' na '||', kreeg '%s'"
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "Verwachtte beleid, kreeg '%c'"
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "Ongeldige operatie %s"
 
 #: src/generic/util/parsers.h:1077
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected EOF, got '%c'."
 msgstr "Verwachtte '%c', kreeg '%c'"
 
@@ -3354,19 +3290,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "Onverwacht ')'"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " of"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "Onverwacht ')'"
 
@@ -3377,7 +3310,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "kan tijdelijke map niet aanmaken van sjabloon \"%s\": %s"
 
@@ -3412,7 +3344,6 @@
 
 #: src/gtk/aptitude.glade:19 src/gtk/aptitude.glade:2273
 #, fuzzy
-#| msgid "False"
 msgid "_File"
 msgstr "Onwaar"
 
@@ -3479,13 +3410,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "Pakket"
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "Views"
 
@@ -3505,7 +3434,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "Help"
 
@@ -3516,7 +3444,6 @@
 
 #: src/gtk/aptitude.glade:345 src/gtk/aptitude.glade:2614
 #, fuzzy
-#| msgid "List Update"
 msgid "Update"
 msgstr "Lijst Bijwerken"
 
@@ -3538,7 +3465,6 @@
 
 #: src/gtk/aptitude.glade:389 src/gtk/aptitude.glade:2658
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Remove"
 msgstr "Geïnstalleerd"
 
@@ -3552,33 +3478,28 @@
 
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "Verwijder de filter van de pakketlijst"
 
 #: src/gtk/aptitude.glade:649
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "Apply these settings to all active package lists."
 msgstr "Pas een filter toe op de pakketlijst"
 
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "Zoek"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "herinstalleren"
 
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "Fout "
 
@@ -3593,19 +3514,16 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "Afhankelijkheden van %s"
 
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "^Changelog"
 msgid "Changelog"
 msgstr "^Changelog"
 
 #: src/gtk/aptitude.glade:1020
 #, fuzzy
-#| msgid "False"
 msgid "Files"
 msgstr "Onwaar"
 
@@ -3619,7 +3537,6 @@
 
 #: src/gtk/aptitude.glade:1051
 #, fuzzy
-#| msgid "Tags"
 msgid "tags"
 msgstr "Labels"
 
@@ -3642,13 +3559,11 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "Staat"
 
 #: src/gtk/aptitude.glade:1247
 #, fuzzy
-#| msgid "Unknown action type: %s"
 msgid "Group by action type"
 msgstr "Onbekend actietype: %s"
 
@@ -3677,13 +3592,11 @@
 
 #: src/gtk/aptitude.glade:1328
 #, fuzzy
-#| msgid "Toggle ^Rejected"
 msgid "Rejected"
 msgstr "Schakel Ver^worpen"
 
 #: src/gtk/aptitude.glade:1343
 #, fuzzy
-#| msgid "Preferences"
 msgid "No preference"
 msgstr "Voorkeursinstellingen"
 
@@ -3697,32 +3610,27 @@
 
 #: src/gtk/aptitude.glade:1400
 #, fuzzy
-#| msgid "^Examine Solution"
 msgid "Find a new solution"
 msgstr "^Bestudeer Oplossing"
 
 #: src/gtk/aptitude.glade:1404
 #, fuzzy
-#| msgid "Select the next solution to the dependency problems."
 msgid "Calculate the next solution that has not yet been generated."
 msgstr "Selecteer de volgende oplossing voor de afhankelijkheidsproblemen"
 
 #: src/gtk/aptitude.glade:1419
 #, fuzzy
-#| msgid "Perform the actions contained in the currently selected solution."
 msgid ""
 "Perform the actions in the currently selected solution and close this tab."
 msgstr "Voer de acties behorend bij de momenteel geselecteerde oplossing uit"
 
 #: src/gtk/aptitude.glade:1576
 #, fuzzy
-#| msgid "Upgrade"
 msgid "Upgrade Summary"
 msgstr "Opwaarderen"
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "Bronpakket: "
 
@@ -3734,7 +3642,6 @@
 
 #: src/gtk/aptitude.glade:1652
 #, fuzzy
-#| msgid "Manual"
 msgid "Fix Manually"
 msgstr "Handmatig"
 
@@ -3782,31 +3689,26 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "Defect"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "Kan niet corrigeren voor niet aanwezige pakketten"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "^Zoek"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for: "
 msgid "Search for packages."
 msgstr "Zoek naar: "
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "Gehaald: "
 
@@ -3840,19 +3742,16 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "Te gebruiken URL voor het ophalen van changelogs"
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "Vereist de installatie van %s versie %s (%s)"
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -3860,20 +3759,17 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr "U kunt alleen changelogs van officiële Debian-pakketten bekijken."
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "Changelog wordt opgehaald"
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "Te gebruiken URL voor het ophalen van changelogs"
 
@@ -3887,7 +3783,6 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "Te gebruiken URL voor het ophalen van changelogs"
 
@@ -3897,8 +3792,6 @@
 
 #: src/gtk/dashboardtab.cc:414
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] "%d op te waarderen"
@@ -3906,13 +3799,11 @@
 
 #: src/gtk/dashboardtab.cc:633
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No upgrades are available."
 msgstr "Niet-geïnstalleerd"
 
 #: src/gtk/dashboardtab.cc:645
 #, fuzzy
-#| msgid "Unable to locate package %s"
 msgid "Unable to calculate an upgrade."
 msgstr "Kan pakket %s niet localiseren"
 
@@ -3947,25 +3838,21 @@
 
 #: src/gtk/dashboardtab.cc:708
 #, fuzzy, c-format
-#| msgid "Internal error: Default column string is unparsable"
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr "Interne fout: standaard kolomstring is niet ontleedbaar"
 
 #: src/gtk/dependency_chains_tab.cc:78
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: start"
 msgstr "Afhankelijkheidsafhandeling"
 
 #: src/gtk/dependency_chains_tab.cc:82
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: end"
 msgstr "Afhankelijkheidsafhandeling"
 
 #: src/gtk/dependency_chains_tab.cc:86
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: results"
 msgstr "Afhankelijkheidsafhandeling"
 
@@ -3975,7 +3862,6 @@
 
 #: src/gtk/dependency_chains_tab.cc:282
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency chain found."
 msgstr "Afhankelijkheidsafhandeling"
 
@@ -3985,13 +3871,11 @@
 
 #: src/gtk/download.cc:185
 #, fuzzy
-#| msgid "False"
 msgid "Failed"
 msgstr "Onwaar"
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "Opgehaalde bestanden verwijderen"
 
@@ -4002,13 +3886,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "Totale voortgang: "
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description"
 msgid "Short Description"
 msgstr "Beschrijving"
 
@@ -4018,13 +3900,11 @@
 
 #: src/gtk/download.cc:319
 #, fuzzy
-#| msgid "Cleaning while a download is in progress is not allowed"
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr "Opschonen terwijl een download bezig is, is niet toegestaan."
 
 #: src/gtk/download.cc:395 src/gtk/gui.cc:832
 #, fuzzy
-#| msgid "View next display"
 msgid "View Details"
 msgstr "Bekijk volgende weergave"
 
@@ -4044,19 +3924,16 @@
 
 #: src/gtk/download.cc:486
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s: %lu/%lu, stalled"
 msgstr "%s; zal worden geïnstalleerd."
 
 #: src/gtk/download.cc:507
 #, fuzzy, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr " [ %i%% ] (%sB/s, %s overblijvend)"
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "maar %s wordt geïnstalleerd."
 
@@ -4070,7 +3947,6 @@
 
 #: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "Kan pakket %s niet localiseren"
 
@@ -4081,7 +3957,6 @@
 
 #: src/gtk/dpkg_terminal.cc:429
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "%s: Unable to accept a connection: %s"
 msgstr "kan tijdelijke map niet aanmaken van sjabloon \"%s\": %s"
 
@@ -4107,80 +3982,67 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "%s versies"
 
 #: src/gtk/entitysummary.cc:123
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Install %s version %s"
 msgstr "Installeer(%s voorziet in %s)"
 
 #: src/gtk/entitysummary.cc:131
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrade to %s version %s"
 msgstr "  cwidget-versie: %s\n"
 
 #: src/gtk/entitysummary.cc:142
 #, fuzzy, c-format
-#| msgid "Keep the following packages at their current version:"
 msgid "Don't hold %s at its current version."
 msgstr "Behoud de volgende pakketten op hun huidige versie:"
 
 #: src/gtk/entitysummary.cc:145 src/gtk/entitysummary.cc:165
 #: src/gtk/entitysummary.cc:168
 #, fuzzy, c-format
-#| msgid "Canc^el pending actions"
 msgid "Cancel any actions on %s."
 msgstr "Annuleer ^lopende acties"
 
 #: src/gtk/entitysummary.cc:150
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the purge of %s."
 msgstr "Annuleer de verwijdering van %F"
 
 #: src/gtk/entitysummary.cc:152
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s."
 msgstr "Annuleer de verwijdering van %F"
 
 #: src/gtk/entitysummary.cc:157
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the upgrade of %s."
 msgstr "Annuleer de verwijdering van %F"
 
 #: src/gtk/entitysummary.cc:159
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s."
 msgstr "Breek de installatie van %F af"
 
 #: src/gtk/entitysummary.cc:161
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the downgrade of %s."
 msgstr "Annuleer de verwijdering van %F"
 
 #: src/gtk/entitysummary.cc:163
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the reinstallation of %s."
 msgstr "Breek de installatie van %F af"
 
 #: src/gtk/entitysummary.cc:206
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "Remove %s"
 msgstr "Verwijder(%s)"
 
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "^Wis (purge)"
 
@@ -4191,19 +4053,16 @@
 
 #: src/gtk/entitysummary.cc:223
 #, fuzzy, c-format
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Mark %s as automatically installed."
 msgstr " '&M' om pakketten als automatisch geïnstalleerd te markeren"
 
 #: src/gtk/entitysummary.cc:228
 #, fuzzy, c-format
-#| msgid "'&m' to mark packages as manually installed"
 msgid "Mark %s as manually installed."
 msgstr "'&m' om pakketten als handmatig geïnstalleerd te markeren"
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
 msgid "%s is a virtual package provided by:\n"
 msgstr "\"%s\" is een virtueel pakket waarin wordt voorzien door:\n"
 
@@ -4213,13 +4072,11 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "Bronpakket: "
 
 #: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 #, fuzzy
-#| msgid "ProgName"
 msgid "Name"
 msgstr "Programmanaam"
 
@@ -4229,13 +4086,11 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "Kan \"%s\" niet openen"
 
 #: src/gtk/entityview.cc:412
 #, fuzzy, c-format
-#| msgid "Rejecting the removal of %s"
 msgid "Editing the columns of \"%s\""
 msgstr "Weigert het verwijderen van %s"
 
@@ -4249,25 +4104,21 @@
 
 #: src/gtk/entityview.cc:570
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Whether the package is automatically installed."
 msgstr " '&M' om pakketten als automatisch geïnstalleerd te markeren"
 
 #: src/gtk/entityview.cc:576
 #, fuzzy
-#| msgid "Cancel any action on the selected package"
 msgid "The name and description of the package."
 msgstr "Annuleer alle acties voor het geselecteerde pakket"
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "Versie: "
 
 #: src/gtk/entityview.cc:592
 #, fuzzy
-#| msgid "Check for new versions of packages"
 msgid "The version number of the package."
 msgstr "Controleer op nieuwe versies van pakketten"
 
@@ -4288,7 +4139,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "niet geïnstalleerd"
 
@@ -4298,25 +4148,21 @@
 
 #: src/gtk/gui.cc:82
 #, fuzzy
-#| msgid "unpacked"
 msgid "Unpacked"
 msgstr "uitgepakt"
 
 #: src/gtk/gui.cc:83
 #, fuzzy
-#| msgid "half-config"
 msgid "Half-configured"
 msgstr "half geconfigureerd"
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "half-install"
 msgid "Half-installed"
 msgstr "half geïnstalleerd"
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "niet geïnstalleerd (configuratiebestanden blijven behouden)"
 
@@ -4350,13 +4196,11 @@
 
 #: src/gtk/gui.cc:97
 #, fuzzy
-#| msgid "forbidden upgrade"
 msgid "Hold (don't upgrade)"
 msgstr "verboden opwaardering"
 
 #: src/gtk/gui.cc:99
 #, fuzzy
-#| msgid "Related Dependencies"
 msgid "Unsatisfied dependencies"
 msgstr "Gerelateerde Afhankelijkheden"
 
@@ -4370,13 +4214,11 @@
 
 #: src/gtk/gui.cc:290
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "Pas een filter toe op de pakketlijst"
 
 #: src/gtk/gui.cc:298 src/gtk/gui.cc:946
 #, fuzzy
-#| msgid "Downloading... "
 msgid "Download already running."
 msgstr "Bezig met ophalen... "
 
@@ -4388,13 +4230,11 @@
 
 #: src/gtk/gui.cc:359
 #, fuzzy, c-format
-#| msgid "List Update"
 msgid "Update %s?"
 msgstr "Lijst Bijwerken"
 
 #: src/gtk/gui.cc:385
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
@@ -4422,31 +4262,26 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "%s changes"
 msgid "Done applying changes!"
 msgstr "%s wijzigingen"
 
 #: src/gtk/gui.cc:823
 #, fuzzy
-#| msgid "%s changes"
 msgid "Applying changes..."
 msgstr "%s wijzigingen"
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "s: %F"
 msgid "%s: %s"
 msgstr "g: %F"
 
 #: src/gtk/gui.cc:878
 #, fuzzy, c-format
-#| msgid "No broken packages."
 msgid "Error in package %s"
 msgstr "Geen defecte pakketten."
 
 #: src/gtk/gui.cc:906
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Kan %s niet vervangen door nieuw configuratiebestand"
 
@@ -4456,25 +4291,21 @@
 
 #: src/gtk/gui.cc:1038
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "Geen defecte pakketten."
 
 #: src/gtk/gui.cc:1071
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "Geen defecte pakketten."
 
 #: src/gtk/gui.cc:1075
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "Afhankelijkheden Oplossen"
 
 #: src/gtk/gui.cc:1103
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Er zijn geen defecte pakketten."
@@ -4482,13 +4313,11 @@
 
 #: src/gtk/gui.cc:1147
 #, fuzzy
-#| msgid "%s changes"
 msgid "View changes"
 msgstr "%s wijzigingen"
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "%s changes"
 msgid "Apply changes"
 msgstr "%s wijzigingen"
 
@@ -4497,8 +4326,6 @@
 #. font.
 #: src/gtk/gui.cc:1192
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%d package to install"
 msgid_plural "%d packages to install"
 msgstr[0] "%d installatie"
@@ -4509,7 +4336,6 @@
 #. font.
 #: src/gtk/gui.cc:1207
 #, fuzzy, c-format
-#| msgid "failed to remove %s"
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "kon %s niet verwijderen"
@@ -4517,7 +4343,6 @@
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "Ophaalgrootte"
 
@@ -4532,19 +4357,16 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "not installed"
 msgid "Not implemented"
 msgstr "niet geïnstalleerd"
 
 #: src/gtk/gui.cc:1408 src/gtk/gui.cc:1427
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "Geïnstalleerd"
 
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "^Wis (purge)"
 
@@ -4562,7 +4384,6 @@
 
 #: src/gtk/gui.cc:1455
 #, fuzzy
-#| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "Gebruikershandleiding"
 
@@ -4577,7 +4398,6 @@
 
 #: src/gtk/info.cc:161 src/gtk/pkgview.cc:169
 #, fuzzy
-#| msgid "Current status: %F."
 msgid "Current status"
 msgstr "Huidige status: %F."
 
@@ -4587,19 +4407,16 @@
 
 #: src/gtk/info.cc:496
 #, fuzzy
-#| msgid "Not Installed"
 msgid "Not available"
 msgstr "Niet-geïnstalleerd"
 
 #: src/gtk/info.cc:545
 #, fuzzy
-#| msgid "C^ycle Package Information"
 msgid "Package information: version list"
 msgstr "^Wissel pakketinformatie"
 
 #: src/gtk/info.cc:555
 #, fuzzy
-#| msgid "Packages which depend on %s"
 msgid "Package information: dependency list"
 msgstr "Pakketten die afhangen van %s"
 
@@ -4609,7 +4426,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "nee"
 
@@ -4623,7 +4439,6 @@
 
 #: src/gtk/packagestab.cc:203
 #, fuzzy, c-format
-#| msgid "No packages matched the pattern \"%ls\"."
 msgid "No packages matched \"%s\"."
 msgstr "Er zijn geen pakketten die overeenkomen met het patroon \"%ls\"."
 
@@ -4633,31 +4448,26 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "Pakket: "
 
 #: src/gtk/pkgview.cc:224
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed automatically."
 msgstr "%s; zal automatisch worden geïnstalleerd"
 
 #: src/gtk/pkgview.cc:227
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed automatically."
 msgstr "%s; zal automatisch worden geïnstalleerd"
 
 #: src/gtk/pkgview.cc:235
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed manually."
 msgstr "%s; zal automatisch worden geïnstalleerd"
 
 #: src/gtk/pkgview.cc:238
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed manually."
 msgstr "%s; zal automatisch worden geïnstalleerd"
 
@@ -4667,13 +4477,11 @@
 
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "Zoek"
 
 #: src/gtk/pkgview.cc:718
 #, fuzzy
-#| msgid "Building view"
 msgid "Finalizing view"
 msgstr "Beeld opbouwen"
 
@@ -4807,13 +4615,11 @@
 
 #: src/gtk/previewtab.cc:179
 #, fuzzy
-#| msgid "Preview"
 msgid "Preview: "
 msgstr "Vooruitblik"
 
 #: src/gtk/resolver.cc:68
 #, fuzzy, c-format
-#| msgid "Error while dumping resolver state"
 msgid "Error in dependency resolver: %s"
 msgstr "Fout bij het archiveren van de status van de oplosser"
 
@@ -4828,7 +4634,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package"
 msgid "Virtual package"
 msgstr "Pakket"
 
@@ -4838,43 +4643,36 @@
 
 #: src/gtk/resolver.cc:377
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Removing %s is rejected."
 msgstr "Verwijderen van %s"
 
 #: src/gtk/resolver.cc:382
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Canceling the installation of %s is rejected."
 msgstr "Breek de installatie van %F af"
 
 #: src/gtk/resolver.cc:391
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Canceling the removal of %s is rejected."
 msgstr "Annuleer de verwijdering van %F"
 
 #: src/gtk/resolver.cc:394
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keeping %s at version %s is rejected."
 msgstr "Behoud %F op versie %s (%s)"
 
 #: src/gtk/resolver.cc:401
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Installing %s version %s is rejected."
 msgstr "Installeer(%s voorziet in %s)"
 
 #: src/gtk/resolver.cc:407
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrading %s to version %s is rejected."
 msgstr "  cwidget-versie: %s\n"
 
 #: src/gtk/resolver.cc:413
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrading %s to version %s is rejected."
 msgstr "%s versies"
 
@@ -4916,7 +4714,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr "%s versies"
@@ -5014,7 +4811,6 @@
 
 #: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862
 #, fuzzy
-#| msgid "Remove the following packages:"
 msgid "Keep the following packages:"
 msgstr "Verwijder de volgende pakketten:"
 
@@ -5030,121 +4826,101 @@
 
 #: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900
 #, fuzzy
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "Leave the following dependencies unresolved:"
 msgstr "Laat de volgende afhankelijkheden onopgelost:%n"
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Remove %F [%s (%s)]"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "Verwijder %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1523
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "Installeer %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1531
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s"
 msgstr "Breek de installatie van %F af"
 
 #: src/gtk/resolver.cc:1534
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s"
 msgstr "Annuleer de verwijdering van %F"
 
 #: src/gtk/resolver.cc:1537
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "Behoud %F op versie %s (%s)"
 
 #: src/gtk/resolver.cc:1544
 #, fuzzy, c-format
-#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Opwaarderen van %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1553
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Degradeer %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>Remove</b> %s"
 msgstr "Verwijder(%s)"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>remove</b> %s"
 msgstr "Verwijder(%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "Behoud %F op versie %s (%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>keep</b> %s at version %s"
 msgstr "Behoud %F op versie %s (%s)"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr "Breek de installatie van %F af"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>cancel</b> the installation of %s"
 msgstr "Breek de installatie van %F af"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>Install</b> %s %s"
 msgstr "Installeer %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>install</b> %s %s"
 msgstr "Installeer %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>Downgrade</b> %s to version %s"
 msgstr "  cwidget-versie: %s\n"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>downgrade</b> %s to version %s"
 msgstr "  cwidget-versie: %s\n"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>Upgrade</b> %s to version %s"
 msgstr "%s versies"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>upgrade</b> %s to version %s"
 msgstr "%s versies"
 
@@ -5160,8 +4936,6 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "%d installatie"
@@ -5169,8 +4943,6 @@
 
 #: src/gtk/resolver.cc:1740
 #, fuzzy, c-format
-#| msgid "%d removal"
-#| msgid_plural "%d removals"
 msgid "%s remove"
 msgid_plural "%s removes"
 msgstr[0] "%d te verwijderen"
@@ -5178,8 +4950,6 @@
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "%d keep"
-#| msgid_plural "%d keeps"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "%d behouden"
@@ -5187,8 +4957,6 @@
 
 #: src/gtk/resolver.cc:1752
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%s upgrade"
 msgid_plural "%s upgrades"
 msgstr[0] "%d op te waarderen"
@@ -5196,8 +4964,6 @@
 
 #: src/gtk/resolver.cc:1758
 #, fuzzy, c-format
-#| msgid "%d downgrade"
-#| msgid_plural "%d downgrades"
 msgid "%s downgrade"
 msgid_plural "%s downgrades"
 msgstr[0] "%d degradatie"
@@ -5205,7 +4971,6 @@
 
 #: src/gtk/resolver.cc:1764
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "%s unresolved recommendation"
 msgid_plural "%s unresolved recommendations"
 msgstr[0] "Onderzoek ^Aanbevelingen"
@@ -5213,19 +4978,16 @@
 
 #: src/gtk/resolver.cc:2056
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions yet."
 msgstr "Geen oplossingen meer."
 
 #: src/gtk/resolver.cc:2063
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency solution was found."
 msgstr "Afhankelijkheidsafhandeling"
 
 #: src/gtk/resolver.cc:2064
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions."
 msgstr "Geen oplossingen meer."
 
@@ -5235,19 +4997,16 @@
 
 #: src/gtk/resolver.cc:2076
 #, fuzzy, c-format
-#| msgid "No more solutions."
 msgid "%u solutions."
 msgstr "Geen oplossingen meer."
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "Kan \"%s\" niet openen"
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr "[Opgehaald]"
 
@@ -5297,7 +5056,6 @@
 
 #: src/load_grouppolicy.cc:305
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected ',', '%c', or '('; got '%c'"
 msgstr "Verwachtte ',' of '(', kreeg '%c'"
 
@@ -5405,7 +5163,6 @@
 
 #: src/load_grouppolicy.cc:713
 #, fuzzy, c-format
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected '{', ')', or ',' following '||', got '%s'"
 msgstr "Verwachtte ',' of ')' na '||', kreeg '%s'"
 
@@ -5525,19 +5282,16 @@
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt-versie %d.%d.%d\n"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt-versie %d.%d.%d\n"
 
 #: src/main.cc:164
 #, fuzzy, c-format
-#| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Ondersteuning van 'ept' niet actief.\n"
 
@@ -5586,44 +5340,36 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Pakketten installeren/opwaarderen\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Pakketten verwijderen\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Pakketten en hun configuratiebestanden verwijderen\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Pakketten behouden\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Annuleer het behouden van een pakket\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Pakketten aanduiden als automatisch geïnstalleerd\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Pakketten aanduiden als handmatig geïnstalleerd\n"
 
@@ -5638,21 +5384,16 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Lijsten van nieuwe/opwaardeerbare pakketten ophalen\n"
 
 #: src/main.cc:190
 #, fuzzy, c-format
-#| msgid " safe-upgrade - Perform a safe upgrade\n"
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Een veilige opwaardering uitvoeren\n"
 
 #: src/main.cc:191
 #, fuzzy, c-format
-#| msgid ""
-#| " full-upgrade - Perform an upgrade, possibly installing and removing "
-#| "packages\n"
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
@@ -5667,51 +5408,41 @@
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr "forget-new   - Vergeet welke pakketten \"nieuw\" zijn\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Een pakket opzoeken op naam en/of op expressie\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Gedetailleerde informatie tonen van een pakket\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Opgehaalde pakketbestanden wissen\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Oude opgehaalde pakketbestanden wissen\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Bekijk de changelog van een pakket\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Het .deb-bestand van een pakket ophalen\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5733,12 +5464,6 @@
 
 #: src/main.cc:203
 #, fuzzy, c-format
-#| msgid ""
-#| " why-not      - Show the manually installed packages that lead to a "
-#| "conflict\n"
-#| "                with the given package, or why one or more packages "
-#| "would\n"
-#| "                lead to a conflict with the given package if installed\n"
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
 "conflict\n"
@@ -5757,7 +5482,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             Deze helptekst\n"
 
@@ -5786,15 +5510,11 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr "-P             Steeds naar bevestiging of actie vragen\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
@@ -5803,9 +5523,6 @@
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5815,9 +5532,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5827,8 +5541,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 ""
@@ -5861,9 +5573,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5873,8 +5582,6 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
@@ -5883,9 +5590,6 @@
 
 #: src/main.cc:226
 #, fuzzy, c-format
-#| msgid ""
-#| " -q             In command-line mode, suppress the incremental progress\n"
-#| "                indicators.\n"
 msgid ""
 " -q             In command-line mode, suppress the incremental progress.\n"
 "                indicators.\n"
@@ -5896,16 +5600,12 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o sleutel=val Zet de configuratie-optie genaamd 'sleutel' rechtstreeks\n"
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -5943,7 +5643,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "true"
 msgid "trace"
 msgstr "waar"
 
@@ -5957,7 +5656,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "nee"
 
@@ -5971,7 +5669,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:377
 #, fuzzy
-#| msgid "Err "
 msgid "error"
 msgstr "Fout "
 
@@ -5979,7 +5676,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:380
 #, fuzzy
-#| msgid "false"
 msgid "fatal"
 msgstr "onwaar"
 
@@ -6000,7 +5696,6 @@
 
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "Ongeldige operatie %s"
 
@@ -6053,7 +5748,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "Pakket"
 
@@ -6063,7 +5757,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "Alle Pakketten"
 
@@ -6083,7 +5776,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -6091,8 +5783,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -6102,7 +5792,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "-u en -i mogen niet meegegeven worden met een commando"
 
@@ -7352,7 +7041,6 @@
 
 #: src/ui.cc:472
 #, fuzzy, c-format
-#| msgid "Unable to open %ls"
 msgid "Unable to fork: %s"
 msgstr "Kan %ls niet openen"
 
@@ -7630,9 +7318,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7655,9 +7340,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -8196,19 +7878,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "Te gebruiken URL voor het ophalen van changelogs"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "Te gebruiken URL voor het ophalen van changelogs"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "Changelog wordt opgehaald"
 
Index: aptitude/po/nn.po
===================================================================
--- aptitude.orig/po/nn.po
+++ aptitude/po/nn.po
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: aptitude_nn\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2005-06-27 21:26+0200\n"
 "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -650,13 +650,11 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s er ikkje installert no, så han blir ikkje re-installert.\n"
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "%s er allereie installert med den førespurde versjonen (%s)\n"
@@ -756,7 +754,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "Endringslogg for %s"
 
@@ -919,7 +916,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "ingen"
 
@@ -1319,7 +1315,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "&M for å merkje pakkar som automatisk installerte"
 
@@ -1617,7 +1612,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Handlingar"
 
@@ -1804,13 +1798,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "men lèt seg ikkje installera"
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "men %s blir installert."
 
@@ -2175,19 +2167,16 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "Pakkar"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Kjeldepakke: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Arkiv"
 
@@ -2231,7 +2220,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "søk: Du må oppgje iallefall eitt søkje ord\n"
 
@@ -2360,7 +2348,6 @@
 
 #: src/cmdline/cmdline_why.cc:1285
 #, fuzzy, c-format
-#| msgid "Packages depending on %s"
 msgid "Packages requiring %s:"
 msgstr "Pakkar som krev %s"
 
@@ -2394,7 +2381,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[FEIL]"
 
@@ -2941,7 +2927,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "Lastar ned pakkar"
 
@@ -3015,7 +3000,6 @@
 
 #: src/generic/apt/matching/parse.cc:1388
 #, fuzzy, c-format
-#| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "Dårleg utforma uttrykk"
 
@@ -3054,19 +3038,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "Nettadresse som endringsloggar skal hentast frå"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "Nettadresse som endringsloggar skal hentast frå"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "Endringslogg for %s"
 
@@ -3126,14 +3107,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "Ikkje installert"
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "Ikkje installert"
 
@@ -3175,7 +3154,6 @@
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "Feil handlingsteikn «%c»\n"
 
@@ -3206,7 +3184,6 @@
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "Ugyldig operasjon %s"
 
@@ -3225,19 +3202,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "Uventa «)»"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " eller"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "Uventa «)»"
 
@@ -3345,13 +3319,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "Pakke"
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "Visingar"
 
@@ -3371,7 +3343,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "Hjelp"
 
@@ -3382,7 +3353,6 @@
 
 #: src/gtk/aptitude.glade:345 src/gtk/aptitude.glade:2614
 #, fuzzy
-#| msgid "List Update"
 msgid "Update"
 msgstr "Listeoppdatering"
 
@@ -3418,33 +3388,28 @@
 
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "Fjernar filteret frå pakkelista"
 
 #: src/gtk/aptitude.glade:649
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "Apply these settings to all active package lists."
 msgstr "Bruk eit filter på pakkelista"
 
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "Søk"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "installer på ny"
 
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "Feil "
 
@@ -3459,13 +3424,11 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "Pakkekrav for %s"
 
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "^Changelog"
 msgid "Changelog"
 msgstr "^Endringslogg"
 
@@ -3506,13 +3469,11 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "Tilstand"
 
 #: src/gtk/aptitude.glade:1247
 #, fuzzy
-#| msgid "Unknown action type: %s"
 msgid "Group by action type"
 msgstr "Ukjent handlingstype: %s"
 
@@ -3578,7 +3539,6 @@
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "Kjeldepakke: "
 
@@ -3643,25 +3603,21 @@
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "Ikkje i stand til å retta opp for utilgjengelege pakkar"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "^Finn"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for a package"
 msgid "Search for packages."
 msgstr "Søk etter ein pakke"
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "Fekk "
 
@@ -3696,7 +3652,6 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "Nettadresse som endringsloggar skal hentast frå"
 
@@ -3707,7 +3662,6 @@
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -3715,20 +3669,17 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr "Du kan berre lesa endringsloggar for offisielle debianpakkar."
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "Lastar ned endringslogg"
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "Nettadresse som endringsloggar skal hentast frå"
 
@@ -3742,7 +3693,6 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "Nettadresse som endringsloggar skal hentast frå"
 
@@ -3759,7 +3709,6 @@
 
 #: src/gtk/dashboardtab.cc:633
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No upgrades are available."
 msgstr "Ikkje installert"
 
@@ -3799,7 +3748,6 @@
 
 #: src/gtk/dashboardtab.cc:708
 #, fuzzy, c-format
-#| msgid "Internal error: Default column string is unparsable"
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr "Intern feil: Standard kolonnestreng kan ikkje tolkast"
 
@@ -3838,7 +3786,6 @@
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "Slettar nedlasta filer"
 
@@ -3849,13 +3796,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "Totalt utført: "
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description"
 msgid "Short Description"
 msgstr "Skildring"
 
@@ -3865,13 +3810,11 @@
 
 #: src/gtk/download.cc:319
 #, fuzzy
-#| msgid "Cleaning while a download is in progress is not allowed"
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr "Å vaske medan ei nedlasting held på er ikkje tillatt!"
 
 #: src/gtk/download.cc:395 src/gtk/gui.cc:832
 #, fuzzy
-#| msgid "View next display"
 msgid "View Details"
 msgstr "Vis neste skjermbilete"
 
@@ -3896,13 +3839,11 @@
 
 #: src/gtk/download.cc:507
 #, fuzzy, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr " [ %i%% ] (%sB/s, %s igjen)"
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "men %s blir installert."
 
@@ -3951,13 +3892,11 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "%s-versjonar"
 
 #: src/gtk/entitysummary.cc:123
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Install %s version %s"
 msgstr "%s-versjonar"
 
@@ -4014,7 +3953,6 @@
 
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "^Reinsk ut"
 
@@ -4025,7 +3963,6 @@
 
 #: src/gtk/entitysummary.cc:223
 #, fuzzy, c-format
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Mark %s as automatically installed."
 msgstr "&M for å merkje pakkar som automatisk installerte"
 
@@ -4036,7 +3973,6 @@
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
 msgid "%s is a virtual package provided by:\n"
 msgstr "«%s» er ein virtuell pakke gjeven av:\n"
 
@@ -4046,13 +3982,11 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "Kjeldepakke: "
 
 #: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 #, fuzzy
-#| msgid "ProgName"
 msgid "Name"
 msgstr "ProgNamn"
 
@@ -4062,7 +3996,6 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "Klarte ikkje opna fila «%s»"
 
@@ -4081,25 +4014,21 @@
 
 #: src/gtk/entityview.cc:570
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Whether the package is automatically installed."
 msgstr "&M for å merkje pakkar som automatisk installerte"
 
 #: src/gtk/entityview.cc:576
 #, fuzzy
-#| msgid "Cancel any action on the selected package"
 msgid "The name and description of the package."
 msgstr "Avbryt handlingane på den valde pakken"
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "Versjon: "
 
 #: src/gtk/entityview.cc:592
 #, fuzzy
-#| msgid "Check for new versions of packages"
 msgid "The version number of the package."
 msgstr "Sjå etter nye versjonar av pakkar"
 
@@ -4120,7 +4049,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "ikkje installert"
 
@@ -4131,25 +4059,21 @@
 
 #: src/gtk/gui.cc:82
 #, fuzzy
-#| msgid "unpacked"
 msgid "Unpacked"
 msgstr "ikkje-pakka"
 
 #: src/gtk/gui.cc:83
 #, fuzzy
-#| msgid "half-config"
 msgid "Half-configured"
 msgstr "halv.-oppsett"
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "half-install"
 msgid "Half-installed"
 msgstr "halv.-inst"
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "ikkje installert (oppsettsfiler gjenstår)"
 
@@ -4205,7 +4129,6 @@
 
 #: src/gtk/gui.cc:290
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "Bruk eit filter på pakkelista"
 
@@ -4220,13 +4143,11 @@
 
 #: src/gtk/gui.cc:359
 #, fuzzy, c-format
-#| msgid "List Update"
 msgid "Update %s?"
 msgstr "Listeoppdatering"
 
 #: src/gtk/gui.cc:385
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
@@ -4254,19 +4175,16 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "%s changes"
 msgid "Done applying changes!"
 msgstr "%s endringar"
 
 #: src/gtk/gui.cc:823
 #, fuzzy
-#| msgid "%s changes"
 msgid "Applying changes..."
 msgstr "%s endringar"
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "[%s] %s\n"
 msgid "%s: %s"
 msgstr "[%s] %s\n"
 
@@ -4277,7 +4195,6 @@
 
 #: src/gtk/gui.cc:906
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Klarer ikkje byta ut %s med ny oppsettsfil"
 
@@ -4302,7 +4219,6 @@
 
 #: src/gtk/gui.cc:1103
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Ingen pakkar er øydelagde."
@@ -4310,13 +4226,11 @@
 
 #: src/gtk/gui.cc:1147
 #, fuzzy
-#| msgid "%s changes"
 msgid "View changes"
 msgstr "%s endringar"
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "%s changes"
 msgid "Apply changes"
 msgstr "%s endringar"
 
@@ -4342,7 +4256,6 @@
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "Nedlast.Str"
 
@@ -4357,7 +4270,6 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "not installed"
 msgid "Not implemented"
 msgstr "ikkje installert"
 
@@ -4368,7 +4280,6 @@
 
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "^Reinsk ut"
 
@@ -4410,7 +4321,6 @@
 
 #: src/gtk/info.cc:496
 #, fuzzy
-#| msgid "Not Installed"
 msgid "Not available"
 msgstr "Ikkje installert"
 
@@ -4420,7 +4330,6 @@
 
 #: src/gtk/info.cc:555
 #, fuzzy
-#| msgid "Packages which depend on %s"
 msgid "Package information: dependency list"
 msgstr "Pakkar som krev %s"
 
@@ -4430,7 +4339,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "ingen"
 
@@ -4453,7 +4361,6 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "Pakke: "
 
@@ -4483,13 +4390,11 @@
 
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "Søk"
 
 #: src/gtk/pkgview.cc:718
 #, fuzzy
-#| msgid "Building view"
 msgid "Finalizing view"
 msgstr "Byggjer vising"
 
@@ -4624,13 +4529,11 @@
 
 #: src/gtk/previewtab.cc:179
 #, fuzzy
-#| msgid "Preview"
 msgid "Preview: "
 msgstr "Førehandsvising"
 
 #: src/gtk/resolver.cc:68
 #, fuzzy, c-format
-#| msgid "Error while dumping resolver state"
 msgid "Error in dependency resolver: %s"
 msgstr "Feil ved lagring av løysingstilstanden"
 
@@ -4645,7 +4548,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package"
 msgid "Virtual package"
 msgstr "Pakke"
 
@@ -4677,7 +4579,6 @@
 
 #: src/gtk/resolver.cc:401
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Installing %s version %s is rejected."
 msgstr "%s-versjonar"
 
@@ -4688,7 +4589,6 @@
 
 #: src/gtk/resolver.cc:413
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrading %s to version %s is rejected."
 msgstr "%s-versjonar"
 
@@ -4730,7 +4630,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr "%s-versjonar"
@@ -4857,7 +4756,6 @@
 
 #: src/gtk/resolver.cc:1523
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "%s-versjonar"
 
@@ -4924,13 +4822,11 @@
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>Install</b> %s %s"
 msgstr "%s-versjonar"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>install</b> %s %s"
 msgstr "%s-versjonar"
 
@@ -4946,13 +4842,11 @@
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>Upgrade</b> %s to version %s"
 msgstr "%s-versjonar"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>upgrade</b> %s to version %s"
 msgstr "%s-versjonar"
 
@@ -5010,7 +4904,6 @@
 
 #: src/gtk/resolver.cc:2056
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions yet."
 msgstr "Ingen fleire løysingar."
 
@@ -5021,7 +4914,6 @@
 
 #: src/gtk/resolver.cc:2064
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions."
 msgstr "Ingen fleire løysingar."
 
@@ -5031,19 +4923,16 @@
 
 #: src/gtk/resolver.cc:2076
 #, fuzzy, c-format
-#| msgid "No more solutions."
 msgid "%u solutions."
 msgstr "Ingen fleire løysingar."
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "Klarte ikkje opna fila «%s»"
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr "[Nedlasta]"
 
@@ -5395,45 +5284,37 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Installer/oppgrader pakkar\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Fjernar pakkar\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Fjernar pakkar og oppsettsfilene deira\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Legg pakkar på hald\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Fjern ein hald-kommando for ein pakke\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr ""
 " markauto     - Merk pakkar som at dei er blitt installert automatisk\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Merk pakkar som at dei er installert manuelt\n"
 
@@ -5447,7 +5328,6 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Last ned liste over nye/oppgraderbare pakkar\n"
 
@@ -5472,43 +5352,36 @@
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Gløym kva for pakkar som er «nye»\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Søk etter ein pakke etter namn og/eller uttrykk\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Vis detaljert informasjon om ei pakke\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Slett nedlasta pakkefiler\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Slett gamle nedlasta pakkefiler\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Vis endringsloggen til ein pakke\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Last ned .deb-fila for ein pakke\n"
 
@@ -5543,7 +5416,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             Denne hjelpeteksten\n"
 
@@ -5572,24 +5444,17 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             Spør alltid om stadfesting eller handlingar\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr " -y             Forutset at svaret på enkle ja/nei-spørsmål er «Ja»\n"
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5598,9 +5463,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5610,8 +5472,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 ""
@@ -5641,9 +5501,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5652,8 +5509,6 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
@@ -5668,15 +5523,11 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o nøkkel=verdi    Set direkte oppsettsvalet som heiter «nøkkel»\n"
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -5713,7 +5564,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "replaces"
 msgid "trace"
 msgstr "erstattar"
 
@@ -5727,7 +5577,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "ingen"
 
@@ -5741,7 +5590,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:377
 #, fuzzy
-#| msgid "Err "
 msgid "error"
 msgstr "Feil "
 
@@ -5769,7 +5617,6 @@
 
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "Ugyldig operasjon %s"
 
@@ -5822,7 +5669,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "Pakke"
 
@@ -5832,7 +5678,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "Alle pakkar"
 
@@ -5852,7 +5697,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -5860,8 +5704,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -5869,7 +5711,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "-u og -i kan ikkje oppgjevast med ein kommando"
 
@@ -7379,9 +7220,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7405,9 +7243,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7956,19 +7791,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "Nettadresse som endringsloggar skal hentast frå"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "Nettadresse som endringsloggar skal hentast frå"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "Lastar ned endringslogg"
 
Index: aptitude/po/pl.po
===================================================================
--- aptitude.orig/po/pl.po
+++ aptitude/po/pl.po
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.4.11\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2008-05-08 11:06+0200\n"
 "Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -275,9 +275,6 @@
 
 #: src/apt_options.cc:241
 #, fuzzy
-#| msgid ""
-#| "If this option is enabled, the menu bar will only appear when it has been "
-#| "activated by pressing the menu key."
 msgid ""
 "If this option is enabled, then the first view displayed on startup will be "
 "a flat view instead of the default view."
@@ -719,7 +716,6 @@
 
 #: src/cmdline/cmdline_action.cc:212
 #, fuzzy, c-format
-#| msgid "Unable to satisfy the build-depends: %s."
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Nie można spełnić zależności czasu budowania: %s."
 
@@ -776,14 +772,12 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr ""
 "Pakiet %s nie jest zainstalowany, więc nie zostanie ponownie zainstalowany.\n"
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "Jest już zainstalowana żądana wersja pakietu \"%s\" (%s)\n"
@@ -884,7 +878,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "Dziennik zmian dla %s"
 
@@ -1050,7 +1043,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "brak"
 
@@ -1460,7 +1452,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "\"&M\": oznaczenie pakietów jako automatycznie zainstalowanych"
 
@@ -1595,9 +1586,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy, c-format
-#| msgid ""
-#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: "
-#| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
@@ -1644,10 +1632,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:259
 #, fuzzy
-#| msgid ""
-#| "reject the given package versions; don't display any solutions in which "
-#| "they occur.  Enter UNINST instead of a version to reject removing the "
-#| "package."
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package.  "
@@ -1658,9 +1642,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:261
 #, fuzzy
-#| msgid ""
-#| "accept the given package versions; display only solutions in which they "
-#| "occur.  Enter UNINST instead of a version to accept removing the package."
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package.  "
@@ -1765,31 +1746,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "Pozostawienie następujących problemów z zależnościami:"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "P^olecane pakiety"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "Odwołanie polecenia usunięcia %s"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "P^olecane pakiety"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Akcje"
 
@@ -1946,7 +1922,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:1201
 #, fuzzy
-#| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Nie można rozwiązać problemów z zależnościami dla aktualizacji (nie "
@@ -1954,7 +1929,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:1207
 #, fuzzy, c-format
-#| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Nie można rozwiązać problemów z zależnościami dla aktualizacji (%s)."
 
@@ -1985,13 +1959,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "którego nie można zainstalować"
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "ale zaplanowana jest instalacja wersji %s."
 
@@ -2090,13 +2062,11 @@
 
 #: src/cmdline/cmdline_show.cc:326
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s%s; will be installed"
 msgstr "%s, zostanie zainstalowany"
 
 #: src/cmdline/cmdline_show.cc:328
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s%s; will be installed automatically"
 msgstr "%s, zostanie automatycznie zainstalowany"
 
@@ -2365,25 +2335,21 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "Pakiety"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Pakiet źródłowy: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Archiwum"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\".\n"
 msgid "No such package \"%s\"."
 msgstr "Brak pakietu \"%s\".\n"
 
@@ -2422,7 +2388,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "search: Należy podać przynajmniej jedno wyrażenie do wyszukania\n"
 
@@ -2545,7 +2510,6 @@
 
 #: src/cmdline/cmdline_why.cc:1285
 #, fuzzy, c-format
-#| msgid "Packages depending on %s"
 msgid "Packages requiring %s:"
 msgstr "Pakiety zależne od %s"
 
@@ -2561,8 +2525,6 @@
 
 #: src/cmdline/cmdline_why.cc:1416
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: this command requires at least one argument (the package to query)."
 msgid ""
 "%s: this command requires at least one argument (the package to query).\n"
 msgstr "%s: należy podać przynajmniej jeden argument (pakiet do wyszukania)."
@@ -2580,7 +2542,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[BŁĄD]"
 
@@ -2931,7 +2892,6 @@
 
 #: src/generic/apt/download_update_manager.cc:138
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated quoted string in command: %s"
 msgstr "Nie zakończony poprawnie tekst po \"%s\""
 
@@ -3017,7 +2977,6 @@
 
 #: src/generic/apt/dump_packages.cc:674
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create truncated cache: %s."
 msgstr "Nie można znaleźć pakietu %s"
 
@@ -3139,7 +3098,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "Pobieranie pakietów"
 
@@ -3177,7 +3135,6 @@
 
 #: src/generic/apt/matching/parse.cc:860
 #, fuzzy, c-format
-#| msgid "Unknown matcher type: \"%s\"."
 msgid "Unknown term type: \"%s\"."
 msgstr "Nieznany typ dopasowania: \"%s\"."
 
@@ -3185,9 +3142,6 @@
 #. Leave the question marks attached to the string placeholders.
 #: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883
 #, fuzzy, c-format
-#| msgid ""
-#| "The ?%s matcher must be used in a \"wide\" context (a top-level context, "
-#| "or a context enclosed by ?%s)."
 msgid ""
 "The ?%s term must be used in a \"wide\" context (a top-level context, or a "
 "context enclosed by ?%s)."
@@ -3218,7 +3172,6 @@
 
 #: src/generic/apt/matching/parse.cc:1388
 #, fuzzy, c-format
-#| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "Niepoprawne wyrażenie"
 
@@ -3257,19 +3210,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "URL pobierania dzienników zmian"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "URL pobierania dzienników zmian"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "Dziennik zmian dla %s"
 
@@ -3314,7 +3264,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Nie można przetworzyć wzorca %s"
 
@@ -3329,14 +3278,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "nie zainstalowany"
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "nie zainstalowany"
 
@@ -3363,67 +3310,56 @@
 
 #: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got EOF."
 msgstr "Oczekiwano \"%c\", a napotkano \"%c\""
 
 #: src/generic/util/parsers.h:737
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got '%s'."
 msgstr "Oczekiwano \"%c\", a napotkano \"%c\""
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "Po -q= oczekiwano liczby, napotkano %s\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "Nieznana akcja \"%c\"\n"
 
 #: src/generic/util/parsers.h:832
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got EOF."
 msgstr "Oczekiwano \"%c\", a napotkano \"%c\""
 
 #: src/generic/util/parsers.h:843
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got '%c'."
 msgstr "Oczekiwano \"%c\", a napotkano \"%c\""
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "Oczekiwany był identyfikator metody, napotkano \"%c\""
 
 #: src/generic/util/parsers.h:1026
 #, fuzzy
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected an integer following '-', got EOF."
 msgstr "Po \"||\" zamiast \",\" lub \")\" napotkano \"%s\""
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "Oczekiwany był identyfikator metody, napotkano \"%c\""
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "Błędna operacja '%s'"
 
 #: src/generic/util/parsers.h:1077
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected EOF, got '%c'."
 msgstr "Oczekiwano \"%c\", a napotkano \"%c\""
 
@@ -3437,19 +3373,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "Niespodziewany nawias ')'"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " lub"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "Niespodziewany nawias ')'"
 
@@ -3461,7 +3394,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr ""
 "Nie można utworzyć katalogu tymczasowego nazwanego według wzorca \"%s\": %s"
@@ -3497,7 +3429,6 @@
 
 #: src/gtk/aptitude.glade:19 src/gtk/aptitude.glade:2273
 #, fuzzy
-#| msgid "False"
 msgid "_File"
 msgstr "Fałsz"
 
@@ -3562,13 +3493,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "Pakiet"
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "Widoki"
 
@@ -3588,7 +3517,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "Pomoc"
 
@@ -3599,7 +3527,6 @@
 
 #: src/gtk/aptitude.glade:345 src/gtk/aptitude.glade:2614
 #, fuzzy
-#| msgid "List Update"
 msgid "Update"
 msgstr "Uaktualnianie list"
 
@@ -3621,7 +3548,6 @@
 
 #: src/gtk/aptitude.glade:389 src/gtk/aptitude.glade:2658
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Remove"
 msgstr "Zainstalowany"
 
@@ -3635,33 +3561,28 @@
 
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "Usuwa ograniczenie wyświetlanej listy pakietów"
 
 #: src/gtk/aptitude.glade:649
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "Apply these settings to all active package lists."
 msgstr "Ogranicza wyświetlaną listę pakietów"
 
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "Znajdź"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "ponowna instalacja"
 
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "Błąd "
 
@@ -3676,19 +3597,16 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "Zależności %s"
 
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "^Changelog"
 msgid "Changelog"
 msgstr "^Dziennik zmian"
 
 #: src/gtk/aptitude.glade:1020
 #, fuzzy
-#| msgid "False"
 msgid "Files"
 msgstr "Fałsz"
 
@@ -3702,7 +3620,6 @@
 
 #: src/gtk/aptitude.glade:1051
 #, fuzzy
-#| msgid "Tags"
 msgid "tags"
 msgstr "Znaczniki"
 
@@ -3725,13 +3642,11 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "Stan"
 
 #: src/gtk/aptitude.glade:1247
 #, fuzzy
-#| msgid "Unknown action type: %s"
 msgid "Group by action type"
 msgstr "Nieznana akcja: %s"
 
@@ -3760,13 +3675,11 @@
 
 #: src/gtk/aptitude.glade:1328
 #, fuzzy
-#| msgid "Toggle ^Rejected"
 msgid "Rejected"
 msgstr "Przełącz ^odrzucenie"
 
 #: src/gtk/aptitude.glade:1343
 #, fuzzy
-#| msgid "Preferences"
 msgid "No preference"
 msgstr "Preferencje"
 
@@ -3780,32 +3693,27 @@
 
 #: src/gtk/aptitude.glade:1400
 #, fuzzy
-#| msgid "^Examine Solution"
 msgid "Find a new solution"
 msgstr "^Wyświetl rozwiązanie"
 
 #: src/gtk/aptitude.glade:1404
 #, fuzzy
-#| msgid "Select the next solution to the dependency problems."
 msgid "Calculate the next solution that has not yet been generated."
 msgstr "Wybiera następne rozwiązanie problemów z zależnościami"
 
 #: src/gtk/aptitude.glade:1419
 #, fuzzy
-#| msgid "Perform the actions contained in the currently selected solution."
 msgid ""
 "Perform the actions in the currently selected solution and close this tab."
 msgstr "Wykonuje działania składające się na aktualnie wybrane rozwiązanie"
 
 #: src/gtk/aptitude.glade:1576
 #, fuzzy
-#| msgid "Upgrade"
 msgid "Upgrade Summary"
 msgstr "Do uaktualnienia"
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "Pakiet źródłowy: "
 
@@ -3817,7 +3725,6 @@
 
 #: src/gtk/aptitude.glade:1652
 #, fuzzy
-#| msgid "Manual"
 msgid "Fix Manually"
 msgstr "Podręcznik"
 
@@ -3865,31 +3772,26 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "Niespełnione zależności"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "Nie można naprawić braku pakietów"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "^Znajdź"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for: "
 msgid "Search for packages."
 msgstr "Wyszukiwany tekst: "
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "Nowy "
 
@@ -3923,19 +3825,16 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "URL pobierania dzienników zmian"
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "Polecenie instalacji %s w wersji %s (%s)"
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -3945,7 +3844,6 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr ""
@@ -3954,13 +3852,11 @@
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "Pobieranie dziennika zmian"
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "URL pobierania dzienników zmian"
 
@@ -3974,7 +3870,6 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "URL pobierania dzienników zmian"
 
@@ -3984,8 +3879,6 @@
 
 #: src/gtk/dashboardtab.cc:414
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] "%d aktualizacja"
@@ -3994,13 +3887,11 @@
 
 #: src/gtk/dashboardtab.cc:633
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No upgrades are available."
 msgstr "nie zainstalowany"
 
 #: src/gtk/dashboardtab.cc:645
 #, fuzzy
-#| msgid "Unable to locate package %s"
 msgid "Unable to calculate an upgrade."
 msgstr "Nie można znaleźć pakietu %s"
 
@@ -4037,25 +3928,21 @@
 
 #: src/gtk/dashboardtab.cc:708
 #, fuzzy, c-format
-#| msgid "Internal error: Default column string is unparsable"
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr "Błąd wewnętrzny: domyślna konfiguracja kolumn jest błędna"
 
 #: src/gtk/dependency_chains_tab.cc:78
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: start"
 msgstr "Zależności"
 
 #: src/gtk/dependency_chains_tab.cc:82
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: end"
 msgstr "Zależności"
 
 #: src/gtk/dependency_chains_tab.cc:86
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: results"
 msgstr "Zależności"
 
@@ -4065,7 +3952,6 @@
 
 #: src/gtk/dependency_chains_tab.cc:282
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency chain found."
 msgstr "Zależności"
 
@@ -4075,13 +3961,11 @@
 
 #: src/gtk/download.cc:185
 #, fuzzy
-#| msgid "False"
 msgid "Failed"
 msgstr "Fałsz"
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "Usuwanie pobranych plików"
 
@@ -4092,13 +3976,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "Ogółem: "
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description"
 msgid "Short Description"
 msgstr "Opis"
 
@@ -4108,13 +3990,11 @@
 
 #: src/gtk/download.cc:319
 #, fuzzy
-#| msgid "Cleaning while a download is in progress is not allowed"
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr "Nie można czyścić archiwum w czasie pobierania pakietów"
 
 #: src/gtk/download.cc:395 src/gtk/gui.cc:832
 #, fuzzy
-#| msgid "View next display"
 msgid "View Details"
 msgstr "Wyświetla następny widok"
 
@@ -4134,19 +4014,16 @@
 
 #: src/gtk/download.cc:486
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s: %lu/%lu, stalled"
 msgstr "%s, zostanie zainstalowany"
 
 #: src/gtk/download.cc:507
 #, fuzzy, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr " [ %i%% ] (%sB/s, do końca %s)"
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "ale zaplanowana jest instalacja wersji %s."
 
@@ -4160,7 +4037,6 @@
 
 #: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "Nie można znaleźć pakietu %s"
 
@@ -4171,7 +4047,6 @@
 
 #: src/gtk/dpkg_terminal.cc:429
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "%s: Unable to accept a connection: %s"
 msgstr ""
 "Nie można utworzyć katalogu tymczasowego nazwanego według wzorca \"%s\": %s"
@@ -4198,80 +4073,67 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "Wersje %s"
 
 #: src/gtk/entitysummary.cc:123
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Install %s version %s"
 msgstr "Instalacja(%s udostępnia %s)"
 
 #: src/gtk/entitysummary.cc:131
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrade to %s version %s"
 msgstr "  wersja cwidget: %s\n"
 
 #: src/gtk/entitysummary.cc:142
 #, fuzzy, c-format
-#| msgid "Keep the following packages at their current version:"
 msgid "Don't hold %s at its current version."
 msgstr "Zatrzymanie bieżących wersji następujących pakietów:"
 
 #: src/gtk/entitysummary.cc:145 src/gtk/entitysummary.cc:165
 #: src/gtk/entitysummary.cc:168
 #, fuzzy, c-format
-#| msgid "Canc^el pending actions"
 msgid "Cancel any actions on %s."
 msgstr "Anuluj z^aplanowane zadania"
 
 #: src/gtk/entitysummary.cc:150
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the purge of %s."
 msgstr "Odwołanie usunięcia %F"
 
 #: src/gtk/entitysummary.cc:152
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s."
 msgstr "Odwołanie usunięcia %F"
 
 #: src/gtk/entitysummary.cc:157
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the upgrade of %s."
 msgstr "Odwołanie usunięcia %F"
 
 #: src/gtk/entitysummary.cc:159
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s."
 msgstr "Odwołanie instalacji %F"
 
 #: src/gtk/entitysummary.cc:161
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the downgrade of %s."
 msgstr "Odwołanie usunięcia %F"
 
 #: src/gtk/entitysummary.cc:163
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the reinstallation of %s."
 msgstr "Odwołanie instalacji %F"
 
 #: src/gtk/entitysummary.cc:206
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "Remove %s"
 msgstr "Usunięcie(%s)"
 
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "^Wyczyść"
 
@@ -4282,19 +4144,16 @@
 
 #: src/gtk/entitysummary.cc:223
 #, fuzzy, c-format
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Mark %s as automatically installed."
 msgstr "\"&M\": oznaczenie pakietów jako automatycznie zainstalowanych"
 
 #: src/gtk/entitysummary.cc:228
 #, fuzzy, c-format
-#| msgid "The package \"%s\" is manually installed.\n"
 msgid "Mark %s as manually installed."
 msgstr "Pakiet \"%s\" jest zainstalowany ręcznie\n"
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
 msgid "%s is a virtual package provided by:\n"
 msgstr "\"%s\" jest pakietem wirtualnym udostępnianym przez:\n"
 
@@ -4304,13 +4163,11 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "Pakiet źródłowy: "
 
 #: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 #, fuzzy
-#| msgid "ProgName"
 msgid "Name"
 msgstr "Nazwa"
 
@@ -4320,13 +4177,11 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "Nie można otworzyć pliku \"%s\""
 
 #: src/gtk/entityview.cc:412
 #, fuzzy, c-format
-#| msgid "Rejecting the removal of %s"
 msgid "Editing the columns of \"%s\""
 msgstr "Zakaz usuwania %s"
 
@@ -4340,25 +4195,21 @@
 
 #: src/gtk/entityview.cc:570
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Whether the package is automatically installed."
 msgstr "\"&M\": oznaczenie pakietów jako automatycznie zainstalowanych"
 
 #: src/gtk/entityview.cc:576
 #, fuzzy
-#| msgid "Cancel any action on the selected package"
 msgid "The name and description of the package."
 msgstr "Odwołuje planowane działania na wybranym pakiecie"
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "Wersja: "
 
 #: src/gtk/entityview.cc:592
 #, fuzzy
-#| msgid "Check for new versions of packages"
 msgid "The version number of the package."
 msgstr "Sprawdza dostępność nowszych wersji pakietów"
 
@@ -4379,7 +4230,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "niezainstalowany"
 
@@ -4389,37 +4239,31 @@
 
 #: src/gtk/gui.cc:82
 #, fuzzy
-#| msgid "unpacked"
 msgid "Unpacked"
 msgstr "rozpakowany"
 
 #: src/gtk/gui.cc:83
 #, fuzzy
-#| msgid "half-config"
 msgid "Half-configured"
 msgstr "niedokonfigurowany"
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "half-install"
 msgid "Half-installed"
 msgstr "niedoinstalowany"
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "niezainstalowany (pozostawione pliki konfiguracyjne)"
 
 #: src/gtk/gui.cc:86
 #, fuzzy
-#| msgid "triggers-awaited"
 msgid "Triggers awaited"
 msgstr "wyzwalacze-oczekiwanie"
 
 #: src/gtk/gui.cc:87
 #, fuzzy
-#| msgid "triggers-pending"
 msgid "Triggers pending"
 msgstr "wyzwalacze-zaplanowane"
 
@@ -4445,13 +4289,11 @@
 
 #: src/gtk/gui.cc:97
 #, fuzzy
-#| msgid "forbidden upgrade"
 msgid "Hold (don't upgrade)"
 msgstr "aktualizacja zabroniona"
 
 #: src/gtk/gui.cc:99
 #, fuzzy
-#| msgid "Related Dependencies"
 msgid "Unsatisfied dependencies"
 msgstr "Powiązane zależności"
 
@@ -4465,13 +4307,11 @@
 
 #: src/gtk/gui.cc:290
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "Ogranicza wyświetlaną listę pakietów"
 
 #: src/gtk/gui.cc:298 src/gtk/gui.cc:946
 #, fuzzy
-#| msgid "Downloading... "
 msgid "Download already running."
 msgstr "Pobieranie... "
 
@@ -4481,13 +4321,11 @@
 
 #: src/gtk/gui.cc:359
 #, fuzzy, c-format
-#| msgid "List Update"
 msgid "Update %s?"
 msgstr "Uaktualnianie list"
 
 #: src/gtk/gui.cc:385
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
@@ -4515,31 +4353,26 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "%s changes"
 msgid "Done applying changes!"
 msgstr "Zmiany w %s"
 
 #: src/gtk/gui.cc:823
 #, fuzzy
-#| msgid "%s changes"
 msgid "Applying changes..."
 msgstr "Zmiany w %s"
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "s: %F"
 msgid "%s: %s"
 msgstr "s: %F"
 
 #: src/gtk/gui.cc:878
 #, fuzzy, c-format
-#| msgid "No broken packages."
 msgid "Error in package %s"
 msgstr "Brak pakietów z niespełnionymi zależnościami."
 
 #: src/gtk/gui.cc:906
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Nie można zastąpić %s nowym plikiem konfiguracyjnym"
 
@@ -4549,25 +4382,21 @@
 
 #: src/gtk/gui.cc:1038
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "Brak pakietów z niespełnionymi zależnościami."
 
 #: src/gtk/gui.cc:1071
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "Brak pakietów z niespełnionymi zależnościami."
 
 #: src/gtk/gui.cc:1075
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "Rozwiązywanie problemów"
 
 #: src/gtk/gui.cc:1103
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Nie ma pakietów z niespełnionymi zależnościami."
@@ -4576,13 +4405,11 @@
 
 #: src/gtk/gui.cc:1147
 #, fuzzy
-#| msgid "%s changes"
 msgid "View changes"
 msgstr "Zmiany w %s"
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "%s changes"
 msgid "Apply changes"
 msgstr "Zmiany w %s"
 
@@ -4591,8 +4418,6 @@
 #. font.
 #: src/gtk/gui.cc:1192
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%d package to install"
 msgid_plural "%d packages to install"
 msgstr[0] "%d instalacja"
@@ -4604,7 +4429,6 @@
 #. font.
 #: src/gtk/gui.cc:1207
 #, fuzzy, c-format
-#| msgid "failed to remove %s"
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "nie można usunąć %s"
@@ -4613,7 +4437,6 @@
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "Pobierane"
 
@@ -4628,19 +4451,16 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "not installed"
 msgid "Not implemented"
 msgstr "niezainstalowany"
 
 #: src/gtk/gui.cc:1408 src/gtk/gui.cc:1427
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "Zainstalowany"
 
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "^Wyczyść"
 
@@ -4658,7 +4478,6 @@
 
 #: src/gtk/gui.cc:1455
 #, fuzzy
-#| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "Podręcznik użytkownika"
 
@@ -4673,7 +4492,6 @@
 
 #: src/gtk/info.cc:161 src/gtk/pkgview.cc:169
 #, fuzzy
-#| msgid "Current status: %F."
 msgid "Current status"
 msgstr "Bieżący status: %F."
 
@@ -4683,19 +4501,16 @@
 
 #: src/gtk/info.cc:496
 #, fuzzy
-#| msgid "Not Installed"
 msgid "Not available"
 msgstr "nie zainstalowany"
 
 #: src/gtk/info.cc:545
 #, fuzzy
-#| msgid "C^ycle Package Information"
 msgid "Package information: version list"
 msgstr "C^ykliczne przełączanie informacji o pakiecie"
 
 #: src/gtk/info.cc:555
 #, fuzzy
-#| msgid "Packages which depend on %s"
 msgid "Package information: dependency list"
 msgstr "Pakiety zależne od %s"
 
@@ -4705,7 +4520,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "nie"
 
@@ -4719,7 +4533,6 @@
 
 #: src/gtk/packagestab.cc:203
 #, fuzzy, c-format
-#| msgid "No packages matched the pattern \"%ls\"."
 msgid "No packages matched \"%s\"."
 msgstr "Nie znaleziono pakietów pasujących do wzorca \"%ls\"."
 
@@ -4729,31 +4542,26 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "Pakiet: "
 
 #: src/gtk/pkgview.cc:224
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed automatically."
 msgstr "%s, zostanie automatycznie zainstalowany"
 
 #: src/gtk/pkgview.cc:227
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed automatically."
 msgstr "%s, zostanie automatycznie zainstalowany"
 
 #: src/gtk/pkgview.cc:235
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed manually."
 msgstr "%s, zostanie automatycznie zainstalowany"
 
 #: src/gtk/pkgview.cc:238
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed manually."
 msgstr "%s, zostanie automatycznie zainstalowany"
 
@@ -4763,13 +4571,11 @@
 
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "Znajdź"
 
 #: src/gtk/pkgview.cc:718
 #, fuzzy
-#| msgid "Building view"
 msgid "Finalizing view"
 msgstr "Tworzenie widoku"
 
@@ -4900,13 +4706,11 @@
 
 #: src/gtk/previewtab.cc:179
 #, fuzzy
-#| msgid "Preview"
 msgid "Preview: "
 msgstr "Przegląd"
 
 #: src/gtk/resolver.cc:68
 #, fuzzy, c-format
-#| msgid "Error while dumping resolver state"
 msgid "Error in dependency resolver: %s"
 msgstr "Błąd w czasie zapisu stanu procedury rozwiązywania zależności"
 
@@ -4921,7 +4725,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package"
 msgid "Virtual package"
 msgstr "Pakiet"
 
@@ -4931,43 +4734,36 @@
 
 #: src/gtk/resolver.cc:377
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Removing %s is rejected."
 msgstr "Usuwanie %s"
 
 #: src/gtk/resolver.cc:382
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Canceling the installation of %s is rejected."
 msgstr "Odwołanie instalacji %F"
 
 #: src/gtk/resolver.cc:391
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Canceling the removal of %s is rejected."
 msgstr "Odwołanie usunięcia %F"
 
 #: src/gtk/resolver.cc:394
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keeping %s at version %s is rejected."
 msgstr "Zatrzymanie %F w wersji %s (%s)"
 
 #: src/gtk/resolver.cc:401
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Installing %s version %s is rejected."
 msgstr "Instalacja(%s udostępnia %s)"
 
 #: src/gtk/resolver.cc:407
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrading %s to version %s is rejected."
 msgstr "  wersja cwidget: %s\n"
 
 #: src/gtk/resolver.cc:413
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrading %s to version %s is rejected."
 msgstr "Wersje %s"
 
@@ -5009,7 +4805,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr "Wersje %s"
@@ -5111,7 +4906,6 @@
 
 #: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862
 #, fuzzy
-#| msgid "Remove the following packages:"
 msgid "Keep the following packages:"
 msgstr "Usunięcie następujących pakietów:"
 
@@ -5127,121 +4921,101 @@
 
 #: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900
 #, fuzzy
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "Leave the following dependencies unresolved:"
 msgstr "Pozostawienie następujących problemów z zależnościami:%n"
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Remove %F [%s (%s)]"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "Usunięcie %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1523
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "Instalacja %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1531
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s"
 msgstr "Odwołanie instalacji %F"
 
 #: src/gtk/resolver.cc:1534
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s"
 msgstr "Odwołanie usunięcia %F"
 
 #: src/gtk/resolver.cc:1537
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "Zatrzymanie %F w wersji %s (%s)"
 
 #: src/gtk/resolver.cc:1544
 #, fuzzy, c-format
-#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Aktualizacja %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1553
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Cofnięcie %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>Remove</b> %s"
 msgstr "Usunięcie(%s)"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>remove</b> %s"
 msgstr "Usunięcie(%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "Zatrzymanie %F w wersji %s (%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>keep</b> %s at version %s"
 msgstr "Zatrzymanie %F w wersji %s (%s)"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr "Odwołanie instalacji %F"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>cancel</b> the installation of %s"
 msgstr "Odwołanie instalacji %F"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>Install</b> %s %s"
 msgstr "Instalacja %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>install</b> %s %s"
 msgstr "Instalacja %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>Downgrade</b> %s to version %s"
 msgstr "  wersja cwidget: %s\n"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>downgrade</b> %s to version %s"
 msgstr "  wersja cwidget: %s\n"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>Upgrade</b> %s to version %s"
 msgstr "Wersje %s"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>upgrade</b> %s to version %s"
 msgstr "Wersje %s"
 
@@ -5257,8 +5031,6 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "%d instalacja"
@@ -5267,8 +5039,6 @@
 
 #: src/gtk/resolver.cc:1740
 #, fuzzy, c-format
-#| msgid "%d removal"
-#| msgid_plural "%d removals"
 msgid "%s remove"
 msgid_plural "%s removes"
 msgstr[0] "%d usunięcie"
@@ -5277,8 +5047,6 @@
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "%d keep"
-#| msgid_plural "%d keeps"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "%d zatrzymanie"
@@ -5287,8 +5055,6 @@
 
 #: src/gtk/resolver.cc:1752
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%s upgrade"
 msgid_plural "%s upgrades"
 msgstr[0] "%d aktualizacja"
@@ -5297,8 +5063,6 @@
 
 #: src/gtk/resolver.cc:1758
 #, fuzzy, c-format
-#| msgid "%d downgrade"
-#| msgid_plural "%d downgrades"
 msgid "%s downgrade"
 msgid_plural "%s downgrades"
 msgstr[0] "%d cofnięcie"
@@ -5307,7 +5071,6 @@
 
 #: src/gtk/resolver.cc:1764
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "%s unresolved recommendation"
 msgid_plural "%s unresolved recommendations"
 msgstr[0] "P^olecane pakiety"
@@ -5316,19 +5079,16 @@
 
 #: src/gtk/resolver.cc:2056
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions yet."
 msgstr "Nie ma więcej rozwiązań."
 
 #: src/gtk/resolver.cc:2063
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency solution was found."
 msgstr "Zależności"
 
 #: src/gtk/resolver.cc:2064
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions."
 msgstr "Nie ma więcej rozwiązań."
 
@@ -5338,19 +5098,16 @@
 
 #: src/gtk/resolver.cc:2076
 #, fuzzy, c-format
-#| msgid "No more solutions."
 msgid "%u solutions."
 msgstr "Nie ma więcej rozwiązań."
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "Nie można otworzyć pliku \"%s\""
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr "[Pobrany]"
 
@@ -5400,7 +5157,6 @@
 
 #: src/load_grouppolicy.cc:305
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected ',', '%c', or '('; got '%c'"
 msgstr "Zamiast \",\" lub \"(\" napotkano \"%c\""
 
@@ -5508,7 +5264,6 @@
 
 #: src/load_grouppolicy.cc:713
 #, fuzzy, c-format
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected '{', ')', or ',' following '||', got '%s'"
 msgstr "Po \"||\" zamiast \",\" lub \")\" napotkano \"%s\""
 
@@ -5629,19 +5384,16 @@
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  wersja apt %d.%d.%d\n"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  wersja apt %d.%d.%d\n"
 
 #: src/main.cc:164
 #, fuzzy, c-format
-#| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Obsługa ept wyłączona.\n"
 
@@ -5689,45 +5441,37 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Instalacja/uaktualnienie pakietów\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Usunięcie pakietów\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Usunięcie pakietów i ich plików konfiguracyjnych\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Zatrzymanie pakietów\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Anulowanie zatrzymania pakietów\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr ""
 " markauto     - Zaznaczenie pakietów jako automatycznie zainstalowanych\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Zaznaczenie pakietów jako ręcznie zainstalowanych\n"
 
@@ -5741,21 +5485,16 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Pobranie list nowych/uaktualnionych pakietów\n"
 
 #: src/main.cc:190
 #, fuzzy, c-format
-#| msgid " safe-upgrade - Perform a safe upgrade\n"
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Bezpieczna aktualizacja systemu\n"
 
 #: src/main.cc:191
 #, fuzzy, c-format
-#| msgid ""
-#| " full-upgrade - Perform an upgrade, possibly installing and removing "
-#| "packages\n"
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
@@ -5764,57 +5503,46 @@
 
 #: src/main.cc:192
 #, fuzzy, c-format
-#| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "\"&BD\": instalacja zależności na czas budowania dla pakietu."
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Usunięcie informacji o tym, które pakiety są nowe\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Wyszukiwanie pakietów według nazwy/wyrażenia\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Wyświetlanie szczegółowych informacji o pakiecie\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Usunięcie pobranych plików pakietów\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Usunięcie starych plików pakietów\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Wyświetlanie dziennika zmian pakietu\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Pobranie pliku .deb pakietu\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5835,12 +5563,6 @@
 
 #: src/main.cc:203
 #, fuzzy, c-format
-#| msgid ""
-#| " why-not      - Show the manually installed packages that lead to a "
-#| "conflict\n"
-#| "                with the given package, or why one or more packages "
-#| "would\n"
-#| "                lead to a conflict with the given package if installed\n"
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
 "conflict\n"
@@ -5860,7 +5582,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             Ten tekst pomocy\n"
 
@@ -5889,24 +5610,17 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             Pytanie o potwierdzenie wykonywanych akcji\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr " -y             Przyjęcie odpowiedzi \"tak\" na pytania typu tak/nie\n"
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5915,9 +5629,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5926,8 +5637,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 width       Szerokość wyświetlania wyników wyszukiwania\n"
@@ -5957,9 +5666,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5969,8 +5675,6 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
@@ -5979,9 +5683,6 @@
 
 #: src/main.cc:226
 #, fuzzy, c-format
-#| msgid ""
-#| " -q             In command-line mode, suppress the incremental progress\n"
-#| "                indicators.\n"
 msgid ""
 " -q             In command-line mode, suppress the incremental progress.\n"
 "                indicators.\n"
@@ -5991,15 +5692,11 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o nazwa=wartość  Bezpośrednie ustawienie wartości podanej opcji\n"
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -6037,7 +5734,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "true"
 msgid "trace"
 msgstr "prawda"
 
@@ -6051,7 +5747,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "nie"
 
@@ -6065,7 +5760,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:377
 #, fuzzy
-#| msgid "Err "
 msgid "error"
 msgstr "Błąd "
 
@@ -6073,7 +5767,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:380
 #, fuzzy
-#| msgid "false"
 msgid "fatal"
 msgstr "fałsz"
 
@@ -6094,7 +5787,6 @@
 
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "Błędna operacja '%s'"
 
@@ -6147,7 +5839,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "Pakiet"
 
@@ -6157,7 +5848,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "Wszystkie pakiety"
 
@@ -6177,7 +5867,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -6185,8 +5874,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -6195,7 +5882,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "-u ani -i nie można podać razem z poleceniem"
 
@@ -7441,7 +7127,6 @@
 
 #: src/ui.cc:472
 #, fuzzy, c-format
-#| msgid "Unable to open %ls"
 msgid "Unable to fork: %s"
 msgstr "Nie można otworzyć %ls"
 
@@ -7716,9 +7401,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7740,9 +7422,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -8273,19 +7952,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "URL pobierania dzienników zmian"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "URL pobierania dzienników zmian"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "Pobieranie dziennika zmian"
 
Index: aptitude/po/pt.po
===================================================================
--- aptitude.orig/po/pt.po
+++ aptitude/po/pt.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2009-09-23 12:45+0200\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianPT.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -878,7 +878,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "Registo de alterações de %s"
 
@@ -1456,7 +1455,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "Whether the package is automatically installed."
 msgid "'a': the package was automatically installed or removed."
 msgstr "Se este pacote é automaticamente instalado."
 
@@ -1591,9 +1589,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy, c-format
-#| msgid ""
-#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: "
-#| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
@@ -1640,10 +1635,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:259
 #, fuzzy
-#| msgid ""
-#| "reject the given package versions; don't display any solutions in which "
-#| "they occur.  Enter UNINST instead of a version to reject removing the "
-#| "package."
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package.  "
@@ -1655,9 +1646,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:261
 #, fuzzy
-#| msgid ""
-#| "accept the given package versions; display only solutions in which they "
-#| "occur.  Enter UNINST instead of a version to accept removing the package."
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package.  "
@@ -1763,31 +1751,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "Deixar as seguintes recomendações não resolvidas:"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "Auditar ^Recomendações"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "Já não é necessária a remoção de %s"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "Auditar ^Recomendações"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Acções"
 
@@ -1947,14 +1930,12 @@
 
 #: src/cmdline/cmdline_resolver.cc:1201
 #, fuzzy
-#| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Não foi possível resolver para a actualização (não foi encontrada solução)."
 
 #: src/cmdline/cmdline_resolver.cc:1207
 #, fuzzy, c-format
-#| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Não foi possível resolver as dependências para a actualização (%s)."
 
@@ -2362,19 +2343,16 @@
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Pacote de Fonte: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Arquivo"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\".\n"
 msgid "No such package \"%s\"."
 msgstr "O pacote \"%s\" não existe.\n"
 
@@ -2413,7 +2391,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "pesquisa: Deve fornecer pelo menos um termo para pesquisar\n"
 
@@ -2573,7 +2550,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[ERRO]"
 
@@ -2853,7 +2829,6 @@
 
 #: src/generic/apt/aptitude_resolver.cc:552
 #, fuzzy, c-format
-#| msgid "Invalid hint \"%s\": expected a target, but found nothing."
 msgid "Invalid hint \"%s\": expected a level, but found nothing."
 msgstr ""
 "Dica \"%s\" inválida: era esperado um alvo, mas não foi encontrado nada."
@@ -3144,7 +3119,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "A transferir pacotes"
 
@@ -3259,19 +3233,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "Failed to download the changelog: %s"
 msgid "Failed to download changelogs: %s"
 msgstr "Falhou a transferência do registo de alterações: %s"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "Failed to download the changelog: %s"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "Falhou a transferência do registo de alterações: %s"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "Registo de alterações de %s"
 
@@ -3319,7 +3290,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Não foi possível analisar o padrão %s"
 
@@ -3366,55 +3336,46 @@
 
 #: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got EOF."
 msgstr "Esperado '%c', obtido '%c'."
 
 #: src/generic/util/parsers.h:737
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got '%s'."
 msgstr "Esperado '%c', obtido '%c'."
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "Esperava um número após -q=, foi obtido %s\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "Carácter de acção '%c' não disponível\n"
 
 #: src/generic/util/parsers.h:832
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got EOF."
 msgstr "Esperado '%c', obtido '%c'."
 
 #: src/generic/util/parsers.h:843
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got '%c'."
 msgstr "Esperado '%c', obtido '%c'."
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "Esperava identificador de política, obtido '%c'"
 
 #: src/generic/util/parsers.h:1026
 #, fuzzy
-#| msgid "Expected '{', ')', or ',' following '||', got '%s'"
 msgid "Expected an integer following '-', got EOF."
 msgstr "Esperado '{', ')', ou ',' seguido de '||', foi obtido '%s'"
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "Esperava identificador de política, obtido '%c'"
 
@@ -3425,7 +3386,6 @@
 
 #: src/generic/util/parsers.h:1077
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected EOF, got '%c'."
 msgstr "Esperado '%c', obtido '%c'."
 
@@ -3439,19 +3399,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "')' inesperado"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " ou"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "')' inesperado"
 
@@ -3463,7 +3420,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr ""
 "Não foi possível criar o directório temporário a partir do modelo \"%s\": %s"
@@ -3839,31 +3795,26 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "Com problemas"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "Não é possível corrigir para pacotes não disponíveis"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "^F Procurar"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for a package"
 msgid "Search for packages."
 msgstr "Procurar por um pacote"
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "Obteve "
 
@@ -3906,7 +3857,6 @@
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "Necessita da instalação de %s versão %s (%s)"
 
@@ -3928,13 +3878,11 @@
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading changelog; please wait..."
 msgid "Downloading the changelog of %s version %s..."
 msgstr "A transferir registo de alterações; por favor aguarde..."
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "Preparing to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "A preparar para transferir registos de alterações"
 
@@ -5423,19 +5371,16 @@
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt versão %d.%d.%d\n"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt versão %d.%d.%d\n"
 
 #: src/main.cc:164
 #, fuzzy, c-format
-#| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Suporte para Ept desactivado.\n"
 
@@ -5484,45 +5429,37 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Instalar/actualizar pacotes\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Remover pacotes\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Remover pacotes e os seus ficheiros de configuração\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Manter pacotes na versão actual\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Cancelar o comando hold para um pacote\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr ""
 " markauto     - Marcar pacotes como tendo sido automaticamente instalados\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr ""
 " unmarkauto   - Marcar pacotes como tendo sido manualmente instalados\n"
@@ -5538,21 +5475,16 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Transferir as listas de pacotes novos/actualizáveis\n"
 
 #: src/main.cc:190
 #, fuzzy, c-format
-#| msgid " safe-upgrade - Perform a safe upgrade\n"
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Executar uma actualização segura\n"
 
 #: src/main.cc:191
 #, fuzzy, c-format
-#| msgid ""
-#| " full-upgrade - Perform an upgrade, possibly installing and removing "
-#| "packages\n"
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
@@ -5562,57 +5494,46 @@
 
 #: src/main.cc:192
 #, fuzzy, c-format
-#| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "'&BD' para instalar as dependências de compilação de um pacote."
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Esquecer quais os pacotes que são \"novos\"\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Procurar um pacote por nome e/ou expressão\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Mostrar informação detalhada acerca de um pacote\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Apagar ficheiros de pacotes já transferidos\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Apagar ficheiros antigos de pacotes transferidos\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Ver o registo de alterações de um pacote\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Transferir o ficheiro .deb para um pacote\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5634,12 +5555,6 @@
 
 #: src/main.cc:203
 #, fuzzy, c-format
-#| msgid ""
-#| " why-not      - Show the manually installed packages that lead to a "
-#| "conflict\n"
-#| "                with the given package, or why one or more packages "
-#| "would\n"
-#| "                lead to a conflict with the given package if installed\n"
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
 "conflict\n"
@@ -5656,7 +5571,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             Este texto de ajuda\n"
 
@@ -5686,15 +5600,11 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             Pedir sempre por confirmação ou acções\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
@@ -5703,9 +5613,6 @@
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5715,9 +5622,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5727,8 +5631,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 ""
@@ -5763,9 +5665,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5774,8 +5673,6 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
@@ -5783,9 +5680,6 @@
 
 #: src/main.cc:226
 #, fuzzy, c-format
-#| msgid ""
-#| " -q             In command-line mode, suppress the incremental progress\n"
-#| "                indicators.\n"
 msgid ""
 " -q             In command-line mode, suppress the incremental progress.\n"
 "                indicators.\n"
@@ -5795,16 +5689,12 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o key=val     Define directamente a opção de configuração chamada 'key'\n"
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -8079,19 +7969,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "Preparing to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "A preparar para transferir registos de alterações"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "Failed to download the changelog: %s"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "Falhou a transferência do registo de alterações: %s"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading changelogs"
 msgid "Downloading the changelog of %s"
 msgstr "A transferir registos de alterações"
 
Index: aptitude/po/pt_BR.po
===================================================================
--- aptitude.orig/po/pt_BR.po
+++ aptitude/po/pt_BR.po
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2008-06-15 18:07-0300\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -268,9 +268,6 @@
 
 #: src/apt_options.cc:241
 #, fuzzy
-#| msgid ""
-#| "If this option is enabled, the menu bar will only appear when it has been "
-#| "activated by pressing the menu key."
 msgid ""
 "If this option is enabled, then the first view displayed on startup will be "
 "a flat view instead of the default view."
@@ -714,7 +711,6 @@
 
 #: src/cmdline/cmdline_action.cc:212
 #, fuzzy, c-format
-#| msgid "Unable to satisfy the build-depends: %s."
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Impossível satisfazer as dependências de construção: %s."
 
@@ -771,13 +767,11 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s não está atualmente instalado, portanto não será reinstalado.\n"
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "%s já está instalado na versão requisitada (%s)\n"
@@ -883,7 +877,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "Log de mudanças de %s"
 
@@ -1052,7 +1045,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "nenhum"
 
@@ -1464,7 +1456,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "'&M' para marcar pacotes como automaticamente instalados"
 
@@ -1598,9 +1589,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy, c-format
-#| msgid ""
-#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: "
-#| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
@@ -1647,10 +1635,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:259
 #, fuzzy
-#| msgid ""
-#| "reject the given package versions; don't display any solutions in which "
-#| "they occur.  Enter UNINST instead of a version to reject removing the "
-#| "package."
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package.  "
@@ -1662,9 +1646,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:261
 #, fuzzy
-#| msgid ""
-#| "accept the given package versions; display only solutions in which they "
-#| "occur.  Enter UNINST instead of a version to accept removing the package."
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package.  "
@@ -1769,31 +1750,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "Manter as recomendações a seguir não resolvidas:"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "Auditar ^recomendações"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "Não mais requerendo a remoção de %s"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "Auditar ^recomendações"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Ações"
 
@@ -1953,7 +1929,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:1201
 #, fuzzy
-#| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Impossível resolver dependências para a atualização (nenhuma solução "
@@ -1961,7 +1936,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:1207
 #, fuzzy, c-format
-#| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Impossível resolver dependências para a atualização (%s)."
 
@@ -1992,13 +1966,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "mas não é instalável."
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "mas %s será instalado."
 
@@ -2097,13 +2069,11 @@
 
 #: src/cmdline/cmdline_show.cc:326
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s%s; will be installed"
 msgstr "%s; serão instalados."
 
 #: src/cmdline/cmdline_show.cc:328
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s%s; will be installed automatically"
 msgstr "%s; serão automaticamente instalados"
 
@@ -2367,25 +2337,21 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "Pacotes"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Pacote Fonte: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Repositório"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\".\n"
 msgid "No such package \"%s\"."
 msgstr "Não há pacote \"%s\".\n"
 
@@ -2424,7 +2390,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "busca: Você deve fornecer pelo menos um termo para busca\n"
 
@@ -2547,7 +2512,6 @@
 
 #: src/cmdline/cmdline_why.cc:1285
 #, fuzzy, c-format
-#| msgid "Packages depending on %s"
 msgid "Packages requiring %s:"
 msgstr "Pacotes que dependem de %s"
 
@@ -2563,8 +2527,6 @@
 
 #: src/cmdline/cmdline_why.cc:1416
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: this command requires at least one argument (the package to query)."
 msgid ""
 "%s: this command requires at least one argument (the package to query).\n"
 msgstr ""
@@ -2583,7 +2545,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[ERRO]"
 
@@ -2937,7 +2898,6 @@
 
 #: src/generic/apt/download_update_manager.cc:138
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated quoted string in command: %s"
 msgstr "String literal não terminada depois de %s"
 
@@ -3023,7 +2983,6 @@
 
 #: src/generic/apt/dump_packages.cc:674
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create truncated cache: %s."
 msgstr "Impossível localizar pacote %s"
 
@@ -3144,7 +3103,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "Baixando pacotes"
 
@@ -3182,7 +3140,6 @@
 
 #: src/generic/apt/matching/parse.cc:860
 #, fuzzy, c-format
-#| msgid "Unknown matcher type: \"%s\"."
 msgid "Unknown term type: \"%s\"."
 msgstr "Tipo de combinação desconhecido: \"%s\"."
 
@@ -3190,9 +3147,6 @@
 #. Leave the question marks attached to the string placeholders.
 #: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883
 #, fuzzy, c-format
-#| msgid ""
-#| "The ?%s matcher must be used in a \"wide\" context (a top-level context, "
-#| "or a context enclosed by ?%s)."
 msgid ""
 "The ?%s term must be used in a \"wide\" context (a top-level context, or a "
 "context enclosed by ?%s)."
@@ -3223,7 +3177,6 @@
 
 #: src/generic/apt/matching/parse.cc:1388
 #, fuzzy, c-format
-#| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "Expressão mal formada"
 
@@ -3264,19 +3217,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "URL a ser usada para baixar os logs de mudanças"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "URL a ser usada para baixar os logs de mudanças"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "Log de mudanças de %s"
 
@@ -3322,7 +3272,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Impossível interpretar padrão %s"
 
@@ -3337,14 +3286,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "Não Instalado"
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "Não Instalado"
 
@@ -3371,67 +3318,56 @@
 
 #: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got EOF."
 msgstr "Esperado '%c', obtido '%c'."
 
 #: src/generic/util/parsers.h:737
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got '%s'."
 msgstr "Esperado '%c', obtido '%c'."
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "Esperado um número após -q=, obtido %s\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "Caracter de ação ruim '%c'\n"
 
 #: src/generic/util/parsers.h:832
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got EOF."
 msgstr "Esperado '%c', obtido '%c'."
 
 #: src/generic/util/parsers.h:843
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got '%c'."
 msgstr "Esperado '%c', obtido '%c'."
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "Esperado identificador de política, obtido '%c'"
 
 #: src/generic/util/parsers.h:1026
 #, fuzzy
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected an integer following '-', got EOF."
 msgstr "Esperado ',' ou ')', após '||', obtido '%s'"
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "Esperado identificador de política, obtido '%c'"
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "Operação %s inválida"
 
 #: src/generic/util/parsers.h:1077
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected EOF, got '%c'."
 msgstr "Esperado '%c', obtido '%c'."
 
@@ -3445,19 +3381,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "')' inesperado"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " ou"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "')' inesperado"
 
@@ -3468,7 +3401,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "Impossível criar diretório temporário a partir de modelo \"%s\": %s"
 
@@ -3503,7 +3435,6 @@
 
 #: src/gtk/aptitude.glade:19 src/gtk/aptitude.glade:2273
 #, fuzzy
-#| msgid "False"
 msgid "_File"
 msgstr "Falso"
 
@@ -3568,13 +3499,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "Pacote"
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "Visões"
 
@@ -3594,7 +3523,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "Ajuda"
 
@@ -3605,7 +3533,6 @@
 
 #: src/gtk/aptitude.glade:345 src/gtk/aptitude.glade:2614
 #, fuzzy
-#| msgid "List Update"
 msgid "Update"
 msgstr "Atualização da lista"
 
@@ -3627,7 +3554,6 @@
 
 #: src/gtk/aptitude.glade:389 src/gtk/aptitude.glade:2658
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Remove"
 msgstr "Instalado"
 
@@ -3641,33 +3567,28 @@
 
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "Remover o filtro da lista de pacotes"
 
 #: src/gtk/aptitude.glade:649
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "Apply these settings to all active package lists."
 msgstr "Aplicar um filtro à lista de pacotes"
 
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "Pesquisar"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "reinstalar"
 
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "Err "
 
@@ -3682,19 +3603,16 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "Dependências de %s"
 
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "^Changelog"
 msgid "Changelog"
 msgstr "Log de mudanças (^C)"
 
 #: src/gtk/aptitude.glade:1020
 #, fuzzy
-#| msgid "False"
 msgid "Files"
 msgstr "Falso"
 
@@ -3708,7 +3626,6 @@
 
 #: src/gtk/aptitude.glade:1051
 #, fuzzy
-#| msgid "Tags"
 msgid "tags"
 msgstr "Tags"
 
@@ -3731,13 +3648,11 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "Estado"
 
 #: src/gtk/aptitude.glade:1247
 #, fuzzy
-#| msgid "Unknown action type: %s"
 msgid "Group by action type"
 msgstr "Tipo de ação desconhecida: %s"
 
@@ -3766,13 +3681,11 @@
 
 #: src/gtk/aptitude.glade:1328
 #, fuzzy
-#| msgid "Toggle ^Rejected"
 msgid "Rejected"
 msgstr "^Rejeitar ação"
 
 #: src/gtk/aptitude.glade:1343
 #, fuzzy
-#| msgid "Preferences"
 msgid "No preference"
 msgstr "Preferências"
 
@@ -3786,32 +3699,27 @@
 
 #: src/gtk/aptitude.glade:1400
 #, fuzzy
-#| msgid "^Examine Solution"
 msgid "Find a new solution"
 msgstr "^Examinar solução"
 
 #: src/gtk/aptitude.glade:1404
 #, fuzzy
-#| msgid "Select the next solution to the dependency problems."
 msgid "Calculate the next solution that has not yet been generated."
 msgstr "Seleciona a próxima solução para os problemas de dependência."
 
 #: src/gtk/aptitude.glade:1419
 #, fuzzy
-#| msgid "Perform the actions contained in the currently selected solution."
 msgid ""
 "Perform the actions in the currently selected solution and close this tab."
 msgstr "Executar as ações contidas na solução atualmente selecionada."
 
 #: src/gtk/aptitude.glade:1576
 #, fuzzy
-#| msgid "Upgrade"
 msgid "Upgrade Summary"
 msgstr "Atualizar"
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "Pacote Fonte: "
 
@@ -3823,7 +3731,6 @@
 
 #: src/gtk/aptitude.glade:1652
 #, fuzzy
-#| msgid "Manual"
 msgid "Fix Manually"
 msgstr "Manual"
 
@@ -3871,31 +3778,26 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "Quebrado"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "Não é possível corrigir para pacotes não disponíveis"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "Localizar (^F)"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for a package"
 msgid "Search for packages."
 msgstr "Procurar por um pacote"
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "Obtido "
 
@@ -3929,19 +3831,16 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "URL a ser usada para baixar os logs de mudanças"
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "Requerendo a instalação de %s versão %s (%s)"
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -3949,20 +3848,17 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr "Você só pode visualizar logs de mudanças de pacotes Debian oficiais."
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "Baixando logs de mudanças"
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "URL a ser usada para baixar os logs de mudanças"
 
@@ -3976,7 +3872,6 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "URL a ser usada para baixar os logs de mudanças"
 
@@ -3986,8 +3881,6 @@
 
 #: src/gtk/dashboardtab.cc:414
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] "%d atualização"
@@ -3995,13 +3888,11 @@
 
 #: src/gtk/dashboardtab.cc:633
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No upgrades are available."
 msgstr "Não Instalado"
 
 #: src/gtk/dashboardtab.cc:645
 #, fuzzy
-#| msgid "Unable to locate package %s"
 msgid "Unable to calculate an upgrade."
 msgstr "Impossível localizar pacote %s"
 
@@ -4036,25 +3927,21 @@
 
 #: src/gtk/dashboardtab.cc:708
 #, fuzzy, c-format
-#| msgid "Internal error: Default column string is unparsable"
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr "Erro interno: String de coluna padrão não é analisável"
 
 #: src/gtk/dependency_chains_tab.cc:78
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: start"
 msgstr "Gerenciamento de dependências"
 
 #: src/gtk/dependency_chains_tab.cc:82
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: end"
 msgstr "Gerenciamento de dependências"
 
 #: src/gtk/dependency_chains_tab.cc:86
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: results"
 msgstr "Gerenciamento de dependências"
 
@@ -4064,7 +3951,6 @@
 
 #: src/gtk/dependency_chains_tab.cc:282
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency chain found."
 msgstr "Gerenciamento de dependências"
 
@@ -4074,13 +3960,11 @@
 
 #: src/gtk/download.cc:185
 #, fuzzy
-#| msgid "False"
 msgid "Failed"
 msgstr "Falso"
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "Apagando arquivos baixados"
 
@@ -4091,13 +3975,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "Progresso Total: "
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description"
 msgid "Short Description"
 msgstr "Descrição"
 
@@ -4107,13 +3989,11 @@
 
 #: src/gtk/download.cc:319
 #, fuzzy
-#| msgid "Cleaning while a download is in progress is not allowed"
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr "Limpar enquanto um download está em progresso não é permitido"
 
 #: src/gtk/download.cc:395 src/gtk/gui.cc:832
 #, fuzzy
-#| msgid "View next display"
 msgid "View Details"
 msgstr "Visualizar próxima tela"
 
@@ -4133,19 +4013,16 @@
 
 #: src/gtk/download.cc:486
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s: %lu/%lu, stalled"
 msgstr "%s; serão instalados."
 
 #: src/gtk/download.cc:507
 #, fuzzy, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr " [ %i%% ] (%sB/s, %s restantes)"
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "mas %s será instalado."
 
@@ -4159,7 +4036,6 @@
 
 #: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "Impossível localizar pacote %s"
 
@@ -4170,7 +4046,6 @@
 
 #: src/gtk/dpkg_terminal.cc:429
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "%s: Unable to accept a connection: %s"
 msgstr "Impossível criar diretório temporário a partir de modelo \"%s\": %s"
 
@@ -4196,80 +4071,67 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "%s versões"
 
 #: src/gtk/entitysummary.cc:123
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Install %s version %s"
 msgstr "Instalar(%s fornece %s)"
 
 #: src/gtk/entitysummary.cc:131
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrade to %s version %s"
 msgstr "  versão cwidget: %s\n"
 
 #: src/gtk/entitysummary.cc:142
 #, fuzzy, c-format
-#| msgid "Keep the following packages at their current version:"
 msgid "Don't hold %s at its current version."
 msgstr "Manter os pacotes a seguir em suas versões atuais:"
 
 #: src/gtk/entitysummary.cc:145 src/gtk/entitysummary.cc:165
 #: src/gtk/entitysummary.cc:168
 #, fuzzy, c-format
-#| msgid "Canc^el pending actions"
 msgid "Cancel any actions on %s."
 msgstr "Canc^elar ações pendentes"
 
 #: src/gtk/entitysummary.cc:150
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the purge of %s."
 msgstr "Cancelar a remoção de %F"
 
 #: src/gtk/entitysummary.cc:152
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s."
 msgstr "Cancelar a remoção de %F"
 
 #: src/gtk/entitysummary.cc:157
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the upgrade of %s."
 msgstr "Cancelar a remoção de %F"
 
 #: src/gtk/entitysummary.cc:159
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s."
 msgstr "Cancelar a instalação de %F"
 
 #: src/gtk/entitysummary.cc:161
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the downgrade of %s."
 msgstr "Cancelar a remoção de %F"
 
 #: src/gtk/entitysummary.cc:163
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the reinstallation of %s."
 msgstr "Cancelar a instalação de %F"
 
 #: src/gtk/entitysummary.cc:206
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "Remove %s"
 msgstr "Remover(%s)"
 
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "Ex^purgar"
 
@@ -4280,19 +4142,16 @@
 
 #: src/gtk/entitysummary.cc:223
 #, fuzzy, c-format
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Mark %s as automatically installed."
 msgstr "'&M' para marcar pacotes como automaticamente instalados"
 
 #: src/gtk/entitysummary.cc:228
 #, fuzzy, c-format
-#| msgid "The package \"%s\" is manually installed.\n"
 msgid "Mark %s as manually installed."
 msgstr "O pacote \"%s\" está instalado manualmente.\n"
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
 msgid "%s is a virtual package provided by:\n"
 msgstr "\"%s\" é um pacote virtual fornecido por:\n"
 
@@ -4302,13 +4161,11 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "Pacote Fonte: "
 
 #: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 #, fuzzy
-#| msgid "ProgName"
 msgid "Name"
 msgstr "NomeProg"
 
@@ -4318,13 +4175,11 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "Não foi possível abrir arquivo \"%s\""
 
 #: src/gtk/entityview.cc:412
 #, fuzzy, c-format
-#| msgid "Rejecting the removal of %s"
 msgid "Editing the columns of \"%s\""
 msgstr "Rejeitando a remoção de %s"
 
@@ -4338,25 +4193,21 @@
 
 #: src/gtk/entityview.cc:570
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Whether the package is automatically installed."
 msgstr "'&M' para marcar pacotes como automaticamente instalados"
 
 #: src/gtk/entityview.cc:576
 #, fuzzy
-#| msgid "Cancel any action on the selected package"
 msgid "The name and description of the package."
 msgstr "Cancelar quaisquer ações nos pacotes selecionados"
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "Versão: "
 
 #: src/gtk/entityview.cc:592
 #, fuzzy
-#| msgid "Check for new versions of packages"
 msgid "The version number of the package."
 msgstr "Checar por novas versões de pacotes"
 
@@ -4377,7 +4228,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "não instalado"
 
@@ -4387,37 +4237,31 @@
 
 #: src/gtk/gui.cc:82
 #, fuzzy
-#| msgid "unpacked"
 msgid "Unpacked"
 msgstr "desempacotado"
 
 #: src/gtk/gui.cc:83
 #, fuzzy
-#| msgid "half-config"
 msgid "Half-configured"
 msgstr "parcialmente-configurado"
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "half-install"
 msgid "Half-installed"
 msgstr "parcialmente-instalado"
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "não instalado (arquivos de configuração permanecem)"
 
 #: src/gtk/gui.cc:86
 #, fuzzy
-#| msgid "triggers-awaited"
 msgid "Triggers awaited"
 msgstr "gatilhos-em-espera"
 
 #: src/gtk/gui.cc:87
 #, fuzzy
-#| msgid "triggers-pending"
 msgid "Triggers pending"
 msgstr "gatilhos-pendentes"
 
@@ -4443,13 +4287,11 @@
 
 #: src/gtk/gui.cc:97
 #, fuzzy
-#| msgid "forbidden upgrade"
 msgid "Hold (don't upgrade)"
 msgstr "atualização proibida"
 
 #: src/gtk/gui.cc:99
 #, fuzzy
-#| msgid "Related Dependencies"
 msgid "Unsatisfied dependencies"
 msgstr "Dependências relacionadas"
 
@@ -4463,7 +4305,6 @@
 
 #: src/gtk/gui.cc:290
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "Aplicar um filtro à lista de pacotes"
 
@@ -4478,13 +4319,11 @@
 
 #: src/gtk/gui.cc:359
 #, fuzzy, c-format
-#| msgid "List Update"
 msgid "Update %s?"
 msgstr "Atualização da lista"
 
 #: src/gtk/gui.cc:385
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
@@ -4512,31 +4351,26 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "%s changes"
 msgid "Done applying changes!"
 msgstr "%s mudanças"
 
 #: src/gtk/gui.cc:823
 #, fuzzy
-#| msgid "%s changes"
 msgid "Applying changes..."
 msgstr "%s mudanças"
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "s: %F"
 msgid "%s: %s"
 msgstr "s: %F"
 
 #: src/gtk/gui.cc:878
 #, fuzzy, c-format
-#| msgid "No broken packages."
 msgid "Error in package %s"
 msgstr "Nenhum pacote quebrado."
 
 #: src/gtk/gui.cc:906
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Impossível substituir %s pelo novo arquivo de configuração"
 
@@ -4546,25 +4380,21 @@
 
 #: src/gtk/gui.cc:1038
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "Nenhum pacote quebrado."
 
 #: src/gtk/gui.cc:1071
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "Nenhum pacote quebrado."
 
 #: src/gtk/gui.cc:1075
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "Resolver dependências"
 
 #: src/gtk/gui.cc:1103
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Nenhum pacote está quebrado."
@@ -4572,13 +4402,11 @@
 
 #: src/gtk/gui.cc:1147
 #, fuzzy
-#| msgid "%s changes"
 msgid "View changes"
 msgstr "%s mudanças"
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "%s changes"
 msgid "Apply changes"
 msgstr "%s mudanças"
 
@@ -4587,8 +4415,6 @@
 #. font.
 #: src/gtk/gui.cc:1192
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%d package to install"
 msgid_plural "%d packages to install"
 msgstr[0] "%d instalação"
@@ -4599,7 +4425,6 @@
 #. font.
 #: src/gtk/gui.cc:1207
 #, fuzzy, c-format
-#| msgid "failed to remove %s"
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "falhou ao remover %s"
@@ -4607,7 +4432,6 @@
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "TamanhoDownload"
 
@@ -4622,19 +4446,16 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "not installed"
 msgid "Not implemented"
 msgstr "não instalado"
 
 #: src/gtk/gui.cc:1408 src/gtk/gui.cc:1427
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "Instalado"
 
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "Ex^purgar"
 
@@ -4652,7 +4473,6 @@
 
 #: src/gtk/gui.cc:1455
 #, fuzzy
-#| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "Manual do Usuário"
 
@@ -4667,7 +4487,6 @@
 
 #: src/gtk/info.cc:161 src/gtk/pkgview.cc:169
 #, fuzzy
-#| msgid "Current status: %F."
 msgid "Current status"
 msgstr "Estado atual: %F."
 
@@ -4677,19 +4496,16 @@
 
 #: src/gtk/info.cc:496
 #, fuzzy
-#| msgid "Not Installed"
 msgid "Not available"
 msgstr "Não Instalado"
 
 #: src/gtk/info.cc:545
 #, fuzzy
-#| msgid "C^ycle Package Information"
 msgid "Package information: version list"
 msgstr "Percorrer informações (^y)"
 
 #: src/gtk/info.cc:555
 #, fuzzy
-#| msgid "Packages which depend on %s"
 msgid "Package information: dependency list"
 msgstr "Pacotes que dependem de %s"
 
@@ -4699,7 +4515,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "não"
 
@@ -4713,7 +4528,6 @@
 
 #: src/gtk/packagestab.cc:203
 #, fuzzy, c-format
-#| msgid "No packages matched the pattern \"%ls\"."
 msgid "No packages matched \"%s\"."
 msgstr "Nenhum pacote combinou com o padrão \"%ls\"."
 
@@ -4723,31 +4537,26 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "Pacote: "
 
 #: src/gtk/pkgview.cc:224
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed automatically."
 msgstr "%s; serão automaticamente instalados"
 
 #: src/gtk/pkgview.cc:227
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed automatically."
 msgstr "%s; serão automaticamente instalados"
 
 #: src/gtk/pkgview.cc:235
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed manually."
 msgstr "%s; serão automaticamente instalados"
 
 #: src/gtk/pkgview.cc:238
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed manually."
 msgstr "%s; serão automaticamente instalados"
 
@@ -4757,13 +4566,11 @@
 
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "Pesquisar"
 
 #: src/gtk/pkgview.cc:718
 #, fuzzy
-#| msgid "Building view"
 msgid "Finalizing view"
 msgstr "Construindo visão"
 
@@ -4895,13 +4702,11 @@
 
 #: src/gtk/previewtab.cc:179
 #, fuzzy
-#| msgid "Preview"
 msgid "Preview: "
 msgstr "Pré-visualização"
 
 #: src/gtk/resolver.cc:68
 #, fuzzy, c-format
-#| msgid "Error while dumping resolver state"
 msgid "Error in dependency resolver: %s"
 msgstr "Erro descarregando o estado do resolvedor"
 
@@ -4916,7 +4721,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package"
 msgid "Virtual package"
 msgstr "Pacote"
 
@@ -4926,43 +4730,36 @@
 
 #: src/gtk/resolver.cc:377
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Removing %s is rejected."
 msgstr "Removendo %s"
 
 #: src/gtk/resolver.cc:382
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Canceling the installation of %s is rejected."
 msgstr "Cancelar a instalação de %F"
 
 #: src/gtk/resolver.cc:391
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Canceling the removal of %s is rejected."
 msgstr "Cancelar a remoção de %F"
 
 #: src/gtk/resolver.cc:394
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keeping %s at version %s is rejected."
 msgstr "Manter %F na versão %s (%s)"
 
 #: src/gtk/resolver.cc:401
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Installing %s version %s is rejected."
 msgstr "Instalar(%s fornece %s)"
 
 #: src/gtk/resolver.cc:407
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrading %s to version %s is rejected."
 msgstr "  versão cwidget: %s\n"
 
 #: src/gtk/resolver.cc:413
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrading %s to version %s is rejected."
 msgstr "%s versões"
 
@@ -5004,7 +4801,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr "%s versões"
@@ -5102,7 +4898,6 @@
 
 #: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862
 #, fuzzy
-#| msgid "Remove the following packages:"
 msgid "Keep the following packages:"
 msgstr "Remover os pacotes a seguir:"
 
@@ -5118,121 +4913,101 @@
 
 #: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900
 #, fuzzy
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "Leave the following dependencies unresolved:"
 msgstr "Manter as seguintes dependências não resolvidas:%n"
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Remove %F [%s (%s)]"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "Remover %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1523
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "Instalar %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1531
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s"
 msgstr "Cancelar a instalação de %F"
 
 #: src/gtk/resolver.cc:1534
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s"
 msgstr "Cancelar a remoção de %F"
 
 #: src/gtk/resolver.cc:1537
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "Manter %F na versão %s (%s)"
 
 #: src/gtk/resolver.cc:1544
 #, fuzzy, c-format
-#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Atualizar %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1553
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Reverter %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>Remove</b> %s"
 msgstr "Remover(%s)"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>remove</b> %s"
 msgstr "Remover(%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "Manter %F na versão %s (%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>keep</b> %s at version %s"
 msgstr "Manter %F na versão %s (%s)"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr "Cancelar a instalação de %F"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>cancel</b> the installation of %s"
 msgstr "Cancelar a instalação de %F"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>Install</b> %s %s"
 msgstr "Instalar %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>install</b> %s %s"
 msgstr "Instalar %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>Downgrade</b> %s to version %s"
 msgstr "  versão cwidget: %s\n"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>downgrade</b> %s to version %s"
 msgstr "  versão cwidget: %s\n"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>Upgrade</b> %s to version %s"
 msgstr "%s versões"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>upgrade</b> %s to version %s"
 msgstr "%s versões"
 
@@ -5248,8 +5023,6 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "%d instalação"
@@ -5257,8 +5030,6 @@
 
 #: src/gtk/resolver.cc:1740
 #, fuzzy, c-format
-#| msgid "%d removal"
-#| msgid_plural "%d removals"
 msgid "%s remove"
 msgid_plural "%s removes"
 msgstr[0] "%d remoção"
@@ -5266,8 +5037,6 @@
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "%d keep"
-#| msgid_plural "%d keeps"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "%d mantido"
@@ -5275,8 +5044,6 @@
 
 #: src/gtk/resolver.cc:1752
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%s upgrade"
 msgid_plural "%s upgrades"
 msgstr[0] "%d atualização"
@@ -5284,8 +5051,6 @@
 
 #: src/gtk/resolver.cc:1758
 #, fuzzy, c-format
-#| msgid "%d downgrade"
-#| msgid_plural "%d downgrades"
 msgid "%s downgrade"
 msgid_plural "%s downgrades"
 msgstr[0] "%d reversão"
@@ -5293,7 +5058,6 @@
 
 #: src/gtk/resolver.cc:1764
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "%s unresolved recommendation"
 msgid_plural "%s unresolved recommendations"
 msgstr[0] "Auditar ^recomendações"
@@ -5301,19 +5065,16 @@
 
 #: src/gtk/resolver.cc:2056
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions yet."
 msgstr "Sem mais soluções."
 
 #: src/gtk/resolver.cc:2063
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency solution was found."
 msgstr "Gerenciamento de dependências"
 
 #: src/gtk/resolver.cc:2064
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions."
 msgstr "Sem mais soluções."
 
@@ -5323,19 +5084,16 @@
 
 #: src/gtk/resolver.cc:2076
 #, fuzzy, c-format
-#| msgid "No more solutions."
 msgid "%u solutions."
 msgstr "Sem mais soluções."
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "Não foi possível abrir arquivo \"%s\""
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr "[Baixado]"
 
@@ -5385,7 +5143,6 @@
 
 #: src/load_grouppolicy.cc:305
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected ',', '%c', or '('; got '%c'"
 msgstr "Esperado ',' ou '(', obtido '%c'"
 
@@ -5493,7 +5250,6 @@
 
 #: src/load_grouppolicy.cc:713
 #, fuzzy, c-format
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected '{', ')', or ',' following '||', got '%s'"
 msgstr "Esperado ',' ou ')', após '||', obtido '%s'"
 
@@ -5618,19 +5374,16 @@
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr " versão apt %d.%d.%d\n"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr " versão apt %d.%d.%d\n"
 
 #: src/main.cc:164
 #, fuzzy, c-format
-#| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Suporte a ept desabilitado.\n"
 
@@ -5679,45 +5432,37 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Instala/atualiza pacotes\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Remove pacotes\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Remove pacotes e seus arquivos de configuração\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Coloca pacotes em retenção (\"hold\")\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Cancela o comando 'hold' para um pacote\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr ""
 " markauto     - Marca pacotes como tendo sido automaticamente instalados\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Marca pacotes como tendo sido manualmente instalados\n"
 
@@ -5732,21 +5477,16 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Baixa as listas de pacotes novos/atualizáveis\n"
 
 #: src/main.cc:190
 #, fuzzy, c-format
-#| msgid " safe-upgrade - Perform a safe upgrade\n"
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Executa uma atualização segura\n"
 
 #: src/main.cc:191
 #, fuzzy, c-format
-#| msgid ""
-#| " full-upgrade - Perform an upgrade, possibly installing and removing "
-#| "packages\n"
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
@@ -5756,57 +5496,46 @@
 
 #: src/main.cc:192
 #, fuzzy, c-format
-#| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "'&BD' para instalar as dependências de construção de um pacote."
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Esquece quais pacotes são \"novos\"\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Pesquisa por um pacote pelo nome e/ou expressão\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Exibe informações detalhadas sobre um pacote\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Apaga arquivos de pacotes baixados\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Apaga arquivos antigos de pacotes baixados\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Visualiza o log de mudanças de um pacote\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Baixa do arquivo .deb de um pacote\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5826,12 +5555,6 @@
 
 #: src/main.cc:203
 #, fuzzy, c-format
-#| msgid ""
-#| " why-not      - Show the manually installed packages that lead to a "
-#| "conflict\n"
-#| "                with the given package, or why one or more packages "
-#| "would\n"
-#| "                lead to a conflict with the given package if installed\n"
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
 "conflict\n"
@@ -5850,7 +5573,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             Este texto de ajuda\n"
 
@@ -5878,15 +5600,11 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             Sempre pedir por confirmação ou ações\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
@@ -5895,9 +5613,6 @@
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5907,9 +5622,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5920,8 +5632,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 ""
@@ -5954,9 +5664,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5966,8 +5673,6 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
@@ -5975,9 +5680,6 @@
 
 #: src/main.cc:226
 #, fuzzy, c-format
-#| msgid ""
-#| " -q             In command-line mode, suppress the incremental progress\n"
-#| "                indicators.\n"
 msgid ""
 " -q             In command-line mode, suppress the incremental progress.\n"
 "                indicators.\n"
@@ -5987,16 +5689,12 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o chave=val   Definir diretamente a opção de configuração chamada 'chave'\n"
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -6034,7 +5732,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "true"
 msgid "trace"
 msgstr "verdadeiro"
 
@@ -6048,7 +5745,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "não"
 
@@ -6062,7 +5758,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:377
 #, fuzzy
-#| msgid "Err "
 msgid "error"
 msgstr "Err "
 
@@ -6070,7 +5765,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:380
 #, fuzzy
-#| msgid "false"
 msgid "fatal"
 msgstr "falso"
 
@@ -6091,7 +5785,6 @@
 
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "Operação %s inválida"
 
@@ -6144,7 +5837,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "Pacote"
 
@@ -6154,7 +5846,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "Todos os pacotes"
 
@@ -6174,7 +5865,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -6182,8 +5872,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -6193,7 +5881,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "-u e -i não podem ser especificados com um comando"
 
@@ -7439,7 +7126,6 @@
 
 #: src/ui.cc:472
 #, fuzzy, c-format
-#| msgid "Unable to open %ls"
 msgid "Unable to fork: %s"
 msgstr "Impossível abrir %ls"
 
@@ -7715,9 +7401,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7740,9 +7423,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -8280,19 +7960,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "URL a ser usada para baixar os logs de mudanças"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "URL a ser usada para baixar os logs de mudanças"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "Baixando logs de mudanças"
 
Index: aptitude/po/ro.po
===================================================================
--- aptitude.orig/po/ro.po
+++ aptitude/po/ro.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2008-10-17 15:42+0200\n"
 "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -272,9 +272,6 @@
 
 #: src/apt_options.cc:241
 #, fuzzy
-#| msgid ""
-#| "If this option is enabled, the menu bar will only appear when it has been "
-#| "activated by pressing the menu key."
 msgid ""
 "If this option is enabled, then the first view displayed on startup will be "
 "a flat view instead of the default view."
@@ -723,7 +720,6 @@
 
 #: src/cmdline/cmdline_action.cc:212
 #, fuzzy, c-format
-#| msgid "Unable to satisfy the build-depends: %s."
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Nu se pot satisface dependențele la compilare: %s."
 
@@ -780,14 +776,12 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr ""
 "%s nu este instalat în momentul de față, astfel încât nu va fi reinstalat.\n"
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "%s este deja instalat cu versiunea cerută (%s)\n"
@@ -890,7 +884,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "Jurnal de modificări al lui %s"
 
@@ -1057,7 +1050,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "niciunul"
 
@@ -1477,7 +1469,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "'&M' pentru a marca pachetele ca fiind automat instalate"
 
@@ -1612,9 +1603,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy, c-format
-#| msgid ""
-#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: "
-#| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
@@ -1660,10 +1648,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:259
 #, fuzzy
-#| msgid ""
-#| "reject the given package versions; don't display any solutions in which "
-#| "they occur.  Enter UNINST instead of a version to reject removing the "
-#| "package."
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package.  "
@@ -1674,9 +1658,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:261
 #, fuzzy
-#| msgid ""
-#| "accept the given package versions; display only solutions in which they "
-#| "occur.  Enter UNINST instead of a version to accept removing the package."
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package.  "
@@ -1780,31 +1761,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "Se lasă nerezolvate următoarele recomandări:"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "^Revizuiește recomandările"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "Nu mai este nevoie de ștergerea lui %s"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "^Revizuiește recomandările"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Acțiuni"
 
@@ -1966,7 +1942,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:1201
 #, fuzzy
-#| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Nu se pot rezolva dependențele pentru actualizare (nu a fost găsită nici o "
@@ -1974,7 +1949,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:1207
 #, fuzzy, c-format
-#| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Nu se pot rezolva dependențele pentru înnoire (%s)."
 
@@ -2005,13 +1979,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "dar nu este instalabil"
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "dar %s e pe cale să fie instalat."
 
@@ -2110,13 +2082,11 @@
 
 #: src/cmdline/cmdline_show.cc:326
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s%s; will be installed"
 msgstr "%s; va fi instalat"
 
 #: src/cmdline/cmdline_show.cc:328
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s%s; will be installed automatically"
 msgstr "%s; va fi instalată automat"
 
@@ -2384,25 +2354,21 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "Pachete"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Pachetul sursă: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Arhivă"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\".\n"
 msgid "No such package \"%s\"."
 msgstr "Nu există pachetul „%s”.\n"
 
@@ -2441,7 +2407,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "căutare: Trebuie să furnizați cel puțin un termen de căutare\n"
 
@@ -2565,7 +2530,6 @@
 
 #: src/cmdline/cmdline_why.cc:1285
 #, fuzzy, c-format
-#| msgid "Packages depending on %s"
 msgid "Packages requiring %s:"
 msgstr "Pachete ce depind de %s"
 
@@ -2581,8 +2545,6 @@
 
 #: src/cmdline/cmdline_why.cc:1416
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: this command requires at least one argument (the package to query)."
 msgid ""
 "%s: this command requires at least one argument (the package to query).\n"
 msgstr ""
@@ -2602,7 +2564,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[EROARE]"
 
@@ -2956,7 +2917,6 @@
 
 #: src/generic/apt/download_update_manager.cc:138
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated quoted string in command: %s"
 msgstr "Șir literal neterminat după %s"
 
@@ -3042,7 +3002,6 @@
 
 #: src/generic/apt/dump_packages.cc:674
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create truncated cache: %s."
 msgstr "Nu s-a putut localiza pachetul %s"
 
@@ -3165,7 +3124,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "Se descarcă pachetele"
 
@@ -3203,7 +3161,6 @@
 
 #: src/generic/apt/matching/parse.cc:860
 #, fuzzy, c-format
-#| msgid "Unknown matcher type: \"%s\"."
 msgid "Unknown term type: \"%s\"."
 msgstr "Tip de model necunoscut: \"%s\"."
 
@@ -3211,9 +3168,6 @@
 #. Leave the question marks attached to the string placeholders.
 #: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883
 #, fuzzy, c-format
-#| msgid ""
-#| "The ?%s matcher must be used in a \"wide\" context (a top-level context, "
-#| "or a context enclosed by ?%s)."
 msgid ""
 "The ?%s term must be used in a \"wide\" context (a top-level context, or a "
 "context enclosed by ?%s)."
@@ -3244,7 +3198,6 @@
 
 #: src/generic/apt/matching/parse.cc:1388
 #, fuzzy, c-format
-#| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "Expresie formată greșit"
 
@@ -3285,19 +3238,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "URL de folosit la descărcarea jurnalelor de modificări"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "URL de folosit la descărcarea jurnalelor de modificări"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "Jurnal de modificări al lui %s"
 
@@ -3344,7 +3294,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Nu se poate analiza modelul %s"
 
@@ -3359,14 +3308,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "Neinstalat"
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "Neinstalat"
 
@@ -3393,67 +3340,56 @@
 
 #: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got EOF."
 msgstr "Se aștepta „%c”, s-a primit „%c”."
 
 #: src/generic/util/parsers.h:737
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got '%s'."
 msgstr "Se aștepta „%c”, s-a primit „%c”."
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "Așteptat un număr după -q=, primit %s\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "Caracter de acțiune necorespunzător „%c”\n"
 
 #: src/generic/util/parsers.h:832
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got EOF."
 msgstr "Se aștepta „%c”, s-a primit „%c”."
 
 #: src/generic/util/parsers.h:843
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got '%c'."
 msgstr "Se aștepta „%c”, s-a primit „%c”."
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "Se aștepta un identificator de politică, s-a primit „%c”"
 
 #: src/generic/util/parsers.h:1026
 #, fuzzy
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected an integer following '-', got EOF."
 msgstr "Era de așteptat ',' sau '(' după „||”, s-a primit „%s”"
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "Se aștepta un identificator de politică, s-a primit „%c”"
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "Operațiune necorespunzătoare %s"
 
 #: src/generic/util/parsers.h:1077
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected EOF, got '%c'."
 msgstr "Se aștepta „%c”, s-a primit „%c”."
 
@@ -3467,19 +3403,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "Caracter neașteptat „)”"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr "sau"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "Caracter neașteptat „)”"
 
@@ -3490,7 +3423,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "Nu se poate crea directorul temporar din șablonul „%s”: %s"
 
@@ -3525,7 +3457,6 @@
 
 #: src/gtk/aptitude.glade:19 src/gtk/aptitude.glade:2273
 #, fuzzy
-#| msgid "False"
 msgid "_File"
 msgstr "Fals"
 
@@ -3591,13 +3522,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "Pachet"
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "Vizualizări"
 
@@ -3617,7 +3546,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "Ajutor"
 
@@ -3628,7 +3556,6 @@
 
 #: src/gtk/aptitude.glade:345 src/gtk/aptitude.glade:2614
 #, fuzzy
-#| msgid "List Update"
 msgid "Update"
 msgstr "Actualizează Listă"
 
@@ -3650,7 +3577,6 @@
 
 #: src/gtk/aptitude.glade:389 src/gtk/aptitude.glade:2658
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Remove"
 msgstr "Instalat"
 
@@ -3664,33 +3590,28 @@
 
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "Șterge filtrul listei de pachete"
 
 #: src/gtk/aptitude.glade:649
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "Apply these settings to all active package lists."
 msgstr "Aplică un filtru listei de pachete"
 
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "Căutare"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "reinstalează"
 
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "Er "
 
@@ -3705,19 +3626,16 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "Dependențele %s"
 
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "^Changelog"
 msgid "Changelog"
 msgstr "Jurnal de modifi^cări"
 
 #: src/gtk/aptitude.glade:1020
 #, fuzzy
-#| msgid "False"
 msgid "Files"
 msgstr "Fals"
 
@@ -3731,7 +3649,6 @@
 
 #: src/gtk/aptitude.glade:1051
 #, fuzzy
-#| msgid "Tags"
 msgid "tags"
 msgstr "Etichete"
 
@@ -3754,13 +3671,11 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "Stare"
 
 #: src/gtk/aptitude.glade:1247
 #, fuzzy
-#| msgid "Unknown action type: %s"
 msgid "Group by action type"
 msgstr "Tip de acțiune necunoscut: %s"
 
@@ -3789,13 +3704,11 @@
 
 #: src/gtk/aptitude.glade:1328
 #, fuzzy
-#| msgid "Toggle ^Rejected"
 msgid "Rejected"
 msgstr "Comută „acțiune ^respinsă”"
 
 #: src/gtk/aptitude.glade:1343
 #, fuzzy
-#| msgid "Preferences"
 msgid "No preference"
 msgstr "Preferințe"
 
@@ -3809,32 +3722,27 @@
 
 #: src/gtk/aptitude.glade:1400
 #, fuzzy
-#| msgid "^Examine Solution"
 msgid "Find a new solution"
 msgstr "^Examinează soluția"
 
 #: src/gtk/aptitude.glade:1404
 #, fuzzy
-#| msgid "Select the next solution to the dependency problems."
 msgid "Calculate the next solution that has not yet been generated."
 msgstr "Selectați următoarea soluție pentru problemele de dependențe."
 
 #: src/gtk/aptitude.glade:1419
 #, fuzzy
-#| msgid "Perform the actions contained in the currently selected solution."
 msgid ""
 "Perform the actions in the currently selected solution and close this tab."
 msgstr "Executarea acțiunilor conținute de soluția selectată."
 
 #: src/gtk/aptitude.glade:1576
 #, fuzzy
-#| msgid "Upgrade"
 msgid "Upgrade Summary"
 msgstr "Înnoire"
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "Pachetul sursă: "
 
@@ -3846,7 +3754,6 @@
 
 #: src/gtk/aptitude.glade:1652
 #, fuzzy
-#| msgid "Manual"
 msgid "Fix Manually"
 msgstr "Manual"
 
@@ -3894,31 +3801,26 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "Deteriorat"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "Nu se poate realiza corecția pentru pachetele indisponibile"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "^Caută"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for: "
 msgid "Search for packages."
 msgstr "Căutare pentru: "
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "Luat "
 
@@ -3952,19 +3854,16 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "URL de folosit la descărcarea jurnalelor de modificări"
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "Se cere instalarea lui %s versiunea %s (%s)"
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -3973,7 +3872,6 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr ""
@@ -3981,13 +3879,11 @@
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "Se descarcă jurnalul de modificări"
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "URL de folosit la descărcarea jurnalelor de modificări"
 
@@ -4001,7 +3897,6 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "URL de folosit la descărcarea jurnalelor de modificări"
 
@@ -4011,8 +3906,6 @@
 
 #: src/gtk/dashboardtab.cc:414
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] "%d înnoire"
@@ -4021,13 +3914,11 @@
 
 #: src/gtk/dashboardtab.cc:633
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No upgrades are available."
 msgstr "Neinstalat"
 
 #: src/gtk/dashboardtab.cc:645
 #, fuzzy
-#| msgid "Unable to locate package %s"
 msgid "Unable to calculate an upgrade."
 msgstr "Nu s-a putut localiza pachetul %s"
 
@@ -4064,25 +3955,21 @@
 
 #: src/gtk/dashboardtab.cc:708
 #, fuzzy, c-format
-#| msgid "Internal error: Default column string is unparsable"
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr "Eroare internă: Șirul implicit de coloană este neanalizabil"
 
 #: src/gtk/dependency_chains_tab.cc:78
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: start"
 msgstr "Manevrarea dependențelor"
 
 #: src/gtk/dependency_chains_tab.cc:82
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: end"
 msgstr "Manevrarea dependențelor"
 
 #: src/gtk/dependency_chains_tab.cc:86
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: results"
 msgstr "Manevrarea dependențelor"
 
@@ -4092,7 +3979,6 @@
 
 #: src/gtk/dependency_chains_tab.cc:282
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency chain found."
 msgstr "Manevrarea dependențelor"
 
@@ -4102,13 +3988,11 @@
 
 #: src/gtk/download.cc:185
 #, fuzzy
-#| msgid "False"
 msgid "Failed"
 msgstr "Fals"
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "Se șterg fișierele descărcate"
 
@@ -4119,13 +4003,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "Progresul total: "
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description"
 msgid "Short Description"
 msgstr "Descriere"
 
@@ -4135,13 +4017,11 @@
 
 #: src/gtk/download.cc:319
 #, fuzzy
-#| msgid "Cleaning while a download is in progress is not allowed"
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr "Curățarea în timp ce descărcarea este în desfășurare nu este permisă"
 
 #: src/gtk/download.cc:395 src/gtk/gui.cc:832
 #, fuzzy
-#| msgid "View next display"
 msgid "View Details"
 msgstr "Arată următorul afișaj"
 
@@ -4161,19 +4041,16 @@
 
 #: src/gtk/download.cc:486
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s: %lu/%lu, stalled"
 msgstr "%s; va fi instalat"
 
 #: src/gtk/download.cc:507
 #, fuzzy, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr " [ %i%% ] (%sB/s, au mai rămas %s)"
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "dar %s e pe cale să fie instalat."
 
@@ -4187,7 +4064,6 @@
 
 #: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "Nu s-a putut localiza pachetul %s"
 
@@ -4198,7 +4074,6 @@
 
 #: src/gtk/dpkg_terminal.cc:429
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "%s: Unable to accept a connection: %s"
 msgstr "Nu se poate crea directorul temporar din șablonul „%s”: %s"
 
@@ -4224,80 +4099,67 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "%s versiuni"
 
 #: src/gtk/entitysummary.cc:123
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Install %s version %s"
 msgstr "Instalare(%s furnizează %s)"
 
 #: src/gtk/entitysummary.cc:131
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrade to %s version %s"
 msgstr "  cwidget, versiunea: %s\n"
 
 #: src/gtk/entitysummary.cc:142
 #, fuzzy, c-format
-#| msgid "Keep the following packages at their current version:"
 msgid "Don't hold %s at its current version."
 msgstr "Se păstrează următoarele pachete la versiunea lor curentă:"
 
 #: src/gtk/entitysummary.cc:145 src/gtk/entitysummary.cc:165
 #: src/gtk/entitysummary.cc:168
 #, fuzzy, c-format
-#| msgid "Canc^el pending actions"
 msgid "Cancel any actions on %s."
 msgstr "A^nularea acțiunilor în desfășurare"
 
 #: src/gtk/entitysummary.cc:150
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the purge of %s."
 msgstr "Se anulează ștergerea lui %F"
 
 #: src/gtk/entitysummary.cc:152
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s."
 msgstr "Se anulează ștergerea lui %F"
 
 #: src/gtk/entitysummary.cc:157
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the upgrade of %s."
 msgstr "Se anulează ștergerea lui %F"
 
 #: src/gtk/entitysummary.cc:159
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s."
 msgstr "Se anulează instalarea lui %F"
 
 #: src/gtk/entitysummary.cc:161
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the downgrade of %s."
 msgstr "Se anulează ștergerea lui %F"
 
 #: src/gtk/entitysummary.cc:163
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the reinstallation of %s."
 msgstr "Se anulează instalarea lui %F"
 
 #: src/gtk/entitysummary.cc:206
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "Remove %s"
 msgstr "Ștergere(%s)"
 
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "^Curăță"
 
@@ -4308,19 +4170,16 @@
 
 #: src/gtk/entitysummary.cc:223
 #, fuzzy, c-format
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Mark %s as automatically installed."
 msgstr "'&M' pentru a marca pachetele ca fiind automat instalate"
 
 #: src/gtk/entitysummary.cc:228
 #, fuzzy, c-format
-#| msgid "The package \"%s\" is manually installed.\n"
 msgid "Mark %s as manually installed."
 msgstr "Pachetul „%s” este instalat manual.\n"
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
 msgid "%s is a virtual package provided by:\n"
 msgstr "„%s” este un pachet virtual furnizat de:\n"
 
@@ -4330,13 +4189,11 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "Pachetul sursă: "
 
 #: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 #, fuzzy
-#| msgid "ProgName"
 msgid "Name"
 msgstr "NumeProg"
 
@@ -4346,13 +4203,11 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "Nu s-a putut deschide fișierul „%s”"
 
 #: src/gtk/entityview.cc:412
 #, fuzzy, c-format
-#| msgid "Rejecting the removal of %s"
 msgid "Editing the columns of \"%s\""
 msgstr "Se respinge ștergerea lui %s"
 
@@ -4366,25 +4221,21 @@
 
 #: src/gtk/entityview.cc:570
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Whether the package is automatically installed."
 msgstr "'&M' pentru a marca pachetele ca fiind automat instalate"
 
 #: src/gtk/entityview.cc:576
 #, fuzzy
-#| msgid "Cancel any action on the selected package"
 msgid "The name and description of the package."
 msgstr "Anulează orice acțiune pentru pachetul selectat"
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "Versiune: "
 
 #: src/gtk/entityview.cc:592
 #, fuzzy
-#| msgid "Check for new versions of packages"
 msgid "The version number of the package."
 msgstr "Verifică existența a noi versiuni de pachete"
 
@@ -4405,7 +4256,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "neinstalat"
 
@@ -4415,37 +4265,31 @@
 
 #: src/gtk/gui.cc:82
 #, fuzzy
-#| msgid "unpacked"
 msgid "Unpacked"
 msgstr "nedespachetat"
 
 #: src/gtk/gui.cc:83
 #, fuzzy
-#| msgid "half-config"
 msgid "Half-configured"
 msgstr "semi-config"
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "half-install"
 msgid "Half-installed"
 msgstr "semi-instal"
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "neinstalat (fișierele de configurare rămân)"
 
 #: src/gtk/gui.cc:86
 #, fuzzy
-#| msgid "triggers-awaited"
 msgid "Triggers awaited"
 msgstr "declanșatori-așteptați"
 
 #: src/gtk/gui.cc:87
 #, fuzzy
-#| msgid "triggers-pending"
 msgid "Triggers pending"
 msgstr "declanșatori-suspendați"
 
@@ -4471,13 +4315,11 @@
 
 #: src/gtk/gui.cc:97
 #, fuzzy
-#| msgid "forbidden upgrade"
 msgid "Hold (don't upgrade)"
 msgstr "înnoire interzisă"
 
 #: src/gtk/gui.cc:99
 #, fuzzy
-#| msgid "Related Dependencies"
 msgid "Unsatisfied dependencies"
 msgstr "Dependențe conexe"
 
@@ -4491,7 +4333,6 @@
 
 #: src/gtk/gui.cc:290
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "Aplică un filtru listei de pachete"
 
@@ -4506,13 +4347,11 @@
 
 #: src/gtk/gui.cc:359
 #, fuzzy, c-format
-#| msgid "List Update"
 msgid "Update %s?"
 msgstr "Actualizează Listă"
 
 #: src/gtk/gui.cc:385
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
@@ -4540,31 +4379,26 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "%s changes"
 msgid "Done applying changes!"
 msgstr "%s schimbări"
 
 #: src/gtk/gui.cc:823
 #, fuzzy
-#| msgid "%s changes"
 msgid "Applying changes..."
 msgstr "%s schimbări"
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "s: %F"
 msgid "%s: %s"
 msgstr "s: %F"
 
 #: src/gtk/gui.cc:878
 #, fuzzy, c-format
-#| msgid "No broken packages."
 msgid "Error in package %s"
 msgstr "Nici un pachet deteriorat."
 
 #: src/gtk/gui.cc:906
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Nu se poate înlocui %s cu noul fișier de configurare"
 
@@ -4574,25 +4408,21 @@
 
 #: src/gtk/gui.cc:1038
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "Nici un pachet deteriorat."
 
 #: src/gtk/gui.cc:1071
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "Nici un pachet deteriorat."
 
 #: src/gtk/gui.cc:1075
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "Rezolvă Dependențe"
 
 #: src/gtk/gui.cc:1103
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Nici un pachet nu este deteriorat."
@@ -4601,13 +4431,11 @@
 
 #: src/gtk/gui.cc:1147
 #, fuzzy
-#| msgid "%s changes"
 msgid "View changes"
 msgstr "%s schimbări"
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "%s changes"
 msgid "Apply changes"
 msgstr "%s schimbări"
 
@@ -4616,8 +4444,6 @@
 #. font.
 #: src/gtk/gui.cc:1192
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%d package to install"
 msgid_plural "%d packages to install"
 msgstr[0] "%d instalare"
@@ -4629,7 +4455,6 @@
 #. font.
 #: src/gtk/gui.cc:1207
 #, fuzzy, c-format
-#| msgid "failed to remove %s"
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "eșec la ștergerea lui %s"
@@ -4638,7 +4463,6 @@
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "DimensDesc"
 
@@ -4653,19 +4477,16 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "not installed"
 msgid "Not implemented"
 msgstr "neinstalat"
 
 #: src/gtk/gui.cc:1408 src/gtk/gui.cc:1427
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "Instalat"
 
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "^Curăță"
 
@@ -4683,7 +4504,6 @@
 
 #: src/gtk/gui.cc:1455
 #, fuzzy
-#| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "Manual de Utilizare"
 
@@ -4698,7 +4518,6 @@
 
 #: src/gtk/info.cc:161 src/gtk/pkgview.cc:169
 #, fuzzy
-#| msgid "Current status: %F."
 msgid "Current status"
 msgstr "Starea curentă: %F."
 
@@ -4708,19 +4527,16 @@
 
 #: src/gtk/info.cc:496
 #, fuzzy
-#| msgid "Not Installed"
 msgid "Not available"
 msgstr "Neinstalat"
 
 #: src/gtk/info.cc:545
 #, fuzzy
-#| msgid "C^ycle Package Information"
 msgid "Package information: version list"
 msgstr "C^omută informațiile despre pachet"
 
 #: src/gtk/info.cc:555
 #, fuzzy
-#| msgid "Packages which depend on %s"
 msgid "Package information: dependency list"
 msgstr "Pachete ce depind de %s"
 
@@ -4730,7 +4546,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "nu"
 
@@ -4744,7 +4559,6 @@
 
 #: src/gtk/packagestab.cc:203
 #, fuzzy, c-format
-#| msgid "No packages matched the pattern \"%ls\"."
 msgid "No packages matched \"%s\"."
 msgstr "Nici un pachet nu îndeplinește modelul \"%ls\"."
 
@@ -4754,31 +4568,26 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "Pachet: "
 
 #: src/gtk/pkgview.cc:224
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed automatically."
 msgstr "%s; va fi instalată automat"
 
 #: src/gtk/pkgview.cc:227
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed automatically."
 msgstr "%s; va fi instalată automat"
 
 #: src/gtk/pkgview.cc:235
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed manually."
 msgstr "%s; va fi instalată automat"
 
 #: src/gtk/pkgview.cc:238
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed manually."
 msgstr "%s; va fi instalată automat"
 
@@ -4788,13 +4597,11 @@
 
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "Căutare"
 
 #: src/gtk/pkgview.cc:718
 #, fuzzy
-#| msgid "Building view"
 msgid "Finalizing view"
 msgstr "Se construiește vizualizarea"
 
@@ -4927,13 +4734,11 @@
 
 #: src/gtk/previewtab.cc:179
 #, fuzzy
-#| msgid "Preview"
 msgid "Preview: "
 msgstr "Previzualizare"
 
 #: src/gtk/resolver.cc:68
 #, fuzzy, c-format
-#| msgid "Error while dumping resolver state"
 msgid "Error in dependency resolver: %s"
 msgstr "Eroare în timpul scrierii stării rezolvatorului"
 
@@ -4948,7 +4753,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package"
 msgid "Virtual package"
 msgstr "Pachet"
 
@@ -4958,43 +4762,36 @@
 
 #: src/gtk/resolver.cc:377
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Removing %s is rejected."
 msgstr "Se șterge %s"
 
 #: src/gtk/resolver.cc:382
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Canceling the installation of %s is rejected."
 msgstr "Se anulează instalarea lui %F"
 
 #: src/gtk/resolver.cc:391
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Canceling the removal of %s is rejected."
 msgstr "Se anulează ștergerea lui %F"
 
 #: src/gtk/resolver.cc:394
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keeping %s at version %s is rejected."
 msgstr "Se păstrează %F la versiunea %s (%s)"
 
 #: src/gtk/resolver.cc:401
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Installing %s version %s is rejected."
 msgstr "Instalare(%s furnizează %s)"
 
 #: src/gtk/resolver.cc:407
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrading %s to version %s is rejected."
 msgstr "  cwidget, versiunea: %s\n"
 
 #: src/gtk/resolver.cc:413
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrading %s to version %s is rejected."
 msgstr "%s versiuni"
 
@@ -5036,7 +4833,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr "%s versiuni"
@@ -5138,7 +4934,6 @@
 
 #: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862
 #, fuzzy
-#| msgid "Remove the following packages:"
 msgid "Keep the following packages:"
 msgstr "Se șterg următoarele pachete:"
 
@@ -5154,121 +4949,101 @@
 
 #: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900
 #, fuzzy
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "Leave the following dependencies unresolved:"
 msgstr "Se lasă următoarele dependențe nesatisfăcute: %n"
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Remove %F [%s (%s)]"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "Se șterge %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1523
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "Se instalează %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1531
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s"
 msgstr "Se anulează instalarea lui %F"
 
 #: src/gtk/resolver.cc:1534
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s"
 msgstr "Se anulează ștergerea lui %F"
 
 #: src/gtk/resolver.cc:1537
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "Se păstrează %F la versiunea %s (%s)"
 
 #: src/gtk/resolver.cc:1544
 #, fuzzy, c-format
-#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Se înnoiește %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1553
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Se retrogradează %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>Remove</b> %s"
 msgstr "Ștergere(%s)"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>remove</b> %s"
 msgstr "Ștergere(%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "Se păstrează %F la versiunea %s (%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>keep</b> %s at version %s"
 msgstr "Se păstrează %F la versiunea %s (%s)"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr "Se anulează instalarea lui %F"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>cancel</b> the installation of %s"
 msgstr "Se anulează instalarea lui %F"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>Install</b> %s %s"
 msgstr "Se instalează %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>install</b> %s %s"
 msgstr "Se instalează %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>Downgrade</b> %s to version %s"
 msgstr "  cwidget, versiunea: %s\n"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>downgrade</b> %s to version %s"
 msgstr "  cwidget, versiunea: %s\n"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>Upgrade</b> %s to version %s"
 msgstr "%s versiuni"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>upgrade</b> %s to version %s"
 msgstr "%s versiuni"
 
@@ -5284,8 +5059,6 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "%d instalare"
@@ -5294,8 +5067,6 @@
 
 #: src/gtk/resolver.cc:1740
 #, fuzzy, c-format
-#| msgid "%d removal"
-#| msgid_plural "%d removals"
 msgid "%s remove"
 msgid_plural "%s removes"
 msgstr[0] "%d ștergere"
@@ -5304,8 +5075,6 @@
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "%d keep"
-#| msgid_plural "%d keeps"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "%d păstrare"
@@ -5314,8 +5083,6 @@
 
 #: src/gtk/resolver.cc:1752
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%s upgrade"
 msgid_plural "%s upgrades"
 msgstr[0] "%d înnoire"
@@ -5324,8 +5091,6 @@
 
 #: src/gtk/resolver.cc:1758
 #, fuzzy, c-format
-#| msgid "%d downgrade"
-#| msgid_plural "%d downgrades"
 msgid "%s downgrade"
 msgid_plural "%s downgrades"
 msgstr[0] "%d retrogradare"
@@ -5334,7 +5099,6 @@
 
 #: src/gtk/resolver.cc:1764
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "%s unresolved recommendation"
 msgid_plural "%s unresolved recommendations"
 msgstr[0] "^Revizuiește recomandările"
@@ -5343,19 +5107,16 @@
 
 #: src/gtk/resolver.cc:2056
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions yet."
 msgstr "Nu mai sunt soluții."
 
 #: src/gtk/resolver.cc:2063
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency solution was found."
 msgstr "Manevrarea dependențelor"
 
 #: src/gtk/resolver.cc:2064
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions."
 msgstr "Nu mai sunt soluții."
 
@@ -5365,19 +5126,16 @@
 
 #: src/gtk/resolver.cc:2076
 #, fuzzy, c-format
-#| msgid "No more solutions."
 msgid "%u solutions."
 msgstr "Nu mai sunt soluții."
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "Nu s-a putut deschide fișierul „%s”"
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr "[Descărcat]"
 
@@ -5428,7 +5186,6 @@
 
 #: src/load_grouppolicy.cc:305
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected ',', '%c', or '('; got '%c'"
 msgstr "Se aștepta „,” sau „(”, s-a primit „%c”"
 
@@ -5536,7 +5293,6 @@
 
 #: src/load_grouppolicy.cc:713
 #, fuzzy, c-format
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected '{', ')', or ',' following '||', got '%s'"
 msgstr "Era de așteptat ',' sau '(' după „||”, s-a primit „%s”"
 
@@ -5661,19 +5417,16 @@
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt, versiunea %d.%d.%d\n"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt, versiunea %d.%d.%d\n"
 
 #: src/main.cc:164
 #, fuzzy, c-format
-#| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Suportul pentru ept este dezactivat.\n"
 
@@ -5722,44 +5475,36 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Instalează/înnoiește pachetele\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Șterge pachetele\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Curăță pachetele și fișierele lor de configurare\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Pune pachetele în starea „păstrează”\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Anulează comanda de păstrare pentru un pachet\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Marchează pachetele ca fiind automat instalate\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Marchează pachetele ca fiind instalate manual\n"
 
@@ -5774,21 +5519,16 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Descarcă listele de pachete noi/posibil de înnoit\n"
 
 #: src/main.cc:190
 #, fuzzy, c-format
-#| msgid " safe-upgrade - Perform a safe upgrade\n"
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Execută o înnoire sigură\n"
 
 #: src/main.cc:191
 #, fuzzy, c-format
-#| msgid ""
-#| " full-upgrade - Perform an upgrade, possibly installing and removing "
-#| "packages\n"
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
@@ -5797,57 +5537,46 @@
 
 #: src/main.cc:192
 #, fuzzy, c-format
-#| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "'&BD' pentru instalarea dependențelor de compilare ale unui pachet."
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Uită de pachetele ce sunt \"noi\"\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Caută un pachet după nume și/sau expresie\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Afișează informații detaliate despre un pachet\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Șterge fișierele pachetelor descărcate\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Șterge vechile fișiere ale pachetelor descărcate\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Afișează jurnalul de modificări al unui pachet\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Descarcă fișierul .deb pentru un pachet\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5867,12 +5596,6 @@
 
 #: src/main.cc:203
 #, fuzzy, c-format
-#| msgid ""
-#| " why-not      - Show the manually installed packages that lead to a "
-#| "conflict\n"
-#| "                with the given package, or why one or more packages "
-#| "would\n"
-#| "                lead to a conflict with the given package if installed\n"
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
 "conflict\n"
@@ -5890,7 +5613,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             Acest text de ajutor\n"
 
@@ -5919,15 +5641,11 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             Întodeauna cere confirmare pentru acțiuni\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
@@ -5936,9 +5654,6 @@
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5948,9 +5663,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5960,8 +5672,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 ""
@@ -5992,9 +5702,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -6004,8 +5711,6 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
@@ -6013,9 +5718,6 @@
 
 #: src/main.cc:226
 #, fuzzy, c-format
-#| msgid ""
-#| " -q             In command-line mode, suppress the incremental progress\n"
-#| "                indicators.\n"
 msgid ""
 " -q             In command-line mode, suppress the incremental progress.\n"
 "                indicators.\n"
@@ -6025,16 +5727,12 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o key=val     Ajustează direct opțiunea de configurare numită 'key'\n"
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -6074,7 +5772,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "true"
 msgid "trace"
 msgstr "adevărat"
 
@@ -6088,7 +5785,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "nu"
 
@@ -6102,7 +5798,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:377
 #, fuzzy
-#| msgid "Err "
 msgid "error"
 msgstr "Er "
 
@@ -6110,7 +5805,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:380
 #, fuzzy
-#| msgid "false"
 msgid "fatal"
 msgstr "fals"
 
@@ -6131,7 +5825,6 @@
 
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "Operațiune necorespunzătoare %s"
 
@@ -6184,7 +5877,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "Pachet"
 
@@ -6194,7 +5886,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "Toate pachetele"
 
@@ -6214,7 +5905,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -6222,8 +5912,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -6232,7 +5920,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "-u și -i nu pot fi folosiți cu o comandă"
 
@@ -7479,7 +7166,6 @@
 
 #: src/ui.cc:472
 #, fuzzy, c-format
-#| msgid "Unable to open %ls"
 msgid "Unable to fork: %s"
 msgstr "Nu se poate deschide %ls"
 
@@ -7765,9 +7451,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7791,9 +7474,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -8327,19 +8007,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "URL de folosit la descărcarea jurnalelor de modificări"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "URL de folosit la descărcarea jurnalelor de modificări"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "Se descarcă jurnalul de modificări"
 
Index: aptitude/po/ru.po
===================================================================
--- aptitude.orig/po/ru.po
+++ aptitude/po/ru.po
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.4.11.3-1\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2009-09-23 12:30+0200\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -871,7 +871,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "ChangeLog для %s"
 
@@ -1446,7 +1445,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "Whether the package is automatically installed."
 msgid "'a': the package was automatically installed or removed."
 msgstr "Установлен ли пакет автоматически."
 
@@ -1579,9 +1577,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy, c-format
-#| msgid ""
-#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: "
-#| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
@@ -1628,10 +1623,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:259
 #, fuzzy
-#| msgid ""
-#| "reject the given package versions; don't display any solutions in which "
-#| "they occur.  Enter UNINST instead of a version to reject removing the "
-#| "package."
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package.  "
@@ -1642,9 +1633,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:261
 #, fuzzy
-#| msgid ""
-#| "accept the given package versions; display only solutions in which they "
-#| "occur.  Enter UNINST instead of a version to accept removing the package."
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package.  "
@@ -1748,31 +1736,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "Оставить следующие зависимости неразрешёнными:"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "^Проверка рекомендаций"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "Удаление %s больше не требуется"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "^Проверка рекомендаций"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Действия"
 
@@ -1930,13 +1913,11 @@
 
 #: src/cmdline/cmdline_resolver.cc:1201
 #, fuzzy
-#| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr "Не удалось разрешить зависимости для обновления (решение не найдено)."
 
 #: src/cmdline/cmdline_resolver.cc:1207
 #, fuzzy, c-format
-#| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Не удалось разрешить зависимости для обновления (%s)."
 
@@ -2346,19 +2327,16 @@
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Исходный пакет: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Архив"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\".\n"
 msgid "No such package \"%s\"."
 msgstr "Пакет не найден \"%s\".\n"
 
@@ -2397,7 +2375,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "поиск: вы должны ввести хотя бы одно слово\n"
 
@@ -2554,7 +2531,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[ОШИБКА]"
 
@@ -2809,7 +2785,6 @@
 
 #: src/generic/apt/aptitude_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Invalid hint \"%s\": expected a tier number, but found nothing."
 msgid ""
 "Invalid hint \"%s\": expected a component name and a number, but found "
 "nothing."
@@ -2818,7 +2793,6 @@
 
 #: src/generic/apt/aptitude_resolver.cc:521
 #, fuzzy, c-format
-#| msgid "Invalid hint \"%s\": expected a tier number, but found nothing."
 msgid ""
 "Invalid hint \"%s\": expected the numeric value following the component "
 "name, but found nothing."
@@ -2832,7 +2806,6 @@
 
 #: src/generic/apt/aptitude_resolver.cc:552
 #, fuzzy, c-format
-#| msgid "Invalid hint \"%s\": expected a target, but found nothing."
 msgid "Invalid hint \"%s\": expected a level, but found nothing."
 msgstr "Неверная подсказка \"%s\": ожидалась цель, но ничего не найдено."
 
@@ -2867,8 +2840,6 @@
 
 #: src/generic/apt/aptitude_resolver_universe.cc:828
 #, fuzzy, c-format
-#| msgid ""
-#| "Invalid search tier \"%s\" (not \"conflict\", \"minimum\", or an integer)."
 msgid ""
 "Invalid safety level \"%s\" (not \"discard\", \"maximum\", \"minimum\", or "
 "an integer)."
@@ -3118,7 +3089,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "Скачиваются пакеты"
 
@@ -3230,19 +3200,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "Failed to download the changelog: %s"
 msgid "Failed to download changelogs: %s"
 msgstr "Не удалось скачать список изменений: %s"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "Failed to download the changelog: %s"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "Не удалось скачать список изменений: %s"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "ChangeLog для %s"
 
@@ -3290,7 +3257,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Не удалось проанализировать шаблон %s"
 
@@ -3305,14 +3271,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "No upgrades are available."
 msgid "No tag descriptions are available."
 msgstr "Нет доступных обновлений."
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "No upgrades are available."
 msgid "No description available for %s."
 msgstr "Нет доступных обновлений."
 
@@ -3339,67 +3303,56 @@
 
 #: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got EOF."
 msgstr "Ожидался '%c', получен '%c'."
 
 #: src/generic/util/parsers.h:737
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got '%s'."
 msgstr "Ожидался '%c', получен '%c'."
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "Ожидается число после -q=, получен %s\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "Неверный символ '%c' для выбора действия\n"
 
 #: src/generic/util/parsers.h:832
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got EOF."
 msgstr "Ожидался '%c', получен '%c'."
 
 #: src/generic/util/parsers.h:843
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got '%c'."
 msgstr "Ожидался '%c', получен '%c'."
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "Ожидался идентификатор правила, получен '%c'"
 
 #: src/generic/util/parsers.h:1026
 #, fuzzy
-#| msgid "Expected '{', ')', or ',' following '||', got '%s'"
 msgid "Expected an integer following '-', got EOF."
 msgstr "Ожидался символ '{', ')', или ',' после '||', получен '%s'"
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "Ожидался идентификатор правила, получен '%c'"
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid logger name \"%s\"."
 msgid "Invalid integer: \"%s\"."
 msgstr "Неверное имя команды ведения протокола \"%s\"."
 
 #: src/generic/util/parsers.h:1077
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected EOF, got '%c'."
 msgstr "Ожидался '%c', получен '%c'."
 
@@ -3413,19 +3366,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "Неожиданное ')'"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " или"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "Неожиданное ')'"
 
@@ -3436,7 +3386,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "Не удалось создать временный каталог из шаблона \"%s\": %s"
 
@@ -3806,19 +3755,16 @@
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "Не удалось скорректировать недоступность пакетов"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "^Поиск"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for: "
 msgid "Search for packages."
 msgstr "Поиск: "
 
@@ -3865,7 +3811,6 @@
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "Требуется установка %s версии %s (%s)"
 
@@ -3888,13 +3833,11 @@
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading changelog; please wait..."
 msgid "Downloading the changelog of %s version %s..."
 msgstr "Скачивается список изменений, подождите..."
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "Preparing to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "Подготовка к получению файлов списков изменений"
 
@@ -4821,8 +4764,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid ""
-#| "Upgrading %s to version %s is preferred over all un-accpted alternatives."
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr ""
@@ -5124,7 +5065,6 @@
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Solution %s of %s (tier %s)."
 msgid "Solution %s of %s."
 msgstr "Решение %s из %s (уровень %s)."
 
@@ -5403,19 +5343,16 @@
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt версии %d.%d.%d\n"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt версии %d.%d.%d\n"
 
 #: src/main.cc:164
 #, fuzzy, c-format
-#| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Поддержка ept выключена.\n"
 
@@ -5463,44 +5400,36 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Установить/обновить пакеты\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Удалить пакеты\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Удалить пакеты и их файлы настройки\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Зафиксировать пакеты\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Отменить команду hold для пакета\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Пометить пакет, что он был установлен автоматически\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Пометить пакет, что он был установлен вручную\n"
 
@@ -5514,21 +5443,16 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Скачать список новых/обновлённых пакетов\n"
 
 #: src/main.cc:190
 #, fuzzy, c-format
-#| msgid " safe-upgrade - Perform a safe upgrade\n"
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Выполнить безопасное обновление\n"
 
 #: src/main.cc:191
 #, fuzzy, c-format
-#| msgid ""
-#| " full-upgrade - Perform an upgrade, possibly installing and removing "
-#| "packages\n"
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
@@ -5537,57 +5461,46 @@
 
 #: src/main.cc:192
 #, fuzzy, c-format
-#| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "'&BD' установить сборочные зависимости пакета."
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Забыть, какие пакеты \"новые\"\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Поиск пакета по имени и/или выражению\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Показать подробную информацию о пакете\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Удалить загруженные файлы пакетов\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Удалить старые загруженные файлы пакетов\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Посмотреть список изменений пакета\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Скачать файл .deb для пакета\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5608,12 +5521,6 @@
 
 #: src/main.cc:203
 #, fuzzy, c-format
-#| msgid ""
-#| " why-not      - Show the manually installed packages that lead to a "
-#| "conflict\n"
-#| "                with the given package, or why one or more packages "
-#| "would\n"
-#| "                lead to a conflict with the given package if installed\n"
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
 "conflict\n"
@@ -5632,7 +5539,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             Эта справка\n"
 
@@ -5664,24 +5570,17 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             Всегда спрашивать подтверждение или действия\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr " -y             Предполагать ответ 'да' на простой вопрос да/нет\n"
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5691,9 +5590,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5703,8 +5599,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 width       Задать ширину вывода результатов поиска\n"
@@ -5734,9 +5628,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5746,8 +5637,6 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
@@ -5755,9 +5644,6 @@
 
 #: src/main.cc:226
 #, fuzzy, c-format
-#| msgid ""
-#| " -q             In command-line mode, suppress the incremental progress\n"
-#| "                indicators.\n"
 msgid ""
 " -q             In command-line mode, suppress the incremental progress.\n"
 "                indicators.\n"
@@ -5767,7 +5653,6 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o key=val     Вручную установить значение параметра настройки с именем "
@@ -5775,9 +5660,6 @@
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -8021,19 +7903,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "Preparing to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "Подготовка к получению файлов списков изменений"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "Failed to download the changelog: %s"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "Не удалось скачать список изменений: %s"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading changelogs"
 msgid "Downloading the changelog of %s"
 msgstr "Скачиваются файлы списков изменений"
 
Index: aptitude/po/sk.po
===================================================================
--- aptitude.orig/po/sk.po
+++ aptitude/po/sk.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2009-07-21 13:49+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -750,13 +750,11 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s nie je nainštalovaný, preto sa nepreinštaluje.\n"
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "%s je už inštalovaný v požadovanej verzii (%s)\n"
@@ -858,7 +856,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "Súbor zmien %s"
 
@@ -1428,7 +1425,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "Whether the package is automatically installed."
 msgid "'a': the package was automatically installed or removed."
 msgstr "Či sa má balík nainštalovať automaticky."
 
@@ -1561,9 +1557,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy, c-format
-#| msgid ""
-#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: "
-#| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
@@ -1608,10 +1601,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:259
 #, fuzzy
-#| msgid ""
-#| "reject the given package versions; don't display any solutions in which "
-#| "they occur.  Enter UNINST instead of a version to reject removing the "
-#| "package."
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package.  "
@@ -1622,9 +1611,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:261
 #, fuzzy
-#| msgid ""
-#| "accept the given package versions; display only solutions in which they "
-#| "occur.  Enter UNINST instead of a version to accept removing the package."
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package.  "
@@ -1727,31 +1713,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "Ponechať nasledujúce návrhy nevyriešené:"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "Audit ^Odporúčaní"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "Už sa nepožaduje odstránenie %s"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "Audit ^Odporúčaní"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Operácie"
 
@@ -1906,13 +1887,11 @@
 
 #: src/cmdline/cmdline_resolver.cc:1201
 #, fuzzy
-#| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr "Nedajú sa vyriešiť závislosti aktualizácie (nebolo nájdené riešenie)."
 
 #: src/cmdline/cmdline_resolver.cc:1207
 #, fuzzy, c-format
-#| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Nedajú sa vyriešiť závislosti aktualizácie (%s)."
 
@@ -2317,25 +2296,21 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages:"
 msgid "Package %s:"
 msgstr "Balíky:"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Zdrojový balík: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Archív"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\".\n"
 msgid "No such package \"%s\"."
 msgstr "Neexistuje balík „%s“.\n"
 
@@ -2374,7 +2349,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "search: Musíte zadať aspoň jeden hľadaný výraz\n"
 
@@ -2531,7 +2505,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[CHYBA]"
 
@@ -2781,7 +2754,6 @@
 
 #: src/generic/apt/aptitude_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Invalid hint \"%s\": expected a tier number, but found nothing."
 msgid ""
 "Invalid hint \"%s\": expected a component name and a number, but found "
 "nothing."
@@ -2789,7 +2761,6 @@
 
 #: src/generic/apt/aptitude_resolver.cc:521
 #, fuzzy, c-format
-#| msgid "Invalid hint \"%s\": expected a tier number, but found nothing."
 msgid ""
 "Invalid hint \"%s\": expected the numeric value following the component "
 "name, but found nothing."
@@ -2802,7 +2773,6 @@
 
 #: src/generic/apt/aptitude_resolver.cc:552
 #, fuzzy, c-format
-#| msgid "Invalid hint \"%s\": expected a target, but found nothing."
 msgid "Invalid hint \"%s\": expected a level, but found nothing."
 msgstr "Neplatná pomôcka „%s“: očakával sa cieľ, ale nič sa nenašlo."
 
@@ -2837,8 +2807,6 @@
 
 #: src/generic/apt/aptitude_resolver_universe.cc:828
 #, fuzzy, c-format
-#| msgid ""
-#| "Invalid search tier \"%s\" (not \"conflict\", \"minimum\", or an integer)."
 msgid ""
 "Invalid safety level \"%s\" (not \"discard\", \"maximum\", \"minimum\", or "
 "an integer)."
@@ -3090,7 +3058,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "Sťahujú sa balíky"
 
@@ -3205,19 +3172,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "Failed to download the changelog: %s"
 msgid "Failed to download changelogs: %s"
 msgstr "Nepodarilo sa stiahnuť záznam zmien: %s"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "Failed to download the changelog: %s"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "Nepodarilo sa stiahnuť záznam zmien: %s"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "Súbor zmien %s"
 
@@ -3265,7 +3229,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Nedá sa spracovať vzor %s"
 
@@ -3280,14 +3243,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "No upgrades are available."
 msgid "No tag descriptions are available."
 msgstr "Žiadne aktualizácie nie sú dostupné."
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "No upgrades are available."
 msgid "No description available for %s."
 msgstr "Žiadne aktualizácie nie sú dostupné."
 
@@ -3314,67 +3275,56 @@
 
 #: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got EOF."
 msgstr "Očakávala sa „%c“, zadané „%c“"
 
 #: src/generic/util/parsers.h:737
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got '%s'."
 msgstr "Očakávala sa „%c“, zadané „%c“"
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "Po -q= sa očakáva číslo, zadané bolo %s\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "Chybná operácia „%c“\n"
 
 #: src/generic/util/parsers.h:832
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got EOF."
 msgstr "Očakávala sa „%c“, zadané „%c“"
 
 #: src/generic/util/parsers.h:843
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got '%c'."
 msgstr "Očakávala sa „%c“, zadané „%c“"
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "Očakával sa identifikátor pravidla,  zadané „%c“"
 
 #: src/generic/util/parsers.h:1026
 #, fuzzy
-#| msgid "Expected '{', ')', or ',' following '||', got '%s'"
 msgid "Expected an integer following '-', got EOF."
 msgstr "Očakávalo sa „{“, „)“ alebo „,“ po „||“, zadané „%s“"
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "Očakával sa identifikátor pravidla,  zadané „%c“"
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid logger name \"%s\"."
 msgid "Invalid integer: \"%s\"."
 msgstr "Neplatný názov protokolu „%s“."
 
 #: src/generic/util/parsers.h:1077
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected EOF, got '%c'."
 msgstr "Očakávala sa „%c“, zadané „%c“"
 
@@ -3388,19 +3338,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "Neočakávaná „)“"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " alebo"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "Neočakávaná „)“"
 
@@ -3411,7 +3358,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "Zlyhalo vytvorenie dočasného adresára zo šablóny „%s“: %s"
 
@@ -3778,31 +3724,26 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "Porušené"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "Nedá sa opraviť kvôli nedostupným balíkom"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "Hľadať"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for: "
 msgid "Search for packages."
 msgstr "Hľadať: "
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "Máme "
 
@@ -3845,7 +3786,6 @@
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "Požaduje sa inštalácia %s verzie %s (%s)"
 
@@ -3868,13 +3808,11 @@
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading changelog; please wait..."
 msgid "Downloading the changelog of %s version %s..."
 msgstr "Sťahuje sa záznam zmien (changelog), čakajte prosím..."
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "Preparing to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "Pripravuje sa sťahovanie záznamov zmien"
 
@@ -4808,8 +4746,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid ""
-#| "Upgrading %s to version %s is preferred over all un-accpted alternatives."
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr ""
@@ -5116,7 +5052,6 @@
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Solution %s of %s (tier %s)."
 msgid "Solution %s of %s."
 msgstr "Riešenie %s z %s (váha %s)"
 
@@ -5392,19 +5327,16 @@
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  Verzia apt %d.%d.%d\n"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  Verzia apt %d.%d.%d\n"
 
 #: src/main.cc:164
 #, fuzzy, c-format
-#| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Podpora Ept vypnutá.\n"
 
@@ -5452,44 +5384,36 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Inštaluje/aktualizuje balíky\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Odstráni balíky\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Vyčistí balíky a ich konfiguračné súbory\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Ochráni balíky pred aktualizáciou\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Zruší ochranu balíka pred aktualizáciou\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Označí balíky, že boli inštalované automaticky\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Označí balíky, že boli inštalované manuálne\n"
 
@@ -5503,21 +5427,16 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Stiahne zoznamy nových/aktualizovateľných balíkov\n"
 
 #: src/main.cc:190
 #, fuzzy, c-format
-#| msgid " safe-upgrade - Perform a safe upgrade\n"
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Vykoná bezpečnú aktualizáciu\n"
 
 #: src/main.cc:191
 #, fuzzy, c-format
-#| msgid ""
-#| " full-upgrade - Perform an upgrade, possibly installing and removing "
-#| "packages\n"
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
@@ -5527,57 +5446,46 @@
 
 #: src/main.cc:192
 #, fuzzy, c-format
-#| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "„&BD“ nainštaluje závislosti pre zostavenie balíka."
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Zabudne, ktoré balíky sú „nové“\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Vyhľadá balíky podľa názvu a/alebo výrazu\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Zobrazí podrobné informácie o balíku\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Odstráni stiahnuté .deb súbory balíkov\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Odstráni staré stiahnuté .deb súbory balíkov\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Zobrazí zoznam zmien balíka\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Stiahne .deb súbor balíka\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5598,12 +5506,6 @@
 
 #: src/main.cc:203
 #, fuzzy, c-format
-#| msgid ""
-#| " why-not      - Show the manually installed packages that lead to a "
-#| "conflict\n"
-#| "                with the given package, or why one or more packages "
-#| "would\n"
-#| "                lead to a conflict with the given package if installed\n"
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
 "conflict\n"
@@ -5622,7 +5524,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             Tento pomocník\n"
 
@@ -5654,15 +5555,11 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             Vždy vyžadovať potvrdenie alebo operácie\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
@@ -5670,9 +5567,6 @@
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5681,9 +5575,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5692,8 +5583,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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       Udáva šírku zobrazenia výsledkov hľadania\n"
@@ -5721,9 +5610,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5732,8 +5618,6 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
@@ -5742,9 +5626,6 @@
 
 #: src/main.cc:226
 #, fuzzy, c-format
-#| msgid ""
-#| " -q             In command-line mode, suppress the incremental progress\n"
-#| "                indicators.\n"
 msgid ""
 " -q             In command-line mode, suppress the incremental progress.\n"
 "                indicators.\n"
@@ -5754,15 +5635,11 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o kľúč=hodn   Nastaví konfiguračnú voľbu nazvanú „kľúč“\n"
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -5931,7 +5808,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -5939,8 +5815,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -5948,7 +5822,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "-u a -i nemôžu byť použité spoločne s príkazom"
 
@@ -7448,9 +7321,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7472,9 +7342,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -8007,19 +7874,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "Preparing to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "Pripravuje sa sťahovanie záznamov zmien"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "Failed to download the changelog: %s"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "Nepodarilo sa stiahnuť záznam zmien: %s"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading changelogs"
 msgid "Downloading the changelog of %s"
 msgstr "Sťahujú sa záznamy zmien"
 
Index: aptitude/po/sv.po
===================================================================
--- aptitude.orig/po/sv.po
+++ aptitude/po/sv.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2009-02-03 15:46+0100\n"
 "Last-Translator: Martin Bagge <brother@bsnet.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -274,9 +274,6 @@
 
 #: src/apt_options.cc:241
 #, fuzzy
-#| msgid ""
-#| "If this option is enabled, the menu bar will only appear when it has been "
-#| "activated by pressing the menu key."
 msgid ""
 "If this option is enabled, then the first view displayed on startup will be "
 "a flat view instead of the default view."
@@ -705,7 +702,6 @@
 
 #: src/cmdline/cmdline_action.cc:212
 #, fuzzy, c-format
-#| msgid "Unable to satisfy the build-depends: %s."
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Beroenden för att köra byggnation av källan saknas: \"%s\"."
 
@@ -762,7 +758,6 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr ""
 "%s är för tillfället inte installerat så det kommer inte att installeras "
@@ -770,7 +765,6 @@
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "%s är redan installerat med den begärda versionen (%s)\n"
@@ -876,7 +870,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "Ändringslogg för %s"
 
@@ -1044,7 +1037,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "ingen"
 
@@ -1451,7 +1443,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "\"&M\" för att markera paket som automatiskt installerade"
 
@@ -1584,9 +1575,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy, c-format
-#| msgid ""
-#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: "
-#| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
@@ -1631,10 +1619,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:259
 #, fuzzy
-#| msgid ""
-#| "reject the given package versions; don't display any solutions in which "
-#| "they occur.  Enter UNINST instead of a version to reject removing the "
-#| "package."
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package.  "
@@ -1645,9 +1629,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:261
 #, fuzzy
-#| msgid ""
-#| "accept the given package versions; display only solutions in which they "
-#| "occur.  Enter UNINST instead of a version to accept removing the package."
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package.  "
@@ -1751,31 +1732,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "Lämna följande rekommendationer utan åtgärd:"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "Granska ^rekommendationer"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "Kräver inte längre borttagningen av %s"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "Granska ^rekommendationer"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Åtgärder"
 
@@ -1930,13 +1906,11 @@
 
 #: src/cmdline/cmdline_resolver.cc:1201
 #, fuzzy
-#| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr "Kunde inte lösa beroenden! Ger upp... (lösning saknas)"
 
 #: src/cmdline/cmdline_resolver.cc:1207
 #, fuzzy, c-format
-#| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Kunde inte lösa beroenden (%s)."
 
@@ -1967,13 +1941,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "men det är inte installerbart"
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "men %s kommer att installeras."
 
@@ -2072,13 +2044,11 @@
 
 #: src/cmdline/cmdline_show.cc:326
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s%s; will be installed"
 msgstr "%s; kommer att installeras"
 
 #: src/cmdline/cmdline_show.cc:328
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s%s; will be installed automatically"
 msgstr "%s; kommer att installeras automatiskt"
 
@@ -2342,25 +2312,21 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "Paket"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Källpaket: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Arkiv"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\".\n"
 msgid "No such package \"%s\"."
 msgstr "Inget sådant paket \"%s\".\n"
 
@@ -2399,7 +2365,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "sökning: Du måste ange åtminstone en sökterm\n"
 
@@ -2525,7 +2490,6 @@
 
 #: src/cmdline/cmdline_why.cc:1285
 #, fuzzy, c-format
-#| msgid "Packages depending on %s"
 msgid "Packages requiring %s:"
 msgstr "Paketen är beroende av %s"
 
@@ -2541,8 +2505,6 @@
 
 #: src/cmdline/cmdline_why.cc:1416
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: this command requires at least one argument (the package to query)."
 msgid ""
 "%s: this command requires at least one argument (the package to query).\n"
 msgstr ""
@@ -2562,7 +2524,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[FEL]"
 
@@ -2908,7 +2869,6 @@
 
 #: src/generic/apt/download_update_manager.cc:138
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated quoted string in command: %s"
 msgstr "Ej avslutande bokstavlig sträng efter %s"
 
@@ -2990,7 +2950,6 @@
 
 #: src/generic/apt/dump_packages.cc:674
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create truncated cache: %s."
 msgstr "Kunde inte hitta paketet %s"
 
@@ -3112,7 +3071,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "Hämtar paket"
 
@@ -3150,7 +3108,6 @@
 
 #: src/generic/apt/matching/parse.cc:860
 #, fuzzy, c-format
-#| msgid "Unknown matcher type: \"%s\"."
 msgid "Unknown term type: \"%s\"."
 msgstr "Okänd mönstertyp: %s."
 
@@ -3158,9 +3115,6 @@
 #. Leave the question marks attached to the string placeholders.
 #: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883
 #, fuzzy, c-format
-#| msgid ""
-#| "The ?%s matcher must be used in a \"wide\" context (a top-level context, "
-#| "or a context enclosed by ?%s)."
 msgid ""
 "The ?%s term must be used in a \"wide\" context (a top-level context, or a "
 "context enclosed by ?%s)."
@@ -3191,7 +3145,6 @@
 
 #: src/generic/apt/matching/parse.cc:1388
 #, fuzzy, c-format
-#| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "Felaktigt formulerat uttryck"
 
@@ -3229,19 +3182,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "URL att använda för att hämta ändringsloggar"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "URL att använda för att hämta ändringsloggar"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "Ändringslogg för %s"
 
@@ -3288,7 +3238,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Kunde inte tolka mönstret %s"
 
@@ -3303,14 +3252,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "Inte installerat"
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "Inte installerat"
 
@@ -3337,67 +3284,56 @@
 
 #: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got EOF."
 msgstr "Förväntade \"%c\" men fick \"%c\"."
 
 #: src/generic/util/parsers.h:737
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got '%s'."
 msgstr "Förväntade \"%c\" men fick \"%c\"."
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "Förväntade ett nummer efter -q=, fick %s\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "Felaktigt åtgärdstecken \"%c\"\n"
 
 #: src/generic/util/parsers.h:832
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got EOF."
 msgstr "Förväntade \"%c\" men fick \"%c\"."
 
 #: src/generic/util/parsers.h:843
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got '%c'."
 msgstr "Förväntade \"%c\" men fick \"%c\"."
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "Förväntade policyidentifierare, fick \"%c\""
 
 #: src/generic/util/parsers.h:1026
 #, fuzzy
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected an integer following '-', got EOF."
 msgstr "Förväntade ',' eller ')' efter '||' men fick '%s'"
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "Förväntade policyidentifierare, fick \"%c\""
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "Ogiltig åtgärd %s"
 
 #: src/generic/util/parsers.h:1077
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected EOF, got '%c'."
 msgstr "Förväntade \"%c\" men fick \"%c\"."
 
@@ -3411,19 +3347,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "Oväntat \")\""
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " eller"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "Oväntat \")\""
 
@@ -3434,7 +3367,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "Kunde inte skapa temporärkatalog från mallen \"%s\": %s"
 
@@ -3469,7 +3401,6 @@
 
 #: src/gtk/aptitude.glade:19 src/gtk/aptitude.glade:2273
 #, fuzzy
-#| msgid "False"
 msgid "_File"
 msgstr "Falskt"
 
@@ -3535,13 +3466,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "Paket"
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "Vyer"
 
@@ -3561,7 +3490,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "Hjälp"
 
@@ -3572,7 +3500,6 @@
 
 #: src/gtk/aptitude.glade:345 src/gtk/aptitude.glade:2614
 #, fuzzy
-#| msgid "List Update"
 msgid "Update"
 msgstr "Listuppdatering"
 
@@ -3594,7 +3521,6 @@
 
 #: src/gtk/aptitude.glade:389 src/gtk/aptitude.glade:2658
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Remove"
 msgstr "Installerat"
 
@@ -3608,33 +3534,28 @@
 
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "Ta bort filtret från paketlistan"
 
 #: src/gtk/aptitude.glade:649
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "Apply these settings to all active package lists."
 msgstr "Aktivera ett filter på paketlistan"
 
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "Sök"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "installera om"
 
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "Fel"
 
@@ -3649,19 +3570,16 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "Beroenden för %s"
 
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "^Changelog"
 msgid "Changelog"
 msgstr "^Ändringslogg"
 
 #: src/gtk/aptitude.glade:1020
 #, fuzzy
-#| msgid "False"
 msgid "Files"
 msgstr "Falskt"
 
@@ -3675,7 +3593,6 @@
 
 #: src/gtk/aptitude.glade:1051
 #, fuzzy
-#| msgid "Tags"
 msgid "tags"
 msgstr "Taggar"
 
@@ -3698,13 +3615,11 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "Tillstånd"
 
 #: src/gtk/aptitude.glade:1247
 #, fuzzy
-#| msgid "Unknown action type: %s"
 msgid "Group by action type"
 msgstr "Okänd åtgärdstyp: %s"
 
@@ -3733,13 +3648,11 @@
 
 #: src/gtk/aptitude.glade:1328
 #, fuzzy
-#| msgid "Toggle ^Rejected"
 msgid "Rejected"
 msgstr "Växla väg^rad"
 
 #: src/gtk/aptitude.glade:1343
 #, fuzzy
-#| msgid "Preferences"
 msgid "No preference"
 msgstr "Egenskaper"
 
@@ -3753,32 +3666,27 @@
 
 #: src/gtk/aptitude.glade:1400
 #, fuzzy
-#| msgid "^Examine Solution"
 msgid "Find a new solution"
 msgstr "Und^ersök lösning"
 
 #: src/gtk/aptitude.glade:1404
 #, fuzzy
-#| msgid "Select the next solution to the dependency problems."
 msgid "Calculate the next solution that has not yet been generated."
 msgstr "Välj nästa lösning till beroendeproblemen."
 
 #: src/gtk/aptitude.glade:1419
 #, fuzzy
-#| msgid "Perform the actions contained in the currently selected solution."
 msgid ""
 "Perform the actions in the currently selected solution and close this tab."
 msgstr "Genomför åtgärderna som nuvarande lösning innebär."
 
 #: src/gtk/aptitude.glade:1576
 #, fuzzy
-#| msgid "Upgrade"
 msgid "Upgrade Summary"
 msgstr "Uppgradera"
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "Källpaket: "
 
@@ -3790,7 +3698,6 @@
 
 #: src/gtk/aptitude.glade:1652
 #, fuzzy
-#| msgid "Manual"
 msgid "Fix Manually"
 msgstr "Handbok"
 
@@ -3838,31 +3745,26 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "Trasig"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "Kunde inte rätta till för otillgängliga paket"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "^Sök"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for: "
 msgid "Search for packages."
 msgstr "Sök efter: "
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "Läs "
 
@@ -3896,19 +3798,16 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "URL att använda för att hämta ändringsloggar"
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "Kräver installationen av %s version %s (%s)"
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -3916,20 +3815,17 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr "Du kan endast se ändringsloggar från officiella Debianpaket."
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "Hämtar ändringslogg"
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "URL att använda för att hämta ändringsloggar"
 
@@ -3943,7 +3839,6 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "URL att använda för att hämta ändringsloggar"
 
@@ -3953,8 +3848,6 @@
 
 #: src/gtk/dashboardtab.cc:414
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] "%d att uppgradera"
@@ -3962,13 +3855,11 @@
 
 #: src/gtk/dashboardtab.cc:633
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No upgrades are available."
 msgstr "Inte installerat"
 
 #: src/gtk/dashboardtab.cc:645
 #, fuzzy
-#| msgid "Unable to locate package %s"
 msgid "Unable to calculate an upgrade."
 msgstr "Kunde inte hitta paketet %s"
 
@@ -4003,25 +3894,21 @@
 
 #: src/gtk/dashboardtab.cc:708
 #, fuzzy, c-format
-#| msgid "Internal error: Default column string is unparsable"
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr "Internt fel: Standardkolumnsträng är inte tolkningsbar"
 
 #: src/gtk/dependency_chains_tab.cc:78
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: start"
 msgstr "Beroendehantering"
 
 #: src/gtk/dependency_chains_tab.cc:82
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: end"
 msgstr "Beroendehantering"
 
 #: src/gtk/dependency_chains_tab.cc:86
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: results"
 msgstr "Beroendehantering"
 
@@ -4031,7 +3918,6 @@
 
 #: src/gtk/dependency_chains_tab.cc:282
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency chain found."
 msgstr "Beroendehantering"
 
@@ -4041,13 +3927,11 @@
 
 #: src/gtk/download.cc:185
 #, fuzzy
-#| msgid "False"
 msgid "Failed"
 msgstr "Falskt"
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "Tar bort hämtade filer"
 
@@ -4058,13 +3942,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "Totalt förlopp: "
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description"
 msgid "Short Description"
 msgstr "Beskrivning"
 
@@ -4074,13 +3956,11 @@
 
 #: src/gtk/download.cc:319
 #, fuzzy
-#| msgid "Cleaning while a download is in progress is not allowed"
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr "Rensning under tiden en hämtning pågår är inte tillåtet"
 
 #: src/gtk/download.cc:395 src/gtk/gui.cc:832
 #, fuzzy
-#| msgid "View next display"
 msgid "View Details"
 msgstr "Visa nästa vy"
 
@@ -4100,19 +3980,16 @@
 
 #: src/gtk/download.cc:486
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s: %lu/%lu, stalled"
 msgstr "%s; kommer att installeras"
 
 #: src/gtk/download.cc:507
 #, fuzzy, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr " [ %i%% ] (%sB/s, %s återstår)"
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "men %s kommer att installeras."
 
@@ -4126,7 +4003,6 @@
 
 #: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "Kunde inte hitta paketet %s"
 
@@ -4137,7 +4013,6 @@
 
 #: src/gtk/dpkg_terminal.cc:429
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "%s: Unable to accept a connection: %s"
 msgstr "Kunde inte skapa temporärkatalog från mallen \"%s\": %s"
 
@@ -4163,80 +4038,67 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "%s versioner"
 
 #: src/gtk/entitysummary.cc:123
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Install %s version %s"
 msgstr "Installera (%s tillhandahåller %s)"
 
 #: src/gtk/entitysummary.cc:131
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrade to %s version %s"
 msgstr "  cwidget-version: %s\n"
 
 #: src/gtk/entitysummary.cc:142
 #, fuzzy, c-format
-#| msgid "Keep the following packages at their current version:"
 msgid "Don't hold %s at its current version."
 msgstr "Behåll följande paket vid deras nuvarande version:"
 
 #: src/gtk/entitysummary.cc:145 src/gtk/entitysummary.cc:165
 #: src/gtk/entitysummary.cc:168
 #, fuzzy, c-format
-#| msgid "Canc^el pending actions"
 msgid "Cancel any actions on %s."
 msgstr "Avbry^t väntande åtgärder"
 
 #: src/gtk/entitysummary.cc:150
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the purge of %s."
 msgstr "Avbryt borttagningen av %F"
 
 #: src/gtk/entitysummary.cc:152
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s."
 msgstr "Avbryt borttagningen av %F"
 
 #: src/gtk/entitysummary.cc:157
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the upgrade of %s."
 msgstr "Avbryt borttagningen av %F"
 
 #: src/gtk/entitysummary.cc:159
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s."
 msgstr "Avbryt installationen av %F"
 
 #: src/gtk/entitysummary.cc:161
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the downgrade of %s."
 msgstr "Avbryt borttagningen av %F"
 
 #: src/gtk/entitysummary.cc:163
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the reinstallation of %s."
 msgstr "Avbryt installationen av %F"
 
 #: src/gtk/entitysummary.cc:206
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "Remove %s"
 msgstr "Ta bort (%s)"
 
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "^Rensa"
 
@@ -4247,7 +4109,6 @@
 
 #: src/gtk/entitysummary.cc:223
 #, fuzzy, c-format
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Mark %s as automatically installed."
 msgstr "\"&M\" för att markera paket som automatiskt installerade"
 
@@ -4258,7 +4119,6 @@
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
 msgid "%s is a virtual package provided by:\n"
 msgstr "\"%s\" är ett virtuellt paket som tillhandahålls av:\n"
 
@@ -4268,13 +4128,11 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "Källpaket: "
 
 #: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 #, fuzzy
-#| msgid "ProgName"
 msgid "Name"
 msgstr "ProgNamn"
 
@@ -4284,13 +4142,11 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "Kunde inte öppna filen \"%s\""
 
 #: src/gtk/entityview.cc:412
 #, fuzzy, c-format
-#| msgid "Rejecting the removal of %s"
 msgid "Editing the columns of \"%s\""
 msgstr "Vägrar borttagningen av %s"
 
@@ -4304,25 +4160,21 @@
 
 #: src/gtk/entityview.cc:570
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Whether the package is automatically installed."
 msgstr "\"&M\" för att markera paket som automatiskt installerade"
 
 #: src/gtk/entityview.cc:576
 #, fuzzy
-#| msgid "Cancel any action on the selected package"
 msgid "The name and description of the package."
 msgstr "Avbryt alla åtgärder för det valda paketet"
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "Version: "
 
 #: src/gtk/entityview.cc:592
 #, fuzzy
-#| msgid "Check for new versions of packages"
 msgid "The version number of the package."
 msgstr "Leta efter nya versioner av paket"
 
@@ -4343,7 +4195,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "inte installerat"
 
@@ -4353,37 +4204,31 @@
 
 #: src/gtk/gui.cc:82
 #, fuzzy
-#| msgid "unpacked"
 msgid "Unpacked"
 msgstr "uppackat"
 
 #: src/gtk/gui.cc:83
 #, fuzzy
-#| msgid "half-config"
 msgid "Half-configured"
 msgstr "halvt konfigurerat"
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "half-install"
 msgid "Half-installed"
 msgstr "halvt installerat"
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "inte installerat (konfigurationsfilerna kvarstår)"
 
 #: src/gtk/gui.cc:86
 #, fuzzy
-#| msgid "triggers-awaited"
 msgid "Triggers awaited"
 msgstr "utlösare förväntas"
 
 #: src/gtk/gui.cc:87
 #, fuzzy
-#| msgid "triggers-pending"
 msgid "Triggers pending"
 msgstr "utlösare att genomföra"
 
@@ -4409,13 +4254,11 @@
 
 #: src/gtk/gui.cc:97
 #, fuzzy
-#| msgid "forbidden upgrade"
 msgid "Hold (don't upgrade)"
 msgstr "förbjuden uppgradering"
 
 #: src/gtk/gui.cc:99
 #, fuzzy
-#| msgid "Related Dependencies"
 msgid "Unsatisfied dependencies"
 msgstr "Lös beroenden"
 
@@ -4429,7 +4272,6 @@
 
 #: src/gtk/gui.cc:290
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "Aktivera ett filter på paketlistan"
 
@@ -4445,13 +4287,11 @@
 
 #: src/gtk/gui.cc:359
 #, fuzzy, c-format
-#| msgid "List Update"
 msgid "Update %s?"
 msgstr "Listuppdatering"
 
 #: src/gtk/gui.cc:385
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
@@ -4479,31 +4319,26 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "%s changes"
 msgid "Done applying changes!"
 msgstr "%s ändrar"
 
 #: src/gtk/gui.cc:823
 #, fuzzy
-#| msgid "%s changes"
 msgid "Applying changes..."
 msgstr "%s ändrar"
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "s: %F"
 msgid "%s: %s"
 msgstr "s: %F"
 
 #: src/gtk/gui.cc:878
 #, fuzzy, c-format
-#| msgid "No broken packages."
 msgid "Error in package %s"
 msgstr "Inga trasiga paket."
 
 #: src/gtk/gui.cc:906
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Kunde inte ersätta %s med ny konfigurationsfil"
 
@@ -4513,25 +4348,21 @@
 
 #: src/gtk/gui.cc:1038
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "Inga trasiga paket."
 
 #: src/gtk/gui.cc:1071
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "Inga trasiga paket."
 
 #: src/gtk/gui.cc:1075
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "Lös beroenden"
 
 #: src/gtk/gui.cc:1103
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Inga paket är trasiga."
@@ -4539,13 +4370,11 @@
 
 #: src/gtk/gui.cc:1147
 #, fuzzy
-#| msgid "%s changes"
 msgid "View changes"
 msgstr "%s ändrar"
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "%s changes"
 msgid "Apply changes"
 msgstr "%s ändrar"
 
@@ -4554,8 +4383,6 @@
 #. font.
 #: src/gtk/gui.cc:1192
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%d package to install"
 msgid_plural "%d packages to install"
 msgstr[0] "%d att installera"
@@ -4566,7 +4393,6 @@
 #. font.
 #: src/gtk/gui.cc:1207
 #, fuzzy, c-format
-#| msgid "failed to remove %s"
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "misslyckades med att ta bort %s"
@@ -4574,7 +4400,6 @@
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "HämtStorlek"
 
@@ -4589,19 +4414,16 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "not installed"
 msgid "Not implemented"
 msgstr "inte installerat"
 
 #: src/gtk/gui.cc:1408 src/gtk/gui.cc:1427
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "Installerat"
 
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "^Rensa"
 
@@ -4619,7 +4441,6 @@
 
 #: src/gtk/gui.cc:1455
 #, fuzzy
-#| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "Användarhandbok"
 
@@ -4634,7 +4455,6 @@
 
 #: src/gtk/info.cc:161 src/gtk/pkgview.cc:169
 #, fuzzy
-#| msgid "Current status: %F."
 msgid "Current status"
 msgstr "Nuvarande status: %F."
 
@@ -4644,19 +4464,16 @@
 
 #: src/gtk/info.cc:496
 #, fuzzy
-#| msgid "Not Installed"
 msgid "Not available"
 msgstr "Inte installerat"
 
 #: src/gtk/info.cc:545
 #, fuzzy
-#| msgid "C^ycle Package Information"
 msgid "Package information: version list"
 msgstr "Cirk^ulera paketinformation"
 
 #: src/gtk/info.cc:555
 #, fuzzy
-#| msgid "Packages which depend on %s"
 msgid "Package information: dependency list"
 msgstr "Paket som är beroende av %s"
 
@@ -4666,7 +4483,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "nej"
 
@@ -4680,7 +4496,6 @@
 
 #: src/gtk/packagestab.cc:203
 #, fuzzy, c-format
-#| msgid "No packages matched the pattern \"%ls\"."
 msgid "No packages matched \"%s\"."
 msgstr "Inga paket matchade mönstret \"%ls\"."
 
@@ -4690,31 +4505,26 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "Paket: "
 
 #: src/gtk/pkgview.cc:224
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed automatically."
 msgstr "%s; kommer att installeras automatiskt"
 
 #: src/gtk/pkgview.cc:227
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed automatically."
 msgstr "%s; kommer att installeras automatiskt"
 
 #: src/gtk/pkgview.cc:235
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed manually."
 msgstr "%s; kommer att installeras automatiskt"
 
 #: src/gtk/pkgview.cc:238
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed manually."
 msgstr "%s; kommer att installeras automatiskt"
 
@@ -4724,13 +4534,11 @@
 
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "Sök"
 
 #: src/gtk/pkgview.cc:718
 #, fuzzy
-#| msgid "Building view"
 msgid "Finalizing view"
 msgstr "Bygger vy"
 
@@ -4863,13 +4671,11 @@
 
 #: src/gtk/previewtab.cc:179
 #, fuzzy
-#| msgid "Preview"
 msgid "Preview: "
 msgstr "Förhandsvisning"
 
 #: src/gtk/resolver.cc:68
 #, fuzzy, c-format
-#| msgid "Error while dumping resolver state"
 msgid "Error in dependency resolver: %s"
 msgstr "Fel vid dumpning av problemlösarens tillstånd"
 
@@ -4884,7 +4690,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package"
 msgid "Virtual package"
 msgstr "Paket"
 
@@ -4894,43 +4699,36 @@
 
 #: src/gtk/resolver.cc:377
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Removing %s is rejected."
 msgstr "Tar bort %s"
 
 #: src/gtk/resolver.cc:382
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Canceling the installation of %s is rejected."
 msgstr "Avbryt installationen av %F"
 
 #: src/gtk/resolver.cc:391
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Canceling the removal of %s is rejected."
 msgstr "Avbryt borttagningen av %F"
 
 #: src/gtk/resolver.cc:394
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keeping %s at version %s is rejected."
 msgstr "Håll kvar %F vid version %s (%s)"
 
 #: src/gtk/resolver.cc:401
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Installing %s version %s is rejected."
 msgstr "Installera (%s tillhandahåller %s)"
 
 #: src/gtk/resolver.cc:407
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrading %s to version %s is rejected."
 msgstr "  cwidget-version: %s\n"
 
 #: src/gtk/resolver.cc:413
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrading %s to version %s is rejected."
 msgstr "%s versioner"
 
@@ -4972,7 +4770,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr "%s versioner"
@@ -5070,7 +4867,6 @@
 
 #: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862
 #, fuzzy
-#| msgid "Remove the following packages:"
 msgid "Keep the following packages:"
 msgstr "Ta bort följande paket:"
 
@@ -5086,121 +4882,101 @@
 
 #: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900
 #, fuzzy
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "Leave the following dependencies unresolved:"
 msgstr "Lämna följande beroenden olösta:%n"
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Remove %F [%s (%s)]"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "Ta bort %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1523
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "Installera %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1531
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s"
 msgstr "Avbryt installationen av %F"
 
 #: src/gtk/resolver.cc:1534
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s"
 msgstr "Avbryt borttagningen av %F"
 
 #: src/gtk/resolver.cc:1537
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "Håll kvar %F vid version %s (%s)"
 
 #: src/gtk/resolver.cc:1544
 #, fuzzy, c-format
-#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Uppgradera %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1553
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Nedgradera %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>Remove</b> %s"
 msgstr "Ta bort (%s)"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>remove</b> %s"
 msgstr "Ta bort (%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "Håll kvar %F vid version %s (%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>keep</b> %s at version %s"
 msgstr "Håll kvar %F vid version %s (%s)"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr "Avbryt installationen av %F"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>cancel</b> the installation of %s"
 msgstr "Avbryt installationen av %F"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>Install</b> %s %s"
 msgstr "Installera %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>install</b> %s %s"
 msgstr "Installera %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>Downgrade</b> %s to version %s"
 msgstr "  cwidget-version: %s\n"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>downgrade</b> %s to version %s"
 msgstr "  cwidget-version: %s\n"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>Upgrade</b> %s to version %s"
 msgstr "%s versioner"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>upgrade</b> %s to version %s"
 msgstr "%s versioner"
 
@@ -5216,8 +4992,6 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "%d att installera"
@@ -5225,8 +4999,6 @@
 
 #: src/gtk/resolver.cc:1740
 #, fuzzy, c-format
-#| msgid "%d removal"
-#| msgid_plural "%d removals"
 msgid "%s remove"
 msgid_plural "%s removes"
 msgstr[0] "%d att ta bort"
@@ -5234,8 +5006,6 @@
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "%d keep"
-#| msgid_plural "%d keeps"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "%d att behålla"
@@ -5243,8 +5013,6 @@
 
 #: src/gtk/resolver.cc:1752
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%s upgrade"
 msgid_plural "%s upgrades"
 msgstr[0] "%d att uppgradera"
@@ -5252,8 +5020,6 @@
 
 #: src/gtk/resolver.cc:1758
 #, fuzzy, c-format
-#| msgid "%d downgrade"
-#| msgid_plural "%d downgrades"
 msgid "%s downgrade"
 msgid_plural "%s downgrades"
 msgstr[0] "%d att nedgradera"
@@ -5261,7 +5027,6 @@
 
 #: src/gtk/resolver.cc:1764
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "%s unresolved recommendation"
 msgid_plural "%s unresolved recommendations"
 msgstr[0] "Granska ^rekommendationer"
@@ -5269,19 +5034,16 @@
 
 #: src/gtk/resolver.cc:2056
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions yet."
 msgstr "Inga fler lösningar."
 
 #: src/gtk/resolver.cc:2063
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency solution was found."
 msgstr "Beroendehantering"
 
 #: src/gtk/resolver.cc:2064
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions."
 msgstr "Inga fler lösningar."
 
@@ -5291,19 +5053,16 @@
 
 #: src/gtk/resolver.cc:2076
 #, fuzzy, c-format
-#| msgid "No more solutions."
 msgid "%u solutions."
 msgstr "Inga fler lösningar."
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "Kunde inte öppna filen \"%s\""
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr "[Hämtat]"
 
@@ -5353,7 +5112,6 @@
 
 #: src/load_grouppolicy.cc:305
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected ',', '%c', or '('; got '%c'"
 msgstr "Förväntade \",\" eller \"(\" men fick \"%c\""
 
@@ -5460,7 +5218,6 @@
 
 #: src/load_grouppolicy.cc:713
 #, fuzzy, c-format
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected '{', ')', or ',' following '||', got '%s'"
 msgstr "Förväntade ',' eller ')' efter '||' men fick '%s'"
 
@@ -5579,19 +5336,16 @@
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt-version %d.%d.%d\n"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt-version %d.%d.%d\n"
 
 #: src/main.cc:164
 #, fuzzy, c-format
-#| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Stöd för Ept avaktiverat.\n"
 
@@ -5639,44 +5393,36 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Installera/uppgradera paket\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Ta bort paket\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Rensa paket och deras konfigurationsfiler\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Ställ in paket till att hållas tillbaka\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Avbryt tillbakahållning av ett paket\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Markera paket som de vore automatiskt installerade\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Markera paket som de vore manuellt installerade\n"
 
@@ -5691,21 +5437,16 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Hämta listor på nya/uppgraderingsbara paket\n"
 
 #: src/main.cc:190
 #, fuzzy, c-format
-#| msgid " safe-upgrade - Perform a safe upgrade\n"
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Genomför en säker uppgradering\n"
 
 #: src/main.cc:191
 #, fuzzy, c-format
-#| msgid ""
-#| " full-upgrade - Perform an upgrade, possibly installing and removing "
-#| "packages\n"
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
@@ -5715,57 +5456,46 @@
 
 #: src/main.cc:192
 #, fuzzy, c-format
-#| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "\"&BD\" för att installera bygg-beroenden för ett paket."
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Glöm vilka paket som är \"nya\"\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Sök efter ett paket efter namn och/eller uttryck\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Visa detaljerad information om ett paket\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Radera hämtade paketfiler\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Radera gamla hämtade paketfiler\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Visa ändringsloggen för ett paket\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Hämta .deb-filen för ett paket\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5788,12 +5518,6 @@
 # if I ever meet the person who choose this layout... /Martin
 #: src/main.cc:203
 #, fuzzy, c-format
-#| msgid ""
-#| " why-not      - Show the manually installed packages that lead to a "
-#| "conflict\n"
-#| "                with the given package, or why one or more packages "
-#| "would\n"
-#| "                lead to a conflict with the given package if installed\n"
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
 "conflict\n"
@@ -5813,7 +5537,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             Denna hjälptext\n"
 
@@ -5843,24 +5566,17 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             Fråga alltid efter bekräftelse eller åtgärder\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr " -y             Anta att svaret på enkla ja/nej-frågor är \"ja\"\n"
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5869,9 +5585,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5879,8 +5592,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 bredd       Ange visningsbredd för att formatera sökresultat\n"
@@ -5908,9 +5619,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5918,17 +5626,12 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr " -t [utgåva]    Ange utgåvan för vilken paketen ska installeras\n"
 
 #: src/main.cc:226
 #, fuzzy, c-format
-#| msgid ""
-#| " -q             In command-line mode, suppress the incremental progress\n"
-#| "                indicators.\n"
 msgid ""
 " -q             In command-line mode, suppress the incremental progress.\n"
 "                indicators.\n"
@@ -5938,7 +5641,6 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o nyckel=värde   Ställ direkt in en konfigurationsinställning med namnet "
@@ -5946,9 +5648,6 @@
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -5985,7 +5684,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "true"
 msgid "trace"
 msgstr "Sant"
 
@@ -5999,7 +5697,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "nej"
 
@@ -6013,7 +5710,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:377
 #, fuzzy
-#| msgid "Err "
 msgid "error"
 msgstr "Fel"
 
@@ -6021,7 +5717,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:380
 #, fuzzy
-#| msgid "false"
 msgid "fatal"
 msgstr "Falskt"
 
@@ -6042,7 +5737,6 @@
 
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "Ogiltig åtgärd %s"
 
@@ -6095,7 +5789,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "Paket"
 
@@ -6105,7 +5798,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "Alla paket"
 
@@ -6125,7 +5817,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -6133,8 +5824,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -6143,7 +5832,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "-u och -i får inte anges med ett kommando"
 
@@ -7386,7 +7074,6 @@
 
 #: src/ui.cc:472
 #, fuzzy, c-format
-#| msgid "Unable to open %ls"
 msgid "Unable to fork: %s"
 msgstr "Kunde inte öppna %ls"
 
@@ -7663,9 +7350,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7687,9 +7371,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -8221,19 +7902,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "URL att använda för att hämta ändringsloggar"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "URL att använda för att hämta ändringsloggar"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "Hämtar ändringslogg"
 
Index: aptitude/po/th.po
===================================================================
--- aptitude.orig/po/th.po
+++ aptitude/po/th.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2008-05-06 12:52+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -1707,13 +1707,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "แต่ไม่สามารถติดตั้งได้"
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not going to be installed."
 msgstr "แต่ไม่สามารถติดตั้งได้"
 
@@ -1812,7 +1810,6 @@
 
 #: src/cmdline/cmdline_show.cc:326
 #, fuzzy, c-format
-#| msgid "%lu reinstalled, "
 msgid "%s%s; will be installed"
 msgstr "ติดตั้งซ้ำ %lu, "
 
@@ -2084,7 +2081,6 @@
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Source package %s:"
 msgstr "กำลังถอดถอน %s"
 
@@ -2698,7 +2694,6 @@
 
 #: src/generic/apt/dump_packages.cc:674
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create truncated cache: %s."
 msgstr "ไม่พบแพกเกจ %s"
 
@@ -2814,7 +2809,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "The following packages will be REMOVED:"
 msgid "Filtering packages"
 msgstr "จะ *ลบ* แพกเกจต่อไปนี้:"
 
@@ -2922,13 +2916,11 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Failed to download changelogs: %s"
 msgstr "ไม่พบแพกเกจ %s"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "Unable to locate package %s"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "ไม่พบแพกเกจ %s"
 
@@ -2978,7 +2970,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "ไม่พบแพกเกจ %s"
 
@@ -3065,7 +3056,6 @@
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "ไม่รู้จักคำสั่ง %s"
 
@@ -3089,7 +3079,6 @@
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " หรือ"
 
@@ -3105,7 +3094,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "ไม่พบแพกเกจ %s"
 
@@ -3280,7 +3268,6 @@
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "ปัญหา "
 
@@ -3295,7 +3282,6 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Depends"
 msgid "Dependencies"
 msgstr "ต้องใช้"
 
@@ -3470,7 +3456,6 @@
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Removing %s"
 msgid "Search for packages."
 msgstr "กำลังถอดถอน %s"
 
@@ -3508,7 +3493,6 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Failed to download the changelog: %s"
 msgstr "ไม่พบแพกเกจ %s"
 
@@ -3537,7 +3521,6 @@
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "ไม่พบแพกเกจ %s"
 
@@ -3570,7 +3553,6 @@
 
 #: src/gtk/dashboardtab.cc:645
 #, fuzzy
-#| msgid "Unable to locate package %s"
 msgid "Unable to calculate an upgrade."
 msgstr "ไม่พบแพกเกจ %s"
 
@@ -3704,7 +3686,6 @@
 
 #: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "ไม่พบแพกเกจ %s"
 
@@ -3715,7 +3696,6 @@
 
 #: src/gtk/dpkg_terminal.cc:429
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to accept a connection: %s"
 msgstr "ไม่พบแพกเกจ %s"
 
@@ -3746,7 +3726,6 @@
 
 #: src/gtk/entitysummary.cc:123
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Install %s version %s"
 msgstr "ไม่รู้จักคำสั่ง %s"
 
@@ -3798,7 +3777,6 @@
 
 #: src/gtk/entitysummary.cc:206
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Remove %s"
 msgstr "กำลังถอดถอน %s"
 
@@ -3894,7 +3872,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "%lu reinstalled, "
 msgid "Not installed"
 msgstr "ติดตั้งซ้ำ %lu, "
 
@@ -3912,7 +3889,6 @@
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "%lu reinstalled, "
 msgid "Half-installed"
 msgstr "ติดตั้งซ้ำ %lu, "
 
@@ -4098,7 +4074,6 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "%lu reinstalled, "
 msgid "Not implemented"
 msgstr "ติดตั้งซ้ำ %lu, "
 
@@ -4334,7 +4309,6 @@
 
 #: src/gtk/resolver.cc:377
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Removing %s is rejected."
 msgstr "กำลังถอดถอน %s"
 
@@ -4350,13 +4324,11 @@
 
 #: src/gtk/resolver.cc:394
 #, fuzzy, c-format
-#| msgid "Fetched %sB in %s (%sB/s)\n"
 msgid "Keeping %s at version %s is rejected."
 msgstr "ดาวน์โหลด %sB ใน %s (%sB/s)\n"
 
 #: src/gtk/resolver.cc:401
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Installing %s version %s is rejected."
 msgstr "ไม่รู้จักคำสั่ง %s"
 
@@ -4505,7 +4477,6 @@
 
 #: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862
 #, fuzzy
-#| msgid "The following packages will be REMOVED:"
 msgid "Keep the following packages:"
 msgstr "จะ *ลบ* แพกเกจต่อไปนี้:"
 
@@ -4525,13 +4496,11 @@
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "กำลังถอดถอน %s"
 
 #: src/gtk/resolver.cc:1523
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "ไม่รู้จักคำสั่ง %s"
 
@@ -4547,7 +4516,6 @@
 
 #: src/gtk/resolver.cc:1537
 #, fuzzy, c-format
-#| msgid "Fetched %sB in %s (%sB/s)\n"
 msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "ดาวน์โหลด %sB ใน %s (%sB/s)\n"
 
@@ -4563,25 +4531,21 @@
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "<b>Remove</b> %s"
 msgstr "กำลังถอดถอน %s"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "<b>remove</b> %s"
 msgstr "กำลังถอดถอน %s"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Fetched %sB in %s (%sB/s)\n"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "ดาวน์โหลด %sB ใน %s (%sB/s)\n"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Fetched %sB in %s (%sB/s)\n"
 msgid "<b>keep</b> %s at version %s"
 msgstr "ดาวน์โหลด %sB ใน %s (%sB/s)\n"
 
@@ -4597,13 +4561,11 @@
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "<b>Install</b> %s %s"
 msgstr "ไม่รู้จักคำสั่ง %s"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "<b>install</b> %s %s"
 msgstr "ไม่รู้จักคำสั่ง %s"
 
@@ -4639,7 +4601,6 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%lu reinstalled, "
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "ติดตั้งซ้ำ %lu, "
@@ -4668,7 +4629,6 @@
 
 #: src/gtk/resolver.cc:1758
 #, fuzzy, c-format
-#| msgid "%lu downgraded, "
 msgid "%s downgrade"
 msgid_plural "%s downgrades"
 msgstr[0] "ปรับรุ่นลง %lu, "
@@ -5034,7 +4994,6 @@
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid " remove       - Remove packages.\n"
 msgstr "กำลังถอดถอน %s"
 
@@ -5320,7 +5279,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:377
 #, fuzzy
-#| msgid "Err "
 msgid "error"
 msgstr "ปัญหา "
 
@@ -5347,7 +5305,6 @@
 
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "ไม่รู้จักคำสั่ง %s"
 
@@ -6590,7 +6547,6 @@
 
 #: src/ui.cc:472
 #, fuzzy, c-format
-#| msgid "Unable to stat %s."
 msgid "Unable to fork: %s"
 msgstr "ไม่สามารถ stat %s"
 
@@ -7364,19 +7320,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Preparing to download the changelog of %s"
 msgstr "ไม่พบแพกเกจ %s"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "ไม่พบแพกเกจ %s"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Downloading the changelog of %s"
 msgstr "ไม่พบแพกเกจ %s"
 
Index: aptitude/po/tl.po
===================================================================
--- aptitude.orig/po/tl.po
+++ aptitude/po/tl.po
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2005-03-30 16:02+0800\n"
 "Last-Translator: Ryan Escarez <rescarez@gmail.com>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -656,14 +656,12 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr ""
 "%s ay kasalukuyan hindi pa naka-instol, kaya hindi ito iinstolin muli.\n"
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "%s ay naka-instoll na sa hiniling na bersyon (%s)\n"
@@ -766,7 +764,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "ChangeLog ng %s"
 
@@ -928,7 +925,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "wala"
 
@@ -1629,7 +1625,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Mga Gagawin"
 
@@ -1821,13 +1816,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "ngunit hindi ito maaaring ma-instol."
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "ngunit %s ay iinstolahin."
 
@@ -2193,19 +2186,16 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "Mga Pakete"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Pinanggalingan ng pakete: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Arkibo"
 
@@ -2249,7 +2239,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr ""
 "paghanap: Dapat magbigay kayo ng di kukulang sa isang terminong hahanapin\n"
@@ -2379,7 +2368,6 @@
 
 #: src/cmdline/cmdline_why.cc:1285
 #, fuzzy, c-format
-#| msgid "Packages depending on %s"
 msgid "Packages requiring %s:"
 msgstr "Pakete na umaasa sa %s"
 
@@ -2413,7 +2401,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[ERROR]"
 
@@ -2961,7 +2948,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "Kinukuha ang mga pakete"
 
@@ -3035,7 +3021,6 @@
 
 #: src/generic/apt/matching/parse.cc:1388
 #, fuzzy, c-format
-#| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "Badly formed expression"
 
@@ -3074,19 +3059,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "URL na gamitin upang kunin ang mga changelog"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "URL na gamitin upang kunin ang mga changelog"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "ChangeLog ng %s"
 
@@ -3193,7 +3175,6 @@
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "Di tanggap na utos '%c'\n"
 
@@ -3224,7 +3205,6 @@
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "Hindi tanggap na operasyon %s"
 
@@ -3243,19 +3223,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "Hindi inaasahan ')'"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " o"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "Hindi inaasahan ')'"
 
@@ -3366,13 +3343,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "Pakete"
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "Mga Pananaw"
 
@@ -3392,7 +3367,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "Tulong"
 
@@ -3439,33 +3413,28 @@
 
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "Alisin ang filter sa mga listahan ng pakete"
 
 #: src/gtk/aptitude.glade:649
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "Apply these settings to all active package lists."
 msgstr "Apply ang filter sa listahan ng mga pakete"
 
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "Paghahanap"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "reinstall"
 
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "Err "
 
@@ -3480,13 +3449,11 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "Dependensiya ng %s"
 
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "^Changelog"
 msgid "Changelog"
 msgstr "^Changelog"
 
@@ -3527,13 +3494,11 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "Katayuan"
 
 #: src/gtk/aptitude.glade:1247
 #, fuzzy
-#| msgid "Unknown action type: %s"
 msgid "Group by action type"
 msgstr "Di-kilalang anyo ng aksyon: %s"
 
@@ -3598,7 +3563,6 @@
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "Pinanggalingan ng pakete: "
 
@@ -3663,25 +3627,21 @@
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "Hindi ma i-ayos dahil sa hindi available na pakete"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "^Hanap"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for a package"
 msgid "Search for packages."
 msgstr "Humanap ng pakete"
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "Nakuha "
 
@@ -3716,7 +3676,6 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "URL na gamitin upang kunin ang mga changelog"
 
@@ -3727,7 +3686,6 @@
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -3735,20 +3693,17 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr "Maari lang tignan ang mga changelog ng mga opisyal na paketeng Debian."
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "Kinukuha ang Changelog"
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "URL na gamitin upang kunin ang mga changelog"
 
@@ -3762,7 +3717,6 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "URL na gamitin upang kunin ang mga changelog"
 
@@ -3818,7 +3772,6 @@
 
 #: src/gtk/dashboardtab.cc:708
 #, fuzzy, c-format
-#| msgid "Internal error: Default column string is unparsable"
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr "Internal error: Default na hanay ng string ay unparsable"
 
@@ -3857,7 +3810,6 @@
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "Binubura ang mga na-download na files"
 
@@ -3868,13 +3820,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "Pangkalahatan progreso: "
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description"
 msgid "Short Description"
 msgstr "Deskripsyon"
 
@@ -3884,14 +3834,12 @@
 
 #: src/gtk/download.cc:319
 #, fuzzy
-#| msgid "Cleaning while a download is in progress is not allowed"
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr ""
 "Paglilinis habang ang pagkuha ay nasa progreso ay hindi pina hi-hintulutan"
 
 #: src/gtk/download.cc:395 src/gtk/gui.cc:832
 #, fuzzy
-#| msgid "View next display"
 msgid "View Details"
 msgstr "Pakita ang susunod na display"
 
@@ -3916,13 +3864,11 @@
 
 #: src/gtk/download.cc:507
 #, fuzzy, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr " [ %i%% ] (%sB/s, %s natitira)"
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "ngunit %s ay iinstolahin."
 
@@ -4032,7 +3978,6 @@
 
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "^Purge"
 
@@ -4053,7 +3998,6 @@
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
 msgid "%s is a virtual package provided by:\n"
 msgstr "\"%s\" ay paketeng bertwal na binibigay ng:\n"
 
@@ -4063,13 +4007,11 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "Pinanggalingan ng pakete: "
 
 #: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 #, fuzzy
-#| msgid "ProgName"
 msgid "Name"
 msgstr "PangalanNgProg"
 
@@ -4079,7 +4021,6 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "hindi ma-buksan na file \"%s\""
 
@@ -4103,19 +4044,16 @@
 
 #: src/gtk/entityview.cc:576
 #, fuzzy
-#| msgid "Cancel any action on the selected package"
 msgid "The name and description of the package."
 msgstr "Kansel ang anumang aksyon sa napiling pakete"
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "Bersyon: "
 
 #: src/gtk/entityview.cc:592
 #, fuzzy
-#| msgid "Check for new versions of packages"
 msgid "The version number of the package."
 msgstr "Suriin para sa mga bagong bersyon ng mga pakete"
 
@@ -4136,7 +4074,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "hindi naka-instol"
 
@@ -4147,25 +4084,21 @@
 
 #: src/gtk/gui.cc:82
 #, fuzzy
-#| msgid "unpacked"
 msgid "Unpacked"
 msgstr "binuklat"
 
 #: src/gtk/gui.cc:83
 #, fuzzy
-#| msgid "half-config"
 msgid "Half-configured"
 msgstr "kalahating-config"
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "half-install"
 msgid "Half-installed"
 msgstr "kalahating-install"
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "hindi naka-instol (may mga tipunang pagkaayos na naiwan)"
 
@@ -4221,7 +4154,6 @@
 
 #: src/gtk/gui.cc:290
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "Apply ang filter sa listahan ng mga pakete"
 
@@ -4241,7 +4173,6 @@
 
 #: src/gtk/gui.cc:385
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
@@ -4269,19 +4200,16 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "All Packages"
 msgid "Done applying changes!"
 msgstr "Lahat ng pakete"
 
 #: src/gtk/gui.cc:823
 #, fuzzy
-#| msgid "All Packages"
 msgid "Applying changes..."
 msgstr "Lahat ng pakete"
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "[%s] %s\n"
 msgid "%s: %s"
 msgstr "[%s] %s\n"
 
@@ -4292,7 +4220,6 @@
 
 #: src/gtk/gui.cc:906
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Hindi ma-palitan ang %s ng bagong configuration file"
 
@@ -4329,7 +4256,6 @@
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "All Packages"
 msgid "Apply changes"
 msgstr "Lahat ng pakete"
 
@@ -4355,7 +4281,6 @@
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "DownloadSize"
 
@@ -4370,7 +4295,6 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "not installed"
 msgid "Not implemented"
 msgstr "hindi naka-instol"
 
@@ -4381,7 +4305,6 @@
 
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "^Purge"
 
@@ -4432,7 +4355,6 @@
 
 #: src/gtk/info.cc:555
 #, fuzzy
-#| msgid "Packages which depend on %s"
 msgid "Package information: dependency list"
 msgstr "Pakete na naka-depende sa %s"
 
@@ -4442,7 +4364,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "hindi"
 
@@ -4465,7 +4386,6 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "Pakete: "
 
@@ -4495,13 +4415,11 @@
 
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "Paghahanap"
 
 #: src/gtk/pkgview.cc:718
 #, fuzzy
-#| msgid "Building view"
 msgid "Finalizing view"
 msgstr "Gumagawa ng view"
 
@@ -4640,7 +4558,6 @@
 
 #: src/gtk/resolver.cc:68
 #, fuzzy, c-format
-#| msgid "Unknown dependency type: %s"
 msgid "Error in dependency resolver: %s"
 msgstr "Di-kilalang anyo ng dependency: %s"
 
@@ -4655,7 +4572,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package"
 msgid "Virtual package"
 msgstr "Pakete"
 
@@ -4985,7 +4901,6 @@
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "sleep"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "tulog"
@@ -5037,13 +4952,11 @@
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "hindi ma-buksan na file \"%s\""
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr "[Nakuha]"
 
@@ -5401,45 +5314,37 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Install/upgrade ang mga pakete\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Alisin ang pakete\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr ""
 " purge        - Alisin ang pakete at ang kanilang configuration files\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - ilagay ang pakete sa pag kakahawak\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Tanggalin ang pagkakawak sa pakete\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markahanlagi     - Markahan ang pakete para kusang mag instal\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " alisin-ang-marka-lagi   - Markahan ang pakete para i-manual instal\n"
 
@@ -5454,7 +5359,6 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Listahan ng na-kuha na bago/upgradable pakete\n"
 
@@ -5479,43 +5383,36 @@
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Limutin kung ano ang mga pakete na  \"bago\"\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Hanapin ang pakete sa pangalan at/o expression\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Pakita ang detalyadong impormasyon tungkol sa pakete\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Burahin ang nakuhang pakete files\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Burahin ang lumang nakuhang pakete files\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Tingnan ang changelog ng pakete\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Kuhain ang .deb file para sa pakete\n"
 
@@ -5552,7 +5449,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             Ang tulong na ito\n"
 
@@ -5584,15 +5480,11 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             Laging mag prompt para sa compermasyon o aksyon\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
@@ -5601,9 +5493,6 @@
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5613,9 +5502,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5625,8 +5511,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 ""
@@ -5660,9 +5544,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5672,8 +5553,6 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
@@ -5688,7 +5567,6 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o key=val     Diretstong ilagay ang pangalan ng configuration option "
@@ -5696,9 +5574,6 @@
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -5738,7 +5613,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "replaces"
 msgid "trace"
 msgstr "papalitan"
 
@@ -5752,7 +5626,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "hindi"
 
@@ -5766,7 +5639,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:377
 #, fuzzy
-#| msgid "Err "
 msgid "error"
 msgstr "Err "
 
@@ -5794,7 +5666,6 @@
 
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "Hindi tanggap na operasyon %s"
 
@@ -5847,7 +5718,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "Pakete"
 
@@ -5857,7 +5727,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "Lahat ng pakete"
 
@@ -5877,7 +5746,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -5885,8 +5753,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -5896,7 +5762,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "-u at -i hindi siguro na specified na merong command"
 
@@ -8028,19 +7893,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "URL na gamitin upang kunin ang mga changelog"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "URL na gamitin upang kunin ang mga changelog"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "Kinukuha ang Changelog"
 
Index: aptitude/po/tr.po
===================================================================
--- aptitude.orig/po/tr.po
+++ aptitude/po/tr.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2006-10-18 02:07+0300\n"
 "Last-Translator: Erçin EKER <ercin.eker@linux.org.tr>\n"
 "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -643,13 +643,11 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s şu anda kurulu değil, bu nedenle yeniden yüklenmeyecek.\n"
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "%s paketinin istenen sürümü zaten kurulu (%s)\n"
@@ -749,7 +747,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "%s için değişim günlüğü"
 
@@ -908,7 +905,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "yok"
 
@@ -1316,7 +1312,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "Paketi otomatik kurulmuş olarak işaretlemek için'&M'"
 
@@ -1598,31 +1593,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "Aşağıdaki önerilenleri çözümlenmemiş bırak:"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "^Önerilenleri Denetle"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "Artık %s'in kaldırılması gerekmiyor"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "^Önerilenleri Denetle"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Eylemler"
 
@@ -1688,7 +1678,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:790
 #, fuzzy, c-format
-#| msgid "open: %d; closed: %d; defer: %d; conflict: %d"
 msgid "open: %zd; closed: %zd; defer: %zd; conflict: %zd"
 msgstr "açık: %d; kapalı: %d; ertele: %d; çakışma: %d"
 
@@ -1807,13 +1796,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "fakat kurulabilir değil"
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "fakat %s kurulacak."
 
@@ -1913,13 +1900,11 @@
 
 #: src/cmdline/cmdline_show.cc:326
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s%s; will be installed"
 msgstr "%s; kurulacak"
 
 #: src/cmdline/cmdline_show.cc:328
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s%s; will be installed automatically"
 msgstr "%s; otomatik olarak kurulacak"
 
@@ -2176,19 +2161,16 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "Paketler"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Kaynak paketi: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Arşiv"
 
@@ -2232,7 +2214,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "Arama: En az bir arama terimi girmelisiniz\n"
 
@@ -2360,7 +2341,6 @@
 
 #: src/cmdline/cmdline_why.cc:1285
 #, fuzzy, c-format
-#| msgid "Packages depending on %s"
 msgid "Packages requiring %s:"
 msgstr "%s paketine bağımlı paketler"
 
@@ -2394,7 +2374,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[HATA]"
 
@@ -2737,7 +2716,6 @@
 
 #: src/generic/apt/download_update_manager.cc:138
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated quoted string in command: %s"
 msgstr "%s'den sonra sonlandırılmamış yalın dizi"
 
@@ -2816,7 +2794,6 @@
 
 #: src/generic/apt/dump_packages.cc:674
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create truncated cache: %s."
 msgstr "%s paketi konumlandırılamıyor"
 
@@ -2937,7 +2914,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "Paketler indiriliyor"
 
@@ -3010,7 +2986,6 @@
 
 #: src/generic/apt/matching/parse.cc:1388
 #, fuzzy, c-format
-#| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "Kötü biçimli ifade"
 
@@ -3050,19 +3025,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "Değişim günlüklerini indirmek için kullanılacak URL(adres)"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "Değişim günlüklerini indirmek için kullanılacak URL(adres)"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "%s için değişim günlüğü"
 
@@ -3107,7 +3079,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "%s kalıbı ayrıştırılamıyor"
 
@@ -3122,14 +3093,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "Kurulmadı"
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "Kurulmadı"
 
@@ -3166,13 +3135,11 @@
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "-q='dan sonra sayı belirtilmeli, %s kullanılmış\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "Kötü eylem karakteri '%c'\n"
 
@@ -3188,7 +3155,6 @@
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "Politika tanımlayıcı gerekli, '%c' değil"
 
@@ -3199,13 +3165,11 @@
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "Politika tanımlayıcı gerekli, '%c' değil"
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "Geçersiz işlem %s"
 
@@ -3224,19 +3188,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "Beklenmeyen ')'"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " ya da"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "Beklenmeyen ')'"
 
@@ -3247,7 +3208,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "\"%s\" şablonundan geçici klasör oluşturulamıyor: %s"
 
@@ -3347,13 +3307,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "Paket"
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "Görünümler"
 
@@ -3373,7 +3331,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "Yardım"
 
@@ -3384,7 +3341,6 @@
 
 #: src/gtk/aptitude.glade:345 src/gtk/aptitude.glade:2614
 #, fuzzy
-#| msgid "List Update"
 msgid "Update"
 msgstr "Liste Güncelleme"
 
@@ -3406,7 +3362,6 @@
 
 #: src/gtk/aptitude.glade:389 src/gtk/aptitude.glade:2658
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Remove"
 msgstr "Kurulu"
 
@@ -3420,33 +3375,28 @@
 
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "Paket listesine uygulanan filtreyi kaldır"
 
 #: src/gtk/aptitude.glade:649
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "Apply these settings to all active package lists."
 msgstr "Paket listesini filtrele"
 
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "Ara"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "tekrarkur"
 
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "Hata"
 
@@ -3461,13 +3411,11 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "%s paketinin bağımlılıkları"
 
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "^Changelog"
 msgid "Changelog"
 msgstr "^Changelog"
 
@@ -3486,7 +3434,6 @@
 
 #: src/gtk/aptitude.glade:1051
 #, fuzzy
-#| msgid "Tags"
 msgid "tags"
 msgstr "Etiketler"
 
@@ -3509,13 +3456,11 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "Durum"
 
 #: src/gtk/aptitude.glade:1247
 #, fuzzy
-#| msgid "Unknown action type: %s"
 msgid "Group by action type"
 msgstr "Bilinmeyen eylem tipi: %s"
 
@@ -3544,7 +3489,6 @@
 
 #: src/gtk/aptitude.glade:1328
 #, fuzzy
-#| msgid "Toggle ^Rejected"
 msgid "Rejected"
 msgstr "^Rededilmiş durumunu değiştir"
 
@@ -3563,32 +3507,27 @@
 
 #: src/gtk/aptitude.glade:1400
 #, fuzzy
-#| msgid "^Examine Solution"
 msgid "Find a new solution"
 msgstr "^Çözümü Denetle"
 
 #: src/gtk/aptitude.glade:1404
 #, fuzzy
-#| msgid "Select the next solution to the dependency problems."
 msgid "Calculate the next solution that has not yet been generated."
 msgstr "Bağımlılık sorunları için sonraki çözümü seç."
 
 #: src/gtk/aptitude.glade:1419
 #, fuzzy
-#| msgid "Perform the actions contained in the currently selected solution."
 msgid ""
 "Perform the actions in the currently selected solution and close this tab."
 msgstr "Seçili çözümdeki eylemleri gerçekleştir."
 
 #: src/gtk/aptitude.glade:1576
 #, fuzzy
-#| msgid "Upgrade"
 msgid "Upgrade Summary"
 msgstr "Yükselt"
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "Kaynak paketi: "
 
@@ -3600,7 +3539,6 @@
 
 #: src/gtk/aptitude.glade:1652
 #, fuzzy
-#| msgid "Manual"
 msgid "Fix Manually"
 msgstr "Kılavuz"
 
@@ -3648,31 +3586,26 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "Kırık"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "Mevcut olmayan paketler için düzeltme yapılamıyor"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "^Bul"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for a package"
 msgid "Search for packages."
 msgstr "Paket ara"
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "Alındı "
 
@@ -3707,19 +3640,16 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "Değişim günlüklerini indirmek için kullanılacak URL(adres)"
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "%s'in %s (%s) sürümünün kurulması gerekiyor"
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -3728,7 +3658,6 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr ""
@@ -3736,13 +3665,11 @@
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "Changelog İndiriliyor"
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "Değişim günlüklerini indirmek için kullanılacak URL(adres)"
 
@@ -3756,7 +3683,6 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "Değişim günlüklerini indirmek için kullanılacak URL(adres)"
 
@@ -3766,21 +3692,17 @@
 
 #: src/gtk/dashboardtab.cc:414
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] "%d güncellenecek"
 
 #: src/gtk/dashboardtab.cc:633
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No upgrades are available."
 msgstr "Kurulmadı"
 
 #: src/gtk/dashboardtab.cc:645
 #, fuzzy
-#| msgid "Unable to locate package %s"
 msgid "Unable to calculate an upgrade."
 msgstr "%s paketi konumlandırılamıyor"
 
@@ -3813,7 +3735,6 @@
 
 #: src/gtk/dashboardtab.cc:708
 #, fuzzy, c-format
-#| msgid "Internal error: Default column string is unparsable"
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr "İç hata: Varsayılan kolon dizgisi ayrıştırılamaz"
 
@@ -3852,7 +3773,6 @@
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "İndirilmiş dosyalar siliniyor"
 
@@ -3863,13 +3783,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "Toplam İlerleme: "
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description"
 msgid "Short Description"
 msgstr "Açıklama"
 
@@ -3879,13 +3797,11 @@
 
 #: src/gtk/download.cc:319
 #, fuzzy
-#| msgid "Cleaning while a download is in progress is not allowed"
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr "İndirme işlemi sürerken temizlemeye izin verilmez."
 
 #: src/gtk/download.cc:395 src/gtk/gui.cc:832
 #, fuzzy
-#| msgid "View next display"
 msgid "View Details"
 msgstr "Sonraki ekranı görüntüle"
 
@@ -3905,19 +3821,16 @@
 
 #: src/gtk/download.cc:486
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s: %lu/%lu, stalled"
 msgstr "%s; kurulacak"
 
 #: src/gtk/download.cc:507
 #, fuzzy, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr " [ %i%% ] (%sB/s, %s kaldı)"
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "fakat %s kurulacak."
 
@@ -3931,7 +3844,6 @@
 
 #: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "%s paketi konumlandırılamıyor"
 
@@ -3942,7 +3854,6 @@
 
 #: src/gtk/dpkg_terminal.cc:429
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "%s: Unable to accept a connection: %s"
 msgstr "\"%s\" şablonundan geçici klasör oluşturulamıyor: %s"
 
@@ -3968,7 +3879,6 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "%s sürümleri"
 
@@ -3984,50 +3894,42 @@
 
 #: src/gtk/entitysummary.cc:142
 #, fuzzy, c-format
-#| msgid "Keep the following packages at their current version:"
 msgid "Don't hold %s at its current version."
 msgstr "Aşağıdaki paketleri mevcut sürümlerinde tut:"
 
 #: src/gtk/entitysummary.cc:145 src/gtk/entitysummary.cc:165
 #: src/gtk/entitysummary.cc:168
 #, fuzzy, c-format
-#| msgid "Canc^el pending actions"
 msgid "Cancel any actions on %s."
 msgstr "Bekleyen eylemleri ip^tal et"
 
 #: src/gtk/entitysummary.cc:150
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the purge of %s."
 msgstr "%F'i kaldırmayı iptal et"
 
 #: src/gtk/entitysummary.cc:152
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s."
 msgstr "%F'i kaldırmayı iptal et"
 
 #: src/gtk/entitysummary.cc:157
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the upgrade of %s."
 msgstr "%F'i kaldırmayı iptal et"
 
 #: src/gtk/entitysummary.cc:159
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s."
 msgstr "%F'in kurulumunu iptal et"
 
 #: src/gtk/entitysummary.cc:161
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the downgrade of %s."
 msgstr "%F'i kaldırmayı iptal et"
 
 #: src/gtk/entitysummary.cc:163
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the reinstallation of %s."
 msgstr "%F'in kurulumunu iptal et"
 
@@ -4038,7 +3940,6 @@
 
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "^Temizle"
 
@@ -4049,7 +3950,6 @@
 
 #: src/gtk/entitysummary.cc:223
 #, fuzzy, c-format
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Mark %s as automatically installed."
 msgstr "Paketi otomatik kurulmuş olarak işaretlemek için'&M'"
 
@@ -4060,7 +3960,6 @@
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
 msgid "%s is a virtual package provided by:\n"
 msgstr "%s bir sanal paket, ve şu paket tarafından sağlanıyor:\n"
 
@@ -4070,13 +3969,11 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "Kaynak paketi: "
 
 #: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 #, fuzzy
-#| msgid "ProgName"
 msgid "Name"
 msgstr "UygAdı"
 
@@ -4086,13 +3983,11 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "Dosya açılamıyor: \"%s\""
 
 #: src/gtk/entityview.cc:412
 #, fuzzy, c-format
-#| msgid "Rejecting the removal of %s"
 msgid "Editing the columns of \"%s\""
 msgstr "%s'in kaldırılması redediliyor"
 
@@ -4106,25 +4001,21 @@
 
 #: src/gtk/entityview.cc:570
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Whether the package is automatically installed."
 msgstr "Paketi otomatik kurulmuş olarak işaretlemek için'&M'"
 
 #: src/gtk/entityview.cc:576
 #, fuzzy
-#| msgid "Cancel any action on the selected package"
 msgid "The name and description of the package."
 msgstr "Seçili paket üzerindeki işlemleri iptal et"
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "Sürüm:"
 
 #: src/gtk/entityview.cc:592
 #, fuzzy
-#| msgid "Check for new versions of packages"
 msgid "The version number of the package."
 msgstr "Paketleri yeni sürümleri için denetler"
 
@@ -4145,7 +4036,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "kurulmadı"
 
@@ -4155,25 +4045,21 @@
 
 #: src/gtk/gui.cc:82
 #, fuzzy
-#| msgid "unpacked"
 msgid "Unpacked"
 msgstr "paketlenmemiş"
 
 #: src/gtk/gui.cc:83
 #, fuzzy
-#| msgid "half-config"
 msgid "Half-configured"
 msgstr "yarım-ayarlı"
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "half-install"
 msgid "Half-installed"
 msgstr "yarım-kurulu"
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "kurulu değil (yapılandırma dosyaları kalmış)"
 
@@ -4207,7 +4093,6 @@
 
 #: src/gtk/gui.cc:97
 #, fuzzy
-#| msgid "forbidden upgrade"
 msgid "Hold (don't upgrade)"
 msgstr "yasaklanmış yükseltme"
 
@@ -4226,7 +4111,6 @@
 
 #: src/gtk/gui.cc:290
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "Paket listesini filtrele"
 
@@ -4241,13 +4125,11 @@
 
 #: src/gtk/gui.cc:359
 #, fuzzy, c-format
-#| msgid "List Update"
 msgid "Update %s?"
 msgstr "Liste Güncelleme"
 
 #: src/gtk/gui.cc:385
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
@@ -4275,31 +4157,26 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "%s changes"
 msgid "Done applying changes!"
 msgstr "%s değişiklikleri"
 
 #: src/gtk/gui.cc:823
 #, fuzzy
-#| msgid "%s changes"
 msgid "Applying changes..."
 msgstr "%s değişiklikleri"
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "[%s] %s\n"
 msgid "%s: %s"
 msgstr "[%s] %s\n"
 
 #: src/gtk/gui.cc:878
 #, fuzzy, c-format
-#| msgid "No broken packages."
 msgid "Error in package %s"
 msgstr "Kırık paket yok."
 
 #: src/gtk/gui.cc:906
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "%s yeni yapılandırma dosyası ile değiştirilemiyor"
 
@@ -4309,38 +4186,32 @@
 
 #: src/gtk/gui.cc:1038
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "Kırık paket yok."
 
 #: src/gtk/gui.cc:1071
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "Kırık paket yok."
 
 #: src/gtk/gui.cc:1075
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "Bağımlılıkları çözümle"
 
 #: src/gtk/gui.cc:1103
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Bozuk paket bulunmuyor."
 
 #: src/gtk/gui.cc:1147
 #, fuzzy
-#| msgid "%s changes"
 msgid "View changes"
 msgstr "%s değişiklikleri"
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "%s changes"
 msgid "Apply changes"
 msgstr "%s değişiklikleri"
 
@@ -4349,8 +4220,6 @@
 #. font.
 #: src/gtk/gui.cc:1192
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%d package to install"
 msgid_plural "%d packages to install"
 msgstr[0] "%d kurulacak"
@@ -4360,14 +4229,12 @@
 #. font.
 #: src/gtk/gui.cc:1207
 #, fuzzy, c-format
-#| msgid "failed to remove %s"
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "%s kaldırılırken hata oluştu"
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "İndirmeBoyutu"
 
@@ -4382,19 +4249,16 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "not installed"
 msgid "Not implemented"
 msgstr "kurulmadı"
 
 #: src/gtk/gui.cc:1408 src/gtk/gui.cc:1427
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "Kurulu"
 
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "^Temizle"
 
@@ -4412,7 +4276,6 @@
 
 #: src/gtk/gui.cc:1455
 #, fuzzy
-#| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "Kullanıcı Kılavuzu"
 
@@ -4435,7 +4298,6 @@
 
 #: src/gtk/info.cc:496
 #, fuzzy
-#| msgid "Not Installed"
 msgid "Not available"
 msgstr "Kurulmadı"
 
@@ -4445,7 +4307,6 @@
 
 #: src/gtk/info.cc:555
 #, fuzzy
-#| msgid "Packages which depend on %s"
 msgid "Package information: dependency list"
 msgstr "%s paketine bağımlı paketler"
 
@@ -4455,7 +4316,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "hayır"
 
@@ -4469,7 +4329,6 @@
 
 #: src/gtk/packagestab.cc:203
 #, fuzzy, c-format
-#| msgid "No packages matched the pattern \"%ls\"."
 msgid "No packages matched \"%s\"."
 msgstr "\"%ls\" kalıbına uygun paket yok."
 
@@ -4479,31 +4338,26 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "Paket:"
 
 #: src/gtk/pkgview.cc:224
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed automatically."
 msgstr "%s; otomatik olarak kurulacak"
 
 #: src/gtk/pkgview.cc:227
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed automatically."
 msgstr "%s; otomatik olarak kurulacak"
 
 #: src/gtk/pkgview.cc:235
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed manually."
 msgstr "%s; otomatik olarak kurulacak"
 
 #: src/gtk/pkgview.cc:238
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed manually."
 msgstr "%s; otomatik olarak kurulacak"
 
@@ -4513,13 +4367,11 @@
 
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "Ara"
 
 #: src/gtk/pkgview.cc:718
 #, fuzzy
-#| msgid "Building view"
 msgid "Finalizing view"
 msgstr "Görüntü oluşturuluyor"
 
@@ -4652,13 +4504,11 @@
 
 #: src/gtk/previewtab.cc:179
 #, fuzzy
-#| msgid "Preview"
 msgid "Preview: "
 msgstr "Önizleme"
 
 #: src/gtk/resolver.cc:68
 #, fuzzy, c-format
-#| msgid "Error while dumping resolver state"
 msgid "Error in dependency resolver: %s"
 msgstr "Çözücü durumu kaydedilirken hata"
 
@@ -4673,7 +4523,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package"
 msgid "Virtual package"
 msgstr "Paket"
 
@@ -4683,25 +4532,21 @@
 
 #: src/gtk/resolver.cc:377
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Removing %s is rejected."
 msgstr "%s kaldırılıyor"
 
 #: src/gtk/resolver.cc:382
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Canceling the installation of %s is rejected."
 msgstr "%F'in kurulumunu iptal et"
 
 #: src/gtk/resolver.cc:391
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Canceling the removal of %s is rejected."
 msgstr "%F'i kaldırmayı iptal et"
 
 #: src/gtk/resolver.cc:394
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keeping %s at version %s is rejected."
 msgstr "%F'in %s (%s) sürümünü tut"
 
@@ -4717,7 +4562,6 @@
 
 #: src/gtk/resolver.cc:413
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrading %s to version %s is rejected."
 msgstr "%s sürümleri"
 
@@ -4759,7 +4603,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr "%s sürümleri"
@@ -4853,7 +4696,6 @@
 
 #: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862
 #, fuzzy
-#| msgid "Remove the following packages:"
 msgid "Keep the following packages:"
 msgstr "Aşağıdaki paketleri kaldır:"
 
@@ -4869,49 +4711,41 @@
 
 #: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900
 #, fuzzy
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "Leave the following dependencies unresolved:"
 msgstr "Aşağıdaki bağımlılıkları çözülmemiş bırak:%n"
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Remove %F [%s (%s)]"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "%F [%s (%s)]'i kaldır"
 
 #: src/gtk/resolver.cc:1523
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "%F [%s (%s)]'i kur"
 
 #: src/gtk/resolver.cc:1531
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s"
 msgstr "%F'in kurulumunu iptal et"
 
 #: src/gtk/resolver.cc:1534
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s"
 msgstr "%F'i kaldırmayı iptal et"
 
 #: src/gtk/resolver.cc:1537
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "%F'in %s (%s) sürümünü tut"
 
 #: src/gtk/resolver.cc:1544
 #, fuzzy, c-format
-#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "%F'i yükselt [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1553
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Alçalt %F [%s (%s) -> %s (%s)]"
 
@@ -4927,37 +4761,31 @@
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "%F'in %s (%s) sürümünü tut"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>keep</b> %s at version %s"
 msgstr "%F'in %s (%s) sürümünü tut"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr "%F'in kurulumunu iptal et"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>cancel</b> the installation of %s"
 msgstr "%F'in kurulumunu iptal et"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>Install</b> %s %s"
 msgstr "%F [%s (%s)]'i kur"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>install</b> %s %s"
 msgstr "%F [%s (%s)]'i kur"
 
@@ -4973,13 +4801,11 @@
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>Upgrade</b> %s to version %s"
 msgstr "%s sürümleri"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>upgrade</b> %s to version %s"
 msgstr "%s sürümleri"
 
@@ -4995,54 +4821,42 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "%d kurulacak"
 
 #: src/gtk/resolver.cc:1740
 #, fuzzy, c-format
-#| msgid "%d removal"
-#| msgid_plural "%d removals"
 msgid "%s remove"
 msgid_plural "%s removes"
 msgstr[0] "%d kaldırılacak"
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "%d keep"
-#| msgid_plural "%d keeps"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "%d tutulacak"
 
 #: src/gtk/resolver.cc:1752
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%s upgrade"
 msgid_plural "%s upgrades"
 msgstr[0] "%d güncellenecek"
 
 #: src/gtk/resolver.cc:1758
 #, fuzzy, c-format
-#| msgid "%d downgrade"
-#| msgid_plural "%d downgrades"
 msgid "%s downgrade"
 msgid_plural "%s downgrades"
 msgstr[0] "%d eski sürümü kurulacak"
 
 #: src/gtk/resolver.cc:1764
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "%s unresolved recommendation"
 msgid_plural "%s unresolved recommendations"
 msgstr[0] "^Önerilenleri Denetle"
 
 #: src/gtk/resolver.cc:2056
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions yet."
 msgstr "Başka çözüm yok."
 
@@ -5053,7 +4867,6 @@
 
 #: src/gtk/resolver.cc:2064
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions."
 msgstr "Başka çözüm yok."
 
@@ -5063,19 +4876,16 @@
 
 #: src/gtk/resolver.cc:2076
 #, fuzzy, c-format
-#| msgid "No more solutions."
 msgid "%u solutions."
 msgstr "Başka çözüm yok."
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "Dosya açılamıyor: \"%s\""
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr "[İndirildi]"
 
@@ -5125,7 +4935,6 @@
 
 #: src/load_grouppolicy.cc:305
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected ',', '%c', or '('; got '%c'"
 msgstr "',' ya da '(' gerekli, '%c' değil"
 
@@ -5413,45 +5222,37 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr "install      - Paketleri kur/güncelle\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Paketleri kaldır\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Paketleri ve onlara ait ayar dosyalarını kaldır\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Paketleri tut\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold         - Bir paket için hold(tut) komutunu iptal et\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr ""
 "markauto     - Paketler otomatik olarak kurulacak şekilde işaretlenir\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto     - Paketler elle kurulacak şekilde işaretlenir\n"
 
@@ -5466,7 +5267,6 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update     - Yeni/güncellenebilir paketlerin listesini indir\n"
 
@@ -5491,51 +5291,41 @@
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr "forget-new       Hangi paketlerin \"yeni\" olduğunu unut\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Paketleri ismine ve/veya tanımlara göre ara\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Bir paket hakkında detaylı bilgi göster\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean         - İndirilmiş paket dosyalarını sil\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Eski indirilmiş paket dosyalarını sil\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Paketin değişiklik güncesini göster\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download    - Bir paket için .deb dosyasını indir\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5569,7 +5359,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             Bu yardım metni\n"
 
@@ -5598,15 +5387,11 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -p             Her zaman onay için ya da eylem için sor\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
@@ -5615,9 +5400,6 @@
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5627,9 +5409,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5639,8 +5418,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 genişlik       Arama sonuçları için gösterme genişliği belirt\n"
@@ -5671,9 +5448,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5681,8 +5455,6 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr " -t [sürüm]   Paketlerin kurulacağı sürümü ayarla\n"
@@ -5696,15 +5468,11 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o key=değ     'key' yapılandırma seçeneğini doğrudan değiştir\n"
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -5742,7 +5510,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "replaces"
 msgid "trace"
 msgstr "yerini alırsa"
 
@@ -5756,7 +5523,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "hayır"
 
@@ -5770,7 +5536,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:377
 #, fuzzy
-#| msgid "Err "
 msgid "error"
 msgstr "Hata"
 
@@ -5798,7 +5563,6 @@
 
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "Geçersiz işlem %s"
 
@@ -5851,7 +5615,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "Paket"
 
@@ -5861,7 +5624,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "Tüm Paketler"
 
@@ -5881,7 +5643,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -5889,8 +5650,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -5898,7 +5657,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "-u ve -i bir komutla birlikte kullanılamaz"
 
@@ -7133,7 +6891,6 @@
 
 #: src/ui.cc:472
 #, fuzzy, c-format
-#| msgid "Unable to open %ls"
 msgid "Unable to fork: %s"
 msgstr "%ls açılamıyor"
 
@@ -7408,9 +7165,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7432,9 +7186,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7963,19 +7714,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "Değişim günlüklerini indirmek için kullanılacak URL(adres)"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "Değişim günlüklerini indirmek için kullanılacak URL(adres)"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "Changelog İndiriliyor"
 
Index: aptitude/po/uk.po
===================================================================
--- aptitude.orig/po/uk.po
+++ aptitude/po/uk.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2008-09-05 09:43+0200\n"
 "Last-Translator: Borys Yanovych <borman@pravex.kiev.ua>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -199,16 +199,11 @@
 
 #: src/apt_options.cc:211
 #, fuzzy
-#| msgid "Display the extended description area by default"
 msgid "Display the information area by default"
 msgstr "За замовчуванням показувати область розширеного опису"
 
 #: src/apt_options.cc:212
 #, fuzzy
-#| msgid ""
-#| "If this option is enabled, the long description area (the pane at the "
-#| "bottom of the screen) in the package list will be visible when the "
-#| "program starts; otherwise, it will be initially hidden."
 msgid ""
 "If this option is enabled, the information area (the pane at the bottom of "
 "the screen) in the package list will be visible when the program starts; "
@@ -220,15 +215,11 @@
 
 #: src/apt_options.cc:217
 #, fuzzy
-#| msgid "The display format for package views"
 msgid "Display tabs for the available views"
 msgstr "Формат представлень пакунків"
 
 #: src/apt_options.cc:218
 #, fuzzy
-#| msgid ""
-#| "If this option is enabled, aptitude will display the status of ongoing "
-#| "downloads at the bottom of the screen, rather than opening a new view."
 msgid ""
 "If this option is enabled, tabs will appear at the top of the screen listing "
 "the currently opened views."
@@ -238,16 +229,11 @@
 
 #: src/apt_options.cc:221
 #, fuzzy
-#| msgid "Display more information about the selected package"
 msgid "Display tabs for the information area"
 msgstr "Показати більше інформації про виділений пакунок"
 
 #: src/apt_options.cc:222
 #, fuzzy
-#| msgid ""
-#| "If this option is enabled, the long description area (the pane at the "
-#| "bottom of the screen) in the package list will be visible when the "
-#| "program starts; otherwise, it will be initially hidden."
 msgid ""
 "If this option is enabled, tabs will appear at the top of the information "
 "area (the pane at the bottom of the screen) listing the different displays "
@@ -290,9 +276,6 @@
 
 #: src/apt_options.cc:241
 #, fuzzy
-#| msgid ""
-#| "If this option is enabled, the menu bar will only appear when it has been "
-#| "activated by pressing the menu key."
 msgid ""
 "If this option is enabled, then the first view displayed on startup will be "
 "a flat view instead of the default view."
@@ -401,10 +384,6 @@
 
 #: src/apt_options.cc:294
 #, fuzzy
-#| msgid ""
-#| "This option controls the template that's used to download changelogs from "
-#| "the Debian Web site.  You should only need to change this if the URL of "
-#| "the package archive changes."
 msgid ""
 "This option controls the template that's used to download changelogs from "
 "the Debian Web site.  You should only need to change this if the changelogs "
@@ -618,19 +597,16 @@
 
 #: src/apt_options.cc:525
 #, fuzzy
-#| msgid "^UI options"
 msgid "UI options"
 msgstr "Налаштування ІК"
 
 #: src/apt_options.cc:527
 #, fuzzy
-#| msgid "^Dependency handling"
 msgid "Dependency handling"
 msgstr "Обробка залежностей"
 
 #: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1022
 #, fuzzy
-#| msgid "^Miscellaneous"
 msgid "Miscellaneous"
 msgstr "Різне"
 
@@ -679,7 +655,6 @@
 
 #: src/broken_indicator.cc:371
 #, fuzzy
-#| msgid "%BKeep%b the following packages at their current version:%n"
 msgid "Suggest keeping all packages at their current version."
 msgstr "%BЗберегти%b поточні версії таких пакунків:%n"
 
@@ -733,13 +708,11 @@
 
 #: src/cmdline/cmdline_action.cc:55
 #, fuzzy, c-format
-#| msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
 msgid "Unable to find the source package for \"%s\".\n"
 msgstr "Неможливо знайти архів \"%s\" для пакунка \"%s\"\n"
 
 #: src/cmdline/cmdline_action.cc:212
 #, fuzzy, c-format
-#| msgid "Unable to list files in \"%s\""
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Неможливо отримати список файлів в \"%s\""
 
@@ -796,13 +769,11 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s не встановлений, тому його перевстановлення неможливе.\n"
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "%s вже встановлено потрібної версії (%s)\n"
@@ -903,7 +874,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "Список змін для %s"
 
@@ -962,7 +932,6 @@
 
 #: src/cmdline/cmdline_do_action.cc:347
 #, fuzzy, c-format
-#| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid ""
 "Unable to safely resolve dependencies, try running with --full-resolver.\n"
 msgstr "Не вдається розв'язати залежності для оновлення (%s)."
@@ -1009,7 +978,6 @@
 #: src/cmdline/cmdline_extract_cache_subset.cc:95
 #: src/cmdline/cmdline_user_tag.cc:133
 #, fuzzy, c-format
-#| msgid "No such package \"%s\""
 msgid "No such package \"%s\".\n"
 msgstr "Неможливо знайти пакунок \"%s\""
 
@@ -1066,7 +1034,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "none"
 
@@ -1080,7 +1047,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:344
 #, fuzzy
-#| msgid "config-files"
 msgid "Config files"
 msgstr "конфіг-файли"
 
@@ -1307,9 +1273,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:805
 #, fuzzy, c-format
-#| msgid ""
-#| "No packages found -- enter zero or more roots of the search followed by "
-#| "the package to justify."
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
 "package to justify.\n"
@@ -1482,7 +1445,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "'&M' позначити пакунки як автоматично встановлені"
 
@@ -1617,9 +1579,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy, c-format
-#| msgid ""
-#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
-#| "n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
@@ -1659,8 +1618,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:257
 #, fuzzy
-#| msgid ""
-#| "run the automatic dependency resolver to fix the broken dependencies."
 msgid ""
 "abort automatic dependency resolution; resolve dependencies by hand instead"
 msgstr ""
@@ -1669,9 +1626,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:259
 #, fuzzy
-#| msgid ""
-#| "reject the given package versions; don't display any solutions in which "
-#| "they occur."
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package.  "
@@ -1681,9 +1635,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:261
 #, fuzzy
-#| msgid ""
-#| "accept the given package versions; display only solutions in which they "
-#| "occur."
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package.  "
@@ -1732,7 +1683,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:351
 #, fuzzy, c-format
-#| msgid "Expected a version after \"%s\""
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "Очікується версія після \"%s\""
 
@@ -1788,31 +1738,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "Залишити наступні залежності нерозв'язаними:%n"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "Перевірка рекомендацій"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "Видалення %s більше не вимагається"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "Перевірка рекомендацій"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Дії"
 
@@ -1878,7 +1823,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:790
 #, fuzzy, c-format
-#| msgid "open: %d; closed: %d; defer: %d; conflict: %d"
 msgid "open: %zd; closed: %zd; defer: %zd; conflict: %zd"
 msgstr "відкрито: %d; закрито: %d; відкладено: %d; конфліктує: %d"
 
@@ -1968,13 +1912,11 @@
 
 #: src/cmdline/cmdline_resolver.cc:1201
 #, fuzzy
-#| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr "Не вдалося розв'язати залежності для оновлення (рішень не знайдено)."
 
 #: src/cmdline/cmdline_resolver.cc:1207
 #, fuzzy, c-format
-#| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Не вдається розв'язати залежності для оновлення (%s)."
 
@@ -2005,13 +1947,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "проте його неможливо встановити"
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "але має бути встановленим %s."
 
@@ -2110,13 +2050,11 @@
 
 #: src/cmdline/cmdline_show.cc:326
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s%s; will be installed"
 msgstr "%s; буде встановлено."
 
 #: src/cmdline/cmdline_show.cc:328
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s%s; will be installed automatically"
 msgstr "%s; буде встановлений автоматично"
 
@@ -2293,13 +2231,11 @@
 
 #: src/cmdline/cmdline_user_tag.cc:66
 #, fuzzy, c-format
-#| msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
 msgid "Adding user tag \"%s\" to the package \"%s\".\n"
 msgstr "Неможливо знайти версію \"%s\" для пакунка \"%s\"\n"
 
 #: src/cmdline/cmdline_user_tag.cc:73
 #, fuzzy, c-format
-#| msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
 msgid "Removing user tag \"%s\" from the package \"%s\".\n"
 msgstr "Неможливо знайти версію \"%s\" для пакунка \"%s\"\n"
 
@@ -2386,25 +2322,21 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "Пакунки"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Джерельний пакунок: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Архів"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\""
 msgid "No such package \"%s\"."
 msgstr "Неможливо знайти пакунок \"%s\""
 
@@ -2443,19 +2375,16 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "пошук: Ви повинні ввести хоча б одне слово для пошуку\n"
 
 #: src/cmdline/cmdline_why.cc:340
 #, fuzzy
-#| msgid "delete"
 msgid "dep_level"
 msgstr "delete"
 
 #: src/cmdline/cmdline_why.cc:346
 #, fuzzy
-#| msgid "Depends"
 msgid "DependsOnly"
 msgstr "Залежить"
 
@@ -2469,7 +2398,6 @@
 
 #: src/cmdline/cmdline_why.cc:368
 #, fuzzy
-#| msgid "CandVer"
 msgid "Candidate"
 msgstr "МожлВерс"
 
@@ -2479,7 +2407,6 @@
 
 #: src/cmdline/cmdline_why.cc:374
 #, fuzzy
-#| msgid "Installed"
 msgid "InstallNotCurrent"
 msgstr "Встановлений"
 
@@ -2489,13 +2416,11 @@
 
 #: src/cmdline/cmdline_why.cc:385
 #, fuzzy
-#| msgid "True"
 msgid "true"
 msgstr "True"
 
 #: src/cmdline/cmdline_why.cc:387
 #, fuzzy
-#| msgid "False"
 msgid "false"
 msgstr "False"
 
@@ -2542,7 +2467,6 @@
 
 #: src/cmdline/cmdline_why.cc:1156
 #, fuzzy
-#| msgid "    ++   --> skipping, parent is not the selected version\n"
 msgid "    ++   --> skipping, the dep is satisfied by the current version\n"
 msgstr "    ++   --> ігноруємо, основа не є вибраною версією\n"
 
@@ -2570,19 +2494,16 @@
 
 #: src/cmdline/cmdline_why.cc:1244
 #, fuzzy, c-format
-#| msgid "Unable to find a solution to apply."
 msgid "Unable to find a reason to remove %s.\n"
 msgstr "Не вдалося знайти розв'язок, який можна було б застосувати."
 
 #: src/cmdline/cmdline_why.cc:1246
 #, fuzzy, c-format
-#| msgid "Unable to find a solution to apply."
 msgid "Unable to find a reason to install %s.\n"
 msgstr "Не вдалося знайти розв'язок, який можна було б застосувати."
 
 #: src/cmdline/cmdline_why.cc:1285
 #, fuzzy, c-format
-#| msgid "Packages depending on %s"
 msgid "Packages requiring %s:"
 msgstr "Пакунки, що залежать від %s"
 
@@ -2598,8 +2519,6 @@
 
 #: src/cmdline/cmdline_why.cc:1416
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: this command requires at least one argument (the package to query)."
 msgid ""
 "%s: this command requires at least one argument (the package to query).\n"
 msgstr ""
@@ -2618,7 +2537,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[ПОМИЛКА]"
 
@@ -2632,7 +2550,6 @@
 
 #: src/desc_render.cc:134 src/gtk/aptitude.glade:1060
 #, fuzzy
-#| msgid "Tag"
 msgid "Tags"
 msgstr "Мітка"
 
@@ -2693,7 +2610,6 @@
 
 #: src/download_list.cc:264
 #, fuzzy
-#| msgid "Downloading..."
 msgid "Downloading... "
 msgstr "Завантаження..."
 
@@ -2704,7 +2620,6 @@
 
 #: src/download_list.cc:347 src/gtk/download.cc:445
 #, fuzzy
-#| msgid "Abort.\n"
 msgid "Abort"
 msgstr "Перервати.\n"
 
@@ -2764,7 +2679,6 @@
 
 #: src/generic/apt/aptcache.cc:288
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated '\"' in the user-tags list of the package %s."
 msgstr "Незавершений текстовий рядок після %s"
 
@@ -2861,9 +2775,6 @@
 
 #: src/generic/apt/apt.cc:453
 #, fuzzy
-#| msgid ""
-#| "Could not lock the cache file.  Opening in read-only mode; any changes "
-#| "you make to the states of packages will NOT be preserved!"
 msgid ""
 "Could not lock the cache file; this usually means that dpkg or another apt "
 "tool is already installing packages.  Opening in read-only mode; any changes "
@@ -2976,7 +2887,6 @@
 
 #: src/generic/apt/download_update_manager.cc:138
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated quoted string in command: %s"
 msgstr "Незавершений текстовий рядок після %s"
 
@@ -3013,7 +2923,6 @@
 
 #: src/generic/apt/download_update_manager.cc:371
 #, fuzzy
-#| msgid "Building tag database"
 msgid "Updating debtags database..."
 msgstr "Створення бази даних міток"
 
@@ -3044,7 +2953,6 @@
 #. ForTranslators: "%s update %s" gets replaced by a command line, do not translate it!
 #: src/generic/apt/download_update_manager.cc:412
 #, fuzzy, c-format
-#| msgid "Unable to load debtags vocabulary, perhaps debtags is not installed?"
 msgid ""
 "Updating the debtags database (%s update %s) failed (perhaps debtags is not "
 "installed?): %s"
@@ -3057,7 +2965,6 @@
 
 #: src/generic/apt/dump_packages.cc:674
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create truncated cache: %s."
 msgstr "Неможливо знайти пакунок %s"
 
@@ -3180,7 +3087,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "Завантаження пакунків"
 
@@ -3206,7 +3112,6 @@
 
 #: src/generic/apt/matching/parse.cc:467
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected '%c', got '%c'."
 msgstr "Очікувалась ',' або '(', отримали '%c'"
 
@@ -3219,7 +3124,6 @@
 
 #: src/generic/apt/matching/parse.cc:860
 #, fuzzy, c-format
-#| msgid "Unknown pattern type: %c"
 msgid "Unknown term type: \"%s\"."
 msgstr "Невідомий тип шаблону: %c"
 
@@ -3255,7 +3159,6 @@
 
 #: src/generic/apt/matching/parse.cc:1388
 #, fuzzy, c-format
-#| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "Невірно сформований вираз"
 
@@ -3295,19 +3198,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "URL для завантаження списків змін"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "URL для завантаження списків змін"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "Список змін для %s"
 
@@ -3353,7 +3253,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Не вдалося проаналізувати шаблон %s"
 
@@ -3368,14 +3267,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "Не встановлений"
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "Не встановлений"
 
@@ -3402,67 +3299,56 @@
 
 #: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected '%s', but got EOF."
 msgstr "Очікувалась ',' або '(', отримали '%c'"
 
 #: src/generic/util/parsers.h:737
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected '%s', but got '%s'."
 msgstr "Очікувалась ',' або '(', отримали '%c'"
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "Після -q= очікується число, отримано %s\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "Невірний символ вибору дії: '%c'\n"
 
 #: src/generic/util/parsers.h:832
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected %s, but got EOF."
 msgstr "Очікувалась ',' або '(', отримали '%c'"
 
 #: src/generic/util/parsers.h:843
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected %s, but got '%c'."
 msgstr "Очікувалась ',' або '(', отримали '%c'"
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "Очікувався ідентифікатор правила, отримано '%c'"
 
 #: src/generic/util/parsers.h:1026
 #, fuzzy
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected an integer following '-', got EOF."
 msgstr "Очікувалась ',' або ')' після '||', отримали '%s'"
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "Очікувався ідентифікатор правила, отримано '%c'"
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "Помилкова дія %s"
 
 #: src/generic/util/parsers.h:1077
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected EOF, got '%c'."
 msgstr "Очікувалась ',' або '(', отримали '%c'"
 
@@ -3476,19 +3362,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "Неочікувана ')'"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " чи"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "Неочікувана ')'"
 
@@ -3499,7 +3382,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "Не вдалося створити тимчасову теку з шаблона \"%s\": %s"
 
@@ -3534,7 +3416,6 @@
 
 #: src/gtk/aptitude.glade:19 src/gtk/aptitude.glade:2273
 #, fuzzy
-#| msgid "False"
 msgid "_File"
 msgstr "False"
 
@@ -3598,13 +3479,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "Пакунок"
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "Представлення"
 
@@ -3624,7 +3503,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "Допомога"
 
@@ -3635,7 +3513,6 @@
 
 #: src/gtk/aptitude.glade:345 src/gtk/aptitude.glade:2614
 #, fuzzy
-#| msgid "List Update"
 msgid "Update"
 msgstr "Оновлення списку"
 
@@ -3657,7 +3534,6 @@
 
 #: src/gtk/aptitude.glade:389 src/gtk/aptitude.glade:2658
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Remove"
 msgstr "Встановлений"
 
@@ -3671,33 +3547,28 @@
 
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "Зняти фільтр зі списку пакунків"
 
 #: src/gtk/aptitude.glade:649
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "Apply these settings to all active package lists."
 msgstr "Застосувати фільтр до списку пакунків"
 
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "Пошук"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "reinstall"
 
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "Пмл "
 
@@ -3712,19 +3583,16 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "Залежні від %s"
 
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "^Changelog"
 msgid "Changelog"
 msgstr "^ChangeLog"
 
 #: src/gtk/aptitude.glade:1020
 #, fuzzy
-#| msgid "False"
 msgid "Files"
 msgstr "False"
 
@@ -3738,7 +3606,6 @@
 
 #: src/gtk/aptitude.glade:1051
 #, fuzzy
-#| msgid "Tag"
 msgid "tags"
 msgstr "Мітка"
 
@@ -3761,13 +3628,11 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "Стан"
 
 #: src/gtk/aptitude.glade:1247
 #, fuzzy
-#| msgid "Unknown action type: %s"
 msgid "Group by action type"
 msgstr "Невідомий тип дії: %s"
 
@@ -3796,13 +3661,11 @@
 
 #: src/gtk/aptitude.glade:1328
 #, fuzzy
-#| msgid "Toggle ^Rejected"
 msgid "Rejected"
 msgstr "Встановити скасування"
 
 #: src/gtk/aptitude.glade:1343
 #, fuzzy
-#| msgid "Preferences"
 msgid "No preference"
 msgstr "Вподобання"
 
@@ -3816,32 +3679,27 @@
 
 #: src/gtk/aptitude.glade:1400
 #, fuzzy
-#| msgid "^Examine Solution"
 msgid "Find a new solution"
 msgstr "Розглянути розв'язок"
 
 #: src/gtk/aptitude.glade:1404
 #, fuzzy
-#| msgid "Select the next solution to the dependency problems."
 msgid "Calculate the next solution that has not yet been generated."
 msgstr "Вибрати наступний розв'язок проблем з залежностями."
 
 #: src/gtk/aptitude.glade:1419
 #, fuzzy
-#| msgid "Perform the actions contained in the currently selected solution."
 msgid ""
 "Perform the actions in the currently selected solution and close this tab."
 msgstr "Виконати дії, що містяться у вибраному на даний момент розв'язку."
 
 #: src/gtk/aptitude.glade:1576
 #, fuzzy
-#| msgid "Upgrade"
 msgid "Upgrade Summary"
 msgstr "Оновити"
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "Джерельний пакунок: "
 
@@ -3853,7 +3711,6 @@
 
 #: src/gtk/aptitude.glade:1652
 #, fuzzy
-#| msgid "Manual"
 msgid "Fix Manually"
 msgstr "Довідник"
 
@@ -3901,31 +3758,26 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "Недієздатний"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "Неможливо виправити для недоступних пакунків"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "Пошук"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search forwards"
 msgid "Search for packages."
 msgstr "Пошук вперед"
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "Отримано "
 
@@ -3959,19 +3811,16 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "URL для завантаження списків змін"
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "Вимагається встановлення %s версії %s (%s)"
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -3979,20 +3828,17 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr "Список змін можна переглянути лише для офіційних пакунків Debian."
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "Завантаження списку змін"
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "URL для завантаження списків змін"
 
@@ -4006,7 +3852,6 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "URL для завантаження списків змін"
 
@@ -4016,8 +3861,6 @@
 
 #: src/gtk/dashboardtab.cc:414
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] "%d оновити"
@@ -4026,13 +3869,11 @@
 
 #: src/gtk/dashboardtab.cc:633
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No upgrades are available."
 msgstr "Не встановлений"
 
 #: src/gtk/dashboardtab.cc:645
 #, fuzzy
-#| msgid "Unable to locate package %s"
 msgid "Unable to calculate an upgrade."
 msgstr "Неможливо знайти пакунок %s"
 
@@ -4069,26 +3910,22 @@
 
 #: src/gtk/dashboardtab.cc:708
 #, fuzzy, c-format
-#| msgid "Internal error: Default column string is unparsable"
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr ""
 "Внутрішня помилка: Неможливо проаналізувати стовпчик рядка за замовчанням"
 
 #: src/gtk/dependency_chains_tab.cc:78
 #, fuzzy
-#| msgid "^Dependency handling"
 msgid "Find dependency chains: start"
 msgstr "Обробка залежностей"
 
 #: src/gtk/dependency_chains_tab.cc:82
 #, fuzzy
-#| msgid "^Dependency handling"
 msgid "Find dependency chains: end"
 msgstr "Обробка залежностей"
 
 #: src/gtk/dependency_chains_tab.cc:86
 #, fuzzy
-#| msgid "^Dependency handling"
 msgid "Find dependency chains: results"
 msgstr "Обробка залежностей"
 
@@ -4098,7 +3935,6 @@
 
 #: src/gtk/dependency_chains_tab.cc:282
 #, fuzzy
-#| msgid "^Dependency handling"
 msgid "No dependency chain found."
 msgstr "Обробка залежностей"
 
@@ -4108,13 +3944,11 @@
 
 #: src/gtk/download.cc:185
 #, fuzzy
-#| msgid "False"
 msgid "Failed"
 msgstr "False"
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "Видалення завантажених файлів"
 
@@ -4125,13 +3959,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "Загальний поступ: "
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description"
 msgid "Short Description"
 msgstr "Опис"
 
@@ -4141,13 +3973,11 @@
 
 #: src/gtk/download.cc:319
 #, fuzzy
-#| msgid "Cleaning while a download is in progress is not allowed"
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr "Очищення під час процесу завантаження неможливе"
 
 #: src/gtk/download.cc:395 src/gtk/gui.cc:832
 #, fuzzy
-#| msgid "View next display"
 msgid "View Details"
 msgstr "Вивести наступне вікно"
 
@@ -4167,19 +3997,16 @@
 
 #: src/gtk/download.cc:486
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s: %lu/%lu, stalled"
 msgstr "%s; буде встановлено."
 
 #: src/gtk/download.cc:507
 #, fuzzy, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr " [ %i%% ] (%sb/s, %s залишилось)"
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "але має бути встановленим %s."
 
@@ -4193,7 +4020,6 @@
 
 #: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "Неможливо знайти пакунок %s"
 
@@ -4204,7 +4030,6 @@
 
 #: src/gtk/dpkg_terminal.cc:429
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "%s: Unable to accept a connection: %s"
 msgstr "Не вдалося створити тимчасову теку з шаблона \"%s\": %s"
 
@@ -4230,80 +4055,67 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "%s версії"
 
 #: src/gtk/entitysummary.cc:123
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Install %s version %s"
 msgstr "Встановлюється(%s забезпечує %s)"
 
 #: src/gtk/entitysummary.cc:131
 #, fuzzy, c-format
-#| msgid "libsigc++ version: %s\n"
 msgid "Downgrade to %s version %s"
 msgstr "Версія libsigc++: %s\n"
 
 #: src/gtk/entitysummary.cc:142
 #, fuzzy, c-format
-#| msgid "%BKeep%b the following packages at their current version:%n"
 msgid "Don't hold %s at its current version."
 msgstr "%BЗберегти%b поточні версії таких пакунків:%n"
 
 #: src/gtk/entitysummary.cc:145 src/gtk/entitysummary.cc:165
 #: src/gtk/entitysummary.cc:168
 #, fuzzy, c-format
-#| msgid "Canc^el pending actions"
 msgid "Cancel any actions on %s."
 msgstr "Скасувати всі незавершені дії"
 
 #: src/gtk/entitysummary.cc:150
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the purge of %s."
 msgstr "Скасувати видалення %F"
 
 #: src/gtk/entitysummary.cc:152
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s."
 msgstr "Скасувати видалення %F"
 
 #: src/gtk/entitysummary.cc:157
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the upgrade of %s."
 msgstr "Скасувати видалення %F"
 
 #: src/gtk/entitysummary.cc:159
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s."
 msgstr "Скасувати встановлення %F"
 
 #: src/gtk/entitysummary.cc:161
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the downgrade of %s."
 msgstr "Скасувати видалення %F"
 
 #: src/gtk/entitysummary.cc:163
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the reinstallation of %s."
 msgstr "Скасувати встановлення %F"
 
 #: src/gtk/entitysummary.cc:206
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "Remove %s"
 msgstr "Видалити(%s)"
 
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "Очистити"
 
@@ -4314,19 +4126,16 @@
 
 #: src/gtk/entitysummary.cc:223
 #, fuzzy, c-format
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Mark %s as automatically installed."
 msgstr "'&M' позначити пакунки як автоматично встановлені"
 
 #: src/gtk/entitysummary.cc:228
 #, fuzzy, c-format
-#| msgid "The package \"%s\" is manually installed.\n"
 msgid "Mark %s as manually installed."
 msgstr "Пакунок \"%s\" встановлений вручну.\n"
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
 msgid "%s is a virtual package provided by:\n"
 msgstr "\"%s\" є віртуальним пакунком, що забезпечується:\n"
 
@@ -4336,13 +4145,11 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "Джерельний пакунок: "
 
 #: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 #, fuzzy
-#| msgid "ProgName"
 msgid "Name"
 msgstr "ProgName"
 
@@ -4352,13 +4159,11 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "Неможливо відкрити файл \"%s\""
 
 #: src/gtk/entityview.cc:412
 #, fuzzy, c-format
-#| msgid "Rejecting the removal of %s"
 msgid "Editing the columns of \"%s\""
 msgstr "Відхиляється видалення %s"
 
@@ -4372,25 +4177,21 @@
 
 #: src/gtk/entityview.cc:570
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Whether the package is automatically installed."
 msgstr "'&M' позначити пакунки як автоматично встановлені"
 
 #: src/gtk/entityview.cc:576
 #, fuzzy
-#| msgid "Cancel any action on the selected package"
 msgid "The name and description of the package."
 msgstr "Скасувати всі дії над вибраним пакунком"
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "Версія: "
 
 #: src/gtk/entityview.cc:592
 #, fuzzy
-#| msgid "Check for new versions of packages"
 msgid "The version number of the package."
 msgstr "Перевірити доступність нових версій пакунків"
 
@@ -4411,7 +4212,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "не встановлений"
 
@@ -4421,37 +4221,31 @@
 
 #: src/gtk/gui.cc:82
 #, fuzzy
-#| msgid "unpacked"
 msgid "Unpacked"
 msgstr "розпакований"
 
 #: src/gtk/gui.cc:83
 #, fuzzy
-#| msgid "half-config"
 msgid "Half-configured"
 msgstr "напівналаштований"
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "half-install"
 msgid "Half-installed"
 msgstr "напіввстановлений"
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "не встановлений (залишились файли налаштувань)"
 
 #: src/gtk/gui.cc:86
 #, fuzzy
-#| msgid "triggers-awaited"
 msgid "Triggers awaited"
 msgstr "triggers-awaited"
 
 #: src/gtk/gui.cc:87
 #, fuzzy
-#| msgid "triggers-pending"
 msgid "Triggers pending"
 msgstr "triggers-pending"
 
@@ -4477,13 +4271,11 @@
 
 #: src/gtk/gui.cc:97
 #, fuzzy
-#| msgid "forbidden upgrade"
 msgid "Hold (don't upgrade)"
 msgstr "forbidden upgrade"
 
 #: src/gtk/gui.cc:99
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Unsatisfied dependencies"
 msgstr "Розв'язати залежності"
 
@@ -4497,13 +4289,11 @@
 
 #: src/gtk/gui.cc:290
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "Застосувати фільтр до списку пакунків"
 
 #: src/gtk/gui.cc:298 src/gtk/gui.cc:946
 #, fuzzy
-#| msgid "Downloading..."
 msgid "Download already running."
 msgstr "Завантаження..."
 
@@ -4513,13 +4303,11 @@
 
 #: src/gtk/gui.cc:359
 #, fuzzy, c-format
-#| msgid "List Update"
 msgid "Update %s?"
 msgstr "Оновлення списку"
 
 #: src/gtk/gui.cc:385
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
@@ -4547,31 +4335,26 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "%s changes"
 msgid "Done applying changes!"
 msgstr "%s змін"
 
 #: src/gtk/gui.cc:823
 #, fuzzy
-#| msgid "%s changes"
 msgid "Applying changes..."
 msgstr "%s змін"
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "s: %F"
 msgid "%s: %s"
 msgstr "s: %F"
 
 #: src/gtk/gui.cc:878
 #, fuzzy, c-format
-#| msgid "'-' to remove packages"
 msgid "Error in package %s"
 msgstr "'-' видалити пакунки"
 
 #: src/gtk/gui.cc:906
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Неможливо замінити %s новим файлом налаштувань"
 
@@ -4581,25 +4364,21 @@
 
 #: src/gtk/gui.cc:1038
 #, fuzzy
-#| msgid "'-' to remove packages"
 msgid "Broken packages"
 msgstr "'-' видалити пакунки"
 
 #: src/gtk/gui.cc:1071
 #, fuzzy
-#| msgid "'-' to remove packages"
 msgid "Show broken packages"
 msgstr "'-' видалити пакунки"
 
 #: src/gtk/gui.cc:1075
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "Розв'язати залежності"
 
 #: src/gtk/gui.cc:1103
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Всі пакунки є дієздатними."
@@ -4608,13 +4387,11 @@
 
 #: src/gtk/gui.cc:1147
 #, fuzzy
-#| msgid "%s changes"
 msgid "View changes"
 msgstr "%s змін"
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "%s changes"
 msgid "Apply changes"
 msgstr "%s змін"
 
@@ -4623,8 +4400,6 @@
 #. font.
 #: src/gtk/gui.cc:1192
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%d package to install"
 msgid_plural "%d packages to install"
 msgstr[0] "%d встановити"
@@ -4636,7 +4411,6 @@
 #. font.
 #: src/gtk/gui.cc:1207
 #, fuzzy, c-format
-#| msgid "failed to remove %s"
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "не вдалося видалити %s"
@@ -4645,7 +4419,6 @@
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "DownloadSize"
 
@@ -4660,19 +4433,16 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "not installed"
 msgid "Not implemented"
 msgstr "не встановлений"
 
 #: src/gtk/gui.cc:1408 src/gtk/gui.cc:1427
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "Встановлений"
 
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "Очистити"
 
@@ -4690,7 +4460,6 @@
 
 #: src/gtk/gui.cc:1455
 #, fuzzy
-#| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "Довідник користувача"
 
@@ -4713,7 +4482,6 @@
 
 #: src/gtk/info.cc:496
 #, fuzzy
-#| msgid "Not Installed"
 msgid "Not available"
 msgstr "Не встановлений"
 
@@ -4723,7 +4491,6 @@
 
 #: src/gtk/info.cc:555
 #, fuzzy
-#| msgid "Packages which depend on %s"
 msgid "Package information: dependency list"
 msgstr "Пакунки, котрі залежать від %s"
 
@@ -4733,7 +4500,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "ні"
 
@@ -4747,7 +4513,6 @@
 
 #: src/gtk/packagestab.cc:203
 #, fuzzy, c-format
-#| msgid "No package named \"%s\" exists."
 msgid "No packages matched \"%s\"."
 msgstr "Пакунка з назвою \"%s\" не існує."
 
@@ -4757,31 +4522,26 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "Пакунок: "
 
 #: src/gtk/pkgview.cc:224
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed automatically."
 msgstr "%s; буде встановлений автоматично"
 
 #: src/gtk/pkgview.cc:227
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed automatically."
 msgstr "%s; буде встановлений автоматично"
 
 #: src/gtk/pkgview.cc:235
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed manually."
 msgstr "%s; буде встановлений автоматично"
 
 #: src/gtk/pkgview.cc:238
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed manually."
 msgstr "%s; буде встановлений автоматично"
 
@@ -4791,13 +4551,11 @@
 
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "Пошук"
 
 #: src/gtk/pkgview.cc:718
 #, fuzzy
-#| msgid "Building view"
 msgid "Finalizing view"
 msgstr "Створення представлень"
 
@@ -4930,13 +4688,11 @@
 
 #: src/gtk/previewtab.cc:179
 #, fuzzy
-#| msgid "Preview"
 msgid "Preview: "
 msgstr "Огляд"
 
 #: src/gtk/resolver.cc:68
 #, fuzzy, c-format
-#| msgid "Error while dumping resolver state"
 msgid "Error in dependency resolver: %s"
 msgstr "Помилка під час скидання стану розв'язувача"
 
@@ -4951,7 +4707,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package"
 msgid "Virtual package"
 msgstr "Пакунок"
 
@@ -4961,43 +4716,36 @@
 
 #: src/gtk/resolver.cc:377
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Removing %s is rejected."
 msgstr "Видаляється %s"
 
 #: src/gtk/resolver.cc:382
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Canceling the installation of %s is rejected."
 msgstr "Скасувати встановлення %F"
 
 #: src/gtk/resolver.cc:391
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Canceling the removal of %s is rejected."
 msgstr "Скасувати видалення %F"
 
 #: src/gtk/resolver.cc:394
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keeping %s at version %s is rejected."
 msgstr "Зберегти %F версії %s (%s)"
 
 #: src/gtk/resolver.cc:401
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Installing %s version %s is rejected."
 msgstr "Встановлюється(%s забезпечує %s)"
 
 #: src/gtk/resolver.cc:407
 #, fuzzy, c-format
-#| msgid "libsigc++ version: %s\n"
 msgid "Downgrading %s to version %s is rejected."
 msgstr "Версія libsigc++: %s\n"
 
 #: src/gtk/resolver.cc:413
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrading %s to version %s is rejected."
 msgstr "%s версії"
 
@@ -5039,7 +4787,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr "%s версії"
@@ -5090,204 +4837,171 @@
 
 #: src/gtk/resolver.cc:1240 src/solution_fragment.cc:130
 #, fuzzy, c-format
-#| msgid "depends on"
 msgid "%s depends upon %s"
 msgstr "залежить від"
 
 #: src/gtk/resolver.cc:1243 src/solution_fragment.cc:133
 #, fuzzy, c-format
-#| msgid "pre-depends on"
 msgid "%s pre-depends upon %s"
 msgstr "попередньо залежить від"
 
 #: src/gtk/resolver.cc:1246 src/solution_fragment.cc:136
 #, fuzzy, c-format
-#| msgid "suggests"
 msgid "%s suggests %s"
 msgstr "пропонує"
 
 #: src/gtk/resolver.cc:1249 src/solution_fragment.cc:139
 #: src/solution_item.cc:603
 #, fuzzy, c-format
-#| msgid "recommends"
 msgid "%s recommends %s"
 msgstr "рекомендує"
 
 #: src/gtk/resolver.cc:1252 src/solution_fragment.cc:142
 #, fuzzy, c-format
-#| msgid "conflicts with"
 msgid "%s conflicts with %s"
 msgstr "конфліктує з"
 
 #: src/gtk/resolver.cc:1255 src/solution_fragment.cc:145
 #, fuzzy, c-format
-#| msgid "breaks"
 msgid "%s breaks %s"
 msgstr "робить недієздатним"
 
 #: src/gtk/resolver.cc:1258 src/solution_fragment.cc:148
 #, fuzzy, c-format
-#| msgid "replaces"
 msgid "%s replaces %s"
 msgstr "заміщує"
 
 #: src/gtk/resolver.cc:1261 src/solution_fragment.cc:151
 #, fuzzy, c-format
-#| msgid "obsoletes"
 msgid "%s obsoletes %s"
 msgstr "робить застарілим"
 
 #: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838
 #: src/solution_screen.cc:272
 #, fuzzy
-#| msgid "%BRemove%b the following packages:%n"
 msgid "Remove the following packages:"
 msgstr "%BВидалити%b такі пакунки:%n"
 
 #: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850
 #: src/solution_screen.cc:296
 #, fuzzy
-#| msgid "%BInstall%b the following packages:%n"
 msgid "Install the following packages:"
 msgstr "%BВстановити%b такі пакунки:%n"
 
 #: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862
 #, fuzzy
-#| msgid "%BRemove%b the following packages:%n"
 msgid "Keep the following packages:"
 msgstr "%BВидалити%b такі пакунки:%n"
 
 #: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874
 #: src/solution_screen.cc:308
 #, fuzzy
-#| msgid "%BUpgrade%b the following packages:%n"
 msgid "Upgrade the following packages:"
 msgstr "%BОновити%b такі пакунки:%n"
 
 #: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887
 #: src/solution_screen.cc:320
 #, fuzzy
-#| msgid "%BDowngrade%b the following packages:%n"
 msgid "Downgrade the following packages:"
 msgstr "%BЗамінити на більш давні%b версії такі пакунки:%n"
 
 #: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900
 #, fuzzy
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "Leave the following dependencies unresolved:"
 msgstr "Залишити наступні залежності нерозв'язаними:%n"
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Remove %F [%s (%s)]"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "Видалити %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1523
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "Встановити %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1531
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s"
 msgstr "Скасувати встановлення %F"
 
 #: src/gtk/resolver.cc:1534
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s"
 msgstr "Скасувати видалення %F"
 
 #: src/gtk/resolver.cc:1537
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "Зберегти %F версії %s (%s)"
 
 #: src/gtk/resolver.cc:1544
 #, fuzzy, c-format
-#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Оновити %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1553
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Замінити %F на більш давню версію [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>Remove</b> %s"
 msgstr "Видалити(%s)"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>remove</b> %s"
 msgstr "Видалити(%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "Зберегти %F версії %s (%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>keep</b> %s at version %s"
 msgstr "Зберегти %F версії %s (%s)"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr "Скасувати встановлення %F"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>cancel</b> the installation of %s"
 msgstr "Скасувати встановлення %F"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>Install</b> %s %s"
 msgstr "Встановити %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>install</b> %s %s"
 msgstr "Встановити %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "libsigc++ version: %s\n"
 msgid "<b>Downgrade</b> %s to version %s"
 msgstr "Версія libsigc++: %s\n"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "libsigc++ version: %s\n"
 msgid "<b>downgrade</b> %s to version %s"
 msgstr "Версія libsigc++: %s\n"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>Upgrade</b> %s to version %s"
 msgstr "%s версії"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>upgrade</b> %s to version %s"
 msgstr "%s версії"
 
@@ -5303,8 +5017,6 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "%d встановити"
@@ -5313,8 +5025,6 @@
 
 #: src/gtk/resolver.cc:1740
 #, fuzzy, c-format
-#| msgid "%d removal"
-#| msgid_plural "%d removals"
 msgid "%s remove"
 msgid_plural "%s removes"
 msgstr[0] "%d видалити"
@@ -5323,8 +5033,6 @@
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "%d keep"
-#| msgid_plural "%d keeps"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "%d зберегти"
@@ -5333,8 +5041,6 @@
 
 #: src/gtk/resolver.cc:1752
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%s upgrade"
 msgid_plural "%s upgrades"
 msgstr[0] "%d оновити"
@@ -5343,8 +5049,6 @@
 
 #: src/gtk/resolver.cc:1758
 #, fuzzy, c-format
-#| msgid "%d downgrade"
-#| msgid_plural "%d downgrades"
 msgid "%s downgrade"
 msgid_plural "%s downgrades"
 msgstr[0] "%d замінити на більш давній"
@@ -5353,7 +5057,6 @@
 
 #: src/gtk/resolver.cc:1764
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "%s unresolved recommendation"
 msgid_plural "%s unresolved recommendations"
 msgstr[0] "Перевірка рекомендацій"
@@ -5362,19 +5065,16 @@
 
 #: src/gtk/resolver.cc:2056
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions yet."
 msgstr "Більше розв'язків немає."
 
 #: src/gtk/resolver.cc:2063
 #, fuzzy
-#| msgid "^Dependency handling"
 msgid "No dependency solution was found."
 msgstr "Обробка залежностей"
 
 #: src/gtk/resolver.cc:2064
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions."
 msgstr "Більше розв'язків немає."
 
@@ -5384,19 +5084,16 @@
 
 #: src/gtk/resolver.cc:2076
 #, fuzzy, c-format
-#| msgid "No more solutions."
 msgid "%u solutions."
 msgstr "Більше розв'язків немає."
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "Неможливо відкрити файл \"%s\""
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr "[Завантажено]"
 
@@ -5446,7 +5143,6 @@
 
 #: src/load_grouppolicy.cc:305
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected ',', '%c', or '('; got '%c'"
 msgstr "Очікувалась ',' або '(', отримали '%c'"
 
@@ -5553,7 +5249,6 @@
 
 #: src/load_grouppolicy.cc:713
 #, fuzzy, c-format
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected '{', ')', or ',' following '||', got '%s'"
 msgstr "Очікувалась ',' або ')' після '||', отримали '%s'"
 
@@ -5647,21 +5342,16 @@
 
 #: src/main.cc:144
 #, fuzzy
-#| msgid "Compiler: g++ %s\n"
 msgid "Compiled against:\n"
 msgstr "Компілятор: g++ %s\n"
 
 #: src/main.cc:145
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "  apt version %d.%d.%d\n"
 msgstr "Зберегти %F версії %s (%s)"
 
 #: src/main.cc:148
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "NCurses version: %s\n"
 msgid "  NCurses version: Unknown\n"
 msgstr ""
 "\n"
@@ -5669,9 +5359,6 @@
 
 #: src/main.cc:150
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "NCurses version: %s\n"
 msgid "  NCurses version %s\n"
 msgstr ""
 "\n"
@@ -5679,45 +5366,36 @@
 
 #: src/main.cc:152
 #, fuzzy, c-format
-#| msgid "libsigc++ version: %s\n"
 msgid "  libsigc++ version: %s\n"
 msgstr "Версія libsigc++: %s\n"
 
 #: src/main.cc:154
 #, fuzzy, c-format
-#| msgid "Ept support enabled.\n"
 msgid "  Ept support enabled.\n"
 msgstr "Підтримка ept увімкнена.\n"
 
 #: src/main.cc:156
 #, fuzzy, c-format
-#| msgid "Ept support disabled.\n"
 msgid "  Ept support disabled.\n"
 msgstr "Підтримка ept вимкнена.\n"
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "Зберегти %F версії %s (%s)"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "Зберегти %F версії %s (%s)"
 
 #: src/main.cc:164
 #, fuzzy, c-format
-#| msgid "Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "Підтримка ept вимкнена.\n"
 
 #: src/main.cc:167
 #, fuzzy
-#| msgid ""
-#| "\n"
-#| "Curses version: %s\n"
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5727,9 +5405,6 @@
 
 #: src/main.cc:168
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "NCurses version: %s\n"
 msgid "  NCurses version: %s\n"
 msgstr ""
 "\n"
@@ -5737,15 +5412,11 @@
 
 #: src/main.cc:169
 #, fuzzy, c-format
-#| msgid "libsigc++ version: %s\n"
 msgid "  cwidget version: %s\n"
 msgstr "Версія libsigc++: %s\n"
 
 #: src/main.cc:170
 #, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Curses version: %s\n"
 msgid "  Apt version: %s\n"
 msgstr ""
 "\n"
@@ -5772,44 +5443,36 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Встановити/оновити пакунки\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Видалити пакунки\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Видалити пакунки і їх конфігураційні файли\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Зафіксувати пакунки\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Скасувати команду hold для пакунка\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Позначити пакунок як автоматично встановлений\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Позначити пакунок як встановлений вручну\n"
 
@@ -5823,21 +5486,16 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Завантажити списки нових/оновлених пакунків\n"
 
 #: src/main.cc:190
 #, fuzzy, c-format
-#| msgid " safe-upgrade - Perform a safe upgrade\n"
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade      - Виконати безпечне оновлення\n"
 
 #: src/main.cc:191
 #, fuzzy, c-format
-#| msgid ""
-#| " full-upgrade - Perform an upgrade, possibly installing and removing "
-#| "packages\n"
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
@@ -5852,51 +5510,41 @@
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Забути про те які пакунки є \"новими\"\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Пошук пакунка по назві та/або виразу\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Показати детальну інформацію про пакунок\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Стерти завантажені файли пакунків\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Стерти старі завантажені файли пакунків\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Переглянути список змін пакунка\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Завантажити .deb-файл пакунка\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5928,7 +5576,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             Цей допоміжний текст\n"
 
@@ -5958,15 +5605,11 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             Завжди запитувати підтвердження дій\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
@@ -5975,9 +5618,6 @@
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5987,9 +5627,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5999,8 +5636,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 ""
@@ -6032,9 +5667,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -6044,8 +5676,6 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
@@ -6053,9 +5683,6 @@
 
 #: src/main.cc:226
 #, fuzzy, c-format
-#| msgid ""
-#| " -q             In command-line mode, suppress the incremental progress "
-#| "indicators.\n"
 msgid ""
 " -q             In command-line mode, suppress the incremental progress.\n"
 "                indicators.\n"
@@ -6064,16 +5691,12 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o key=val     Напряму задати конфігураційний параметр з назвою 'key'\n"
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -6111,7 +5734,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "True"
 msgid "trace"
 msgstr "True"
 
@@ -6125,7 +5747,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "ні"
 
@@ -6139,7 +5760,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:377
 #, fuzzy
-#| msgid "Err "
 msgid "error"
 msgstr "Пмл "
 
@@ -6147,7 +5767,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:380
 #, fuzzy
-#| msgid "False"
 msgid "fatal"
 msgstr "False"
 
@@ -6168,7 +5787,6 @@
 
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "Помилкова дія %s"
 
@@ -6184,7 +5802,6 @@
 
 #: src/main.cc:762
 #, fuzzy, c-format
-#| msgid "-o requires an argument of the form key=value, got %s"
 msgid "-o requires an argument of the form key=value, got %s\n"
 msgstr "-o вимагає аргумент у вигляді ключ=значення, отримано %s"
 
@@ -6222,7 +5839,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "Пакунок"
 
@@ -6232,7 +5848,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "Packages"
 msgid "all-packages"
 msgstr "Пакунки"
 
@@ -6252,7 +5867,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -6260,8 +5874,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -6271,7 +5883,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "-u та -i не можна використовувати разом з командою"
 
@@ -6287,9 +5898,6 @@
 
 #: src/main.cc:1194 src/main.cc:1267
 #, fuzzy, c-format
-#| msgid ""
-#| "Backtrace:\n"
-#| "%s"
 msgid ""
 "Backtrace:\n"
 "%s\n"
@@ -6299,7 +5907,6 @@
 
 #: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168
 #, fuzzy
-#| msgid "Search forwards"
 msgid "Search for: "
 msgstr "Пошук вперед"
 
@@ -6357,7 +5964,6 @@
 
 #: src/mine/cmine.cc:271
 #, fuzzy
-#| msgid "Invalid response; please enter 'y' or 'n'."
 msgid "Invalid mine count; please enter a positive integer"
 msgstr "Невірна відповідь; будь ласка, вкажіть 'y' або 'n'."
 
@@ -6844,7 +6450,6 @@
 
 #: src/pkg_grouppolicy.cc:1018
 #, fuzzy
-#| msgid "Never"
 msgid "Servers"
 msgstr "Ніколи"
 
@@ -6854,7 +6459,6 @@
 
 #: src/pkg_grouppolicy.cc:1020
 #, fuzzy
-#| msgid "LongAction"
 msgid "Localization"
 msgstr "LongAction"
 
@@ -6864,7 +6468,6 @@
 
 #: src/pkg_grouppolicy.cc:1023
 #, fuzzy
-#| msgid "Unrecognized color name \"%s\""
 msgid "Unrecognized tasks"
 msgstr "Нерозпізнана назва кольору \"%s\""
 
@@ -6929,7 +6532,6 @@
 
 #: src/pkg_info_screen.cc:162
 #, fuzzy, c-format
-#| msgid "Version: "
 msgid "Versions of %s"
 msgstr "Версія: "
 
@@ -7024,7 +6626,6 @@
 
 #: src/pkg_tree.cc:178
 #, fuzzy
-#| msgid "Packages"
 msgid "All Packages"
 msgstr "Пакунки"
 
@@ -7035,7 +6636,6 @@
 
 #: src/pkg_tree.cc:301
 #, fuzzy
-#| msgid "Enter the new package sorting mechanism for this display: "
 msgid "Enter the new package tree limit: "
 msgstr "Введіть новий механізм сортування пакунків для даного вигляду: "
 
@@ -7057,9 +6657,6 @@
 
 #: src/pkg_view.cc:223
 #, fuzzy
-#| msgid ""
-#| "If you select a package, an explanation of its current state will appear "
-#| "in this space."
 msgid ""
 "If you select a package, an explanation of why it should be installed or "
 "removed will appear in this space."
@@ -7079,13 +6676,11 @@
 
 #: src/pkg_view.cc:678
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Related Dependencies"
 msgstr "Розв'язати залежності"
 
 #: src/pkg_view.cc:681
 #, fuzzy
-#| msgid "Installed"
 msgid "Why Installed"
 msgstr "Встановлений"
 
@@ -7427,31 +7022,26 @@
 
 #: src/solution_item.cc:607
 #, fuzzy, c-format
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
 msgstr "Залишити наступні залежності нерозв'язаними:%n"
 
 #: src/solution_screen.cc:164
 #, fuzzy
-#| msgid "The following actions will resolve these dependencies:"
 msgid "The following actions will resolve this dependency:"
 msgstr "Ці залежності можуть розв'язати такі дії:"
 
 #: src/solution_screen.cc:284
 #, fuzzy
-#| msgid "%BKeep%b the following packages at their current version:%n"
 msgid "Keep the following packages at their current version:"
 msgstr "%BЗберегти%b поточні версії таких пакунків:%n"
 
 #: src/solution_screen.cc:332
 #, fuzzy
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "Leave the following recommendations unresolved:"
 msgstr "Залишити наступні залежності нерозв'язаними:%n"
 
 #: src/solution_screen.cc:512
 #, fuzzy
-#| msgid "'-' to remove packages"
 msgid "No broken packages."
 msgstr "'-' видалити пакунки"
 
@@ -7492,7 +7082,6 @@
 
 #: src/ui.cc:256
 #, fuzzy
-#| msgid "Search forwards"
 msgid "Search for:"
 msgstr "Пошук вперед"
 
@@ -7535,7 +7124,6 @@
 
 #: src/ui.cc:472
 #, fuzzy, c-format
-#| msgid "Unable to open %ls"
 msgid "Unable to fork: %s"
 msgstr "Неможливо відкрити %ls"
 
@@ -7578,11 +7166,6 @@
 
 #: src/ui.cc:981
 #, 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."
 msgid ""
 "Aptitude %s%n%nCopyright 2000-2008 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
@@ -7658,7 +7241,6 @@
 
 #: src/ui.cc:1101
 #, fuzzy, c-format
-#| msgid "View the important changes made in each version of "
 msgid "View the important changes made in each version of %s"
 msgstr "Показати важливі зміни, зроблені в кожній версії "
 
@@ -7716,13 +7298,11 @@
 
 #: src/ui.cc:1271
 #, fuzzy
-#| msgid "Really quit Aptitude?"
 msgid "Really Continue"
 msgstr "Завершити роботу Aptitude?"
 
 #: src/ui.cc:1273
 #, fuzzy
-#| msgid "Not Installed"
 msgid "Abort Installation"
 msgstr "Не встановлений"
 
@@ -7761,13 +7341,11 @@
 
 #: src/ui.cc:1459 src/ui.cc:1698 src/ui.cc:1747 src/ui.cc:1830
 #, fuzzy
-#| msgid "^Become root"
 msgid "Become root"
 msgstr "Стати користувачем root"
 
 #: src/ui.cc:1461 src/ui.cc:1700 src/ui.cc:1749 src/ui.cc:1832
 #, fuzzy
-#| msgid "^Become root"
 msgid "Don't become root"
 msgstr "Стати користувачем root"
 
@@ -7823,9 +7401,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7848,9 +7423,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -8374,19 +7946,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "URL для завантаження списків змін"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "URL для завантаження списків змін"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "Завантаження списку змін"
 
Index: aptitude/po/vi.po
===================================================================
--- aptitude.orig/po/vi.po
+++ aptitude/po/vi.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.4.x\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2008-04-22 19:08+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -262,9 +262,6 @@
 
 #: src/apt_options.cc:241
 #, fuzzy
-#| msgid ""
-#| "If this option is enabled, the menu bar will only appear when it has been "
-#| "activated by pressing the menu key."
 msgid ""
 "If this option is enabled, then the first view displayed on startup will be "
 "a flat view instead of the default view."
@@ -689,7 +686,6 @@
 
 #: src/cmdline/cmdline_action.cc:212
 #, fuzzy, c-format
-#| msgid "Unable to satisfy the build-depends: %s."
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Không thể thỏa các quan hệ phụ thuộc khi xây dựng: %s"
 
@@ -746,13 +742,11 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "Chưa cài đặt « %s » nên sẽ không cài lại nó.\n"
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "« %s » đã được cài đặt ở phiên bản đã yêu cầu (%s)\n"
@@ -853,7 +847,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "Bản ghi đổi của %s"
 
@@ -1027,7 +1020,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "k0 có"
 
@@ -1433,7 +1425,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "« &M » để nhãn các gói đã được cài đặt tự động"
 
@@ -1567,9 +1558,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy, c-format
-#| msgid ""
-#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: "
-#| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
@@ -1616,10 +1604,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:259
 #, fuzzy
-#| msgid ""
-#| "reject the given package versions; don't display any solutions in which "
-#| "they occur.  Enter UNINST instead of a version to reject removing the "
-#| "package."
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package.  "
@@ -1630,9 +1614,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:261
 #, fuzzy
-#| msgid ""
-#| "accept the given package versions; display only solutions in which they "
-#| "occur.  Enter UNINST instead of a version to accept removing the package."
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package.  "
@@ -1737,31 +1718,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "Để những sự khuyên sau lại chưa được tháo gỡ :"
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "Kiểm tra sự ^Khuyên"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "Không còn cần thiết lại việc gỡ bỏ %s"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "Kiểm tra sự ^Khuyên"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "Hành vi"
 
@@ -1922,7 +1898,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:1201
 #, fuzzy
-#| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Không thể giải quyết các quan hệ phụ thuộc cho tiến trình nâng cấp (không "
@@ -1930,7 +1905,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:1207
 #, fuzzy, c-format
-#| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr ""
 "Không thể giải quyết các quan hệ phụ thuộc cho tiến trình nâng cấp (%s)."
@@ -1962,13 +1936,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "nhưng mà nó không có khả năng cài đặt"
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "nhưng mà %s sẽ được cài đặt."
 
@@ -2067,13 +2039,11 @@
 
 #: src/cmdline/cmdline_show.cc:326
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s%s; will be installed"
 msgstr "%s sẽ được cài đặt"
 
 #: src/cmdline/cmdline_show.cc:328
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s%s; will be installed automatically"
 msgstr "%s; sẽ được cài đặt tự động"
 
@@ -2333,25 +2303,21 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "Gói"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Gói nguồn: "
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Kho"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\".\n"
 msgid "No such package \"%s\"."
 msgstr "Không có gói « %s » như vậy.\n"
 
@@ -2390,7 +2356,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "tìm kiếm: bạn phải cung cấp ít nhất một từ tìm kiếm\n"
 
@@ -2514,7 +2479,6 @@
 
 #: src/cmdline/cmdline_why.cc:1285
 #, fuzzy, c-format
-#| msgid "Packages depending on %s"
 msgid "Packages requiring %s:"
 msgstr "Các gói phụ thuộc vào %s"
 
@@ -2530,8 +2494,6 @@
 
 #: src/cmdline/cmdline_why.cc:1416
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: this command requires at least one argument (the package to query)."
 msgid ""
 "%s: this command requires at least one argument (the package to query).\n"
 msgstr "%s: lệnh này cần thiết ít nhất một đối số (gói cần truy cập)."
@@ -2549,7 +2511,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[LỖI]"
 
@@ -2903,7 +2864,6 @@
 
 #: src/generic/apt/download_update_manager.cc:138
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated quoted string in command: %s"
 msgstr "Có chuỗi nghĩa chữ chưa chấm dứt nằm sau %s"
 
@@ -2987,7 +2947,6 @@
 
 #: src/generic/apt/dump_packages.cc:674
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create truncated cache: %s."
 msgstr "Không thể định vị gói %s"
 
@@ -3111,7 +3070,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "Đang tài về các gói"
 
@@ -3149,7 +3107,6 @@
 
 #: src/generic/apt/matching/parse.cc:860
 #, fuzzy, c-format
-#| msgid "Unknown matcher type: \"%s\"."
 msgid "Unknown term type: \"%s\"."
 msgstr "Không rõ kiểu hình mẫu : « %s »"
 
@@ -3157,9 +3114,6 @@
 #. Leave the question marks attached to the string placeholders.
 #: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883
 #, fuzzy, c-format
-#| msgid ""
-#| "The ?%s matcher must be used in a \"wide\" context (a top-level context, "
-#| "or a context enclosed by ?%s)."
 msgid ""
 "The ?%s term must be used in a \"wide\" context (a top-level context, or a "
 "context enclosed by ?%s)."
@@ -3190,7 +3144,6 @@
 
 #: src/generic/apt/matching/parse.cc:1388
 #, fuzzy, c-format
-#| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "Biểu thức dạng sai"
 
@@ -3229,19 +3182,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "Địa chỉ URL cần dùng để tải về các bản ghi thay đổi (ChangeLog)"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "Địa chỉ URL cần dùng để tải về các bản ghi thay đổi (ChangeLog)"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "Bản ghi đổi của %s"
 
@@ -3286,7 +3236,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Không thể phân tích hình mẫu %s"
 
@@ -3301,14 +3250,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "Chưa cài đặt"
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "Chưa cài đặt"
 
@@ -3335,67 +3282,56 @@
 
 #: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got EOF."
 msgstr "Đợi « %c », còn nhận « %c »."
 
 #: src/generic/util/parsers.h:737
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got '%s'."
 msgstr "Đợi « %c », còn nhận « %c »."
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "Đợi một số nằm sau « -q= », còn nhận %s\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "Ký tự hành động sai « %c »\n"
 
 #: src/generic/util/parsers.h:832
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got EOF."
 msgstr "Đợi « %c », còn nhận « %c »."
 
 #: src/generic/util/parsers.h:843
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got '%c'."
 msgstr "Đợi « %c », còn nhận « %c »."
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "Đợi dấu nhận diện chính sách còn nhận « %c »"
 
 #: src/generic/util/parsers.h:1026
 #, fuzzy
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected an integer following '-', got EOF."
 msgstr "Đợi dấu phẩy « , » hoặc ngoặc đóng « ) » đi theo « || », còn nhận « %s »"
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "Đợi dấu nhận diện chính sách còn nhận « %c »"
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "Thao tác không hợp lệ %s"
 
 #: src/generic/util/parsers.h:1077
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected EOF, got '%c'."
 msgstr "Đợi « %c », còn nhận « %c »."
 
@@ -3409,19 +3345,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "Dấu « ) » bất thường"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " hoặc"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "Dấu « ) » bất thường"
 
@@ -3432,7 +3365,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "Không thể tạo thư mục tạm từ mẫu « %s »: %s"
 
@@ -3467,7 +3399,6 @@
 
 #: src/gtk/aptitude.glade:19 src/gtk/aptitude.glade:2273
 #, fuzzy
-#| msgid "False"
 msgid "_File"
 msgstr "Sai"
 
@@ -3531,13 +3462,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "Gói"
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "Xem"
 
@@ -3557,7 +3486,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "Trợ giúp"
 
@@ -3568,7 +3496,6 @@
 
 #: src/gtk/aptitude.glade:345 src/gtk/aptitude.glade:2614
 #, fuzzy
-#| msgid "List Update"
 msgid "Update"
 msgstr "Cập nhật danh sách"
 
@@ -3590,7 +3517,6 @@
 
 #: src/gtk/aptitude.glade:389 src/gtk/aptitude.glade:2658
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Remove"
 msgstr "Đã cài"
 
@@ -3604,33 +3530,28 @@
 
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "Gỡ bỏ bộ lọc khỏi danh sách gói"
 
 #: src/gtk/aptitude.glade:649
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "Apply these settings to all active package lists."
 msgstr "Áp dụng bộ lọc vào danh sách gói"
 
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "Tìm kiếm"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "cài lại"
 
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "Lỗi "
 
@@ -3645,19 +3566,16 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "Phụ thuộc của %s"
 
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "^Changelog"
 msgid "Changelog"
 msgstr "^Bản ghi đổi"
 
 #: src/gtk/aptitude.glade:1020
 #, fuzzy
-#| msgid "False"
 msgid "Files"
 msgstr "Sai"
 
@@ -3671,7 +3589,6 @@
 
 #: src/gtk/aptitude.glade:1051
 #, fuzzy
-#| msgid "Tags"
 msgid "tags"
 msgstr "Thẻ"
 
@@ -3694,13 +3611,11 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "Tình trạng"
 
 #: src/gtk/aptitude.glade:1247
 #, fuzzy
-#| msgid "Unknown action type: %s"
 msgid "Group by action type"
 msgstr "Không rõ kiểu hành động: %s"
 
@@ -3729,13 +3644,11 @@
 
 #: src/gtk/aptitude.glade:1328
 #, fuzzy
-#| msgid "Toggle ^Rejected"
 msgid "Rejected"
 msgstr "Bật tắt ^Bác bỏ"
 
 #: src/gtk/aptitude.glade:1343
 #, fuzzy
-#| msgid "Preferences"
 msgid "No preference"
 msgstr "Tùy thích"
 
@@ -3749,32 +3662,27 @@
 
 #: src/gtk/aptitude.glade:1400
 #, fuzzy
-#| msgid "^Examine Solution"
 msgid "Find a new solution"
 msgstr "X^em giải pháp"
 
 #: src/gtk/aptitude.glade:1404
 #, fuzzy
-#| msgid "Select the next solution to the dependency problems."
 msgid "Calculate the next solution that has not yet been generated."
 msgstr "Chọn giải pháp vấn đề phụ thuộc kế tiếp."
 
 #: src/gtk/aptitude.glade:1419
 #, fuzzy
-#| msgid "Perform the actions contained in the currently selected solution."
 msgid ""
 "Perform the actions in the currently selected solution and close this tab."
 msgstr "Thực hiện những hành động của giải pháp hiện thời được chọn."
 
 #: src/gtk/aptitude.glade:1576
 #, fuzzy
-#| msgid "Upgrade"
 msgid "Upgrade Summary"
 msgstr "Nâng cấp"
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "Gói nguồn: "
 
@@ -3786,7 +3694,6 @@
 
 #: src/gtk/aptitude.glade:1652
 #, fuzzy
-#| msgid "Manual"
 msgid "Fix Manually"
 msgstr "Sổ tay"
 
@@ -3834,31 +3741,26 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "Bị hỏng"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "Không thể sửa chữa trường hợp có các gói không sẵn sàng"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "^Tìm"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for: "
 msgid "Search for packages."
 msgstr "Tìm kiếm:"
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "Nhận được"
 
@@ -3892,19 +3794,16 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "Địa chỉ URL cần dùng để tải về các bản ghi thay đổi (ChangeLog)"
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "Cần thiết việc cài đặt %s phiên bản %s (%s)."
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -3912,20 +3811,17 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr "Bạn chỉ có thể xem bản ghi đổi của gói Debian chính thức."
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "Đang tải về Bản ghi đổi"
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "Địa chỉ URL cần dùng để tải về các bản ghi thay đổi (ChangeLog)"
 
@@ -3939,7 +3835,6 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "Địa chỉ URL cần dùng để tải về các bản ghi thay đổi (ChangeLog)"
 
@@ -3949,21 +3844,17 @@
 
 #: src/gtk/dashboardtab.cc:414
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] "%d lần nâng cấp"
 
 #: src/gtk/dashboardtab.cc:633
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No upgrades are available."
 msgstr "Chưa cài đặt"
 
 #: src/gtk/dashboardtab.cc:645
 #, fuzzy
-#| msgid "Unable to locate package %s"
 msgid "Unable to calculate an upgrade."
 msgstr "Không thể định vị gói %s"
 
@@ -3996,25 +3887,21 @@
 
 #: src/gtk/dashboardtab.cc:708
 #, fuzzy, c-format
-#| msgid "Internal error: Default column string is unparsable"
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr "Gặp lỗi nội bộ : không thể phân tích chuỗi cột mặc định"
 
 #: src/gtk/dependency_chains_tab.cc:78
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: start"
 msgstr "Quản lý quan hệ phụ thuộc"
 
 #: src/gtk/dependency_chains_tab.cc:82
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: end"
 msgstr "Quản lý quan hệ phụ thuộc"
 
 #: src/gtk/dependency_chains_tab.cc:86
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: results"
 msgstr "Quản lý quan hệ phụ thuộc"
 
@@ -4024,7 +3911,6 @@
 
 #: src/gtk/dependency_chains_tab.cc:282
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency chain found."
 msgstr "Quản lý quan hệ phụ thuộc"
 
@@ -4034,13 +3920,11 @@
 
 #: src/gtk/download.cc:185
 #, fuzzy
-#| msgid "False"
 msgid "Failed"
 msgstr "Sai"
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "Đang xóa các tập tin đã tải về"
 
@@ -4051,13 +3935,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "Tổng tiến hành: "
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description"
 msgid "Short Description"
 msgstr "Mô tả"
 
@@ -4067,13 +3949,11 @@
 
 #: src/gtk/download.cc:319
 #, fuzzy
-#| msgid "Cleaning while a download is in progress is not allowed"
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr "Không cho phép xóa sạch trong khi tải về gì"
 
 #: src/gtk/download.cc:395 src/gtk/gui.cc:832
 #, fuzzy
-#| msgid "View next display"
 msgid "View Details"
 msgstr "Xem bộ trình bày kế tiếp"
 
@@ -4093,19 +3973,16 @@
 
 #: src/gtk/download.cc:486
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s: %lu/%lu, stalled"
 msgstr "%s sẽ được cài đặt"
 
 #: src/gtk/download.cc:507
 #, fuzzy, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr " [ %i%% ] (%sB/g, %s còn lại)"
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "nhưng mà %s sẽ được cài đặt."
 
@@ -4119,7 +3996,6 @@
 
 #: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "Không thể định vị gói %s"
 
@@ -4130,7 +4006,6 @@
 
 #: src/gtk/dpkg_terminal.cc:429
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "%s: Unable to accept a connection: %s"
 msgstr "Không thể tạo thư mục tạm từ mẫu « %s »: %s"
 
@@ -4156,80 +4031,67 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "Phiên bản %s"
 
 #: src/gtk/entitysummary.cc:123
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Install %s version %s"
 msgstr "Cài(%s cung cấp %s)"
 
 #: src/gtk/entitysummary.cc:131
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrade to %s version %s"
 msgstr "  cwidget phiên bản: %s\n"
 
 #: src/gtk/entitysummary.cc:142
 #, fuzzy, c-format
-#| msgid "Keep the following packages at their current version:"
 msgid "Don't hold %s at its current version."
 msgstr "Giữ lại những gói sau ở phiên bản hiện thời:"
 
 #: src/gtk/entitysummary.cc:145 src/gtk/entitysummary.cc:165
 #: src/gtk/entitysummary.cc:168
 #, fuzzy, c-format
-#| msgid "Canc^el pending actions"
 msgid "Cancel any actions on %s."
 msgstr "^Thôi các hành động bị hoãn"
 
 #: src/gtk/entitysummary.cc:150
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the purge of %s."
 msgstr "Thôi việc gỡ bỏ %F"
 
 #: src/gtk/entitysummary.cc:152
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s."
 msgstr "Thôi việc gỡ bỏ %F"
 
 #: src/gtk/entitysummary.cc:157
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the upgrade of %s."
 msgstr "Thôi việc gỡ bỏ %F"
 
 #: src/gtk/entitysummary.cc:159
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s."
 msgstr "Thôi việc cài đặt %F"
 
 #: src/gtk/entitysummary.cc:161
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the downgrade of %s."
 msgstr "Thôi việc gỡ bỏ %F"
 
 #: src/gtk/entitysummary.cc:163
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the reinstallation of %s."
 msgstr "Thôi việc cài đặt %F"
 
 #: src/gtk/entitysummary.cc:206
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "Remove %s"
 msgstr "Bỏ(%s)"
 
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "^Tẩy"
 
@@ -4240,19 +4102,16 @@
 
 #: src/gtk/entitysummary.cc:223
 #, fuzzy, c-format
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Mark %s as automatically installed."
 msgstr "« &M » để nhãn các gói đã được cài đặt tự động"
 
 #: src/gtk/entitysummary.cc:228
 #, fuzzy, c-format
-#| msgid "The package \"%s\" is manually installed.\n"
 msgid "Mark %s as manually installed."
 msgstr "Gói « %s » được cài đặt bằng tay.\n"
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
 msgid "%s is a virtual package provided by:\n"
 msgstr "« %s » là gói ảo được cung cấp bởi:\n"
 
@@ -4262,13 +4121,11 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "Gói nguồn: "
 
 #: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 #, fuzzy
-#| msgid "ProgName"
 msgid "Name"
 msgstr "TênTrình"
 
@@ -4278,13 +4135,11 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "Không thể mở tập tin « %s »"
 
 #: src/gtk/entityview.cc:412
 #, fuzzy, c-format
-#| msgid "Rejecting the removal of %s"
 msgid "Editing the columns of \"%s\""
 msgstr "Đang từ chối việc gỡ bỏ %s"
 
@@ -4298,25 +4153,21 @@
 
 #: src/gtk/entityview.cc:570
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Whether the package is automatically installed."
 msgstr "« &M » để nhãn các gói đã được cài đặt tự động"
 
 #: src/gtk/entityview.cc:576
 #, fuzzy
-#| msgid "Cancel any action on the selected package"
 msgid "The name and description of the package."
 msgstr "Thôi hành động nào với gói được chọn"
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "Phiên bản: "
 
 #: src/gtk/entityview.cc:592
 #, fuzzy
-#| msgid "Check for new versions of packages"
 msgid "The version number of the package."
 msgstr "Kiểm tra có phiên bản gói mới chưa"
 
@@ -4337,7 +4188,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "chưa cài đặt"
 
@@ -4347,37 +4197,31 @@
 
 #: src/gtk/gui.cc:82
 #, fuzzy
-#| msgid "unpacked"
 msgid "Unpacked"
 msgstr "đã giải nén"
 
 #: src/gtk/gui.cc:83
 #, fuzzy
-#| msgid "half-config"
 msgid "Half-configured"
 msgstr "nửa cấu hình"
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "half-install"
 msgid "Half-installed"
 msgstr "nửa cài"
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "chưa cài (các tập tin cấu hình còn lại)"
 
 #: src/gtk/gui.cc:86
 #, fuzzy
-#| msgid "triggers-awaited"
 msgid "Triggers awaited"
 msgstr "bộ gây nên (đợi)"
 
 #: src/gtk/gui.cc:87
 #, fuzzy
-#| msgid "triggers-pending"
 msgid "Triggers pending"
 msgstr "bộ gây nên (treo)"
 
@@ -4403,13 +4247,11 @@
 
 #: src/gtk/gui.cc:97
 #, fuzzy
-#| msgid "forbidden upgrade"
 msgid "Hold (don't upgrade)"
 msgstr "nâng cấp cấm"
 
 #: src/gtk/gui.cc:99
 #, fuzzy
-#| msgid "Related Dependencies"
 msgid "Unsatisfied dependencies"
 msgstr "Quan hệ phụ thuộc liên quan"
 
@@ -4423,13 +4265,11 @@
 
 #: src/gtk/gui.cc:290
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "Áp dụng bộ lọc vào danh sách gói"
 
 #: src/gtk/gui.cc:298 src/gtk/gui.cc:946
 #, fuzzy
-#| msgid "Downloading..."
 msgid "Download already running."
 msgstr "Đang tải về..."
 
@@ -4439,13 +4279,11 @@
 
 #: src/gtk/gui.cc:359
 #, fuzzy, c-format
-#| msgid "List Update"
 msgid "Update %s?"
 msgstr "Cập nhật danh sách"
 
 #: src/gtk/gui.cc:385
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
@@ -4473,31 +4311,26 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "%s changes"
 msgid "Done applying changes!"
 msgstr "%s thay đổi"
 
 #: src/gtk/gui.cc:823
 #, fuzzy
-#| msgid "%s changes"
 msgid "Applying changes..."
 msgstr "%s thay đổi"
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "s: %F"
 msgid "%s: %s"
 msgstr "s: %F"
 
 #: src/gtk/gui.cc:878
 #, fuzzy, c-format
-#| msgid "No broken packages."
 msgid "Error in package %s"
 msgstr "Không có gói bị hỏng."
 
 #: src/gtk/gui.cc:906
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Không thể thay thế %s bằng tập tin cấu hình mới"
 
@@ -4507,38 +4340,32 @@
 
 #: src/gtk/gui.cc:1038
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "Không có gói bị hỏng."
 
 #: src/gtk/gui.cc:1071
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "Không có gói bị hỏng."
 
 #: src/gtk/gui.cc:1075
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "Tháo gỡ quan hệ phụ thuộc"
 
 #: src/gtk/gui.cc:1103
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Không có gói nào bị hỏng."
 
 #: src/gtk/gui.cc:1147
 #, fuzzy
-#| msgid "%s changes"
 msgid "View changes"
 msgstr "%s thay đổi"
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "%s changes"
 msgid "Apply changes"
 msgstr "%s thay đổi"
 
@@ -4547,8 +4374,6 @@
 #. font.
 #: src/gtk/gui.cc:1192
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%d package to install"
 msgid_plural "%d packages to install"
 msgstr[0] "%d lần cài"
@@ -4558,14 +4383,12 @@
 #. font.
 #: src/gtk/gui.cc:1207
 #, fuzzy, c-format
-#| msgid "failed to remove %s"
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "lỗi gỡ bỏ %s"
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "Cỡ_Tải_Về"
 
@@ -4580,19 +4403,16 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "not installed"
 msgid "Not implemented"
 msgstr "chưa cài đặt"
 
 #: src/gtk/gui.cc:1408 src/gtk/gui.cc:1427
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "Đã cài"
 
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "^Tẩy"
 
@@ -4610,7 +4430,6 @@
 
 #: src/gtk/gui.cc:1455
 #, fuzzy
-#| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "Sổ tay người dùng"
 
@@ -4625,7 +4444,6 @@
 
 #: src/gtk/info.cc:161 src/gtk/pkgview.cc:169
 #, fuzzy
-#| msgid "Current status: %F."
 msgid "Current status"
 msgstr "Trạng thái hiện thời: %F."
 
@@ -4635,19 +4453,16 @@
 
 #: src/gtk/info.cc:496
 #, fuzzy
-#| msgid "Not Installed"
 msgid "Not available"
 msgstr "Chưa cài đặt"
 
 #: src/gtk/info.cc:545
 #, fuzzy
-#| msgid "C^ycle Package Information"
 msgid "Package information: version list"
 msgstr "^Quay lại thông tin gói"
 
 #: src/gtk/info.cc:555
 #, fuzzy
-#| msgid "Packages which depend on %s"
 msgid "Package information: dependency list"
 msgstr "Các gói phụ thuộc vào %s"
 
@@ -4657,7 +4472,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "không"
 
@@ -4671,7 +4485,6 @@
 
 #: src/gtk/packagestab.cc:203
 #, fuzzy, c-format
-#| msgid "No packages matched the pattern \"%ls\"."
 msgid "No packages matched \"%s\"."
 msgstr "Không có gói tương ứng với mẫu « %ls »."
 
@@ -4681,31 +4494,26 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "Gói: "
 
 #: src/gtk/pkgview.cc:224
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed automatically."
 msgstr "%s; sẽ được cài đặt tự động"
 
 #: src/gtk/pkgview.cc:227
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed automatically."
 msgstr "%s; sẽ được cài đặt tự động"
 
 #: src/gtk/pkgview.cc:235
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed manually."
 msgstr "%s; sẽ được cài đặt tự động"
 
 #: src/gtk/pkgview.cc:238
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed manually."
 msgstr "%s; sẽ được cài đặt tự động"
 
@@ -4715,13 +4523,11 @@
 
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "Tìm kiếm"
 
 #: src/gtk/pkgview.cc:718
 #, fuzzy
-#| msgid "Building view"
 msgid "Finalizing view"
 msgstr "Đang xây dựng ô xem"
 
@@ -4852,13 +4658,11 @@
 
 #: src/gtk/previewtab.cc:179
 #, fuzzy
-#| msgid "Preview"
 msgid "Preview: "
 msgstr "Xem thử"
 
 #: src/gtk/resolver.cc:68
 #, fuzzy, c-format
-#| msgid "Error while dumping resolver state"
 msgid "Error in dependency resolver: %s"
 msgstr "Gặp lỗi khi đổ tình trạng bộ tháo gỡ"
 
@@ -4873,7 +4677,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package"
 msgid "Virtual package"
 msgstr "Gói"
 
@@ -4883,43 +4686,36 @@
 
 #: src/gtk/resolver.cc:377
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Removing %s is rejected."
 msgstr "Đang gỡ bỏ %s"
 
 #: src/gtk/resolver.cc:382
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Canceling the installation of %s is rejected."
 msgstr "Thôi việc cài đặt %F"
 
 #: src/gtk/resolver.cc:391
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Canceling the removal of %s is rejected."
 msgstr "Thôi việc gỡ bỏ %F"
 
 #: src/gtk/resolver.cc:394
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keeping %s at version %s is rejected."
 msgstr "Giữ %F ở phiên bản %s (%s)"
 
 #: src/gtk/resolver.cc:401
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Installing %s version %s is rejected."
 msgstr "Cài(%s cung cấp %s)"
 
 #: src/gtk/resolver.cc:407
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrading %s to version %s is rejected."
 msgstr "  cwidget phiên bản: %s\n"
 
 #: src/gtk/resolver.cc:413
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrading %s to version %s is rejected."
 msgstr "Phiên bản %s"
 
@@ -4961,7 +4757,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr "Phiên bản %s"
@@ -5055,7 +4850,6 @@
 
 #: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862
 #, fuzzy
-#| msgid "Remove the following packages:"
 msgid "Keep the following packages:"
 msgstr "Gỡ bỏ những gói sau :"
 
@@ -5071,121 +4865,101 @@
 
 #: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900
 #, fuzzy
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "Leave the following dependencies unresolved:"
 msgstr "Để những quan hệ phụ thuộc sau lại chưa được tháo gỡ :%n"
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Remove %F [%s (%s)]"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "Gỡ bỏ %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1523
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "Cài đặt %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1531
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s"
 msgstr "Thôi việc cài đặt %F"
 
 #: src/gtk/resolver.cc:1534
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s"
 msgstr "Thôi việc gỡ bỏ %F"
 
 #: src/gtk/resolver.cc:1537
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "Giữ %F ở phiên bản %s (%s)"
 
 #: src/gtk/resolver.cc:1544
 #, fuzzy, c-format
-#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Nâng cấp %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1553
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "Hạ cấp %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>Remove</b> %s"
 msgstr "Bỏ(%s)"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>remove</b> %s"
 msgstr "Bỏ(%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "Giữ %F ở phiên bản %s (%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>keep</b> %s at version %s"
 msgstr "Giữ %F ở phiên bản %s (%s)"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr "Thôi việc cài đặt %F"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>cancel</b> the installation of %s"
 msgstr "Thôi việc cài đặt %F"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>Install</b> %s %s"
 msgstr "Cài đặt %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>install</b> %s %s"
 msgstr "Cài đặt %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>Downgrade</b> %s to version %s"
 msgstr "  cwidget phiên bản: %s\n"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>downgrade</b> %s to version %s"
 msgstr "  cwidget phiên bản: %s\n"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>Upgrade</b> %s to version %s"
 msgstr "Phiên bản %s"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>upgrade</b> %s to version %s"
 msgstr "Phiên bản %s"
 
@@ -5201,66 +4975,52 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "%d lần cài"
 
 #: src/gtk/resolver.cc:1740
 #, fuzzy, c-format
-#| msgid "%d removal"
-#| msgid_plural "%d removals"
 msgid "%s remove"
 msgid_plural "%s removes"
 msgstr[0] "%d lần gỡ bỏ"
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "%d keep"
-#| msgid_plural "%d keeps"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "%d lần giữ"
 
 #: src/gtk/resolver.cc:1752
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%s upgrade"
 msgid_plural "%s upgrades"
 msgstr[0] "%d lần nâng cấp"
 
 #: src/gtk/resolver.cc:1758
 #, fuzzy, c-format
-#| msgid "%d downgrade"
-#| msgid_plural "%d downgrades"
 msgid "%s downgrade"
 msgid_plural "%s downgrades"
 msgstr[0] "%d lần hạ cấp"
 
 #: src/gtk/resolver.cc:1764
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "%s unresolved recommendation"
 msgid_plural "%s unresolved recommendations"
 msgstr[0] "Kiểm tra sự ^Khuyên"
 
 #: src/gtk/resolver.cc:2056
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions yet."
 msgstr "Không có giải pháp nữa."
 
 #: src/gtk/resolver.cc:2063
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency solution was found."
 msgstr "Quản lý quan hệ phụ thuộc"
 
 #: src/gtk/resolver.cc:2064
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions."
 msgstr "Không có giải pháp nữa."
 
@@ -5270,19 +5030,16 @@
 
 #: src/gtk/resolver.cc:2076
 #, fuzzy, c-format
-#| msgid "No more solutions."
 msgid "%u solutions."
 msgstr "Không có giải pháp nữa."
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "Không thể mở tập tin « %s »"
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr "[Đã tải về]"
 
@@ -5334,7 +5091,6 @@
 
 #: src/load_grouppolicy.cc:305
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected ',', '%c', or '('; got '%c'"
 msgstr "Đợi dấu phẩy « , » hoặc ngoặc mở « ( », còn nhận « %c »"
 
@@ -5442,7 +5198,6 @@
 
 #: src/load_grouppolicy.cc:713
 #, fuzzy, c-format
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected '{', ')', or ',' following '||', got '%s'"
 msgstr "Đợi dấu phẩy « , » hoặc ngoặc đóng « ) » đi theo « || », còn nhận « %s »"
 
@@ -5561,19 +5316,16 @@
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt phiên bản %d.%d.%d\n"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt phiên bản %d.%d.%d\n"
 
 #: src/main.cc:164
 #, fuzzy, c-format
-#| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Hỗ trợ Ept bị tắt.\n"
 
@@ -5622,44 +5374,36 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      _cài đặt_ / nâng cấp gói\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       _Gỡ bỏ_ gói\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        Gỡ bỏ gói và các tập tin cấu hình (_tẩy_)\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         _Giữ lại_ gói\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       Thôi lệnh « giữ lại » cho gói đó\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     _Đánh dấu_ gói như là được cài đặt _tự động_\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   Đánh dấu gói như là được cài đặt bằng tay\n"
 
@@ -5674,21 +5418,16 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       Tải về các danh sách gói mới / có thê _cập nhật_\n"
 
 #: src/main.cc:190
 #, fuzzy, c-format
-#| msgid " safe-upgrade - Perform a safe upgrade\n"
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade \tNâng cấp an toàn\n"
 
 #: src/main.cc:191
 #, fuzzy, c-format
-#| msgid ""
-#| " full-upgrade - Perform an upgrade, possibly installing and removing "
-#| "packages\n"
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
@@ -5696,57 +5435,46 @@
 
 #: src/main.cc:192
 #, fuzzy, c-format
-#| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "« &BD » để cài đặt các quan hệ phụ thuộc khi xây dựng gói."
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   \t_Quên_ gói nào là _« mới »_\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       _Tìm kiếm_ gói theo tên và/hay biểu thức\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         _Hiển thị_ thông tin chi tiết về gói\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        _Xóa_ các tập tin gói đã tải về\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    _Xóa_ các tập tin gói cũ đã tải về (_tự động_)\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    Xem _bản ghi thay đổi_ của gói\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     _Tải về_ tập tin kiểu .deb cho gói\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5765,12 +5493,6 @@
 
 #: src/main.cc:203
 #, fuzzy, c-format
-#| msgid ""
-#| " why-not      - Show the manually installed packages that lead to a "
-#| "conflict\n"
-#| "                with the given package, or why one or more packages "
-#| "would\n"
-#| "                lead to a conflict with the given package if installed\n"
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
 "conflict\n"
@@ -5789,7 +5511,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             _Trợ giúp_ này\n"
 
@@ -5817,15 +5538,11 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             Luôn luôn _nhắc_ với sự xác nhận hoặc hành động\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
@@ -5834,9 +5551,6 @@
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5845,9 +5559,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5857,8 +5568,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 width       Ghi rõ _độ rộng_ hiển thị kết quả tìm kiếm\n"
@@ -5888,9 +5597,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5899,17 +5605,12 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr " -t [bản]   \tĐặt bản phát hành từ đó cần cài đặt gói\n"
 
 #: src/main.cc:226
 #, fuzzy, c-format
-#| msgid ""
-#| " -q             In command-line mode, suppress the incremental progress\n"
-#| "                indicators.\n"
 msgid ""
 " -q             In command-line mode, suppress the incremental progress.\n"
 "                indicators.\n"
@@ -5917,7 +5618,6 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o key=giá_trị      Đặt trực tiếp _tùy chọn_ cấu hình có tên « key » (phím/"
@@ -5925,9 +5625,6 @@
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -5968,7 +5665,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "true"
 msgid "trace"
 msgstr "đúng"
 
@@ -5982,7 +5678,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "không"
 
@@ -5996,7 +5691,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:377
 #, fuzzy
-#| msgid "Err "
 msgid "error"
 msgstr "Lỗi "
 
@@ -6004,7 +5698,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:380
 #, fuzzy
-#| msgid "false"
 msgid "fatal"
 msgstr "sai"
 
@@ -6025,7 +5718,6 @@
 
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "Thao tác không hợp lệ %s"
 
@@ -6078,7 +5770,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "Gói"
 
@@ -6088,7 +5779,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "Mọi gói"
 
@@ -6108,7 +5798,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -6116,8 +5805,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -6127,7 +5814,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "Không thể ghi rõ tùy chọn « -u » hay « -i » với lệnh nào"
 
@@ -7366,7 +7052,6 @@
 
 #: src/ui.cc:472
 #, fuzzy, c-format
-#| msgid "Unable to open %ls"
 msgid "Unable to fork: %s"
 msgstr "Không thể mở %ls"
 
@@ -7638,9 +7323,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7663,9 +7345,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -8194,19 +7873,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "Địa chỉ URL cần dùng để tải về các bản ghi thay đổi (ChangeLog)"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "Địa chỉ URL cần dùng để tải về các bản ghi thay đổi (ChangeLog)"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "Đang tải về Bản ghi đổi"
 
Index: aptitude/po/zh_CN.po
===================================================================
--- aptitude.orig/po/zh_CN.po
+++ aptitude/po/zh_CN.po
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2008-09-02 21:41+0800\n"
 "Last-Translator: Deng Xiyue <manphiz-guest@users.alioth.debian.org>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
@@ -249,9 +249,6 @@
 
 #: src/apt_options.cc:241
 #, fuzzy
-#| msgid ""
-#| "If this option is enabled, the menu bar will only appear when it has been "
-#| "activated by pressing the menu key."
 msgid ""
 "If this option is enabled, then the first view displayed on startup will be "
 "a flat view instead of the default view."
@@ -645,7 +642,6 @@
 
 #: src/cmdline/cmdline_action.cc:212
 #, fuzzy, c-format
-#| msgid "Unable to satisfy the build-depends: %s."
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "无法满足编译依赖：%s。"
 
@@ -700,13 +696,11 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s 目前未被安装，所以它不会被重新安装。\n"
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "%s 的 (%s) 版本已经按要求安装了\n"
@@ -804,7 +798,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "%s 的变更日志"
 
@@ -961,7 +954,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "无"
 
@@ -1356,7 +1348,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "按'&M'将软件包标记为自动安装"
 
@@ -1487,9 +1478,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy, c-format
-#| msgid ""
-#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: "
-#| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
@@ -1534,10 +1522,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:259
 #, fuzzy
-#| msgid ""
-#| "reject the given package versions; don't display any solutions in which "
-#| "they occur.  Enter UNINST instead of a version to reject removing the "
-#| "package."
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package.  "
@@ -1548,9 +1532,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:261
 #, fuzzy
-#| msgid ""
-#| "accept the given package versions; display only solutions in which they "
-#| "occur.  Enter UNINST instead of a version to accept removing the package."
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package.  "
@@ -1652,31 +1633,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr " 不解决下列推荐的软件包："
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "检查推荐结果(^R)"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "不再要求删除 %s"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "检查推荐结果(^R)"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "动作"
 
@@ -1829,13 +1805,11 @@
 
 #: src/cmdline/cmdline_resolver.cc:1201
 #, fuzzy
-#| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr "未能解决此升级的依赖关系(未找到解决方案)。"
 
 #: src/cmdline/cmdline_resolver.cc:1207
 #, fuzzy, c-format
-#| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "无法解决此更新的依赖关系(%s)。"
 
@@ -1866,13 +1840,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "但是它不是可安装的"
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "但是 %s 将被安装。"
 
@@ -1971,13 +1943,11 @@
 
 #: src/cmdline/cmdline_show.cc:326
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s%s; will be installed"
 msgstr "%s；将被安装"
 
 #: src/cmdline/cmdline_show.cc:328
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s%s; will be installed automatically"
 msgstr "%s；将被自动安装"
 
@@ -2234,25 +2204,21 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "软件包"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "源码软件包："
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "存档"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\".\n"
 msgid "No such package \"%s\"."
 msgstr "没有这个软件包“%s”。\n"
 
@@ -2291,7 +2257,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "查找：您必须提供至少一个查找项\n"
 
@@ -2414,7 +2379,6 @@
 
 #: src/cmdline/cmdline_why.cc:1285
 #, fuzzy, c-format
-#| msgid "Packages depending on %s"
 msgid "Packages requiring %s:"
 msgstr "依赖于 %s 的软件包"
 
@@ -2430,8 +2394,6 @@
 
 #: src/cmdline/cmdline_why.cc:1416
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: this command requires at least one argument (the package to query)."
 msgid ""
 "%s: this command requires at least one argument (the package to query).\n"
 msgstr "%s：这个命令要求至少一个参数(要查询的软件包)。"
@@ -2449,7 +2411,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[错误]"
 
@@ -2786,7 +2747,6 @@
 
 #: src/generic/apt/download_update_manager.cc:138
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated quoted string in command: %s"
 msgstr "无法对 %s 之后的未结束的文字字符串"
 
@@ -2864,7 +2824,6 @@
 
 #: src/generic/apt/dump_packages.cc:674
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create truncated cache: %s."
 msgstr "无法定位软件包 %s"
 
@@ -2985,7 +2944,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "正在下载软件包"
 
@@ -3023,7 +2981,6 @@
 
 #: src/generic/apt/matching/parse.cc:860
 #, fuzzy, c-format
-#| msgid "Unknown matcher type: \"%s\"."
 msgid "Unknown term type: \"%s\"."
 msgstr "未知的匹配器类型：“%s”。"
 
@@ -3031,9 +2988,6 @@
 #. Leave the question marks attached to the string placeholders.
 #: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883
 #, fuzzy, c-format
-#| msgid ""
-#| "The ?%s matcher must be used in a \"wide\" context (a top-level context, "
-#| "or a context enclosed by ?%s)."
 msgid ""
 "The ?%s term must be used in a \"wide\" context (a top-level context, or a "
 "context enclosed by ?%s)."
@@ -3063,7 +3017,6 @@
 
 #: src/generic/apt/matching/parse.cc:1388
 #, fuzzy, c-format
-#| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "错误格式的表达式"
 
@@ -3101,19 +3054,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "用于下载变更日志的 URL"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "用于下载变更日志的 URL"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "%s 的变更日志"
 
@@ -3158,7 +3108,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "无法分析模式 %s"
 
@@ -3173,14 +3122,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "未安装的"
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "未安装的"
 
@@ -3207,67 +3154,56 @@
 
 #: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got EOF."
 msgstr "预期得到“%c”，却得到“%c”。"
 
 #: src/generic/util/parsers.h:737
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got '%s'."
 msgstr "预期得到“%c”，却得到“%c”。"
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "在 -q= 之后需要一个数字，但却得到 %s\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "非法的动作字符“%c”\n"
 
 #: src/generic/util/parsers.h:832
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got EOF."
 msgstr "预期得到“%c”，却得到“%c”。"
 
 #: src/generic/util/parsers.h:843
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got '%c'."
 msgstr "预期得到“%c”，却得到“%c”。"
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "需要策略标识符，却得到“%c”"
 
 #: src/generic/util/parsers.h:1026
 #, fuzzy
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected an integer following '-', got EOF."
 msgstr "在“||”之后应该是“,”或“(”，却得到“%s”"
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "需要策略标识符，却得到“%c”"
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "无效的操作 %s"
 
 #: src/generic/util/parsers.h:1077
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected EOF, got '%c'."
 msgstr "预期得到“%c”，却得到“%c”。"
 
@@ -3281,19 +3217,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "意外的“)”"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " 或者"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "意外的“)”"
 
@@ -3304,7 +3237,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "无法为模板“%s”创建临时文件夹：%s"
 
@@ -3339,7 +3271,6 @@
 
 #: src/gtk/aptitude.glade:19 src/gtk/aptitude.glade:2273
 #, fuzzy
-#| msgid "False"
 msgid "_File"
 msgstr "假"
 
@@ -3400,13 +3331,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "软件包"
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "视图"
 
@@ -3426,7 +3355,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "帮助"
 
@@ -3437,7 +3365,6 @@
 
 #: src/gtk/aptitude.glade:345 src/gtk/aptitude.glade:2614
 #, fuzzy
-#| msgid "List Update"
 msgid "Update"
 msgstr "列表更新"
 
@@ -3459,7 +3386,6 @@
 
 #: src/gtk/aptitude.glade:389 src/gtk/aptitude.glade:2658
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Remove"
 msgstr "已安装"
 
@@ -3473,33 +3399,28 @@
 
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "取消软件包列表中过滤器的效果"
 
 #: src/gtk/aptitude.glade:649
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "Apply these settings to all active package lists."
 msgstr "使用过滤器过滤软件包列表"
 
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "搜索"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "重新安装"
 
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "错误 "
 
@@ -3514,19 +3435,16 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "%s 的依赖关系"
 
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "^Changelog"
 msgid "Changelog"
 msgstr "变更日志(^C)"
 
 #: src/gtk/aptitude.glade:1020
 #, fuzzy
-#| msgid "False"
 msgid "Files"
 msgstr "假"
 
@@ -3540,7 +3458,6 @@
 
 #: src/gtk/aptitude.glade:1051
 #, fuzzy
-#| msgid "Tags"
 msgid "tags"
 msgstr "标签"
 
@@ -3563,13 +3480,11 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "状态"
 
 #: src/gtk/aptitude.glade:1247
 #, fuzzy
-#| msgid "Unknown action type: %s"
 msgid "Group by action type"
 msgstr "未知的操作类型：%s"
 
@@ -3598,13 +3513,11 @@
 
 #: src/gtk/aptitude.glade:1328
 #, fuzzy
-#| msgid "Toggle ^Rejected"
 msgid "Rejected"
 msgstr "放弃(^R)"
 
 #: src/gtk/aptitude.glade:1343
 #, fuzzy
-#| msgid "Preferences"
 msgid "No preference"
 msgstr "首选项"
 
@@ -3618,32 +3531,27 @@
 
 #: src/gtk/aptitude.glade:1400
 #, fuzzy
-#| msgid "^Examine Solution"
 msgid "Find a new solution"
 msgstr "检查解决方案(^E)"
 
 #: src/gtk/aptitude.glade:1404
 #, fuzzy
-#| msgid "Select the next solution to the dependency problems."
 msgid "Calculate the next solution that has not yet been generated."
 msgstr "选择解决此依赖问题的下一个方案。"
 
 #: src/gtk/aptitude.glade:1419
 #, fuzzy
-#| msgid "Perform the actions contained in the currently selected solution."
 msgid ""
 "Perform the actions in the currently selected solution and close this tab."
 msgstr "确认当前选择的解决方案中包含的动作。"
 
 #: src/gtk/aptitude.glade:1576
 #, fuzzy
-#| msgid "Upgrade"
 msgid "Upgrade Summary"
 msgstr "升级"
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "源码软件包："
 
@@ -3655,7 +3563,6 @@
 
 #: src/gtk/aptitude.glade:1652
 #, fuzzy
-#| msgid "Manual"
 msgid "Fix Manually"
 msgstr "手册"
 
@@ -3703,31 +3610,26 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "损坏"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "无法修正因软件包不可用而造成的错误"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "查找(^F)"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for: "
 msgid "Search for packages."
 msgstr "搜索："
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "已取得 "
 
@@ -3761,19 +3663,16 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "用于下载变更日志的 URL"
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "要求安装 %s 的 %s 版本(%s)"
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -3781,20 +3680,17 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr "您只能查看官方 Debian 软件包的变更日志。"
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "正在下载变更日志"
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "用于下载变更日志的 URL"
 
@@ -3808,7 +3704,6 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "用于下载变更日志的 URL"
 
@@ -3818,21 +3713,17 @@
 
 #: src/gtk/dashboardtab.cc:414
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] "升级 %d 个包"
 
 #: src/gtk/dashboardtab.cc:633
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No upgrades are available."
 msgstr "未安装的"
 
 #: src/gtk/dashboardtab.cc:645
 #, fuzzy
-#| msgid "Unable to locate package %s"
 msgid "Unable to calculate an upgrade."
 msgstr "无法定位软件包 %s"
 
@@ -3865,25 +3756,21 @@
 
 #: src/gtk/dashboardtab.cc:708
 #, fuzzy, c-format
-#| msgid "Internal error: Default column string is unparsable"
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr "内部错误：默认栏字符串无法解析"
 
 #: src/gtk/dependency_chains_tab.cc:78
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: start"
 msgstr "处理依赖关系"
 
 #: src/gtk/dependency_chains_tab.cc:82
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: end"
 msgstr "处理依赖关系"
 
 #: src/gtk/dependency_chains_tab.cc:86
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: results"
 msgstr "处理依赖关系"
 
@@ -3893,7 +3780,6 @@
 
 #: src/gtk/dependency_chains_tab.cc:282
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency chain found."
 msgstr "处理依赖关系"
 
@@ -3903,13 +3789,11 @@
 
 #: src/gtk/download.cc:185
 #, fuzzy
-#| msgid "False"
 msgid "Failed"
 msgstr "假"
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "删除下载的文件"
 
@@ -3920,13 +3804,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "总进度："
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description"
 msgid "Short Description"
 msgstr "描述"
 
@@ -3936,13 +3818,11 @@
 
 #: src/gtk/download.cc:319
 #, fuzzy
-#| msgid "Cleaning while a download is in progress is not allowed"
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr "在下载进行过程中不允许执行清除"
 
 #: src/gtk/download.cc:395 src/gtk/gui.cc:832
 #, fuzzy
-#| msgid "View next display"
 msgid "View Details"
 msgstr "查看下一个画面"
 
@@ -3962,19 +3842,16 @@
 
 #: src/gtk/download.cc:486
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s: %lu/%lu, stalled"
 msgstr "%s；将被安装"
 
 #: src/gtk/download.cc:507
 #, fuzzy, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr " [ %i%% ]  (%sB/s, 剩下 %s)"
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "但是 %s 将被安装。"
 
@@ -3988,7 +3865,6 @@
 
 #: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "无法定位软件包 %s"
 
@@ -3999,7 +3875,6 @@
 
 #: src/gtk/dpkg_terminal.cc:429
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "%s: Unable to accept a connection: %s"
 msgstr "无法为模板“%s”创建临时文件夹：%s"
 
@@ -4025,80 +3900,67 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "%s 版本号"
 
 #: src/gtk/entitysummary.cc:123
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Install %s version %s"
 msgstr "安装(%s 提供了 %s)"
 
 #: src/gtk/entitysummary.cc:131
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrade to %s version %s"
 msgstr "  cwidget 版本：%s\n"
 
 #: src/gtk/entitysummary.cc:142
 #, fuzzy, c-format
-#| msgid "Keep the following packages at their current version:"
 msgid "Don't hold %s at its current version."
 msgstr "保持下列软件包于其当前版本："
 
 #: src/gtk/entitysummary.cc:145 src/gtk/entitysummary.cc:165
 #: src/gtk/entitysummary.cc:168
 #, fuzzy, c-format
-#| msgid "Canc^el pending actions"
 msgid "Cancel any actions on %s."
 msgstr "取消待执行的动作(^E)"
 
 #: src/gtk/entitysummary.cc:150
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the purge of %s."
 msgstr "取消删除 %F"
 
 #: src/gtk/entitysummary.cc:152
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s."
 msgstr "取消删除 %F"
 
 #: src/gtk/entitysummary.cc:157
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the upgrade of %s."
 msgstr "取消删除 %F"
 
 #: src/gtk/entitysummary.cc:159
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s."
 msgstr "取消 %F 的安装"
 
 #: src/gtk/entitysummary.cc:161
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the downgrade of %s."
 msgstr "取消删除 %F"
 
 #: src/gtk/entitysummary.cc:163
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the reinstallation of %s."
 msgstr "取消 %F 的安装"
 
 #: src/gtk/entitysummary.cc:206
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "Remove %s"
 msgstr "移除(%s)"
 
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "清除(^P)"
 
@@ -4109,19 +3971,16 @@
 
 #: src/gtk/entitysummary.cc:223
 #, fuzzy, c-format
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Mark %s as automatically installed."
 msgstr "按'&M'将软件包标记为自动安装"
 
 #: src/gtk/entitysummary.cc:228
 #, fuzzy, c-format
-#| msgid "The package \"%s\" is manually installed.\n"
 msgid "Mark %s as manually installed."
 msgstr "软件包“%s”是手动安装的。\n"
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
 msgid "%s is a virtual package provided by:\n"
 msgstr "“%s”是一个虚拟软件包，提供者：\n"
 
@@ -4131,13 +3990,11 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "源码软件包："
 
 #: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 #, fuzzy
-#| msgid "ProgName"
 msgid "Name"
 msgstr "程序名"
 
@@ -4147,13 +4004,11 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "无法打开文件“%s”"
 
 #: src/gtk/entityview.cc:412
 #, fuzzy, c-format
-#| msgid "Rejecting the removal of %s"
 msgid "Editing the columns of \"%s\""
 msgstr "放弃删除 %s"
 
@@ -4167,25 +4022,21 @@
 
 #: src/gtk/entityview.cc:570
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Whether the package is automatically installed."
 msgstr "按'&M'将软件包标记为自动安装"
 
 #: src/gtk/entityview.cc:576
 #, fuzzy
-#| msgid "Cancel any action on the selected package"
 msgid "The name and description of the package."
 msgstr "取消选定软件包上的任何动作"
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "版本号："
 
 #: src/gtk/entityview.cc:592
 #, fuzzy
-#| msgid "Check for new versions of packages"
 msgid "The version number of the package."
 msgstr "正在检查新版本的软件包"
 
@@ -4206,7 +4057,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "未安装"
 
@@ -4216,37 +4066,31 @@
 
 #: src/gtk/gui.cc:82
 #, fuzzy
-#| msgid "unpacked"
 msgid "Unpacked"
 msgstr "未解包的"
 
 #: src/gtk/gui.cc:83
 #, fuzzy
-#| msgid "half-config"
 msgid "Half-configured"
 msgstr "配置完成一半"
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "half-install"
 msgid "Half-installed"
 msgstr "安装完成一半"
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "未安装(配置文件保留)"
 
 #: src/gtk/gui.cc:86
 #, fuzzy
-#| msgid "triggers-awaited"
 msgid "Triggers awaited"
 msgstr "等待触发"
 
 #: src/gtk/gui.cc:87
 #, fuzzy
-#| msgid "triggers-pending"
 msgid "Triggers pending"
 msgstr "即将触发"
 
@@ -4272,13 +4116,11 @@
 
 #: src/gtk/gui.cc:97
 #, fuzzy
-#| msgid "forbidden upgrade"
 msgid "Hold (don't upgrade)"
 msgstr "被禁止的升级"
 
 #: src/gtk/gui.cc:99
 #, fuzzy
-#| msgid "Related Dependencies"
 msgid "Unsatisfied dependencies"
 msgstr "相关依赖关系"
 
@@ -4292,13 +4134,11 @@
 
 #: src/gtk/gui.cc:290
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "使用过滤器过滤软件包列表"
 
 #: src/gtk/gui.cc:298 src/gtk/gui.cc:946
 #, fuzzy
-#| msgid "Downloading... "
 msgid "Download already running."
 msgstr "正在下载... "
 
@@ -4308,13 +4148,11 @@
 
 #: src/gtk/gui.cc:359
 #, fuzzy, c-format
-#| msgid "List Update"
 msgid "Update %s?"
 msgstr "列表更新"
 
 #: src/gtk/gui.cc:385
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
@@ -4342,31 +4180,26 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "%s changes"
 msgid "Done applying changes!"
 msgstr "%s 个包已改变"
 
 #: src/gtk/gui.cc:823
 #, fuzzy
-#| msgid "%s changes"
 msgid "Applying changes..."
 msgstr "%s 个包已改变"
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "s: %F"
 msgid "%s: %s"
 msgstr "s: %F"
 
 #: src/gtk/gui.cc:878
 #, fuzzy, c-format
-#| msgid "No broken packages."
 msgid "Error in package %s"
 msgstr "无破损的软件包。"
 
 #: src/gtk/gui.cc:906
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "无法用新的配置文件代替 %s"
 
@@ -4376,38 +4209,32 @@
 
 #: src/gtk/gui.cc:1038
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "无破损的软件包。"
 
 #: src/gtk/gui.cc:1071
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "无破损的软件包。"
 
 #: src/gtk/gui.cc:1075
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "解决依赖关系"
 
 #: src/gtk/gui.cc:1103
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "没有破损的软件包。"
 
 #: src/gtk/gui.cc:1147
 #, fuzzy
-#| msgid "%s changes"
 msgid "View changes"
 msgstr "%s 个包已改变"
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "%s changes"
 msgid "Apply changes"
 msgstr "%s 个包已改变"
 
@@ -4416,8 +4243,6 @@
 #. font.
 #: src/gtk/gui.cc:1192
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%d package to install"
 msgid_plural "%d packages to install"
 msgstr[0] "安装 %d 个包"
@@ -4427,14 +4252,12 @@
 #. font.
 #: src/gtk/gui.cc:1207
 #, fuzzy, c-format
-#| msgid "failed to remove %s"
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "无法删除 %s"
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "下载文件大小"
 
@@ -4449,19 +4272,16 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "not installed"
 msgid "Not implemented"
 msgstr "未安装"
 
 #: src/gtk/gui.cc:1408 src/gtk/gui.cc:1427
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "已安装"
 
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "清除(^P)"
 
@@ -4479,7 +4299,6 @@
 
 #: src/gtk/gui.cc:1455
 #, fuzzy
-#| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "用户手册"
 
@@ -4494,7 +4313,6 @@
 
 #: src/gtk/info.cc:161 src/gtk/pkgview.cc:169
 #, fuzzy
-#| msgid "Current status: %F."
 msgid "Current status"
 msgstr "当前状态：%F。"
 
@@ -4504,19 +4322,16 @@
 
 #: src/gtk/info.cc:496
 #, fuzzy
-#| msgid "Not Installed"
 msgid "Not available"
 msgstr "未安装的"
 
 #: src/gtk/info.cc:545
 #, fuzzy
-#| msgid "C^ycle Package Information"
 msgid "Package information: version list"
 msgstr "循环软件包信息"
 
 #: src/gtk/info.cc:555
 #, fuzzy
-#| msgid "Packages which depend on %s"
 msgid "Package information: dependency list"
 msgstr "依赖于 %s 的软件包"
 
@@ -4526,7 +4341,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "否"
 
@@ -4540,7 +4354,6 @@
 
 #: src/gtk/packagestab.cc:203
 #, fuzzy, c-format
-#| msgid "No packages matched the pattern \"%ls\"."
 msgid "No packages matched \"%s\"."
 msgstr "没有软件包匹配模式“%ls”。"
 
@@ -4550,31 +4363,26 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "软件包："
 
 #: src/gtk/pkgview.cc:224
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed automatically."
 msgstr "%s；将被自动安装"
 
 #: src/gtk/pkgview.cc:227
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed automatically."
 msgstr "%s；将被自动安装"
 
 #: src/gtk/pkgview.cc:235
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed manually."
 msgstr "%s；将被自动安装"
 
 #: src/gtk/pkgview.cc:238
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed manually."
 msgstr "%s；将被自动安装"
 
@@ -4584,13 +4392,11 @@
 
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "搜索"
 
 #: src/gtk/pkgview.cc:718
 #, fuzzy
-#| msgid "Building view"
 msgid "Finalizing view"
 msgstr "编译视图"
 
@@ -4714,13 +4520,11 @@
 
 #: src/gtk/previewtab.cc:179
 #, fuzzy
-#| msgid "Preview"
 msgid "Preview: "
 msgstr "预览"
 
 #: src/gtk/resolver.cc:68
 #, fuzzy, c-format
-#| msgid "Error while dumping resolver state"
 msgid "Error in dependency resolver: %s"
 msgstr "存储依赖关系解决状态时出错"
 
@@ -4735,7 +4539,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package"
 msgid "Virtual package"
 msgstr "软件包"
 
@@ -4745,43 +4548,36 @@
 
 #: src/gtk/resolver.cc:377
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Removing %s is rejected."
 msgstr "%s 删除中"
 
 #: src/gtk/resolver.cc:382
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Canceling the installation of %s is rejected."
 msgstr "取消 %F 的安装"
 
 #: src/gtk/resolver.cc:391
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Canceling the removal of %s is rejected."
 msgstr "取消删除 %F"
 
 #: src/gtk/resolver.cc:394
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keeping %s at version %s is rejected."
 msgstr "保持 %F 在版本 %s (%s)"
 
 #: src/gtk/resolver.cc:401
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Installing %s version %s is rejected."
 msgstr "安装(%s 提供了 %s)"
 
 #: src/gtk/resolver.cc:407
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrading %s to version %s is rejected."
 msgstr "  cwidget 版本：%s\n"
 
 #: src/gtk/resolver.cc:413
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrading %s to version %s is rejected."
 msgstr "%s 版本号"
 
@@ -4823,7 +4619,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr "%s 版本号"
@@ -4917,7 +4712,6 @@
 
 #: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862
 #, fuzzy
-#| msgid "Remove the following packages:"
 msgid "Keep the following packages:"
 msgstr "删除下列软件包："
 
@@ -4933,121 +4727,101 @@
 
 #: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900
 #, fuzzy
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "Leave the following dependencies unresolved:"
 msgstr "保留下列未解决的依赖关系：%n"
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Remove %F [%s (%s)]"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "删除 %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1523
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "安装 %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1531
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s"
 msgstr "取消 %F 的安装"
 
 #: src/gtk/resolver.cc:1534
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s"
 msgstr "取消删除 %F"
 
 #: src/gtk/resolver.cc:1537
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "保持 %F 在版本 %s (%s)"
 
 #: src/gtk/resolver.cc:1544
 #, fuzzy, c-format
-#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "升级 %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1553
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "降级 %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>Remove</b> %s"
 msgstr "移除(%s)"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>remove</b> %s"
 msgstr "移除(%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "保持 %F 在版本 %s (%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>keep</b> %s at version %s"
 msgstr "保持 %F 在版本 %s (%s)"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr "取消 %F 的安装"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>cancel</b> the installation of %s"
 msgstr "取消 %F 的安装"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>Install</b> %s %s"
 msgstr "安装 %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>install</b> %s %s"
 msgstr "安装 %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>Downgrade</b> %s to version %s"
 msgstr "  cwidget 版本：%s\n"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>downgrade</b> %s to version %s"
 msgstr "  cwidget 版本：%s\n"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>Upgrade</b> %s to version %s"
 msgstr "%s 版本号"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>upgrade</b> %s to version %s"
 msgstr "%s 版本号"
 
@@ -5063,66 +4837,52 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "安装 %d 个包"
 
 #: src/gtk/resolver.cc:1740
 #, fuzzy, c-format
-#| msgid "%d removal"
-#| msgid_plural "%d removals"
 msgid "%s remove"
 msgid_plural "%s removes"
 msgstr[0] "删除 %d 个包"
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "%d keep"
-#| msgid_plural "%d keeps"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "保持 %d 个包"
 
 #: src/gtk/resolver.cc:1752
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%s upgrade"
 msgid_plural "%s upgrades"
 msgstr[0] "升级 %d 个包"
 
 #: src/gtk/resolver.cc:1758
 #, fuzzy, c-format
-#| msgid "%d downgrade"
-#| msgid_plural "%d downgrades"
 msgid "%s downgrade"
 msgid_plural "%s downgrades"
 msgstr[0] "降级 %d 个包"
 
 #: src/gtk/resolver.cc:1764
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "%s unresolved recommendation"
 msgid_plural "%s unresolved recommendations"
 msgstr[0] "检查推荐结果(^R)"
 
 #: src/gtk/resolver.cc:2056
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions yet."
 msgstr "没有更多的解决方案了。"
 
 #: src/gtk/resolver.cc:2063
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency solution was found."
 msgstr "处理依赖关系"
 
 #: src/gtk/resolver.cc:2064
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions."
 msgstr "没有更多的解决方案了。"
 
@@ -5132,19 +4892,16 @@
 
 #: src/gtk/resolver.cc:2076
 #, fuzzy, c-format
-#| msgid "No more solutions."
 msgid "%u solutions."
 msgstr "没有更多的解决方案了。"
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "无法打开文件“%s”"
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr "[已下载]"
 
@@ -5194,7 +4951,6 @@
 
 #: src/load_grouppolicy.cc:305
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected ',', '%c', or '('; got '%c'"
 msgstr "需要“,”或“(”，却得到“%c”"
 
@@ -5296,7 +5052,6 @@
 
 #: src/load_grouppolicy.cc:713
 #, fuzzy, c-format
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected '{', ')', or ',' following '||', got '%s'"
 msgstr "在“||”之后应该是“,”或“(”，却得到“%s”"
 
@@ -5415,19 +5170,16 @@
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "apt 版本 %d.%d.%d\n"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "apt 版本 %d.%d.%d\n"
 
 #: src/main.cc:164
 #, fuzzy, c-format
-#| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Ept 支持已禁用\n"
 
@@ -5475,44 +5227,36 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - 安装/升级软件包\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - 卸载软件包\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - 卸载软件包并删除其配置文件\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - 将软件包置于保持状态\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - 取消对一个软件包的保持命令\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - 将软件包标记为自动安装\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - 将软件包标记为手动安装\n"
 
@@ -5525,21 +5269,16 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - 下载新/可升级软件包列表\n"
 
 #: src/main.cc:190
 #, fuzzy, c-format
-#| msgid " safe-upgrade - Perform a safe upgrade\n"
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - 执行一次安全的升级\n"
 
 #: src/main.cc:191
 #, fuzzy, c-format
-#| msgid ""
-#| " full-upgrade - Perform an upgrade, possibly installing and removing "
-#| "packages\n"
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
@@ -5547,57 +5286,46 @@
 
 #: src/main.cc:192
 #, fuzzy, c-format
-#| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "'&BD' 以安装软件包的编译依赖。"
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - 忘记哪些软件包是“新”的\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - 按名称 和/或 表达式搜索软件包\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show       - 显示一个软件包的详细信息\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - 删除已下载的软件包文件\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - 删除旧的已下载软件包文件\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - 查看一个软件包的变更日志\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - 下载软件包的 .deb 文件\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5615,12 +5343,6 @@
 
 #: src/main.cc:203
 #, fuzzy, c-format
-#| msgid ""
-#| " why-not      - Show the manually installed packages that lead to a "
-#| "conflict\n"
-#| "                with the given package, or why one or more packages "
-#| "would\n"
-#| "                lead to a conflict with the given package if installed\n"
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
 "conflict\n"
@@ -5637,7 +5359,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             此帮助文本\n"
 
@@ -5665,24 +5386,17 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             总是提示确认执行动作\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr " -y             假设对简单的 是/否 问题回答“是”\n"
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5690,9 +5404,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5700,8 +5411,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 宽度        指定显示搜索结果的格式宽度\n"
@@ -5729,9 +5438,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5739,17 +5445,12 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr " -t [release]   设置将要安装的软件包的发布版本\n"
 
 #: src/main.cc:226
 #, fuzzy, c-format
-#| msgid ""
-#| " -q             In command-line mode, suppress the incremental progress\n"
-#| "                indicators.\n"
 msgid ""
 " -q             In command-line mode, suppress the incremental progress.\n"
 "                indicators.\n"
@@ -5757,15 +5458,11 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o key=val     直接设置名为“key”的配置选项\n"
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -5802,7 +5499,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "true"
 msgid "trace"
 msgstr "真"
 
@@ -5816,7 +5512,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "否"
 
@@ -5830,7 +5525,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:377
 #, fuzzy
-#| msgid "Err "
 msgid "error"
 msgstr "错误 "
 
@@ -5838,7 +5532,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:380
 #, fuzzy
-#| msgid "false"
 msgid "fatal"
 msgstr "假"
 
@@ -5859,7 +5552,6 @@
 
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "无效的操作 %s"
 
@@ -5912,7 +5604,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "软件包"
 
@@ -5922,7 +5613,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "全部包"
 
@@ -5942,7 +5632,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -5950,8 +5639,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -5959,7 +5646,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "选项 -u 和 -i 不能在和一个命令一起指定 "
 
@@ -7156,7 +6842,6 @@
 
 #: src/ui.cc:472
 #, fuzzy, c-format
-#| msgid "Unable to open %ls"
 msgid "Unable to fork: %s"
 msgstr "无法打开 %ls"
 
@@ -7418,9 +7103,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7440,9 +7122,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7958,19 +7637,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "用于下载变更日志的 URL"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "用于下载变更日志的 URL"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "正在下载变更日志"
 
Index: aptitude/po/zh_TW.po
===================================================================
--- aptitude.orig/po/zh_TW.po
+++ aptitude/po/zh_TW.po
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2010-06-18 19:06-0700\n"
+"POT-Creation-Date: 2010-07-08 16:15+0000\n"
 "PO-Revision-Date: 2008-10-26 21:02+0100\n"
 "Last-Translator: Asho Yeh <ashoyeh@gmail.com>\n"
 "Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"
@@ -248,9 +248,6 @@
 
 #: src/apt_options.cc:241
 #, fuzzy
-#| msgid ""
-#| "If this option is enabled, the menu bar will only appear when it has been "
-#| "activated by pressing the menu key."
 msgid ""
 "If this option is enabled, then the first view displayed on startup will be "
 "a flat view instead of the default view."
@@ -641,7 +638,6 @@
 
 #: src/cmdline/cmdline_action.cc:212
 #, fuzzy, c-format
-#| msgid "Unable to satisfy the build-depends: %s."
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "無法滿足%s套件的編譯相依關係"
 
@@ -698,13 +694,11 @@
 
 #: src/cmdline/cmdline_action.cc:328
 #, fuzzy, c-format
-#| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s 尚未安裝，因此不會被重新安裝。\n"
 
 #: src/cmdline/cmdline_action.cc:331
 #, fuzzy, c-format
-#| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded."
 msgstr "%s 已經安裝為被要求的版本 (%s)\n"
@@ -802,7 +796,6 @@
 
 #: src/cmdline/cmdline_changelog.cc:178
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog download failed: %s"
 msgstr "%s 的變更日誌"
 
@@ -961,7 +954,6 @@
 
 #: src/cmdline/cmdline_progress_display.cc:167 src/gtk/download.cc:204
 #, fuzzy
-#| msgid "none"
 msgid "Done"
 msgstr "無"
 
@@ -1353,7 +1345,6 @@
 
 #: src/cmdline/cmdline_prompt.cc:911
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "按'&M'將套件標記為自動安裝"
 
@@ -1485,9 +1476,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy, c-format
-#| msgid ""
-#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: "
-#| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg "
 "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
@@ -1532,10 +1520,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:259
 #, fuzzy
-#| msgid ""
-#| "reject the given package versions; don't display any solutions in which "
-#| "they occur.  Enter UNINST instead of a version to reject removing the "
-#| "package."
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package.  "
@@ -1546,9 +1530,6 @@
 
 #: src/cmdline/cmdline_resolver.cc:261
 #, fuzzy
-#| msgid ""
-#| "accept the given package versions; display only solutions in which they "
-#| "occur.  Enter UNINST instead of a version to accept removing the package."
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package.  "
@@ -1648,31 +1629,26 @@
 
 #: src/cmdline/cmdline_resolver.cc:496
 #, fuzzy, c-format
-#| msgid "Leave the following recommendations unresolved:"
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr " 不解決下列推薦的套件："
 
 #: src/cmdline/cmdline_resolver.cc:502
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Always obeying this recommendation: %s"
 msgstr "檢查推薦結果(^R)"
 
 #: src/cmdline/cmdline_resolver.cc:511
 #, fuzzy, c-format
-#| msgid "No longer requiring the removal of %s"
 msgid "No longer ignoring this recommendation: %s"
 msgstr "不再要求刪除 %s"
 
 #: src/cmdline/cmdline_resolver.cc:517
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "Ignoring this recommendation: %s"
 msgstr "檢查推薦結果(^R)"
 
 #: src/cmdline/cmdline_resolver.cc:576
 #, fuzzy, c-format
-#| msgid "Actions"
 msgid "Action \"%s\""
 msgstr "動作"
 
@@ -1823,13 +1799,11 @@
 
 #: src/cmdline/cmdline_resolver.cc:1201
 #, fuzzy
-#| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr "未能解決升級時產生的相依問題。(找不到解法)。"
 
 #: src/cmdline/cmdline_resolver.cc:1207
 #, fuzzy, c-format
-#| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "升級(%s)時無法解決相依問題。"
 
@@ -1860,13 +1834,11 @@
 
 #: src/cmdline/cmdline_show_broken.cc:85
 #, fuzzy, c-format
-#| msgid "but it is not installable"
 msgid "but it is not installable."
 msgstr "但這無法安裝"
 
 #: src/cmdline/cmdline_show_broken.cc:87
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "but it is not going to be installed."
 msgstr "但 %s 將會安裝。"
 
@@ -1965,13 +1937,11 @@
 
 #: src/cmdline/cmdline_show.cc:326
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s%s; will be installed"
 msgstr "%s；將被安裝。"
 
 #: src/cmdline/cmdline_show.cc:328
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s%s; will be installed automatically"
 msgstr "%s; 將會自動安裝"
 
@@ -2228,25 +2198,21 @@
 
 #: src/cmdline/cmdline_versions.cc:121
 #, fuzzy, c-format
-#| msgid "Packages"
 msgid "Package %s:"
 msgstr "套件"
 
 #: src/cmdline/cmdline_versions.cc:148 src/cmdline/cmdline_versions.cc:187
 #, fuzzy, c-format
-#| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "源碼套件："
 
 #: src/cmdline/cmdline_versions.cc:209
 #, fuzzy, c-format
-#| msgid "Archive"
 msgid "Archive %s:"
 msgstr "歸檔"
 
 #: src/cmdline/cmdline_versions.cc:290
 #, fuzzy, c-format
-#| msgid "No such package \"%s\".\n"
 msgid "No such package \"%s\"."
 msgstr "無此套件“%s。\n"
 
@@ -2285,7 +2251,6 @@
 
 #: src/cmdline/cmdline_versions.cc:573
 #, fuzzy, c-format
-#| msgid "search: You must provide at least one search term\n"
 msgid "versions: You must provide at least one package selector\n"
 msgstr "搜尋: 您至少要提供一個搜尋字串\n"
 
@@ -2408,7 +2373,6 @@
 
 #: src/cmdline/cmdline_why.cc:1285
 #, fuzzy, c-format
-#| msgid "Packages depending on %s"
 msgid "Packages requiring %s:"
 msgstr "依賴於 %s 的套件"
 
@@ -2424,8 +2388,6 @@
 
 #: src/cmdline/cmdline_why.cc:1416
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: this command requires at least one argument (the package to query)."
 msgid ""
 "%s: this command requires at least one argument (the package to query).\n"
 msgstr "%s：該指令至少需要一個參數(被查詢的套件名)。"
@@ -2443,7 +2405,6 @@
 #. for "ERROR".
 #: src/cmdline/text_progress.cc:95
 #, fuzzy, c-format
-#| msgid "[ERROR]"
 msgid "[ ERR] %s"
 msgstr "[錯誤]"
 
@@ -2780,7 +2741,6 @@
 
 #: src/generic/apt/download_update_manager.cc:138
 #, fuzzy, c-format
-#| msgid "Unterminated literal string after %s"
 msgid "Unterminated quoted string in command: %s"
 msgstr "無法結束 %s 之後的未結束字串"
 
@@ -2858,7 +2818,6 @@
 
 #: src/generic/apt/dump_packages.cc:674
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "Unable to create truncated cache: %s."
 msgstr "無法定位套件 %s"
 
@@ -2979,7 +2938,6 @@
 #: src/generic/apt/matching/match.cc:2877
 #: src/generic/apt/matching/match.cc:2991
 #, fuzzy
-#| msgid "Downloading packages"
 msgid "Filtering packages"
 msgstr "下載套件中"
 
@@ -3017,7 +2975,6 @@
 
 #: src/generic/apt/matching/parse.cc:860
 #, fuzzy, c-format
-#| msgid "Unknown matcher type: \"%s\"."
 msgid "Unknown term type: \"%s\"."
 msgstr "未知的匹配類型：“%s”"
 
@@ -3025,9 +2982,6 @@
 #. Leave the question marks attached to the string placeholders.
 #: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883
 #, fuzzy, c-format
-#| msgid ""
-#| "The ?%s matcher must be used in a \"wide\" context (a top-level context, "
-#| "or a context enclosed by ?%s)."
 msgid ""
 "The ?%s term must be used in a \"wide\" context (a top-level context, or a "
 "context enclosed by ?%s)."
@@ -3056,7 +3010,6 @@
 
 #: src/generic/apt/matching/parse.cc:1388
 #, fuzzy, c-format
-#| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "錯誤格式的表達式"
 
@@ -3094,19 +3047,16 @@
 
 #: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "用於下載變更日誌的 URL"
 
 #: src/generic/apt/pkg_changelog.cc:575
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "用於下載變更日誌的 URL"
 
 #: src/generic/apt/pkg_changelog.cc:589
 #, fuzzy, c-format
-#| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "%s 的變更日誌"
 
@@ -3151,7 +3101,6 @@
 #: src/generic/apt/resolver_manager.cc:910
 #: src/generic/apt/resolver_manager.cc:912
 #, fuzzy, c-format
-#| msgid "Unable to parse pattern %s"
 msgid "Failed to parse the cost settings string: %s"
 msgstr "無法分析模式 %s"
 
@@ -3166,14 +3115,12 @@
 #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "尚未安裝"
 
 #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
 #, fuzzy, c-format
-#| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "尚未安裝"
 
@@ -3200,67 +3147,56 @@
 
 #: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got EOF."
 msgstr "期許“%c”，卻得到“%c”"
 
 #: src/generic/util/parsers.h:737
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected '%s', but got '%s'."
 msgstr "期許“%c”，卻得到“%c”"
 
 #: src/generic/util/parsers.h:778
 #, fuzzy
-#| msgid "Expected a number after -q=, got %s\n"
 msgid "Expected any character, but got EOF."
 msgstr "在 -q= 之後需要一個數字，但卻得到 %s\n"
 
 #: src/generic/util/parsers.h:791
 #, fuzzy
-#| msgid "Bad action character '%c'\n"
 msgid "any character"
 msgstr "錯誤的動作指令鍵 '%c'\n"
 
 #: src/generic/util/parsers.h:832
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got EOF."
 msgstr "期許“%c”，卻得到“%c”"
 
 #: src/generic/util/parsers.h:843
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected %s, but got '%c'."
 msgstr "期許“%c”，卻得到“%c”"
 
 #: src/generic/util/parsers.h:1017
 #, fuzzy
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got EOF."
 msgstr "需要策略標識，卻得到“%c”"
 
 #: src/generic/util/parsers.h:1026
 #, fuzzy
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected an integer following '-', got EOF."
 msgstr "在“||”後需要“,”或“(”，卻得到“%s”"
 
 #: src/generic/util/parsers.h:1032
 #, fuzzy, c-format
-#| msgid "Expected policy identifier, got '%c'"
 msgid "Expected an integer, got '%c'."
 msgstr "需要策略標識，卻得到“%c”"
 
 #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid integer: \"%s\"."
 msgstr "無效的操作“%s”"
 
 #: src/generic/util/parsers.h:1077
 #, fuzzy, c-format
-#| msgid "Expected '%c', got '%c'."
 msgid "Expected EOF, got '%c'."
 msgstr "期許“%c”，卻得到“%c”"
 
@@ -3274,19 +3210,16 @@
 #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
 #: src/generic/util/parsers.h:2085
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Expected %s"
 msgstr "意外的“)”"
 
 #: src/generic/util/parsers.h:2007
 #, fuzzy
-#| msgid " or"
 msgid " or "
 msgstr " 或"
 
 #: src/generic/util/parsers.h:2770
 #, fuzzy, c-format
-#| msgid "Unexpected ')'"
 msgid "Unexpected %s"
 msgstr "意外的“)”"
 
@@ -3297,7 +3230,6 @@
 
 #: src/generic/util/temp.cc:342
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "Unable to create temporary filename from prefix \"%s\""
 msgstr "無法為模板“%s”建立臨時檔案目錄：%s"
 
@@ -3332,7 +3264,6 @@
 
 #: src/gtk/aptitude.glade:19 src/gtk/aptitude.glade:2273
 #, fuzzy
-#| msgid "False"
 msgid "_File"
 msgstr "否"
 
@@ -3393,13 +3324,11 @@
 
 #: src/gtk/aptitude.glade:206 src/gtk/aptitude.glade:2472
 #, fuzzy
-#| msgid "Package"
 msgid "_Package"
 msgstr "套件"
 
 #: src/gtk/aptitude.glade:218 src/gtk/aptitude.glade:2484
 #, fuzzy
-#| msgid "Views"
 msgid "_View"
 msgstr "查看"
 
@@ -3419,7 +3348,6 @@
 
 #: src/gtk/aptitude.glade:297 src/gtk/aptitude.glade:2566
 #, fuzzy
-#| msgid "Help"
 msgid "_Help"
 msgstr "求助"
 
@@ -3430,7 +3358,6 @@
 
 #: src/gtk/aptitude.glade:345 src/gtk/aptitude.glade:2614
 #, fuzzy
-#| msgid "List Update"
 msgid "Update"
 msgstr "列表更新"
 
@@ -3452,7 +3379,6 @@
 
 #: src/gtk/aptitude.glade:389 src/gtk/aptitude.glade:2658
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Remove"
 msgstr "已安裝"
 
@@ -3466,33 +3392,28 @@
 
 #: src/gtk/aptitude.glade:634
 #, fuzzy
-#| msgid "Remove the filter from the package list"
 msgid "Make this the default for new package lists."
 msgstr "移除套件列表的篩選"
 
 #: src/gtk/aptitude.glade:649
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "Apply these settings to all active package lists."
 msgstr "套用套件列表篩選"
 
 #: src/gtk/aptitude.glade:723 src/gtk/aptitude.glade:1457
 #: src/gtk/aptitude.glade:1789 src/gtk/aptitude.glade:1928
 #, fuzzy
-#| msgid "Search"
 msgid "Search:"
 msgstr "搜尋"
 
 #: src/gtk/aptitude.glade:754
 #, fuzzy
-#| msgid "reinstall"
 msgid "Incremental"
 msgstr "重新安裝"
 
 #: src/gtk/aptitude.glade:774 src/gtk/aptitude.glade:1496
 #: src/gtk/aptitude.glade:1828 src/gtk/aptitude.glade:1967
 #, fuzzy
-#| msgid "Err "
 msgid "Errors"
 msgstr "錯誤 "
 
@@ -3507,19 +3428,16 @@
 
 #: src/gtk/aptitude.glade:962
 #, fuzzy
-#| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "%s 的依賴關係"
 
 #: src/gtk/aptitude.glade:992
 #, fuzzy
-#| msgid "^Changelog"
 msgid "Changelog"
 msgstr "變更紀錄(^C)"
 
 #: src/gtk/aptitude.glade:1020
 #, fuzzy
-#| msgid "False"
 msgid "Files"
 msgstr "否"
 
@@ -3533,7 +3451,6 @@
 
 #: src/gtk/aptitude.glade:1051
 #, fuzzy
-#| msgid "Tags"
 msgid "tags"
 msgstr "標簽"
 
@@ -3556,13 +3473,11 @@
 #: src/gtk/aptitude.glade:1213 src/gtk/download.cc:261
 #: src/gtk/entityview.cc:551
 #, fuzzy
-#| msgid "State"
 msgid "Status"
 msgstr "狀態"
 
 #: src/gtk/aptitude.glade:1247
 #, fuzzy
-#| msgid "Unknown action type: %s"
 msgid "Group by action type"
 msgstr "未知的操作類型：%s"
 
@@ -3591,13 +3506,11 @@
 
 #: src/gtk/aptitude.glade:1328
 #, fuzzy
-#| msgid "Toggle ^Rejected"
 msgid "Rejected"
 msgstr "放棄(^R)"
 
 #: src/gtk/aptitude.glade:1343
 #, fuzzy
-#| msgid "Preferences"
 msgid "No preference"
 msgstr "選項"
 
@@ -3611,32 +3524,27 @@
 
 #: src/gtk/aptitude.glade:1400
 #, fuzzy
-#| msgid "^Examine Solution"
 msgid "Find a new solution"
 msgstr "檢查解決方案(^E)"
 
 #: src/gtk/aptitude.glade:1404
 #, fuzzy
-#| msgid "Select the next solution to the dependency problems."
 msgid "Calculate the next solution that has not yet been generated."
 msgstr "選擇解決此依賴問題的下一個方案。"
 
 #: src/gtk/aptitude.glade:1419
 #, fuzzy
-#| msgid "Perform the actions contained in the currently selected solution."
 msgid ""
 "Perform the actions in the currently selected solution and close this tab."
 msgstr "確認當前選擇的解決方案中包含的動作。"
 
 #: src/gtk/aptitude.glade:1576
 #, fuzzy
-#| msgid "Upgrade"
 msgid "Upgrade Summary"
 msgstr "升級"
 
 #: src/gtk/aptitude.glade:1605
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "源碼套件："
 
@@ -3648,7 +3556,6 @@
 
 #: src/gtk/aptitude.glade:1652
 #, fuzzy
-#| msgid "Manual"
 msgid "Fix Manually"
 msgstr "為手動"
 
@@ -3696,31 +3603,26 @@
 
 #: src/gtk/areas.cc:75
 #, fuzzy
-#| msgid "Broken"
 msgid "Browse"
 msgstr "已損壞"
 
 #: src/gtk/areas.cc:76
 #, fuzzy
-#| msgid "Unable to correct for unavailable packages"
 msgid "Explore the available packages."
 msgstr "無法修正不可取得的套件"
 
 #: src/gtk/areas.cc:78
 #, fuzzy
-#| msgid "^Find"
 msgid "Find"
 msgstr "尋找(^F)"
 
 #: src/gtk/areas.cc:79
 #, fuzzy
-#| msgid "Search for a package"
 msgid "Search for packages."
 msgstr "搜尋套件"
 
 #: src/gtk/areas.cc:81
 #, fuzzy
-#| msgid "Got "
 msgid "Go"
 msgstr "已取得 "
 
@@ -3754,19 +3656,16 @@
 
 #: src/gtk/changelog.cc:378
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog: %s"
 msgstr "用於下載變更日誌的 URL"
 
 #: src/gtk/changelog.cc:514 src/gtk/changelog.cc:646
 #, fuzzy, c-format
-#| msgid "Requiring the installation of %s version %s (%s)"
 msgid "Parsing the changelog of %s version %s..."
 msgstr "要求安裝 %s 的 %s 版本(%s)"
 
 #: src/gtk/changelog.cc:613
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
@@ -3774,20 +3673,17 @@
 
 #: src/gtk/changelog.cc:617
 #, fuzzy, c-format
-#| msgid "You can only view changelogs of official Debian packages."
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr "您只能閱讀官方 Debian 套件的更改紀錄。"
 
 #: src/gtk/changelog.cc:692
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s version %s..."
 msgstr "正在下載更改紀錄"
 
 #: src/gtk/changelog.cc:883
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s version %s."
 msgstr "用於下載變更日誌的 URL"
 
@@ -3801,7 +3697,6 @@
 
 #: src/gtk/dashboardtab.cc:311
 #, fuzzy
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "用於下載變更日誌的 URL"
 
@@ -3811,21 +3706,17 @@
 
 #: src/gtk/dashboardtab.cc:414
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] "%d 個可升級"
 
 #: src/gtk/dashboardtab.cc:633
 #, fuzzy
-#| msgid "Not Installed"
 msgid "No upgrades are available."
 msgstr "尚未安裝"
 
 #: src/gtk/dashboardtab.cc:645
 #, fuzzy
-#| msgid "Unable to locate package %s"
 msgid "Unable to calculate an upgrade."
 msgstr "無法定位套件 %s"
 
@@ -3858,25 +3749,21 @@
 
 #: src/gtk/dashboardtab.cc:708
 #, fuzzy, c-format
-#| msgid "Internal error: Default column string is unparsable"
 msgid "Internal error encountered while calculating an upgrade: %s"
 msgstr "內部錯誤：預設欄字符串無法解析"
 
 #: src/gtk/dependency_chains_tab.cc:78
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: start"
 msgstr "處理相依關係"
 
 #: src/gtk/dependency_chains_tab.cc:82
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: end"
 msgstr "處理相依關係"
 
 #: src/gtk/dependency_chains_tab.cc:86
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "Find dependency chains: results"
 msgstr "處理相依關係"
 
@@ -3886,7 +3773,6 @@
 
 #: src/gtk/dependency_chains_tab.cc:282
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency chain found."
 msgstr "處理相依關係"
 
@@ -3896,13 +3782,11 @@
 
 #: src/gtk/download.cc:185
 #, fuzzy
-#| msgid "False"
 msgid "Failed"
 msgstr "否"
 
 #: src/gtk/download.cc:193
 #, fuzzy
-#| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "刪除下載的檔案"
 
@@ -3913,13 +3797,11 @@
 
 #: src/gtk/download.cc:253
 #, fuzzy
-#| msgid "Total Progress: "
 msgid "Progress"
 msgstr "總進度："
 
 #: src/gtk/download.cc:264
 #, fuzzy
-#| msgid "Description"
 msgid "Short Description"
 msgstr "描述"
 
@@ -3929,13 +3811,11 @@
 
 #: src/gtk/download.cc:319
 #, fuzzy
-#| msgid "Cleaning while a download is in progress is not allowed"
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr "在下載進行過程中不允許執行清除"
 
 #: src/gtk/download.cc:395 src/gtk/gui.cc:832
 #, fuzzy
-#| msgid "View next display"
 msgid "View Details"
 msgstr "查看下一個畫面"
 
@@ -3955,19 +3835,16 @@
 
 #: src/gtk/download.cc:486
 #, fuzzy, c-format
-#| msgid "%s; will be installed"
 msgid "%s: %lu/%lu, stalled"
 msgstr "%s；將被安裝。"
 
 #: src/gtk/download.cc:507
 #, fuzzy, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr " [ %i%% ]  (%sB/s, 剩下 %s)"
 
 #: src/gtk/download.cc:514
 #, fuzzy, c-format
-#| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "但 %s 將會安裝。"
 
@@ -3981,7 +3858,6 @@
 
 #: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
-#| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "無法定位套件 %s"
 
@@ -3992,7 +3868,6 @@
 
 #: src/gtk/dpkg_terminal.cc:429
 #, fuzzy, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "%s: Unable to accept a connection: %s"
 msgstr "無法為模板“%s”建立臨時檔案目錄：%s"
 
@@ -4018,80 +3893,67 @@
 
 #: src/gtk/entitysummary.cc:115
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "%s版本號"
 
 #: src/gtk/entitysummary.cc:123
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Install %s version %s"
 msgstr "安裝(%s 提供 %s)"
 
 #: src/gtk/entitysummary.cc:131
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrade to %s version %s"
 msgstr "cwidget版本：%s\n"
 
 #: src/gtk/entitysummary.cc:142
 #, fuzzy, c-format
-#| msgid "Keep the following packages at their current version:"
 msgid "Don't hold %s at its current version."
 msgstr "保持下列套件於其當前版本："
 
 #: src/gtk/entitysummary.cc:145 src/gtk/entitysummary.cc:165
 #: src/gtk/entitysummary.cc:168
 #, fuzzy, c-format
-#| msgid "Canc^el pending actions"
 msgid "Cancel any actions on %s."
 msgstr "取消待執行的動作(^E)"
 
 #: src/gtk/entitysummary.cc:150
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the purge of %s."
 msgstr "取消移除 %F"
 
 #: src/gtk/entitysummary.cc:152
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s."
 msgstr "取消移除 %F"
 
 #: src/gtk/entitysummary.cc:157
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the upgrade of %s."
 msgstr "取消移除 %F"
 
 #: src/gtk/entitysummary.cc:159
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s."
 msgstr "取消 %F 的安裝"
 
 #: src/gtk/entitysummary.cc:161
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the downgrade of %s."
 msgstr "取消移除 %F"
 
 #: src/gtk/entitysummary.cc:163
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the reinstallation of %s."
 msgstr "取消 %F 的安裝"
 
 #: src/gtk/entitysummary.cc:206
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "Remove %s"
 msgstr "移除(%s)"
 
 #: src/gtk/entitysummary.cc:210
 #, fuzzy, c-format
-#| msgid "^Purge"
 msgid "Purge %s"
 msgstr "清除(^P)"
 
@@ -4102,7 +3964,6 @@
 
 #: src/gtk/entitysummary.cc:223
 #, fuzzy, c-format
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Mark %s as automatically installed."
 msgstr "按'&M'將套件標記為自動安裝"
 
@@ -4113,7 +3974,6 @@
 
 #: src/gtk/entitysummary.cc:277
 #, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
 msgid "%s is a virtual package provided by:\n"
 msgstr "\"%s\" 是一個虛擬套件，由以下套件所提供:\n"
 
@@ -4123,13 +3983,11 @@
 
 #: src/gtk/entitysummary.cc:373
 #, fuzzy
-#| msgid "Source Package: "
 msgid "Source: "
 msgstr "源碼套件："
 
 #: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 #, fuzzy
-#| msgid "ProgName"
 msgid "Name"
 msgstr "程式名"
 
@@ -4139,13 +3997,11 @@
 
 #: src/gtk/entityview.cc:411
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Columns of \"%s\":"
 msgstr "無法打開檔案“%s”"
 
 #: src/gtk/entityview.cc:412
 #, fuzzy, c-format
-#| msgid "Rejecting the removal of %s"
 msgid "Editing the columns of \"%s\""
 msgstr "放棄移除 %s"
 
@@ -4159,25 +4015,21 @@
 
 #: src/gtk/entityview.cc:570
 #, fuzzy
-#| msgid "'&M' to mark packages as automatically installed"
 msgid "Whether the package is automatically installed."
 msgstr "按'&M'將套件標記為自動安裝"
 
 #: src/gtk/entityview.cc:576
 #, fuzzy
-#| msgid "Cancel any action on the selected package"
 msgid "The name and description of the package."
 msgstr "取消選擇的套件上的任何動作"
 
 #: src/gtk/entityview.cc:591
 #, fuzzy
-#| msgid "Version: "
 msgid "Version"
 msgstr "版本:"
 
 #: src/gtk/entityview.cc:592
 #, fuzzy
-#| msgid "Check for new versions of packages"
 msgid "The version number of the package."
 msgstr "正在檢查新版本的套件"
 
@@ -4198,7 +4050,6 @@
 
 #: src/gtk/gui.cc:80
 #, fuzzy
-#| msgid "not installed"
 msgid "Not installed"
 msgstr "尚未安裝"
 
@@ -4208,37 +4059,31 @@
 
 #: src/gtk/gui.cc:82
 #, fuzzy
-#| msgid "unpacked"
 msgid "Unpacked"
 msgstr "未解包的"
 
 #: src/gtk/gui.cc:83
 #, fuzzy
-#| msgid "half-config"
 msgid "Half-configured"
 msgstr "配置完成一半"
 
 #: src/gtk/gui.cc:84
 #, fuzzy
-#| msgid "half-install"
 msgid "Half-installed"
 msgstr "安裝完成一半"
 
 #: src/gtk/gui.cc:85
 #, fuzzy
-#| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "未安裝 (尚保留設定檔案)"
 
 #: src/gtk/gui.cc:86
 #, fuzzy
-#| msgid "triggers-awaited"
 msgid "Triggers awaited"
 msgstr "等待觸發"
 
 #: src/gtk/gui.cc:87
 #, fuzzy
-#| msgid "triggers-pending"
 msgid "Triggers pending"
 msgstr "即將觸發"
 
@@ -4264,13 +4109,11 @@
 
 #: src/gtk/gui.cc:97
 #, fuzzy
-#| msgid "forbidden upgrade"
 msgid "Hold (don't upgrade)"
 msgstr "被禁止的升級"
 
 #: src/gtk/gui.cc:99
 #, fuzzy
-#| msgid "Related Dependencies"
 msgid "Unsatisfied dependencies"
 msgstr "相關的相依性"
 
@@ -4284,7 +4127,6 @@
 
 #: src/gtk/gui.cc:290
 #, fuzzy
-#| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "套用套件列表篩選"
 
@@ -4299,13 +4141,11 @@
 
 #: src/gtk/gui.cc:359
 #, fuzzy, c-format
-#| msgid "List Update"
 msgid "Update %s?"
 msgstr "列表更新"
 
 #: src/gtk/gui.cc:385
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
@@ -4333,31 +4173,26 @@
 
 #: src/gtk/gui.cc:776
 #, fuzzy
-#| msgid "%s changes"
 msgid "Done applying changes!"
 msgstr "%s 個套件已改變"
 
 #: src/gtk/gui.cc:823
 #, fuzzy
-#| msgid "%s changes"
 msgid "Applying changes..."
 msgstr "%s 個套件已改變"
 
 #: src/gtk/gui.cc:875
 #, fuzzy, c-format
-#| msgid "s: %F"
 msgid "%s: %s"
 msgstr "s: %F"
 
 #: src/gtk/gui.cc:878
 #, fuzzy, c-format
-#| msgid "No broken packages."
 msgid "Error in package %s"
 msgstr "無損毀的套件。"
 
 #: src/gtk/gui.cc:906
 #, fuzzy, c-format
-#| msgid "Unable to replace %s with new configuration file"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "無法用新的配置檔案代替 %s"
 
@@ -4367,38 +4202,32 @@
 
 #: src/gtk/gui.cc:1038
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "無損毀的套件。"
 
 #: src/gtk/gui.cc:1071
 #, fuzzy
-#| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "無損毀的套件。"
 
 #: src/gtk/gui.cc:1075
 #, fuzzy
-#| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "解決相依賴關係"
 
 #: src/gtk/gui.cc:1103
 #, fuzzy, c-format
-#| msgid "No packages are broken."
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "沒有損毀的套件。"
 
 #: src/gtk/gui.cc:1147
 #, fuzzy
-#| msgid "%s changes"
 msgid "View changes"
 msgstr "%s 個套件已改變"
 
 #: src/gtk/gui.cc:1151
 #, fuzzy
-#| msgid "%s changes"
 msgid "Apply changes"
 msgstr "%s 個套件已改變"
 
@@ -4407,8 +4236,6 @@
 #. font.
 #: src/gtk/gui.cc:1192
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%d package to install"
 msgid_plural "%d packages to install"
 msgstr[0] "%d 個可安裝"
@@ -4418,14 +4245,12 @@
 #. font.
 #: src/gtk/gui.cc:1207
 #, fuzzy, c-format
-#| msgid "failed to remove %s"
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "無法移除 %s"
 
 #: src/gtk/gui.cc:1246
 #, fuzzy, c-format
-#| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "下載檔案大小"
 
@@ -4440,19 +4265,16 @@
 
 #: src/gtk/gui.cc:1356
 #, fuzzy
-#| msgid "not installed"
 msgid "Not implemented"
 msgstr "尚未安裝"
 
 #: src/gtk/gui.cc:1408 src/gtk/gui.cc:1427
 #, fuzzy
-#| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "已安裝"
 
 #: src/gtk/gui.cc:1434
 #, fuzzy
-#| msgid "^Purge"
 msgid "Purge"
 msgstr "清除(^P)"
 
@@ -4470,7 +4292,6 @@
 
 #: src/gtk/gui.cc:1455
 #, fuzzy
-#| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "使用者手冊"
 
@@ -4485,7 +4306,6 @@
 
 #: src/gtk/info.cc:161 src/gtk/pkgview.cc:169
 #, fuzzy
-#| msgid "Current status: %F."
 msgid "Current status"
 msgstr "目前狀態： %F。"
 
@@ -4495,19 +4315,16 @@
 
 #: src/gtk/info.cc:496
 #, fuzzy
-#| msgid "Not Installed"
 msgid "Not available"
 msgstr "尚未安裝"
 
 #: src/gtk/info.cc:545
 #, fuzzy
-#| msgid "C^ycle Package Information"
 msgid "Package information: version list"
 msgstr "C^循環檢視套件資訊"
 
 #: src/gtk/info.cc:555
 #, fuzzy
-#| msgid "Packages which depend on %s"
 msgid "Package information: dependency list"
 msgstr "依賴於 %s 的套件"
 
@@ -4517,7 +4334,6 @@
 
 #: src/gtk/info.cc:779
 #, fuzzy
-#| msgid "no"
 msgid "Info"
 msgstr "否"
 
@@ -4531,7 +4347,6 @@
 
 #: src/gtk/packagestab.cc:203
 #, fuzzy, c-format
-#| msgid "No packages matched the pattern \"%ls\"."
 msgid "No packages matched \"%s\"."
 msgstr "沒有套件吻合樣式 \"%ls\"。"
 
@@ -4541,31 +4356,26 @@
 
 #: src/gtk/packagestab.cc:415
 #, fuzzy
-#| msgid "Package: "
 msgid "Packages: "
 msgstr "套件:"
 
 #: src/gtk/pkgview.cc:224
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed automatically."
 msgstr "%s; 將會自動安裝"
 
 #: src/gtk/pkgview.cc:227
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed automatically."
 msgstr "%s; 將會自動安裝"
 
 #: src/gtk/pkgview.cc:235
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s was installed manually."
 msgstr "%s; 將會自動安裝"
 
 #: src/gtk/pkgview.cc:238
 #, fuzzy, c-format
-#| msgid "%s; will be installed automatically"
 msgid "%s is being installed manually."
 msgstr "%s; 將會自動安裝"
 
@@ -4575,13 +4385,11 @@
 
 #: src/gtk/pkgview.cc:607
 #, fuzzy
-#| msgid "Search"
 msgid "Searching..."
 msgstr "搜尋"
 
 #: src/gtk/pkgview.cc:718
 #, fuzzy
-#| msgid "Building view"
 msgid "Finalizing view"
 msgstr "建立視望中"
 
@@ -4705,13 +4513,11 @@
 
 #: src/gtk/previewtab.cc:179
 #, fuzzy
-#| msgid "Preview"
 msgid "Preview: "
 msgstr "預覽"
 
 #: src/gtk/resolver.cc:68
 #, fuzzy, c-format
-#| msgid "Error while dumping resolver state"
 msgid "Error in dependency resolver: %s"
 msgstr "傾印相依關係解決狀態時出錯"
 
@@ -4726,7 +4532,6 @@
 
 #: src/gtk/resolver.cc:212
 #, fuzzy
-#| msgid "Package"
 msgid "Virtual package"
 msgstr "套件"
 
@@ -4736,43 +4541,36 @@
 
 #: src/gtk/resolver.cc:377
 #, fuzzy, c-format
-#| msgid "Removing %s"
 msgid "Removing %s is rejected."
 msgstr "%s 移除中"
 
 #: src/gtk/resolver.cc:382
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Canceling the installation of %s is rejected."
 msgstr "取消 %F 的安裝"
 
 #: src/gtk/resolver.cc:391
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Canceling the removal of %s is rejected."
 msgstr "取消移除 %F"
 
 #: src/gtk/resolver.cc:394
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keeping %s at version %s is rejected."
 msgstr "保持 %F 在版本 %s (%s)"
 
 #: src/gtk/resolver.cc:401
 #, fuzzy, c-format
-#| msgid "Install(%s provides %s)"
 msgid "Installing %s version %s is rejected."
 msgstr "安裝(%s 提供 %s)"
 
 #: src/gtk/resolver.cc:407
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "Downgrading %s to version %s is rejected."
 msgstr "cwidget版本：%s\n"
 
 #: src/gtk/resolver.cc:413
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "Upgrading %s to version %s is rejected."
 msgstr "%s版本號"
 
@@ -4814,7 +4612,6 @@
 
 #: src/gtk/resolver.cc:466
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid ""
 "Upgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr "%s版本號"
@@ -4908,7 +4705,6 @@
 
 #: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862
 #, fuzzy
-#| msgid "Remove the following packages:"
 msgid "Keep the following packages:"
 msgstr "移除下列套件："
 
@@ -4924,121 +4720,101 @@
 
 #: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900
 #, fuzzy
-#| msgid "Leave the following dependencies unresolved:%n"
 msgid "Leave the following dependencies unresolved:"
 msgstr "保留下列未解決的相依關係：%n"
 
 #: src/gtk/resolver.cc:1516
 #, fuzzy, c-format
-#| msgid "Remove %F [%s (%s)]"
 msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "刪除 %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1523
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "安裝 %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1531
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s"
 msgstr "取消 %F 的安裝"
 
 #: src/gtk/resolver.cc:1534
 #, fuzzy, c-format
-#| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s"
 msgstr "取消移除 %F"
 
 #: src/gtk/resolver.cc:1537
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "保持 %F 在版本 %s (%s)"
 
 #: src/gtk/resolver.cc:1544
 #, fuzzy, c-format
-#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "升級 %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1553
 #, fuzzy, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr "降級 %F [%s (%s) -> %s (%s)]"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>Remove</b> %s"
 msgstr "移除(%s)"
 
 #: src/gtk/resolver.cc:1612
 #, fuzzy, c-format
-#| msgid "Remove(%s)"
 msgid "<b>remove</b> %s"
 msgstr "移除(%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>Keep</b> %s at version %s"
 msgstr "保持 %F 在版本 %s (%s)"
 
 #: src/gtk/resolver.cc:1621
 #, fuzzy, c-format
-#| msgid "Keep %F at version %s (%s)"
 msgid "<b>keep</b> %s at version %s"
 msgstr "保持 %F 在版本 %s (%s)"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>Cancel</b> the installation of %s"
 msgstr "取消 %F 的安裝"
 
 #: src/gtk/resolver.cc:1629
 #, fuzzy, c-format
-#| msgid "Cancel the installation of %F"
 msgid "<b>cancel</b> the installation of %s"
 msgstr "取消 %F 的安裝"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>Install</b> %s %s"
 msgstr "安裝 %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1636
 #, fuzzy, c-format
-#| msgid "Install %F [%s (%s)]"
 msgid "<b>install</b> %s %s"
 msgstr "安裝 %F [%s (%s)]"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>Downgrade</b> %s to version %s"
 msgstr "cwidget版本：%s\n"
 
 #: src/gtk/resolver.cc:1645
 #, fuzzy, c-format
-#| msgid "  cwidget version: %s\n"
 msgid "<b>downgrade</b> %s to version %s"
 msgstr "cwidget版本：%s\n"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>Upgrade</b> %s to version %s"
 msgstr "%s版本號"
 
 #: src/gtk/resolver.cc:1654
 #, fuzzy, c-format
-#| msgid "%s versions"
 msgid "<b>upgrade</b> %s to version %s"
 msgstr "%s版本號"
 
@@ -5054,66 +4830,52 @@
 
 #: src/gtk/resolver.cc:1735
 #, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
 msgid "%s install"
 msgid_plural "%s installs"
 msgstr[0] "%d 個可安裝"
 
 #: src/gtk/resolver.cc:1740
 #, fuzzy, c-format
-#| msgid "%d removal"
-#| msgid_plural "%d removals"
 msgid "%s remove"
 msgid_plural "%s removes"
 msgstr[0] "%d 個移除"
 
 #: src/gtk/resolver.cc:1746
 #, fuzzy, c-format
-#| msgid "%d keep"
-#| msgid_plural "%d keeps"
 msgid "%s keep"
 msgid_plural "%s keeps"
 msgstr[0] "%d 個保存"
 
 #: src/gtk/resolver.cc:1752
 #, fuzzy, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
 msgid "%s upgrade"
 msgid_plural "%s upgrades"
 msgstr[0] "%d 個可升級"
 
 #: src/gtk/resolver.cc:1758
 #, fuzzy, c-format
-#| msgid "%d downgrade"
-#| msgid_plural "%d downgrades"
 msgid "%s downgrade"
 msgid_plural "%s downgrades"
 msgstr[0] "%d 個可下載"
 
 #: src/gtk/resolver.cc:1764
 #, fuzzy, c-format
-#| msgid "Audit ^Recommendations"
 msgid "%s unresolved recommendation"
 msgid_plural "%s unresolved recommendations"
 msgstr[0] "檢查推薦結果(^R)"
 
 #: src/gtk/resolver.cc:2056
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions yet."
 msgstr "沒有更多的解決方案了。"
 
 #: src/gtk/resolver.cc:2063
 #, fuzzy
-#| msgid "Dependency handling"
 msgid "No dependency solution was found."
 msgstr "處理相依關係"
 
 #: src/gtk/resolver.cc:2064
 #, fuzzy
-#| msgid "No more solutions."
 msgid "No solutions."
 msgstr "沒有更多的解決方案了。"
 
@@ -5123,19 +4885,16 @@
 
 #: src/gtk/resolver.cc:2076
 #, fuzzy, c-format
-#| msgid "No more solutions."
 msgid "%u solutions."
 msgstr "沒有更多的解決方案了。"
 
 #: src/gtk/resolver.cc:2106
 #, fuzzy, c-format
-#| msgid "Could not open file \"%s\""
 msgid "Solution %s of %s."
 msgstr "無法打開檔案“%s”"
 
 #: src/gtk/tab.cc:68
 #, fuzzy
-#| msgid "[Downloaded]"
 msgid "Download"
 msgstr "[已下載]"
 
@@ -5185,7 +4944,6 @@
 
 #: src/load_grouppolicy.cc:305
 #, fuzzy, c-format
-#| msgid "Expected ',' or '(', got '%c'"
 msgid "Expected ',', '%c', or '('; got '%c'"
 msgstr "需要“,”或“(”，卻得到“%c”"
 
@@ -5287,7 +5045,6 @@
 
 #: src/load_grouppolicy.cc:713
 #, fuzzy, c-format
-#| msgid "Expected ',' or ')' following '||', got '%s'"
 msgid "Expected '{', ')', or ',' following '||', got '%s'"
 msgstr "在“||”後需要“,”或“(”，卻得到“%s”"
 
@@ -5406,19 +5163,16 @@
 
 #: src/main.cc:159
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt 版本 %d.%d.%d\n"
 
 #: src/main.cc:161
 #, fuzzy, c-format
-#| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt 版本 %d.%d.%d\n"
 
 #: src/main.cc:164
 #, fuzzy, c-format
-#| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  不支援 Ept\n"
 
@@ -5466,44 +5220,36 @@
 
 #: src/main.cc:181
 #, fuzzy, c-format
-#| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - 安裝/升級套件\n"
 
 #: src/main.cc:182
 #, fuzzy, c-format
-#| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - 移除套件\n"
 
 #: src/main.cc:183
 #, fuzzy, c-format
-#| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - 移除套件並刪除其配置檔案\n"
 
 #: src/main.cc:184
 #, fuzzy, c-format
-#| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - 將套件置於保持狀態\n"
 
 #: src/main.cc:185
 #, fuzzy, c-format
-#| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - 取消對一個套件的保持命令\n"
 
 #: src/main.cc:186
 #, fuzzy, c-format
-#| msgid ""
-#| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - 將套件標記為自動安裝\n"
 
 #: src/main.cc:187
 #, fuzzy, c-format
-#| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - 將套件標記為手動安裝\n"
 
@@ -5516,21 +5262,16 @@
 
 #: src/main.cc:189
 #, fuzzy, c-format
-#| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - 下載新/可升級套件列表\n"
 
 #: src/main.cc:190
 #, fuzzy, c-format
-#| msgid " safe-upgrade - Perform a safe upgrade\n"
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - 執行一次安全的升級\n"
 
 #: src/main.cc:191
 #, fuzzy, c-format
-#| msgid ""
-#| " full-upgrade - Perform an upgrade, possibly installing and removing "
-#| "packages\n"
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
@@ -5538,57 +5279,46 @@
 
 #: src/main.cc:192
 #, fuzzy, c-format
-#| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "'&BD' 安裝套件的編譯相依套件。"
 
 #: src/main.cc:193
 #, fuzzy, c-format
-#| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - 忽略哪些套件是“新”的\n"
 
 #: src/main.cc:194
 #, fuzzy, c-format
-#| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - 按名稱 和/或 表達式搜尋套件\n"
 
 #: src/main.cc:195
 #, fuzzy, c-format
-#| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - 顯示套件細節資訊\n"
 
 #: src/main.cc:196
 #, fuzzy, c-format
-#| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - 刪除已下載的套件檔案\n"
 
 #: src/main.cc:197
 #, fuzzy, c-format
-#| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - 刪除舊的已下載套件檔案\n"
 
 #: src/main.cc:198
 #, fuzzy, c-format
-#| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - 查看套件的更改紀錄\n"
 
 #: src/main.cc:199
 #, fuzzy, c-format
-#| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - 下載套件的 .deb 檔案\n"
 
 #: src/main.cc:200
 #, fuzzy, c-format
-#| msgid ""
-#| " reinstall    - Download and (possibly) reinstall a currently installed "
-#| "package\n"
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
@@ -5607,12 +5337,6 @@
 
 #: src/main.cc:203
 #, fuzzy, c-format
-#| msgid ""
-#| " why-not      - Show the manually installed packages that lead to a "
-#| "conflict\n"
-#| "                with the given package, or why one or more packages "
-#| "would\n"
-#| "                lead to a conflict with the given package if installed\n"
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
 "conflict\n"
@@ -5630,7 +5354,6 @@
 
 #: src/main.cc:208
 #, fuzzy, c-format
-#| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             此求助純文字\n"
 
@@ -5658,24 +5381,17 @@
 
 #: src/main.cc:215
 #, fuzzy, c-format
-#| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             總是提示確認執行動作\n"
 
 #: src/main.cc:216
 #, fuzzy, c-format
-#| msgid ""
-#| " -y             Assume that the answer to simple yes/no questions is "
-#| "'yes'\n"
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr " -y             假設對簡單的 是/否 問題回答“是”\n"
 
 #: src/main.cc:217
 #, fuzzy, c-format
-#| msgid ""
-#| " -F format      Specify a format for displaying search results; see the "
-#| "manual\n"
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
@@ -5683,9 +5399,6 @@
 
 #: src/main.cc:218
 #, fuzzy, c-format
-#| msgid ""
-#| " -O order       Specify how search results should be sorted; see the "
-#| "manual\n"
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
@@ -5693,8 +5406,6 @@
 
 #: src/main.cc:219
 #, fuzzy, 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 寬度        指定顯示搜尋結果的格式寬度\n"
@@ -5722,9 +5433,6 @@
 
 #: src/main.cc:224
 #, fuzzy, c-format
-#| msgid ""
-#| " -v             Display extra information. (may be supplied multiple "
-#| "times)\n"
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
@@ -5732,17 +5440,12 @@
 
 #: src/main.cc:225
 #, fuzzy, c-format
-#| msgid ""
-#| " -t [release]   Set the release from which packages should be installed\n"
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr " -t [release]   設置將要安裝的套件的發布版本\n"
 
 #: src/main.cc:226
 #, fuzzy, c-format
-#| msgid ""
-#| " -q             In command-line mode, suppress the incremental progress\n"
-#| "                indicators.\n"
 msgid ""
 " -q             In command-line mode, suppress the incremental progress.\n"
 "                indicators.\n"
@@ -5750,15 +5453,11 @@
 
 #: src/main.cc:228
 #, fuzzy, c-format
-#| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o key=val     直接指定名稱為 'key' 的設定選項\n"
 
 #: src/main.cc:229
 #, fuzzy, c-format
-#| msgid ""
-#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
-#| "                strong dependencies\n"
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n"
 "                strong dependencies.\n"
@@ -5793,7 +5492,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:365
 #, fuzzy
-#| msgid "true"
 msgid "trace"
 msgstr "真"
 
@@ -5807,7 +5505,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:371
 #, fuzzy
-#| msgid "no"
 msgid "info"
 msgstr "否"
 
@@ -5821,7 +5518,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:377
 #, fuzzy
-#| msgid "Err "
 msgid "error"
 msgstr "錯誤 "
 
@@ -5829,7 +5525,6 @@
 #. the command-line or set in the configuration file.
 #: src/main.cc:380
 #, fuzzy
-#| msgid "false"
 msgid "fatal"
 msgstr "否"
 
@@ -5850,7 +5545,6 @@
 
 #: src/main.cc:460
 #, fuzzy, c-format
-#| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "無效的操作“%s”"
 
@@ -5903,7 +5597,6 @@
 
 #: src/main.cc:991
 #, fuzzy
-#| msgid "Package"
 msgid "first-package"
 msgstr "套件"
 
@@ -5913,7 +5606,6 @@
 
 #: src/main.cc:995
 #, fuzzy
-#| msgid "All Packages"
 msgid "all-packages"
 msgstr "全部包"
 
@@ -5933,7 +5625,6 @@
 
 #: src/main.cc:1041
 #, fuzzy
-#| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
 "specified\n"
@@ -5941,8 +5632,6 @@
 
 #: src/main.cc:1050
 #, fuzzy
-#| msgid ""
-#| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
 "-u, -i, and --clean-on-startup may not be specified in command-line mode "
 "(eg, with 'install')"
@@ -5950,7 +5639,6 @@
 
 #: src/main.cc:1067
 #, fuzzy
-#| msgid "-u and -i may not be specified with a command"
 msgid "-u, -i, and --clean-on-startup may not be specified with a command"
 msgstr "選項 -u 和 -i 不能在和一個命令一起指定 "
 
@@ -7141,7 +6829,6 @@
 
 #: src/ui.cc:472
 #, fuzzy, c-format
-#| msgid "Unable to open %ls"
 msgid "Unable to fork: %s"
 msgstr "無法打開 %ls"
 
@@ -7401,9 +7088,6 @@
 
 #: src/ui.cc:1744
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7423,9 +7107,6 @@
 
 #: src/ui.cc:1827
 #, fuzzy
-#| msgid ""
-#| "Updating the package lists requires administrative privileges, which you "
-#| "currently do not have.  Would you like to change to the root account?"
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7939,19 +7620,16 @@
 
 #: src/view_changelog.cc:343
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Preparing to download the changelog of %s"
 msgstr "用於下載變更日誌的 URL"
 
 #: src/view_changelog.cc:371
 #, fuzzy, c-format
-#| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "用於下載變更日誌的 URL"
 
 #: src/view_changelog.cc:382
 #, fuzzy, c-format
-#| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "正在下載更改紀錄"
 
