diff options
| -rw-r--r-- | doc/en/aptitude.xml | 17 | ||||
| -rw-r--r-- | po/aptitude.pot | 57 | ||||
| -rw-r--r-- | po/ar.po | 57 | ||||
| -rw-r--r-- | po/bs.po | 57 | ||||
| -rw-r--r-- | po/ca.po | 57 | ||||
| -rw-r--r-- | po/cs.po | 57 | ||||
| -rw-r--r-- | po/da.po | 57 | ||||
| -rw-r--r-- | po/de.po | 57 | ||||
| -rw-r--r-- | po/el.po | 57 | ||||
| -rw-r--r-- | po/es.po | 57 | ||||
| -rw-r--r-- | po/eu.po | 57 | ||||
| -rw-r--r-- | po/fi.po | 57 | ||||
| -rw-r--r-- | po/fr.po | 57 | ||||
| -rw-r--r-- | po/gl.po | 57 | ||||
| -rw-r--r-- | po/hu.po | 57 | ||||
| -rw-r--r-- | po/it.po | 57 | ||||
| -rw-r--r-- | po/ja.po | 57 | ||||
| -rw-r--r-- | po/km.po | 57 | ||||
| -rw-r--r-- | po/ku.po | 57 | ||||
| -rw-r--r-- | po/lt.po | 57 | ||||
| -rw-r--r-- | po/mr.po | 57 | ||||
| -rw-r--r-- | po/nb.po | 57 | ||||
| -rw-r--r-- | po/nl.po | 57 | ||||
| -rw-r--r-- | po/nn.po | 57 | ||||
| -rw-r--r-- | po/pl.po | 57 | ||||
| -rw-r--r-- | po/pt.po | 57 | ||||
| -rw-r--r-- | po/pt_BR.po | 57 | ||||
| -rw-r--r-- | po/ro.po | 57 | ||||
| -rw-r--r-- | po/ru.po | 57 | ||||
| -rw-r--r-- | po/sk.po | 57 | ||||
| -rw-r--r-- | po/sv.po | 57 | ||||
| -rw-r--r-- | po/tl.po | 57 | ||||
| -rw-r--r-- | po/tr.po | 57 | ||||
| -rw-r--r-- | po/vi.po | 57 | ||||
| -rw-r--r-- | po/zh_CN.po | 57 | ||||
| -rw-r--r-- | po/zh_TW.po | 57 | ||||
| -rw-r--r-- | src/cmdline/cmdline_resolver.cc | 10 |
37 files changed, 1138 insertions, 884 deletions
diff --git a/doc/en/aptitude.xml b/doc/en/aptitude.xml index 7709b527..7f417052 100644 --- a/doc/en/aptitude.xml +++ b/doc/en/aptitude.xml @@ -8814,14 +8814,15 @@ iuAU wesnoth-data +930kB 0.8.7-1 0.8.8-1.0w Decreasing this number will make the program <quote>give up</quote> sooner; increasing it will permit the search for a solution to consume much more - time and memory before it is aborted. The default - value is large enough to accomodate commonly - encountered situations, while preventing the program - from <quote>blowing up</quote> if an overly - complicated problem is encountered. (note: this - applies only to command-line searches; in the visual - interface, the resolver will continue working until it - reaches a solution) + time and memory before it is aborted. Setting + <literal>StepLimit</literal> to 0 will disable the + problem resolver entirely. The default value is large + enough to accomodate commonly encountered situations, + while preventing the program from <quote>blowing + up</quote> if an overly complicated problem is + encountered. (note: this applies only to command-line + searches; in the visual interface, the resolver will + continue working until it reaches a solution) </seg> </seglistitem> diff --git a/po/aptitude.pot b/po/aptitude.pot index b0a46bab..c5a5bc5c 100644 --- a/po/aptitude.pot +++ b/po/aptitude.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1137,18 +1137,18 @@ msgstr "" msgid "Invalid response. Please enter a valid command or '?' for help.\n" msgstr "" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "" @@ -1286,52 +1286,59 @@ msgstr "" msgid "Requiring the installation of %s version %s (%s)" msgstr "" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "" -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "" -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "" -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "" -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "" -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3531,20 +3538,20 @@ msgstr "" msgid "Couldn't parse column definition" msgstr "" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "" @@ -4749,23 +4756,23 @@ msgstr "" msgid "False" msgstr "" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 msgid "%BOption:%b " msgstr "" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude_po\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\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" @@ -1205,18 +1205,18 @@ msgstr "" msgid "Invalid response. Please enter a valid command or '?' for help.\n" msgstr "ردّ غير صالح. رجاء أدخل أمراً صالحاً أ '؟' للمساعدة.\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "تعذر فتح %s للتسجيل" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "خطأ في تسجيل وضع المُحلّل إلى %s" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "تم تسجيل وضع المحلّل بنجاح!" @@ -1356,52 +1356,59 @@ msgstr "إزالة %s مطلوبة" msgid "Requiring the installation of %s version %s (%s)" msgstr "تثبيت %s النسخة %s (%s) مطلوبة" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "مفتوح: %d; مغلق: %d; مؤجل: %d; متعارض: %d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "العمليات التالية ستحلّ هذه الاعتمادات:" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "قبول هذا الحل? [Y/n/q/?] " -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "تجاهل جميع الجهود لحلّ هذه المعتمدات." -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "الأوامر التالية متوفّرة:" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "اسم الملف المطلوب تسجيل وضع المحلّل إليه:" -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "ردّ باطل؛ من فضلك أدخل أحد هذه الأوامر: " -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "لم يُعثر على حل ضمن الوقع المُخصّص. هل أحاول بجهد أكبر؟ [Y/n]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "ردّ باطل؛ من فضلك أدخل 'y' أو 'n'." -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "تعذر إرضاء المعتمدات! الاستسلام..." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "*** لا مزيد من الحلول ***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3682,20 +3689,20 @@ msgstr "تعذر تحويل تعريف العمود" msgid "Couldn't parse column definition" msgstr "تعذر إعراب تعريف العمود" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "make_package_view: خطأ في المعطيات -- هناك أكثر من widget؟؟" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "make_package_view: خطأ في المعطيات -- قائمة عمودية خاطئة للعنصر الثابت" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: مُعطى سيّء!" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view: لم يعثر على widge أساسيّة" @@ -4951,25 +4958,25 @@ msgstr "" msgid "False" msgstr "إغلاق" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "خيارات" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2004-05-08 17:40+0100\n" "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n" "Language-Team: Bosnian <lokal@lugbih.org>\n" @@ -1145,18 +1145,18 @@ msgstr "" msgid "Invalid response. Please enter a valid command or '?' for help.\n" msgstr "" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "" @@ -1294,53 +1294,60 @@ msgstr "" msgid "Requiring the installation of %s version %s (%s)" msgstr "" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "" -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "" -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 #, fuzzy msgid "The following commands are available:" msgstr "Slijedeći paketi su OŠTEĆENI:" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "" -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "" -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "" -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3547,20 +3554,20 @@ msgstr "" msgid "Couldn't parse column definition" msgstr "" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "" @@ -4782,25 +4789,25 @@ msgstr "" msgid "False" msgstr "" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "Opcije" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude_0.2.13-2\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2006-04-20 08:19+0200\n" "Last-Translator: Aleix Badia i Bosch <a.badia@callusdigital.org>\n" "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n" @@ -1229,19 +1229,19 @@ msgid "Invalid response. Please enter a valid command or '?' for help.\n" msgstr "" "La resposta no és vàlid. Introduïu una ordre vàlid o '?' per a ajuda.\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "No s'ha pogut obrir %s per a l'escriptura" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "" "S'ha produït un error en escriure l'estat del sistema de resolució a %s" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "L'estat del sistema de resolució s'ha desat correctament!" @@ -1387,54 +1387,61 @@ msgstr "És necessària la supressió de %s" msgid "Requiring the installation of %s version %s (%s)" msgstr "És necessària la instal·lació de %s versió %s (%s)" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "oberts: %d; tancats: %d; aplaçats: %d; amb conflictes: %d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "Les accions següents resoldran les dependències:" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "Accepteu la solució? [Y/n/q/?] " -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "S'estan abandonant les tasques per resoldre aquestes dependències." -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "Es disposa de les ordres següents:" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "S'ha produït un error en desar l'estat del sistema de resolució a: " -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "La resposta no és vàlida; introduïu una de les ordres següents:" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "" "No s'ha trobat cap solució en l'interval de temps especificat. Ho voleu " "provar amb més insistència? [Y/n]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "La resposta no és vàlida; introduïu 'y' o 'n'." -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "No s'han pogut resoldre les dependències! Finalitzant..." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "*** No hi ha més solucions disponibles ***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3804,24 +3811,24 @@ msgstr "No s'ha pogut transcodificar la definició de la columna" msgid "Couldn't parse column definition" msgstr "No s'ha pogut analitzar la definició de columna" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "" "make_package_view: s'ha produït un error en els arguments -- hi ha dos " "elements d'interfície gràfica principals??" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "" "make_package_view: s'ha produït un error en els arguments -- la llista de " "columnes per a l'element estàtic és errònia" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: argument erroni." -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "" "make_package_view: no s'ha trobat cap element principal de la interfície " @@ -5144,25 +5151,25 @@ msgstr "" msgid "False" msgstr "Tanca" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "Opcions" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2006-10-01 11:07+0200\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" @@ -1206,18 +1206,18 @@ msgstr "" msgid "Invalid response. Please enter a valid command or '?' for help.\n" msgstr "Chybná odpověď. Zadejte platný příkaz nebo '?' pro nápovědu.\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "Nemohu otevřít %s pro zápis" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "Chyba při zápisu duševního stavu řešitele do %s" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "Stav řešitele byl úspěšně zapsán!" @@ -1360,52 +1360,59 @@ msgstr "Vyžaduji odstranění balíku %s" msgid "Requiring the installation of %s version %s (%s)" msgstr "Vyžaduji instalaci balíku %s verze %s (%s)" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "otevřené: %d; zavřené: %d; odložené: %d; konfliktní: %d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "Následující akce vyřeší tyto závislosti:" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "Přijmout toto řešení? [Y/n/q/?] " -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "Končím všechny snahy na vyřešení těchto závislostí." -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "K dispozici jsou následující příkazy:" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "Soubor, do kterého zapsat stav řešitele:" -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "Chybná odpověď; zadejte některý z následujících příkazů:" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "V přiděleném čase nebylo nalezeno řešení. Zkusit důkladněji? [Y/n]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "Chybná odpověď; zadejte 'y' nebo 'n'." -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "Nemohu vyřešit závislosti! Vzdávám se..." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "*** Žádná další řešení nejsou dostupná ***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3702,20 +3709,20 @@ msgstr "Nemohu překódovat definici sloupce" msgid "Couldn't parse column definition" msgstr "Nemohu zpracovat definici sloupce" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "make_package_view: chyba v argumentech -- dva hlavní widgety??" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "make_package_view: chyba v argumentech -- chybný seznam sloupců" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: chybný argument!" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view: nebyl nalezen hlavní widget" @@ -4999,25 +5006,25 @@ msgstr "" msgid "False" msgstr "Zavřít" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "Volby" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude-0.4.2\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2007-02-03 15:53+0100\n" "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n" "Language-Team: Danish\n" @@ -1216,18 +1216,18 @@ msgstr "" msgid "Invalid response. Please enter a valid command or '?' for help.\n" msgstr "Ugyldigt svar. Anfr en gyldig kommando eller \"?\" for hjlp.\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "Kunne ikke bne %s til skrivning" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "Kunne ikke skrive status ved lsningsforslag til %s" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "Status for lsningsforslag gemt!" @@ -1371,54 +1371,61 @@ msgstr "Krver %s afinstalleret" msgid "Requiring the installation of %s version %s (%s)" msgstr "Krver installering af %s version %s (%s)" +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + # Er i tvivl om "defer" -MBJ -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "bne: %d; lukkede: %d; afviste: %d; konflikter: %d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "De flgende handlinger vil udrede disse afhngigheder:" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "Godkend denne lsning? [Y/n/q/?] " -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "Opgiver alle forsg p at udrede disse afhngigheder." -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "De flgende kommandoer er tilgngelige:" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "Fil som status ved lsningsforslag skrives til: " -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "Ugyldigt svar. Anfr en af flgende kommandoer:" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "" "Ingen lsning fundet indenfor den fastsatte tid. Prv mere ihrdigt? [Y/n]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "Ugyldigt svar; anfr venligst 'y' eller 'n'." -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "Kunne ikke udrede afhngigheder! Opgiver ..." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "*** Ikke flere tilgngelige lsninger ***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3728,22 +3735,22 @@ msgstr "Kunne ikke omkode kolonne-definition" msgid "Couldn't parse column definition" msgstr "Kunne ikke fortolke kolonne-definition" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "make_package_view: fejl i parametre - to \"main widgets\"??" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "" "make_package_view: fejl i parametre - forkert kolonneliste for statisk " "element" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: forkert argument!" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view: ingen \"main widget\" fundet" @@ -5040,25 +5047,25 @@ msgstr "" msgid "False" msgstr "Luk" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "Indstillinger" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude 0.2.15.5\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2006-10-05 23:21+0200\n" "Last-Translator: Jens Seidel <jensseidel@users.sf.net>\n" "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n" @@ -1230,18 +1230,18 @@ msgstr "" "Ungültige Antwort. Bitte geben Sie einen gültigen Befehl oder »?« für Hilfe " "ein.\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "%s konnte nicht zum Schreiben geöffnet werden" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "Fehler beim Schreiben des Auflösungsstatus zu %s" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "Auflösungsstatus wurde erfolgreich geschrieben!" @@ -1392,54 +1392,61 @@ msgstr "Erfordert die Entfernung von %s" msgid "Requiring the installation of %s version %s (%s)" msgstr "Erfordert die Installation von %s Version %s (%s)" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "offen: %d; geschlossen: %d; zurückgestellt: %d; Konflikte: %d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "Die folgenden Aktionen werden diese Abhängigkeiten auflösen:" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "Diese Lösung akzeptieren? [Y/n/q/?] " -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "Alle Anstrengungen diese Abhängigkeiten aufzulösen aufgegeben." -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "Die folgenden Kommandos sind verfügbar:" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "Datei, in die der Auflösungsstatus geschrieben werden soll: " -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "Ungültige Antwort. Bitte geben Sie eines der folgenden Kommandos ein:" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "" "Es wurde in der zugewiesenen Zeit keine Lösung gefunden. Stärker suchen? [Y/" "n]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "Ungültige Antwort. Bitte geben Sie »y« oder »n« ein." -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "Abhängigkeiten können nicht aufgelöst werden! Gebe auf ..." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "*** Keine weiteren Lösungen vorhanden ***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3815,22 +3822,22 @@ msgstr "Konnte Spaltendefinition nicht konvertieren" msgid "Couldn't parse column definition" msgstr "Konnte Spaltendefinition nicht verarbeiten" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "make_package_view: Fehler in Argumenten -- zwei main widgets??" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "" "make_package_view: Fehler in Argumenten -- falsche Spaltenliste für " "statisches Item" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: falsches Argument!" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view: kein main widget gefunden" @@ -5162,25 +5169,25 @@ msgstr "" msgid "False" msgstr "Schließen" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "Optionen" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude_po_el\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2006-12-18 09:26+0200\n" "Last-Translator: quad-nrg.net <galaxico@quad-nrg.net>\n" "Language-Team: Greek <en@li.org>\n" @@ -1247,18 +1247,18 @@ msgid "Invalid response. Please enter a valid command or '?' for help.\n" msgstr "" "Ακυρη απάντηση. Παρακαλώ εισάγετε μια έγκυρη εντολή ή '?' για βοήθεια.\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "Αδύνατο το άνοιγμα του %s για εγγραφή" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "Σφάλμα κατά την εγγραφή της κατάστασης του resolver στο %s" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "Η κατάσταση του resolver γράφτηκε με επιτυχία!" @@ -1410,52 +1410,59 @@ msgstr "Απαιτείται η αφαίρεση του πακέτου %s" msgid "Requiring the installation of %s version %s (%s)" msgstr "Απαιτείται η εγκατάσταση της έκδοσης %s του πακέτου %s (%s)" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "ανοιχτό: %d; κλειστό: %d; αποτροπή: %d; σύγκρουση: %d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "Οι ακόλουθες ενέργεις θα επιλύσουν αυτές τις εξαρτήσεις:" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "Αποδοχή της λύσης; [Y/n/q/?]" -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "Εγκατάλλειψη κάθε προσπάθειας επίλυσης αυτών των εξαρτήσεων." -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "Οι ακόλουθες εντολές είναι διαθέσιμες:" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "Αρχείο για εγγραφή της κατάστασης επίλυσης:" -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "Μη έγκυρη απόκριση. Παρακαλώ εισάγετε μια από τις ακόλουθες εντολές:" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "Δεν βρέθηκε λύση μέσα στον διατιθέμενο χρόνο. Δοκιμή κεφαλίδας;[Y/n]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "Μη έγκυρη απόκριση. Παρακαλώ εισάγετε 'y' ή 'n'." -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "Αδυνατώ να επιλύσω τις εξαρτήσεις! Εγκαταλείπω..." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "*** Δεν υπάρχουν άλλες διαθέσιμες λύσεις ***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3813,21 +3820,21 @@ msgstr "Αδύνατη η μετακωδικοποίηση του ορισμού msgid "Couldn't parse column definition" msgstr "Αδύνατο το parse του ορισμού στήλης" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "make_package_view: σφάλμα στα ορίσματα -- two main widgets??" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "" "make_package_view: σφάλμα στα ορίσματα -- bad column list for static item" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: κακό όρισμα!" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view: no main widget found" @@ -5141,25 +5148,25 @@ msgstr "" msgid "False" msgstr "Κλείσιμο" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "Επιλογές" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude 0.4.3-1\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2007-07-26 15:12+0200\n" "Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n" "Language-Team: Debian-l10n-Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -1242,18 +1242,18 @@ msgstr "" "Respuesta inválida. Por favor, introduzca una orden válida o «?» para leer " "la ayuda.\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "No se pudo abrir %s para escribir en él" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "Error al escribir el estado del solucionador a %s" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "El estado del solucionador se escribió correctamente!" @@ -1401,55 +1401,62 @@ msgstr "Se necesita la eliminación de %s" msgid "Requiring the installation of %s version %s (%s)" msgstr "Se necesita la instalación de %s versión %s (%s)" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "abierto: %d; cerrado: %d; diferido: %d; conflicto: %d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "Las acciones siguientes resolverán estas dependencias" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "¿Acepta esta solución? [Y/n/q/?]" -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "Abandonando todos los esfuerzos por resolver estas dependencias" -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "Las siguientes órdenes están disponibles:" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "Fichero en el que escribir el estado del solucionador:" -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "" "Respuesta inválida. Por favor, introduzca una de las órdenes siguientes:" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "" "No se encontró ninguna solución en el tiempo asignado. ¿Intentarlo " "conzienzudamente? [Y/n]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "Respuesta inválida. Por favor, introduzca «y» o «n»." -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "¡Incapaz de resolver las dependencias! Desistiendo..." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "*** No hay más soluciones disponibles ***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3819,23 +3826,23 @@ msgstr "No se pudo cambiar la codificación de la definición de la columna" msgid "Couldn't parse column definition" msgstr "No se pudo interpretar la definición de la columna" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "" "make_package_view: error en los argumentos -- ¿dos componentes principales?" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "" "make_package_view: error en los argumentos -- la lista de columnas para el " "elemento estático es incorrecta." -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: ¡argumento incorrecto!" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view: componente principal no encontrado" @@ -5149,25 +5156,25 @@ msgstr "" msgid "False" msgstr "Cerrar" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "Opciones" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude_po_eu\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2007-07-10 13:32+0200\n" "Last-Translator: Piarres Beobide <pi@beobide.net>\n" "Language-Team: Euskara <Librezale@librezale.org>\n" @@ -1221,18 +1221,18 @@ msgid "Invalid response. Please enter a valid command or '?' for help.\n" msgstr "" "Erantzun baliogabea. Sartu baliozko komando bat, edo '?' laguntza ikusteko.\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "Ezin da %s idazteko ireki" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "Errorea ebazpen-egoera %s(e)n idaztean" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "Ebazpen-egoera ongi idatzi da." @@ -1377,52 +1377,59 @@ msgstr "Eskatu %s kentzea" msgid "Requiring the installation of %s version %s (%s)" msgstr "Eskatu %s(r)en %s bertsioa (%s) instalatzea" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "ireki: %d; itxita: %d; geroratua: %d; gatazka: %d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "Honako ekintzek mendekotasun hauek konponduko dituzte:" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "Onartu irtenbide hau? [Y/n/q/?] " -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "Mendekotasun hauek ebazteko ahalegin guztiak bertan behera uzten." -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "Honako komandoak eskuragarri daude:" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "Ebazpen-egoera idazteko fitxategia:" -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "Erantzun baliogabea. Sartu hurrengo komendoetariko bat:" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "Ez da irtenbiderik aurkitu emandako denboran. Sakonago saiatu? [Y/n]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "Erantzun baliogabea. Sakatu 'y' edo 'n'." -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "Ezin da mendekotasunak ebatzi. Bertan behera uzten..." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "*** Ez dago irtenbide gehiagorik. ***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3767,22 +3774,22 @@ msgstr "Ezin izan da transkodetu zutabearen definizioa" msgid "Couldn't parse column definition" msgstr "Ezin izan da analizatu zutabearen definizioa" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "make_package_view: errorea argumentuetan - bi trepeta nagusi??" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "" "make_package_view: errorea argumentuetan - zutabe-zerrenda okerra elementu " "estatikoarentzat" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: okerreko argumentua!" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view: ez da trepeta nagusirik aurkitu" @@ -5081,25 +5088,25 @@ msgstr "" msgid "False" msgstr "Itxi" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "Aukerak" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude 0.4.4\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2006-11-05 15:47+0200\n" "Last-Translator: Jaakko Kangasharju <ashar@iki.fi>\n" "Language-Team: Jaakko Kangasharju <ashar@iki.fi>\n" @@ -1208,18 +1208,18 @@ msgid "Invalid response. Please enter a valid command or '?' for help.\n" msgstr "" "Virheellinen komento. Anna hyväksytty komento tai '?' saadaksesi apua.\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "En pysty kirjoittamaan tiedostoon %s" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "Virhe kirjoitettaessa selvityksen tilatietoja tiedostoon %s" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "Ratkaisimen tila tallennettu!" @@ -1364,54 +1364,61 @@ msgstr "Vaadin paketin %s poiston" msgid "Requiring the installation of %s version %s (%s)" msgstr "Vaadin paketin %s version %s (%s) asennuksen" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "avoinna: %d; ratkaistu: %d; siirretty: %d; ristiriitoja: %d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "Seuraavat toiminnot selvittävät nämä riippuvuudet:" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "Hyväksytkö tämän ratkaisun? [Kyllä=y/ei=n/lopeta=q/?] " -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "Lopetetaan yritykset ratkaista näitä riippuvuuksia." -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "Käytettävissä olevat komennot:" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "Mihin tiedostoon selvityksen tila tallennetaan? " -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "Virheellinen syöte; anna jokin seuraavista komennoista:" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "" "Ratkaisua ei löytynyt annetun ajan sisällä. Yritetäänkö pitempään? [Kyllä=y/" "ei=n]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "Virheellinen syöte; kirjoita joko 'y' (kyllä) tai 'n' (ei)." -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "Riippuvuuksien selvitys epäonnistui! Luovutan..." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "*** Ei muita ratkaisuja ***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3713,22 +3720,22 @@ msgstr "Sarakemäärittelyn purku epäonnistui" msgid "Couldn't parse column definition" msgstr "En ymmärtänyt sarakkeen määrittelyä" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "make_package_view: virhe argumenteissa -- kaksi päähärpätintä??" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "" "make_package_view: virhe argumenteissa -- väärä sarakelista kiinteälle " "alkiolle" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: tuhma argumentti!" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view: päähärpätintä ei löydy" @@ -5023,25 +5030,25 @@ msgstr "" msgid "False" msgstr "Lopeta" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "Asetukset" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2007-11-06 18:29+0100\n" "Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon@wanadoo.fr>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -1349,18 +1349,18 @@ msgstr "" "Réponse incorrecte. Veuillez entrer une commande correcte ou « ? » pour " "obtenir de l'aide.\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "Impossible d'ouvrir %s en écriture" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "Erreur lors de l'écriture de l'état du solveur vers %s" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "L'état du solveur a été enregistré avec succès." @@ -1508,55 +1508,62 @@ msgstr "Demande de suppression de %s" msgid "Requiring the installation of %s version %s (%s)" msgstr "Demande d'installation de %s, version %s (%s)" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "ouverts : %d ; fermés : %d ; reportés : %d ; en conflit : %d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "Les actions suivantes permettront de résoudre ces dépendances :" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "Accepter cette solution ? [Y/n/q/?] " -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "" "Abandon de tous les efforts pour rechercher une solution à ces dépendances." -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "Les commandes suivantes sont disponibles :" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "Fichier dans lequel sera écrit l'état du solveur :" -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "Réponse incorrecte. Veuillez entrer une des commandes suivantes :" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "" "Aucune solution n'a été trouvée dans le temps alloué. Faut-il poursuivre la " "recherche ? [Y/n]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "Réponse incorrecte. Veuillez entrer « y » ou « n »." -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "Impossible de trouver une solution à ces dépendances ! Abandon..." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "*** Aucune autre solution disponible ***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3953,24 +3960,24 @@ msgstr "Impossible de transcoder la définition de colonne" msgid "Couldn't parse column definition" msgstr "Analyse de la définition de colonne impossible" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "" "make_package_view : erreur dans les paramètres - deux éléments graphiques " "principaux ? " -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "" "make_package_view : erreur dans les paramètres - liste « column » incorrecte " "pour une entrée statique" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view : paramètre incorrect ! " -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view : le widget principal n'a pas été trouvé" @@ -5288,25 +5295,25 @@ msgstr "" msgid "False" msgstr "Fermer" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "Options" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2007-11-01 22:36+0000\n" "Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n" "Language-Team: Galician <proxecto@trasno.net>\n" @@ -1312,18 +1312,18 @@ msgid "Invalid response. Please enter a valid command or '?' for help.\n" msgstr "" "Resposta non válida. Introduza unha orde válida ou \"?\" para obter axuda.\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "Non se puido abrir %s para escritura" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "Erro ao gravar o estado do resolvedor en %s" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "Gravouse con éxito o estado do resolvedor" @@ -1469,52 +1469,59 @@ msgstr "Requírese a eliminación de %s" msgid "Requiring the installation of %s version %s (%s)" msgstr "Requírese a instalación de %s versión %s (%s)" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "abertos: %d; pechados: %d; retrasar: %d; conflictos: %d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "As seguintes accións han resolver estas dependencias:" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "¿Aceptar esta solución? [S/n/q/?] " -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "Abandónanse tódolos esforzos por resolver estas dependencias." -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "As seguintes ordes están dispoñibles:" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "Ficheiro no que gravar o estado do resolvedor: " -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "Resposta non válida; introdza unha das seguintes ordes:" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "Non se atopou unha solución no tempo asignado. ¿Seguir probando? [S/n]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "Resposta non válida; introduza \"s\" ou \"n\"." -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "¡Non se puideron resolver as dependencias! A desistir..." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "*** Non hai máis solucións ***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3863,22 +3870,22 @@ msgstr "Non se puido transcodificar a definición das columnas" msgid "Couldn't parse column definition" msgstr "Non se puido analizar a definición da columna" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "make_package_view: erro nos argumentos -- ¿dous widgets principais?" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "" "make_package_view: erro nos argumentos -- lista de columnas incorrecta para " "o elemento estático" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: argumento incorrecto" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view: non se atopou o widget principal" @@ -5174,25 +5181,25 @@ msgstr "" msgid "False" msgstr "Pechar" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "Opcións" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude_po_hu\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\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" @@ -1218,18 +1218,18 @@ msgstr "" "Értelmezhetetlen válasz. Kérlek írj be érvényes parancsot vagy '?'-et a " "súgóhoz.\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "Nem lehet a(z) %s-t írásra megnyitni" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "Hiba az ütközésfeloldó állapotának %s-be való írása közben" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "A ütközésfeloldó állapota sikeresen mentve!" @@ -1376,52 +1376,59 @@ msgstr "A(z) %s eltávolítása szükséges" msgid "Requiring the installation of %s version %s (%s)" msgstr "A(z) %s %s (%s) verzió telepítése szükséges" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "nyitott: %d; lezárt %d; elhalasztott: %d; ütközés: %d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "A következő műveletek oldják fel ezeket a függőségeket:" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "Megoldás elfogadása? [I/n/k/?]" -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "A függőségek feloldására tett próbálkozások abbahagyása." -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "A következő parancsok érhetők el:" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "Az ütközésfeloldó állapotának mentése ebbe a fájlba:" -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "Értelmezhetetlen válasz; a következő parancsok közül lehet választani:" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "A megadott időn belül nem találtam megoldást. Próbáljam tovább? [I/n]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "Értelmezhetetlen válasz; az 'i' és az 'n' közül lehet választani." -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "Nem tudom feloldani az ütközéseket! Feladom..." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "*** Nincs több elérhető megoldás ***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3759,22 +3766,22 @@ msgstr "Nem sikerült átkódolni az oszlopdefiníciót" msgid "Couldn't parse column definition" msgstr "Nem sikerült értelmezni az oszlopdefiníciót" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "make_package_view: hiba az argumentumokban -- két fő ablakelem??" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "" "make_package_view: hiba az argumentumokban -- hibás oszloplista állandó " "elemhez" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: hibás argumentum!" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view: nincs fő ablakelem" @@ -5076,25 +5083,25 @@ msgstr "" msgid "False" msgstr "Bezár" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "Opciók" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -42,7 +42,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude 0.4.0\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2006-10-19 23:41+0200\n" "Last-Translator: Danilo Piazzalunga <danilopiazza@gmail.com>\n" "Language-Team: Italian <tp@lists.linux.it>\n" @@ -1247,18 +1247,18 @@ msgstr "" msgid "Invalid response. Please enter a valid command or '?' for help.\n" msgstr "Risposta non ammessa. Immettere un comando valido o «?» per l'aiuto.\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "Impossibile aprire %s in scrittura" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "Impossibile salvare lo stato del risolutore su %s" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "Lo stato del risolutore è stato salvato correttamente" @@ -1404,53 +1404,60 @@ msgstr "Richiesta la rimozione di %s" msgid "Requiring the installation of %s version %s (%s)" msgstr "Richiesta l'installazione di %s, versione %s (%s)" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "aperti: %d; chiusi: %d; rimandati: %d; in conflitto: %d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "Le seguenti azioni permetteranno di soddisfare queste dipendenze:" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "Accettare questa soluzione? [Y/n/q/?] " -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "Abbandonato ogni tentativo di risolvere queste dipendenze." -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "Sono disponibili i seguenti comandi:" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "File su cui salvare lo stato del risolutore:" -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "Risposta non ammessa. Immettere uno dei seguenti comandi:" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "" "Nessuna soluzione trovata nel tempo stabilito. Proseguire la ricerca? [Y/n]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "Risposta non ammessa. Immettere «y» o «n»." -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "Impossibile risolvere le dipendenze. Ricerca abbandonata." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "*** Nessun'altra soluzione disponibile ***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3824,22 +3831,22 @@ msgstr "Impossibile convertire la definizione delle colonne" msgid "Couldn't parse column definition" msgstr "Impossibile analizzare la definizione delle colonne" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "make_package_view: errore negli argomenti (due widget principali)" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "" "make_package_view: errore negli argomenti (elenco delle colonne non ammesso " "per un elemento statico)" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: argomento non ammesso" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view: manca il widget principale" @@ -5152,25 +5159,25 @@ msgstr "" msgid "False" msgstr "Chiudi" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "Opzioni" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -164,7 +164,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude 0.4.1\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2006-11-04 15:34+0900\n" "Last-Translator: Noritada Kobayashi <nori1@dolphin.c.u-tokyo.ac.jp>\n" "Language-Team: Japanese\n" @@ -1382,18 +1382,18 @@ msgid "Invalid response. Please enter a valid command or '?' for help.\n" msgstr "" "応答が不正です。有効なコマンドを入力するか '?' でヘルプを参照してください。\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "%s を書き込み可能な状態で開けません" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "問題解決ツールの状態を %s に書き込む際にエラーが生じました" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "解決ツールの状態の書き込みに成功しました!" @@ -1547,53 +1547,60 @@ msgstr "%s の削除を必須としています" msgid "Requiring the installation of %s version %s (%s)" msgstr "%s バージョン %s (%s) のインストールを必須としています" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "未解決: %d; 解決済み: %d; 保留: %d; 競合: %d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "以下のアクションでこれらの依存関係の問題は解決されます:" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "この解決方法を受け入れますか? [Y/n/q/?]" -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "これらの依存関係の問題を解決するための努力をすべて放棄します。" -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "以下のコマンドが利用可能です:" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "解決ツールの状態を書き込む出力ファイル: " -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "応答が不正です。以下のコマンドから一つを選択して入力してください:" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "" "与えられた時間内に解決方法が見つかりませんでした。再挑戦しますか? [Y/n]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "応答が不正です。'y' か 'n' を入力してください。" -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "依存関係を解決できません! 諦めています..." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "*** 利用可能な解決方法がこれ以上ありません。 ***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -4019,24 +4026,24 @@ msgstr "行の定義をコード変換できませんでした" msgid "Couldn't parse column definition" msgstr "行の定義をパースできませんでした" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "" "make_package_view: 引数にエラーがあります -- メインウィジェットが 2 つです" "か??" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "" "make_package_view: 引数にエラーがあります -- 静的なアイテムに対する行リストが" "不正です" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: 引数が不正です!" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view: メインウィジェットが見つかりません" @@ -5467,25 +5474,25 @@ msgid "False" msgstr "閉じる" # * Menu item on the first line. -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "オプション" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude_po_km\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\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" @@ -1196,18 +1196,18 @@ msgstr "" msgid "Invalid response. Please enter a valid command or '?' for help.\n" msgstr "ចម្លើយតបមិនត្រឹមត្រូវឡើយ ។ សូមបញ្ចូលពាក្យបញ្ជាត្រឹមត្រូវមួយ ឬ '?' ដើម្បីមើលជំនួយ ។\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "មិនអាចបើក %s ដើម្បីសរសេរបានឡើយ" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "កំហុសពេលសរសេរសភាពកម្មវិធីអ្នកដោះស្រាយទៅ %s" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "បានសរសេរសភាពកម្មវិធីដោះស្រាយដោយជោគជ័យ !" @@ -1347,52 +1347,59 @@ msgstr "ទាមទារឲ្យយក %s ចេញ" msgid "Requiring the installation of %s version %s (%s)" msgstr "ទាមទារឲ្យដំឡើង %s កំណែ %s (%s)" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "បើក ៖ %d; បិទ ៖ %d; ពន្យារពេល ៖ %d; ប៉ះទង្គិច ៖ %d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "សកម្មភាពដូចតទៅនឹងដោះស្រាយភាពអាស្រ័យទាំងអស់នេះ ៖" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "ព្រមទទួលដំណោះស្រាយនេះ ? [Y/n/q/?] " -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "កំពុងបោះបង់ចោលកិច្ចប្រឹងប្រែងដោះស្រាយភាពអាស្រ័យទាំងនេះ " -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "ពាក្យបញ្ជាទាំងអស់នេះអាចប្រើបាន ៖" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "ឯកសារដែលត្រូវសរសេរសភាពរបស់កម្មវិធីដោះស្រាយទៅកាន់ ៖ " -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "ចម្លើយតបមិនត្រឹមត្រូវ ។ សូមបញ្ចូលពាក្យបញ្ជាមួយក្នុងចំណោមខាងក្រោម ៖" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "រកមិនឃើញដំណោះស្រាយឡើយ កំឡុងពេលបែងចែក ។ ព្យាយាមឲ្យខ្លាំងជាងមុនទៀត ? [Y/n]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "ចម្លើយតបមិនត្រឹមត្រូវឡើយ ។ សូមបញ្ចូល 'y' ឬ 'n' ។" -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "មិនអាចដោះស្រាយភាពអាស្រ័យបានឡើយ ! កំពុងបោះបង់ចោល..." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "*** គ្មានដំណោះស្រាយផ្សេងទៀតឡើយ ***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3671,20 +3678,20 @@ msgstr "មិនអាចបម្លែងអត្ថន័យជ msgid "Couldn't parse column definition" msgstr "មិនអាចញែកអត្ថន័យជួរឈរបានឡើយ" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "make_package_view ៖ កំហុសក្នុងអាគុយម៉ង់ -- ធាតុក្រាហ្វិកចម្បងពីរ ??" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "make_package_view ៖ កំហុសនៅក្នុងអាគុយម៉ង់ -- បញ្ជីជួរឈរមិនត្រឹមត្រូវ សម្រាប់ធាតុថេរ" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view ៖ អាគុយម៉ង់មិនល្អ" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view ៖ រកមិនឃើញធាតុក្រាហ្វិកចម្បង" @@ -4939,25 +4946,25 @@ msgstr "" msgid "False" msgstr "បិទ" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "ជម្រើស" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2006-09-16 21:03+0100\n" "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n" "Language-Team: Kurdish <ku@li.org>\n" @@ -1148,18 +1148,18 @@ msgstr "" msgid "Invalid response. Please enter a valid command or '?' for help.\n" msgstr "" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "" @@ -1297,52 +1297,59 @@ msgstr "" msgid "Requiring the installation of %s version %s (%s)" msgstr "" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "" -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "" -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "" -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "" -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "" -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3543,20 +3550,20 @@ msgstr "" msgid "Couldn't parse column definition" msgstr "" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "" @@ -4766,24 +4773,24 @@ msgstr "" msgid "False" msgstr "Bigire" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 msgid "%BOption:%b " msgstr "" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: lt\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2005-11-28 01:17+0200\n" "Last-Translator: Darius Žitkevičius <skystis@splius.lt>\n" "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n" @@ -1209,18 +1209,18 @@ msgstr "" msgid "Invalid response. Please enter a valid command or '?' for help.\n" msgstr "Neteisinga komanda. Įveskite teisingą komandą, arba spauskite „?“.\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "Negaliu atidaryti %s rašymui" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "Klaida rašant sprendimų būseną į %s" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "Sprendimų būsena sėkmingai įrašyta!" @@ -1364,52 +1364,59 @@ msgstr "Būtinas %s pašalinimas" msgid "Requiring the installation of %s version %s (%s)" msgstr "Būtinas %s versijos %s (%s) įdiegimas" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "atvira: %d; išspręsta: %d; atidėta: %d; konfliktų: %d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "Šie veiksmai išspręs priklausomybes:" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "Priimti šį sprendimą? [Y/n/q/?] " -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "Atmetami visi bandymai išspręsti priklausomybes." -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "Galimos šios komandos:" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "Byla į kurią įrašyti sprendimų būseną: " -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "Blogas atsakymas; įveskite vieną iš išvardintų komandų:" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "Per nurodytą laiką sprendimas nerastas. Pasistengti labiau? [Y/n]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "Blogas atsakymas; įveskite „y“ arba „n“." -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "Nepavyksta išspręsti priklausomybių! Pasiduodu..." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "*** Daugiau sprendimų nėra ***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3738,22 +3745,22 @@ msgstr "Stulpelio aprašymas neiškoduotas" msgid "Couldn't parse column definition" msgstr "Nepavyko interpretuoti stulpelio aprašymo" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "make_package_view: klaida argumentuose -- du pagrindiniai elementai??" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "" "make_package_view: klaida argumentuose -- blogas statinio elemento stulpelių " "sąrašas" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: blogas argumentas!" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view: nėra pagrindinio raktažodžio" @@ -5045,25 +5052,25 @@ msgstr "" msgid "False" msgstr "Uždaryti" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "Parinktys" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2006-09-03 09:36-0700\n" "Last-Translator: Priti Patil <prithisd@gmail.com>\n" "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " @@ -1198,18 +1198,18 @@ msgstr "" msgid "Invalid response. Please enter a valid command or '?' for help.\n" msgstr "अवैध प्रतिसाद. कृपया वैध आज्ञा प्रविष्ट करा किंवा मदतीसाठी '?'\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "लिहिण्याकरता (लिखाणाकरता) %s उघडण्यास असमर्थ." -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "%sला उत्तरे देणारी स्थिती लिहिताना चूक" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "उत्तरे देणारी स्थिती यशस्वीपणे लिहिली आहे !" @@ -1350,53 +1350,60 @@ msgstr "%sकाढ्ून टाकण्याची गरज आहे" msgid "Requiring the installation of %s version %s (%s)" msgstr "%sची आवृत्ती %s (%s)संस्थापित करण्याची गरज आहे." -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "उघडा %d; बंद केलेः%d; लांबणीवर टाका (प्रलंबित ठेवा)ः %d विरोध (बेबनाव)ः %d " -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "ही अवलंबित्वे पुढील कृतींमुळे दूर होतीलः" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "हे उत्तर स्वीकारायचे का? (हो/ नाही/सोडा/?)" -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "ही अवलंबित्वे दूर करण्याच्या सर्व प्रयत्नांचा त्याग करत आहे." -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "पुढील आज्ञा उपलब्ध आहेत." -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr " ला उत्तरे देणारी स्थिती लिहिण्यासाठी फाइलः" -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "अवैध प्रतिसाद ;कृपया पुढीलपैकी एक आज्ञा प्रविष्ट करा ः" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "" "नेमून दिलेल्या वेळात कोणतेही उत्तर मिळाले नाही. अधिक कसोशीने प्रयत्न करू का? (हो/ नाही)" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "अवैध प्रतिसाद ;कृपया हो किंवा नाही प्रविष्ट करा" -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "अवलंबित्वे दूर करण्यास असमर्थ !सोडून देत आहे" -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "***आणखी उत्तरे उपलब्ध नाहीत***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3715,20 +3722,20 @@ msgstr "रांग व्याख्या ट्रान्सकोड क msgid "Couldn't parse column definition" msgstr "रांग व्याख्या पार्स करु शकत नाही." -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "मेक _पॅकेज _व्ह्यू ः आर्ग्युमेंटस् मध्ये त्रुटी दोन मुख्य विज्गेटस् ??" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "मेक _पॅकेज _व्ह्यू ः आर्ग्युमेंटस् मध्ये त्रुटी स्टॅटीक गोष्टींसाठी वाइट रांगेचे नाव " -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "मेक _पॅकेज _व्ह्यू ः चूकीचे आर्ग्युमेंट " -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "मेक _पॅकेज _व्ह्यू ः मुख्य विज्गेट सापडले नाही. " @@ -4996,25 +5003,25 @@ msgstr "" msgid "False" msgstr "बंद करा" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "पर्याय" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude_nb\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2006-10-11 21:08+0200\n" "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" @@ -1213,18 +1213,18 @@ msgstr "" msgid "Invalid response. Please enter a valid command or '?' for help.\n" msgstr "Ugyldig respons. Skriv inn en gyldig kommando eller «?» for hjelp.\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "Klarer ikke å åpne %s for å skrive til den" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "Feil under skriving av tilstand til %s" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "Løsningsmotorens tilstand vellykket skrevet!" @@ -1367,52 +1367,59 @@ msgstr "Krever at %s fjernes" msgid "Requiring the installation of %s version %s (%s)" msgstr "Krever at %s versjon %s (%s) installeres" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "åpen: %d; lukket: %d; utsatt: %d; konflikt: %d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "Følgende handlinger vil løse opp disse avhengighetene:" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "Godta denne løsningen? [Y/n/q/?]" -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "Gir opp alle forsøk på å løse opp disse avhengighetene." -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "Følgende kommandoer er tilgjengelige:" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "Fil som løsningsstatus skal skrives til: " -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "Ugyldig respons. Skriv inn en av følgende kommandoer:" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "Ingen løsning funnet innen tidsfristen. Arbeide videre? [Y/n]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "Ugyldig respons. Skriv inn 'y' eller 'n'." -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "Klarer ikke løse opp avhengigheter! Gir opp ..." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "*** Ingen flere løsninger tilgjengelig ***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3729,22 +3736,22 @@ msgstr "Klarte ikke transkode kolonnedefinisjonen" msgid "Couldn't parse column definition" msgstr "Klarte ikke å tolke kolonnedefinisjonen" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "make_package_view: feil i argumentene -- er det to hovedelementer??" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "" "make_package_view: feil ved argumentet -- feil på kolonnelista for statiske " "elementer" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: ugyldig argument!" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view: fant intet hovedelement" @@ -5043,25 +5050,25 @@ msgstr "" msgid "False" msgstr "Lukk" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "Valg" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude_0.4.6.1-1.1_nl\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2007-10-19 20:36+0200\n" "Last-Translator: Frans Pop <elendil@planet.nl>\n" "Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n" @@ -1239,18 +1239,18 @@ msgstr "" msgid "Invalid response. Please enter a valid command or '?' for help.\n" msgstr "Ongeldig antwoord. Geef een geldig commando of '?' voor hulp.\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "Kan %s niet openen om te schrijven" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "Fout bij het schrijven van de status van de oplosser naar %s" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "Status van oplosser met succes weggeschreven!" @@ -1396,52 +1396,59 @@ msgstr "Vereist het verwijderen van %s" msgid "Requiring the installation of %s version %s (%s)" msgstr "Vereist de installatie van %s versie %s (%s)" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "open: %d; gesloten: %d; uitgesteld: %d; conflicten: %d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "De volgende acties zullen deze afhankelijkheden oplossen:" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "Deze oplossing aanvaarden? [Y/n/q/?]" -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "Alle pogingen staken om deze afhankelijkheden op te lossen." -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "De volgende commando's zijn beschikbaar:" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "Bestand om status van de oplosser naar weg te schrijven:" -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "Ongeldig antwoord; geef één van de volgende commando's:" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "Geen oplossing gevonden in de toegewezen tijd. Harder proberen? [Y/n]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "Ongeldig antwoord; geef 'y' of 'n' in." -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "Niet gelukt om de afhankelijkheden op te lossen! Gestopt..." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "*** Geen oplossingen meer beschikbaar ***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3788,21 +3795,21 @@ msgstr "Kon kolomdefinitie niet vertalen" msgid "Couldn't parse column definition" msgstr "Kon kolomdefinitie niet ontleden" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "make_package_view: fout in argumenten -- twee hoofd-widgets??" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "" "make_package_view: fout in argumenten -- foute kolomlijst voor statisch item" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: slecht argument!" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view: geen hoofd-widget gevonden" @@ -5117,25 +5124,25 @@ msgstr "" msgid "False" msgstr "Sluiten" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "Opties" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude_nn\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2005-06-27 21:26+0200\n" "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n" "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -1209,18 +1209,18 @@ msgstr "" msgid "Invalid response. Please enter a valid command or '?' for help.\n" msgstr "Ugyldig respons. Skriv inn ein gyldig kommando eller «?» for hjelp.\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "Klarer ikkje opna %s for å skriva til ho" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "Feil ved skriving av løysingstilstand til %s" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "" @@ -1361,54 +1361,61 @@ msgstr "" msgid "Requiring the installation of %s version %s (%s)" msgstr "" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "Desse handlingane vil løyse desse pakkekrava:" # Hugs [J]a, [n]ei, [a]vslutt -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "Vil du godta denne løysinga? [J/n/a/?] " -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "Avbryt alt arbeid med å løyse desse pakkekrava." -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "Desse kommandoane er tilgjengelege:" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "Fil for å skrive løysingstilstanden i: " -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "Ugyldig respons. Skriv inn ein av dei følgjande kommandoane:" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "Inga løysing funne innanfor den tildelte tida. Prøve hardare? [J/n]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "Ugyldig respons. Skriv «j» eller «n»." -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "Klarer ikkje løyse pakkekrava! Gjev opp ..." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 #, fuzzy msgid "*** No more solutions available ***" msgstr "Ingen fleire løysingar." -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3755,21 +3762,21 @@ msgstr "Klarte ikkje opna for skriving" msgid "Couldn't parse column definition" msgstr "Klarte ikkje opna for skriving" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "make_package_view: feil i argument -- to hovudelement?" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "" "make_package_view: feil i argument -- dårleg kolonneliste for statisk element" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: dårleg argument!" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view: fann ingen hovudelement" @@ -5072,25 +5079,25 @@ msgstr "" msgid "False" msgstr "Lukk" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "Val" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude 0.3.3\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2006-04-20 08:46+0200\n" "Last-Translator: Michal Politowski <l10n@mp.pl.eu.org>\n" "Language-Team: Polish\n" @@ -1210,18 +1210,18 @@ msgstr "" "Nieprawidowe polecenie. Prosz poda polecenie, lub \"?\" dla uzyskania " "pomocy.\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "Nie mona otworzy %s do zapisu" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "Bd w czasie zapisu stanu rozwizywania problemw do %s" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "Zapisano stan rozwizywania problemw z zalenociami." @@ -1365,53 +1365,60 @@ msgstr "Polecenie usunicia %s" msgid "Requiring the installation of %s version %s (%s)" msgstr "Polecenie instalacji %s w wersji %s (%s)" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "otwarte: %d; zamknite: %d; odroczone: %d; konflikty: %d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "Nastpujce dziaania rozwi problemy z zalenociami:" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "Zaakceptowa rozwizanie? [Y/n/q/?] " -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "Porzucono prby rozwizania problemw z zalenociami." -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "Dostpne s nastpujce polecenia:" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "Plik do zapisu stanu procedury rozwizywania problemw: " -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "Nieprawidowa odpowied. Prosz poda jedno z nastpujcych polece:" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "" "Nie znaleziono rozwiza przed upywem limitu czasu. Prbowa dalej? [Y/n]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "Nieprawidowa odpowied. Prosz wpisa \"y\" lub \"n\"." -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "Nie mona rozwiza problemw z zalenociami!" -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "*** Nie ma wicej rozwiza ***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3737,22 +3744,22 @@ msgstr "Nie mona przekodowa definicji kolumn" msgid "Couldn't parse column definition" msgstr "Nie mona przetworzy definicji kolumn" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "make_package_view: bdne argumenty -- dwa gwne elementy??" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "" "make_package_view: bdne argumenty -- nieprawidowa lista kolumn elementu " "statycznego" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: bdny argument!" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view: brak gwnego elementu" @@ -5053,25 +5060,25 @@ msgstr "" msgid "False" msgstr "Zamknij" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "Opcje" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2007-09-12 22:03+0100\n" "Last-Translator: Miguel Figueiredo <elmig@debianPT.org>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" @@ -1225,18 +1225,18 @@ msgstr "" "Resposta inválida. Por favor introduza um comando válido ou '?' para " "ajuda.\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "Não foi possível abrir %s para escrita" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "Erro ao escrever o estado do resolver para %s" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "Estado do resolver escrito com sucesso!" @@ -1383,52 +1383,59 @@ msgstr "Necessita da remoção de %s" msgid "Requiring the installation of %s version %s (%s)" msgstr "Necessita da instalação de %s versão %s (%s)" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "aberto: %d; fechado: %d; adiado: %d; conflito: %d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "As seguintes acções irão resolver estas dependências:" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "Aceitar esta solução? [Y/n/q?] " -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "Abandonar todos os esforços para resolver estas dependências." -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "Estão disponíveis os seguintes comandos:" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "Ficheiro para onde escrever o estado: " -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "Resposta inválida; por favor introduza um dos seguintes comandos:" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "Sem solução encontrada dentro do tempo alocado. Tentar melhor? [Y/n]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "Resposta inválida; por favor introduza 'y' ou 'n'." -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "Não foi possível resolver dependências! A desistir..." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "*** Sem mais soluções disponíveis ***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3799,22 +3806,22 @@ msgstr "Não pude interpretar a definição de coluna" msgid "Couldn't parse column definition" msgstr "Não foi possível processar a definição de coluna" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "make_package_view: erro nos argumentos -- dois widgets principais??" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "" "make_package_view: erro nos argumentos -- lista de colunas inválida para " "itens estáticos" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: argumento inválido!" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view: nenhum widget principal encontrado" @@ -5127,25 +5134,25 @@ msgstr "" msgid "False" msgstr "Fechar" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "Opções" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index da80d200..4ed13ede 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2006-09-07 16:00-0300\n" "Last-Translator: André Luís Lopes <andrelop@debian.org>\n" "Language-Team: l10n portuguese <debian-l10n-portuguese@lists.debian.org>\n" @@ -1224,18 +1224,18 @@ msgid "Invalid response. Please enter a valid command or '?' for help.\n" msgstr "" "Resposta inválida. Por favor, informe um comando válido ou '?' para ajuda.\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "Não foi possível abrir %s para gravação" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "Erro ao gravar estado do resolvedor em %s" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "Estado do resolvedor gravado com sucesso !" @@ -1381,54 +1381,61 @@ msgstr "Requerendo a remoção de %s" msgid "Requiring the installation of %s version %s (%s)" msgstr "Requerendo a instalação de %s versão %s (%s)" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "aberto: %d; fechado: %d; deferido: %d; conflito: %d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "As seguintes ações resolverão essas dependências :" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "Aceitar esta solução ? [Y/n/q/?]" -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "Abandonando todos os esforços para resolver essas dependências." -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "Os comandos a seguir estão disponíveis :" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "Arquivo onde gravar o estado do resolvedor :" -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "Resposta inválida. Por favor informe um dos seguintes comandos :" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "" "Nenhuma solução encontrada dentro do tempo alocado. Tentar mais " "agressivamente ? [Y/n]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "Resposta inválida : por favor informe 's' ou 'n'." -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "Impossível resolver dependências ! Desistindo ..." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "*** Sem mais soluções disponíveis ***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3788,22 +3795,22 @@ msgstr "Não foi possível transcodificar definição de coluna" msgid "Couldn't parse column definition" msgstr "Não foi possível interpretar definição de coluna" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "make_package_view: erro nos argumentos -- dois widgets principais??" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "" "make_package_view: erro nos argumentos -- lista de colunas ruim para item " "estático" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: argumento ruim!" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view: nenhum widget principal encontrado" @@ -5108,25 +5115,25 @@ msgstr "" msgid "False" msgstr "Fechar" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "Opções" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2007-03-21 20:44+0200\n" "Last-Translator: Sorin Batariuc <sorin@bonbon.net>\n" "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n" @@ -1241,18 +1241,18 @@ msgstr "" "Răspuns nevalabil. Vă rog introduceţi o comandă valabilă sau '?' pentru " "ajutor.\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "Nu pot deschide %s pentru scriere" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "Eroare în timpul scrierii fişierului de stare resolver în %s" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "S-a scris cu succes starea resolver!" @@ -1400,53 +1400,60 @@ msgstr "Se cere ştergerea lui %s" msgid "Requiring the installation of %s version %s (%s)" msgstr "Se cere instalarea lui %s versiunea %s (%s)" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "deschis: %d; închis: %d; amânat: %d; conflict: %d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "Următoarele acţiuni vor rezolva aceste dependenţe:" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "Acceptaţi această soluţie? [Y/n/q/?] " -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "Se abandonează toate eforturile de a rezolva aceste dependenţe." -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "Următoarele comenzi sunt disponibile:" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "Fişierul de scris starea resolver: " -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "Răspuns nevalabil; vă rog introduceţi una din următoarele comenzi:" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "" "Nu s-a găsit nici o soluţie în timpul acordat. Încerc mai hotărât? [Y/n]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "Răspuns nevalabil; vă rog introduceţi 'y' sau 'n'." -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "Nu pot rezolva dependenţele! Renunţ..." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "*** Nu mai sunt soluţii disponibile ***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3787,22 +3794,22 @@ msgstr "Nu am putut transcoda definiţia coloanei" msgid "Couldn't parse column definition" msgstr "Nu am putut analiza definiţia coloanei" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "make_package_view: eroare în argumente -- două widget-uri principale??" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "" "make_package_view: eroare în argumente -- coloană nevalidă de listă pentru " "articol static" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: argument nevalid!" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view: nu s-a găsit nici un widget principal" @@ -5107,25 +5114,25 @@ msgstr "" msgid "False" msgstr "Închide" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "Opţiuni" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.4.6.1-1.1-next\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2007-11-15 21:24+0300\n" "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" @@ -1316,18 +1316,18 @@ msgstr "" msgid "Invalid response. Please enter a valid command or '?' for help.\n" msgstr "Неверный ответ. Введите допустимую команду или '?' для справки.\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "Не удаётся открыть %s для записи" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "Ошибка записи состояния решателя в %s" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "Состояние решателя успешно сохранено!" @@ -1473,53 +1473,60 @@ msgstr "Требуется удаление %s" msgid "Requiring the installation of %s version %s (%s)" msgstr "Требуется установка %s версии %s (%s)" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "открыто: %d; закрыто: %d; отброшено: %d; конфликтует: %d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "Следующие действия разрешат зависимости:" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "Принять данное решение? [Y/n/q/?] " -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "Отмена всех результатов по разрешению данных зависимостей." -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "Возможны следующие команды:" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "Файл для записи состояния решателя в:" -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "Неверный ответ; можно вводить одну из следующих команд:" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "" "За отведённое время решения не было найдено. Попытаться тщательнее? [Y/n]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "Неверный ответ; можно ввести 'y' или 'n'." -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "Не удалось разрешить зависимости! Ничего не получается..." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "*** Больше решений нет ***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3846,22 +3853,22 @@ msgstr "Не удалось перекодировать определение msgid "Couldn't parse column definition" msgstr "Не удалось проанализировать определение колонки" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "make_package_view: ошибка в аргументах -- два главных виджета??" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "" "make_package_view: ошибка в аргументах -- неверная колонка списка для " "статического элемента??" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: неверный аргумент!" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view: не найден главный виджет" @@ -5138,25 +5145,25 @@ msgstr "" msgid "False" msgstr "Закрыть" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "Параметры" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2006-11-30 21:49+0100\n" "Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n" "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n" @@ -1218,18 +1218,18 @@ msgid "Invalid response. Please enter a valid command or '?' for help.\n" msgstr "" "Chybná odpoveď. Zadajte platný príkaz alebo '?' na zobrazenie pomocníka.\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "%s sa nedá otvoriť na zápis" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "Chyba pri zápise stavu riešenia do %s" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "Stav riešenia úspešne uložený!" @@ -1374,53 +1374,60 @@ msgstr "Požaduje sa odstránenie %s" msgid "Requiring the installation of %s version %s (%s)" msgstr "Požaduje sa inštalácia %s verzie %s (%s)" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "otvorené: %d; uzavreté: %d; odložené: %d; konfliktné: %d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "Nasledujúce akcie vyriešia tieto závislosti:" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "Schváliť toto riešenie? [Y/n/q/?] " -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "Ukončujú sa všetky snahy na vyriešenie týchto závislostí." -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "Dostupné sú nasledujúce príkazy:" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "Súbor na zápis stavu riešenia:" -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "Chybná odpoveď; prosím zadajte jeden z nasledujúcich príkazov:" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "" "Počas prideleného času sa nenašlo žiadne riešenie. Skúsiť dôkladnejšie? [Y/n]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "Chybná odpoveď; prosím zadajte 'y' alebo 'n'." -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "Nemožnosť vyriešenia závislostí! Ukončuje sa..." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "*** Žiadne ďalšie riešenia ***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3727,20 +3734,20 @@ msgstr "Nedá sa previesť definícia stĺpca" msgid "Couldn't parse column definition" msgstr "Nedá sa spracovať definícia stĺpca" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "make_package_view: chyba v argumentoch -- dva hlavné widgety??" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "make_package_view: chyba v argumentoch -- chybný zoznam stĺpcov" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: chybný argument!" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view: nebol nájdený hlavný widget" @@ -5028,25 +5035,25 @@ msgstr "" msgid "False" msgstr "Zavrieť" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "Voľby" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2007-06-25 19:15-0000\n" "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n" @@ -1211,18 +1211,18 @@ msgstr "" msgid "Invalid response. Please enter a valid command or '?' for help.\n" msgstr "Ogiltigt svar. Ange ett giltigt kommando eller \"?\" för hjälp.\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "Kunde inte öppna %s för skrivning" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "Fel vid skrivning av lösningstillstånd till %s" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "Skrivning av lösningtillstånd lyckades!" @@ -1366,53 +1366,60 @@ msgstr "Kräver borttagningen av %s" msgid "Requiring the installation of %s version %s (%s)" msgstr "Kräver installationen av %s version %s (%s)" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "öppna: %d; stängda: %d; framskjutna: %d; konflikter: %d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "Följande åtgärder kommer att lösa dessa beroenden:" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "Acceptera denna lösning? [J/n/q/?] " -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "Avbryter alla försök att lösa dessa beroenden." -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "Följande kommandon finns tillgängliga:" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "Fil att skriva lösningstillstånd till: " -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "Ogiltigt svar; ange ett av följande kommandon:" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "" "Ingen lösning hittades inom den tilldelade tiden. Försöka hårdare? [J/n]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "Ogiltigt svar; ange \"j\" eller \"n\"." -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "Kunde inte lösa beroenden! Ger upp..." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "*** Inga fler lösningar finns tillgängliga ***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3730,22 +3737,22 @@ msgstr "Kunde inte omkoda kolumndefinitionen" msgid "Couldn't parse column definition" msgstr "Kunde inte tolka kolumndefinitionen" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "make_package_view: fel i argumenten -- två huvudwidgets??" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "" "make_package_view: fel i argumenten -- felaktig kolumnlista för statiska " "poster" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: felaktigt argument!" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view: ingen huvudwidget hittades" @@ -5046,25 +5053,25 @@ msgstr "" msgid "False" msgstr "Stäng" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "Inställningar" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2005-03-30 16:02+0800\n" "Last-Translator: Ryan Escarez <rescarez@gmail.com>\n" "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n" @@ -1221,18 +1221,18 @@ msgid "Invalid response. Please enter a valid command or '?' for help.\n" msgstr "" "Di tanggap na sagot. Pakibigay ng tanggap na utos o '?' para sa tulong.\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "Hindi ma-buksan ang %s para sulatan" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, fuzzy, c-format msgid "Error writing resolver state to %s" msgstr "Error sa pagsulat ng state file" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "" @@ -1373,58 +1373,65 @@ msgstr "" msgid "Requiring the installation of %s version %s (%s)" msgstr "" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 #, fuzzy msgid "The following actions will resolve these dependencies:" msgstr "Ang mga sumusunod na pakete ay may kulang na dependensiya:\n" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "" -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "" -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 #, fuzzy msgid "The following commands are available:" msgstr "Ang mga sumusunod na pakete ay SIRA:" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "" -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 #, fuzzy msgid "Invalid response; please enter one of the following commands:" msgstr "" "Di tanggap na sagot. Pakibigay ng tanggap na utos o '?' para sa tulong.\n" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 #, fuzzy msgid "Invalid response; please enter 'y' or 'n'." msgstr "" "Di tanggap na sagot. Pakibigay ng tanggap na utos o '?' para sa tulong.\n" -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "" -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3807,22 +3814,22 @@ msgstr "Hindi mabuksan para masulatan" msgid "Couldn't parse column definition" msgstr "Hindi mabuksan para masulatan" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "make_package_view: error sa argumento -- dalawang main widgets??" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "" "make_package_view: error sa argumento -- masama na hanay na listahan para sa " "static na gamit" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: masamang argumento!" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view: walang main widget na-nakita" @@ -5169,25 +5176,25 @@ msgstr "" msgid "False" msgstr "^Isara" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "Mga Pagpipilian" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\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" @@ -1207,18 +1207,18 @@ msgid "Invalid response. Please enter a valid command or '?' for help.\n" msgstr "" "Geçersiz cevap. Lütfen geçerli bir komut girin ya da yardım için '?'.\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "%s yazmak için açılamıyor" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "%s'e çözümleyici durumu yazmadan hata" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "Çözümleyici durumu başarıyla yazıldı!" @@ -1360,52 +1360,59 @@ msgstr "%s'in kaldırılması gerekiyor" msgid "Requiring the installation of %s version %s (%s)" msgstr "%s'in %s (%s) sürümünün kurulması gerekiyor" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "açık: %d; kapalı: %d; ertele: %d; çakışma: %d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "Aşağıdaki paketler bu bağımlılıkları karşılayacak:" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "Çözümü kabul et? [E/h/i/?]" -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "Bağımlılıkları çözmek için yapılan işlemler iptal ediliyor." -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "Şu komutlar mevcut:" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "Çözümleyici durumunu dosyaya yaz:" -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "Geçersiz yanıt. Lütfen şu komutları kullanın: " -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "Belirlenmiş sürede çözüm bulunamadı. Denemeye devam et? [E/h]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "Geçersiz yanıt. lütfen 'e' veya 'h' girin." -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "Başımlılık çözülemiyor! Vazgeçiliyor..." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "*** Başka bir çözüm mevcut değil ***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3713,21 +3720,21 @@ msgstr "Sütun tanımı kod dönüşümü yapılamıyor" msgid "Couldn't parse column definition" msgstr "Sütun tanımlaması ayrıştırılamıyor" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "make_package_view: ifadelerde hata -- iki ana pencere mi olacak??" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "" "make_package_view: ifadelerde hata -- kalıcı öğe için yanlış kolon listesi" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: hatalı ifade!" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view: Ana nesne bulunamadı" @@ -5016,25 +5023,25 @@ msgstr "" msgid "False" msgstr "Kapat" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "Seçenekler" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude 0.4.x\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2007-07-09 15:42+0930\n" "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" @@ -1217,18 +1217,18 @@ msgstr "" "Đáp ứng không hợp lệ. Hãy nhập một lệnh hợp lệ, hoặc lệnh « ? » để xem trợ " "giúp.\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "Không thể mở %s để ghi" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "Gặp lỗi khi ghi tình trạng bộ tháo gỡ vào %s" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "Tình trạng bộ tháo gỡ đã được ghi." @@ -1375,55 +1375,62 @@ msgstr "Cần thiết việc gỡ bỏ %s" msgid "Requiring the installation of %s version %s (%s)" msgstr "Cần thiết việc cài đặt %s phiên bản %s (%s)." -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "mở: %d; tắt: %d; hoãn: %d; xung đột: %d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "Những hành động sau sẽ tháo gỡ những điều kiện phụ thuộc này:" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "" "Chấp nhận giải pháp này không? [Y] có, [n] không, [q] hỏi, [?] trợ giúp " -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "Đang hủy bỏ mọi sự cố gắng tháo gỡ những điều kiện phụ thuộc này." -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "Có sẵn những lệnh này:" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "Tập tin vào đó cần ghi tình trạng tháo gỡ : " -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "Đáp ứng không hợp lệ: hãy nhập một của những lệnh này:" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "" "Không tìm thấy giải pháp trong thời gian đã gán. Cố tích cực hơn không? [Y] " "có, [n] không" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "Đáp ứng không hợp lệ: hãy nhập « y » (có) hay « n » (không)." -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "Không thể tháo gỡ điều kiện phụ thuộc. Đang hủy bỏ..." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "••• Hết giải pháp •••" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3758,24 +3765,24 @@ msgstr "Không thể dịch mã hóa lời định nghĩa cột" msgid "Couldn't parse column definition" msgstr "Không thể phân tách lời định nghĩa cột" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "" "make_package_view: (tạo ô xem gói) gặp lỗi trong đối số — hai ô điều khiển " "chính ?" -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "" "make_package_view: (tạo ô xem gói) gặp lỗi trong đối số -- danh sách cột sai " "cho mục tĩnh" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: (tạo ô xem gói) gặp đối số sai." -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "" "make_package_view: (tạo ô xem gói) không tìm thấy ô điều khiển chính nào." @@ -5064,25 +5071,25 @@ msgstr "" msgid "False" msgstr "Đóng" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "Tùy chọn" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index d0ba59cc..f6a94567 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude 0.4.3-1\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2007-04-07 18:33+0800\n" "Last-Translator: Kov Chai <tchaikov@sjtu.org>\n" "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n" @@ -1183,18 +1183,18 @@ msgstr "" msgid "Invalid response. Please enter a valid command or '?' for help.\n" msgstr "非法响应。请输入一个合法命令或者“?”请求帮助。\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "无法打开 %s 以写入" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "将依赖关系解决状态写入文件 %s 时发生错误" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "成功写入依赖关系解决状态！" @@ -1334,52 +1334,59 @@ msgstr "要求删除 %s" msgid "Requiring the installation of %s version %s (%s)" msgstr "要求安装 %s 的 %s 版本(%s)" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "打开：%d；关闭；%d；defer: %d; 冲突；%d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "下列动作将解决这些依赖关系：" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "是否接受该解决方案？[Y/n/q/?] " -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "放弃解决这些依赖关系的全部努力。" -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "下列命令可选：" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "将依赖关系解决状态写入文件：" -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "无效响应；请输入下列命令之一：" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "在限定的时间内没能找到解决方案。加把劲再试试？[Y/n]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "非法响应；请输入“y”或者“n”。" -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "未能解决依赖关系！放弃..." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "*** 没有更多的解决方案了 ***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3649,20 +3656,20 @@ msgstr "无法给列定义转码" msgid "Couldn't parse column definition" msgstr "无法解析列定义" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "make_package_view: 参数错误 -- 两个主要部件？ " -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "make_package_view: 参数错误 -- 静态项目的栏列表错误" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: 参数错误！" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view: 未发现主要部件" @@ -4903,25 +4910,25 @@ msgstr "" msgid "False" msgstr "关闭" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "选项" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" diff --git a/po/zh_TW.po b/po/zh_TW.po index 341a80c3..8650ef18 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2007-11-17 09:09-0800\n" +"POT-Creation-Date: 2007-11-21 17:15-0800\n" "PO-Revision-Date: 2006-10-21 22:43+0800\n" "Last-Translator: Asho Yeh <asho@debian.org.tw>\n" "Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n" @@ -1182,18 +1182,18 @@ msgstr "" msgid "Invalid response. Please enter a valid command or '?' for help.\n" msgstr "錯誤回應。請輸入一個正確的指令或 '?' 以取得協助。\n" -#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:660 +#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668 #: src/generic/apt/apt.cc:202 #, c-format msgid "Unable to open %s for writing" msgstr "無法打開 %s 以寫入" -#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:665 +#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673 #, c-format msgid "Error writing resolver state to %s" msgstr "將相依關係解決狀態寫入檔案 %s 時發生錯誤" -#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:667 +#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675 msgid "Resolver state successfully written!" msgstr "成功寫入每依關係解決狀態！" @@ -1333,52 +1333,59 @@ msgstr "要求移除 %s" msgid "Requiring the installation of %s version %s (%s)" msgstr "要求安裝 %s 的 %s 版本(%s)" -#: src/cmdline/cmdline_resolver.cc:516 +#: src/cmdline/cmdline_resolver.cc:484 +#, c-format +msgid "" +"Would resolve dependencies, but dependency resolution is disabled.\n" +" (%s::ProblemResolver::StepLimit = 0)\n" +msgstr "" + +#: src/cmdline/cmdline_resolver.cc:524 #, c-format msgid "open: %d; closed: %d; defer: %d; conflict: %d" msgstr "打開：%d；關閉；%d；defer: %d; 衝突；%d" -#: src/cmdline/cmdline_resolver.cc:566 +#: src/cmdline/cmdline_resolver.cc:574 msgid "The following actions will resolve these dependencies:" msgstr "以下動作會解決這些相依問題:" -#: src/cmdline/cmdline_resolver.cc:583 +#: src/cmdline/cmdline_resolver.cc:591 msgid "Accept this solution? [Y/n/q/?] " msgstr "是否接受該解決方案？[Y/n/q/?] " -#: src/cmdline/cmdline_resolver.cc:610 src/cmdline/cmdline_resolver.cc:711 +#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719 msgid "Abandoning all efforts to resolve these dependencies." msgstr "放棄解決這些相依關係的全部努力。" -#: src/cmdline/cmdline_resolver.cc:640 +#: src/cmdline/cmdline_resolver.cc:648 msgid "The following commands are available:" msgstr "下列命令可選：" -#: src/cmdline/cmdline_resolver.cc:657 +#: src/cmdline/cmdline_resolver.cc:665 msgid "File to write resolver state to: " msgstr "將相依關係解決狀態寫入檔案：" -#: src/cmdline/cmdline_resolver.cc:672 +#: src/cmdline/cmdline_resolver.cc:680 msgid "Invalid response; please enter one of the following commands:" msgstr "錯誤回應。請輸入以下任一個指令：" -#: src/cmdline/cmdline_resolver.cc:685 +#: src/cmdline/cmdline_resolver.cc:693 msgid "No solution found within the allotted time. Try harder? [Y/n]" msgstr "在分配的時間內未找到解決方案。加把勁再試試？[Y/n]" -#: src/cmdline/cmdline_resolver.cc:714 +#: src/cmdline/cmdline_resolver.cc:722 msgid "Invalid response; please enter 'y' or 'n'." msgstr "錯誤回應。請輸入“y”或“n”。" -#: src/cmdline/cmdline_resolver.cc:723 +#: src/cmdline/cmdline_resolver.cc:731 msgid "Unable to resolve dependencies! Giving up..." msgstr "未能解決相依關係！放棄..." -#: src/cmdline/cmdline_resolver.cc:729 +#: src/cmdline/cmdline_resolver.cc:737 msgid "*** No more solutions available ***" msgstr "*** 沒有更多的解決方案了 ***" -#: src/cmdline/cmdline_resolver.cc:739 +#: src/cmdline/cmdline_resolver.cc:751 msgid "" "*** ERROR: search aborted by fatal exception. You may continue\n" " searching, but some solutions will be unreachable." @@ -3646,20 +3653,20 @@ msgstr "無法給列定義轉碼" msgid "Couldn't parse column definition" msgstr "無法解析列定義" -#: src/pkg_view.cc:497 +#: src/pkg_view.cc:513 msgid "make_package_view: error in arguments -- two main widgets??" msgstr "make_package_view: 參數錯誤 -- 兩個主要部件？ " -#: src/pkg_view.cc:503 +#: src/pkg_view.cc:519 msgid "" "make_package_view: error in arguments -- bad column list for static item" msgstr "make_package_view: 參數錯誤 -- 靜態項目的欄列表錯誤" -#: src/pkg_view.cc:608 +#: src/pkg_view.cc:624 msgid "make_package_view: bad argument!" msgstr "make_package_view: 參數錯誤！" -#: src/pkg_view.cc:660 +#: src/pkg_view.cc:676 msgid "make_package_view: no main widget found" msgstr "make_package_view: 未發現主要部件" @@ -4893,25 +4900,25 @@ msgstr "" msgid "False" msgstr "關閉" -#: src/apt_config_treeitems.cc:208 src/apt_config_treeitems.cc:391 +#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:392 #, fuzzy msgid "%BOption:%b " msgstr "選項" -#: src/apt_config_treeitems.cc:210 src/apt_config_treeitems.cc:393 +#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:394 msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:212 src/apt_config_treeitems.cc:395 +#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:396 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:277 +#: src/apt_config_treeitems.cc:278 #, c-format msgid "Editing \"%ls\"" msgstr "" -#: src/apt_config_treeitems.cc:399 +#: src/apt_config_treeitems.cc:400 msgid "%BChoice:%b " msgstr "" diff --git a/src/cmdline/cmdline_resolver.cc b/src/cmdline/cmdline_resolver.cc index e124a91d..2cb70099 100644 --- a/src/cmdline/cmdline_resolver.cc +++ b/src/cmdline/cmdline_resolver.cc @@ -478,6 +478,14 @@ aptitude_solution calculate_current_solution() if(resman->get_selected_solution() < resman->generated_solution_count()) return resman->get_solution(resman->get_selected_solution(), 0); + const int step_limit = aptcfg->FindI(PACKAGE "::ProblemResolver::StepLimit", 5000); + if(step_limit == 0) + { + const std::string msg = ssprintf(_("Would resolve dependencies, but dependency resolution is disabled.\n (%s::ProblemResolver::StepLimit = 0)\n"), PACKAGE); + + throw CmdlineSearchAbortedException(msg); + } + cmdline_spinner spin(aptcfg->FindI("Quiet", 0)); @@ -486,7 +494,7 @@ aptitude_solution calculate_current_solution() cwidget::threads::box<cmdline_resolver_continuation::resolver_result> retbox; resman->get_solution_background(resman->generated_solution_count(), - aptcfg->FindI(PACKAGE "::ProblemResolver::StepLimit", 5000), + step_limit, new cmdline_resolver_continuation(retbox)); cmdline_resolver_continuation::resolver_result res; |