diff options
| author | Daniel Hartwig <mandyke@gmail.com> | 2012-02-07 01:30:43 +0800 |
|---|---|---|
| committer | Daniel Hartwig <mandyke@gmail.com> | 2012-02-07 01:30:43 +0800 |
| commit | b4874477fcf63fc73085ee7af3b962a5d2db619c (patch) | |
| tree | f23bb2a6e881a6a0daad556aad66bd0f616f270a /po | |
| parent | fd6f32c9ca9e3d2a1e61436d3bbb6cf93a273806 (diff) | |
| download | aptitude-b4874477fcf63fc73085ee7af3b962a5d2db619c.tar.gz | |
Pofile changes from "make dist" (i.e., msgmerge).
Diffstat (limited to 'po')
| -rw-r--r-- | po/ar.po | 523 | ||||
| -rw-r--r-- | po/ast.po | 721 | ||||
| -rw-r--r-- | po/bs.po | 497 | ||||
| -rw-r--r-- | po/ca.po | 750 | ||||
| -rw-r--r-- | po/cs.po | 533 | ||||
| -rw-r--r-- | po/da.po | 554 | ||||
| -rw-r--r-- | po/de.po | 559 | ||||
| -rw-r--r-- | po/dz.po | 515 | ||||
| -rw-r--r-- | po/el.po | 544 | ||||
| -rw-r--r-- | po/es.po | 544 | ||||
| -rw-r--r-- | po/eu.po | 536 | ||||
| -rw-r--r-- | po/fi.po | 523 | ||||
| -rw-r--r-- | po/fr.po | 553 | ||||
| -rw-r--r-- | po/gl.po | 544 | ||||
| -rw-r--r-- | po/hu.po | 523 | ||||
| -rw-r--r-- | po/it.po | 536 | ||||
| -rw-r--r-- | po/ja.po | 562 | ||||
| -rw-r--r-- | po/km.po | 523 | ||||
| -rw-r--r-- | po/ku.po | 499 | ||||
| -rw-r--r-- | po/lt.po | 536 | ||||
| -rw-r--r-- | po/mr.po | 523 | ||||
| -rw-r--r-- | po/nb.po | 544 | ||||
| -rw-r--r-- | po/ne.po | 515 | ||||
| -rw-r--r-- | po/nl.po | 540 | ||||
| -rw-r--r-- | po/nn.po | 522 | ||||
| -rw-r--r-- | po/pl.po | 563 | ||||
| -rw-r--r-- | po/pt.po | 542 | ||||
| -rw-r--r-- | po/pt_BR.po | 544 | ||||
| -rw-r--r-- | po/ro.po | 544 | ||||
| -rw-r--r-- | po/ru.po | 547 | ||||
| -rw-r--r-- | po/sk.po | 549 | ||||
| -rw-r--r-- | po/sv.po | 544 | ||||
| -rw-r--r-- | po/th.po | 501 | ||||
| -rw-r--r-- | po/tl.po | 520 | ||||
| -rw-r--r-- | po/tr.po | 523 | ||||
| -rw-r--r-- | po/uk.po | 534 | ||||
| -rw-r--r-- | po/vi.po | 544 | ||||
| -rw-r--r-- | po/zh_CN.po | 552 | ||||
| -rw-r--r-- | po/zh_TW.po | 544 |
39 files changed, 11179 insertions, 10091 deletions
@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude_po\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+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" @@ -19,41 +19,37 @@ msgstr "" "Plural-Forms: nplurals=4; plural=n%100==1 || n==0 ? 0 : n%100==2 ? 2 : n" "%100>=3 && n%100<=10 ? 2 : 3;\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +#, fuzzy +msgid "%BOption:%b " +msgstr "خيارات" + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 #, fuzzy msgid "False" msgstr "إغلاق" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -#, fuzzy -msgid "%BOption:%b " -msgstr "خيارات" - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "" - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:279 +#: src/apt_config_treeitems.cc:280 #, c-format -msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "" @@ -527,8 +523,8 @@ msgstr "" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] حل المعتمدات" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "خطأ داخلي: حلّ غير فارغ متوقع." @@ -824,7 +820,7 @@ msgid "" msgstr "تعذر إرضاء المعتمدات." #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "إجهاض.\n" @@ -1184,7 +1180,7 @@ msgstr "فك فك التغليف سيفرغ %sب.\n" msgid "No packages to show -- enter the package names on the line after 'i'.\n" msgstr "ليست هناك حزم لإظهارها -- أدخل أسماء الحزم على السطر بعد 'i'.\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "إضغط زر الإدخال للاستمرار." @@ -1193,10 +1189,6 @@ msgstr "إضغط زر الإدخال للاستمرار." msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "لم يعثر على أية حزم -- أدخل أسماء الحزم على السطر بعد 'c'.\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "إضغط زر الإدخال للاستمرار" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1490,7 +1482,7 @@ msgstr "تم تسجيل وضع المحلّل بنجاح!" #: src/cmdline/cmdline_resolver.cc:222 #, fuzzy, c-format msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F" @@ -1746,7 +1738,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created." msgstr "" #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "إرضاء المعتمدات..." @@ -1782,7 +1774,9 @@ msgid "Invalid response; please enter one of the following commands:" msgstr "ردّ باطل؛ من فضلك أدخل أحد هذه الأوامر: " #: src/cmdline/cmdline_resolver.cc:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +msgid "No solution found within the allotted time. Try harder? [Y/n] " msgstr "لم يُعثر على حل ضمن الوقع المُخصّص. هل أحاول بجهد أكبر؟ [Y/n]" #: src/cmdline/cmdline_resolver.cc:1080 @@ -1984,7 +1978,7 @@ msgstr "الحزمة: " msgid "State" msgstr "الوضع" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "توفّرها" @@ -2092,27 +2086,31 @@ msgstr "يستبدل" msgid "Obsoletes" msgstr "يُلغي" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "يُوفّر" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "الوصف: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "" -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "تعذر العثور على الحزمة %s" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "تعذر إعراب الصيغة %s" @@ -2442,6 +2440,12 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "" +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "عملية غير صالحة %s" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "نهاية ملف غير متوقعة من الإدخال الافتراضي" @@ -2459,7 +2463,7 @@ msgstr "[خطأ]" msgid "UNSATISFIED" msgstr "غير مستوفى" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "غير متوفر" @@ -2467,7 +2471,7 @@ msgstr "غير متوفر" msgid "Tags" msgstr "علامات" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 #, fuzzy msgid "User Tags" msgstr "علامات" @@ -2860,16 +2864,21 @@ msgstr "تعذر العثور على الحزمة %s" msgid "Unable to open %s to log actions" msgstr "تعذر فتح %s لتسجيل الأعمال" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "خطأ في توليد الوقت المحلي (%s)" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "تقرير التسجيل" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -2880,81 +2889,81 @@ msgstr "" " مشاكل dpkg لا يجب أن تتم. \n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "سيثبّت %li حزمة، ويزيل %li حزمة.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "%s بايت من مساحة القرص سيتم استخدامها\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "%s بايت من مساحة القرص سيتم تفريغها\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[ترقية] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[تثبيط] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "إزالة" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "تثبيت" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "إعادة تثبيت" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "إمساك" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "معطوب" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "إزالة، غير مستخدم" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "إزالة، معتمدات" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "تثبيت، معتمدات" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "إمساك، معتمدات" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -2977,80 +2986,80 @@ msgstr "" msgid "Filtering packages" msgstr "تنزيل الحزم" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "نوع عمل مجهول: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "سلسلة أحرف غير منهاة بعد %s" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "أولوية مجهولة %s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "" -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, fuzzy, c-format msgid "Expected '%c', got '%c'." msgstr "توقع ',' أو '('، عثر على '%c'" -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "نوع معتمد مجهول: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, fuzzy, c-format msgid "Unknown term type: \"%s\"." msgstr "نوع صيغة مجهول: %c" #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, c-format msgid "" "The ?%s term must be used in a \"wide\" context (a top-level context, or a " "context enclosed by ?%s)." msgstr "" -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "'(' غير مُطابق" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "توفّر: لا يمكن أن تعطب" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "نوع صيغة مجهول: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "تعذر البحث عن \"\"" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "صيغة فارغة غير متوقعة" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, fuzzy, c-format #| msgid "Badly formed expression" msgid "Badly formed expression: expected '|', got '%c'" msgstr "صيغة مشكلة بشكل سيء" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "')' غير متوقع" @@ -3985,22 +3994,22 @@ msgstr "" msgid "%s: Unable to accept a connection: %s" msgstr "تعذر إنشاء دليل مؤقت من القالب \"%s\": %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4719,7 +4728,7 @@ msgstr "" msgid "Virtual package" msgstr "حزمة" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "غير مثبتة" @@ -4895,159 +4904,165 @@ msgstr "%s يحل محل %s" msgid "%s obsoletes %s" msgstr "%s يلغي %s" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s يحل محل %s" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "إزالة الحزم التالية:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "تثبيت الحزم التالية:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 #, fuzzy #| msgid "Remove the following packages:" msgid "Keep the following packages:" msgstr "إزالة الحزم التالية:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "ترقية الحزم التالية:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "تثبيط الحزم التالية:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 #, fuzzy #| msgid "Leave the following dependencies unresolved:%n" msgid "Leave the following dependencies unresolved:" msgstr "ترك المعتمدات التالية غير محلولة:%n" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, fuzzy, c-format #| msgid "Remove %F [%s (%s)]" msgid "Remove %s [<big>%s</big> (%s)]" msgstr "إزالة %F [%s (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "Install %s [<big>%s</big> (%s)]" msgstr "تثبيت %F [%s (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "Cancel the installation of %s" msgstr "إلغاء تثبيت %F" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Cancel the removal of %s" msgstr "إلغاء إزالة %F" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "Keep %s at version <big>%s</big> (%s)" msgstr "إبقاء %F النسخة %s (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, fuzzy, c-format #| msgid "Upgrade %F [%s (%s) -> %s (%s)]" msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "ترقية %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, fuzzy, c-format #| msgid "Downgrade %F [%s (%s) -> %s (%s)]" msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "تثبيط %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format msgid "<b>Remove</b> %s" msgstr "إزالة" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format msgid "<b>remove</b> %s" msgstr "إزالة" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>Keep</b> %s at version %s" msgstr "إبقاء %F النسخة %s (%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>keep</b> %s at version %s" msgstr "إبقاء %F النسخة %s (%s)" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>Cancel</b> the installation of %s" msgstr "إلغاء تثبيت %F" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>cancel</b> the installation of %s" msgstr "إلغاء تثبيت %F" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>Install</b> %s %s" msgstr "تثبيت %F [%s (%s)]" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>install</b> %s %s" msgstr "تثبيت %F [%s (%s)]" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format msgid "<b>Downgrade</b> %s to version %s" msgstr "نسخة libsigc++: %s\n" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format msgid "<b>downgrade</b> %s to version %s" msgstr "نسخة libsigc++: %s\n" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>Upgrade</b> %s to version %s" msgstr "نسخ %s" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>upgrade</b> %s to version %s" msgstr "نسخ %s" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format #| msgid "%d install" #| msgid_plural "%d installs" @@ -5058,7 +5073,7 @@ msgstr[1] "تثبيتان" msgstr[2] "%d تثبيتات" msgstr[3] "%d تثبيت" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, fuzzy, c-format #| msgid "%d removal" #| msgid_plural "%d removals" @@ -5069,7 +5084,7 @@ msgstr[1] "إزالتان" msgstr[2] "%d إزالات" msgstr[3] "%d إزالة" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, fuzzy, c-format #| msgid "%d keep" #| msgid_plural "%d keeps" @@ -5080,7 +5095,7 @@ msgstr[1] "إبقاءان" msgstr[2] "%d إبقاءات" msgstr[3] "%d إبقاء" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, fuzzy, c-format #| msgid "%d upgrade" #| msgid_plural "%d upgrades" @@ -5091,7 +5106,7 @@ msgstr[1] "ترقيتان" msgstr[2] "%d ترقيات" msgstr[3] "%d ترقية" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, fuzzy, c-format #| msgid "%d downgrade" #| msgid_plural "%d downgrades" @@ -5102,7 +5117,7 @@ msgstr[1] "تثبيطان" msgstr[2] "%d تثبيطات" msgstr[3] "%d تثبيط" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, fuzzy, c-format #| msgid "Audit ^Recommendations" msgid "%s unresolved recommendation" @@ -5112,34 +5127,34 @@ msgstr[1] "التدقيق بالتو^صيات" msgstr[2] "التدقيق بالتو^صيات" msgstr[3] "التدقيق بالتو^صيات" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 #, fuzzy #| msgid "No more solutions." msgid "No solutions yet." msgstr "لا مزيد من الحلول." -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 #, fuzzy msgid "No dependency solution was found." msgstr "إ^دارة المعتمدات" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 #, fuzzy #| msgid "No more solutions." msgid "No solutions." msgstr "لا مزيد من الحلول." -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, fuzzy, c-format #| msgid "No more solutions." msgid "%u solutions." msgstr "لا مزيد من الحلول." -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Could not open file \"%s\"" msgid "Solution %s of %s." @@ -5445,12 +5460,12 @@ msgstr "" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s جمعت في %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5599,29 +5614,35 @@ msgstr " show - عرض معلومات مفصلة حول حزمة\n" #: src/main.cc:213 #, fuzzy, c-format +#| msgid " show - Display detailed information about a package\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - عرض معلومات مفصلة حول حزمة\n" + +#: src/main.cc:214 +#, fuzzy, c-format #| msgid " clean - Erase downloaded package files\n" msgid " clean - Erase downloaded package files.\n" msgstr " clean - حذف ملفات الحزم المنزلة\n" -#: src/main.cc:214 +#: src/main.cc:215 #, fuzzy, c-format #| msgid " autoclean - Erase old downloaded package files\n" msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean - إزالة ملفات الحزم المنزلة القديمة\n" -#: src/main.cc:215 +#: src/main.cc:216 #, fuzzy, c-format #| msgid " changelog - View a package's changelog\n" msgid " changelog - View a package's changelog.\n" msgstr " changelog - عرض سجل تغييرات حزمة\n" -#: src/main.cc:216 +#: src/main.cc:217 #, fuzzy, c-format #| msgid " download - Download the .deb file for a package\n" msgid " download - Download the .deb file for a package.\n" msgstr " download - تنزيل الملف .deb لحزمة\n" -#: src/main.cc:217 +#: src/main.cc:218 #, fuzzy, c-format #| msgid "" #| " reinstall - Download and (possibly) reinstall a currently installed " @@ -5631,15 +5652,15 @@ msgid "" "package.\n" msgstr " reinstall - تنزيل و(محتمل) إعادة تثبيت حزمةمثبتة حالياً\n" -#: src/main.cc:218 +#: src/main.cc:219 #, fuzzy, c-format msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr " -Z\t\t إظهار التغيير في حجم تثبيت كل حزمة.\n" -#: src/main.cc:220 +#: src/main.cc:221 #, fuzzy, c-format msgid "" " why-not - Show the manually installed packages that lead to a " @@ -5648,58 +5669,58 @@ msgid "" " lead to a conflict with the given package if installed.\n" msgstr " -Z\t\t إظهار التغيير في حجم تثبيت كل حزمة.\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " خيارات:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " -h This help text.\n" msgstr " -h نص المساعدة هذا\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h نص المساعدة هذا\n" -#: src/main.cc:232 +#: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr "" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s تمثيل الإجراءات، لكن دون تنفيذها بالفعل.\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr " -d تنزيل الحزم فقط، دون تثبيت أو إزالة أيها.\n" -#: src/main.cc:236 +#: src/main.cc:237 #, fuzzy, c-format #| msgid " -P Always prompt for confirmation or actions\n" -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P السؤال دائماً للتأكيد أو لتنفيذ الإجراءات\n" -#: src/main.cc:237 +#: src/main.cc:238 #, fuzzy, c-format #| msgid "" #| " -y Assume that the answer to simple yes/no questions is " @@ -5710,7 +5731,7 @@ msgstr "" " -y افتراض أن الإجابة على أسئلة الإجابة بنعم أو لا البسيطة هي " "'نعم'\n" -#: src/main.cc:238 +#: src/main.cc:239 #, fuzzy, c-format #| msgid "" #| " -F format Specify a format for displaying search results; see the " @@ -5720,7 +5741,7 @@ msgid "" "manual.\n" msgstr " -F format تحديد نسق عرض نتائج البحث؛ راجع التعليمات\n" -#: src/main.cc:239 +#: src/main.cc:240 #, fuzzy, c-format #| msgid "" #| " -O order Specify how search results should be sorted; see the " @@ -5730,7 +5751,7 @@ msgid "" "manual.\n" msgstr " -O order تحديد كيفية فرز نتائج البحث؛ راجع التعليمات\n" -#: src/main.cc:240 +#: src/main.cc:241 #, fuzzy, c-format #| msgid "" #| " -w width Specify the display width for formatting search results\n" @@ -5738,28 +5759,28 @@ msgid "" " -w width Specify the display width for formatting search results.\n" msgstr " -w width تحديد عرض الإظهار لتنسيق نتائج البحث\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr " -f محاولة إصلاح الحزم المعطوبة بشدة.\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr " -V إظهار نسخة الحزم التي سيتم تثبيتها.\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr " -D إظهار معتمدات الحزم المغيرة تلقائياً.\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr " -Z\t\t إظهار التغيير في حجم تثبيت كل حزمة.\n" -#: src/main.cc:245 +#: src/main.cc:246 #, fuzzy, c-format #| msgid "" #| " -v Display extra information. (may be supplied multiple " @@ -5769,7 +5790,7 @@ msgid "" "times).\n" msgstr " -v عرض معلومات إضافية. (يمكن استخدامه عدة مرات)\n" -#: src/main.cc:246 +#: src/main.cc:247 #, fuzzy, c-format #| msgid "" #| " -t [release] Set the release from which packages should be installed\n" @@ -5777,61 +5798,61 @@ msgid "" " -t [release] Set the release from which packages should be installed.\n" msgstr " -t [release] تحديد الإصدارة التي يجب تثبيت الحزم منها\n" -#: src/main.cc:247 +#: src/main.cc:248 #, fuzzy, c-format msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" " -q في وضع سطر الأوامر، عدم إظهار\n" "مؤشرات التقدم التصاعدي.\n" -#: src/main.cc:249 +#: src/main.cc:250 #, fuzzy, c-format #| msgid " -o key=val Directly set the configuration option named 'key'\n" msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr " -o key=val تعيين خيار التهيئة المسمى 'key' مباشرة\n" -#: src/main.cc:250 +#: src/main.cc:251 #, fuzzy, c-format #| msgid "" #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" #| " strong dependencies\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends\tتحديد اعتبار الموصى بها\n" " معتمدات ضرورية\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr " -S fname قراءة معلومات وضع aptitude الشاملة من fname.\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u تنزيل قوائم الحزم الجديدة عند بدء التشغيل.\n" -#: src/main.cc:254 src/main.cc:256 -#, c-format -msgid " (terminal interface only)" -msgstr "" +#: src/main.cc:255 src/main.cc:257 +#, fuzzy, c-format +msgid " (terminal interface only)\n" +msgstr " -h نص المساعدة هذا\n" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i القيام بتثبيت عند بدء التشغيل.\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " برنامج aptitude هذا ليست له قوى البقرة الخارقة.\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 #, fuzzy #| msgid "replaces" msgid "trace" @@ -5839,13 +5860,13 @@ msgstr "يستبدل" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 #, fuzzy #| msgid "no" msgid "info" @@ -5853,13 +5874,13 @@ msgstr "لا" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 #, fuzzy #| msgid "Err " msgid "error" @@ -5867,102 +5888,102 @@ msgstr "خطأ " #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 #, fuzzy msgid "fatal" msgstr "إغلاق" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " "\"warn\", \"error\", \"fatal\", or \"off\")." msgstr "" -#: src/main.cc:487 +#: src/main.cc:488 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "Invalid logger name \"%s\"." msgstr "عملية غير صالحة %s" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "توقع رقم بعد -q=\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "توقع رقم بعد -q=، لكن وجد %s\n" -#: src/main.cc:802 +#: src/main.cc:794 #, fuzzy, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "يتطلب المعطى -o معطى آخر بالشكل key=value، ولكن وجد %s" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "عجباً: استقبل رمز خير مجهول\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "" -#: src/main.cc:1039 +#: src/main.cc:1023 #, fuzzy #| msgid "Package" msgid "first-package" msgstr "حزمة" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "" -#: src/main.cc:1043 +#: src/main.cc:1027 #, fuzzy #| msgid "All Packages" msgid "all-packages" msgstr "كل الحزم" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -5970,7 +5991,7 @@ msgid "" "versions\"." msgstr "" -#: src/main.cc:1089 +#: src/main.cc:1073 #, fuzzy #| msgid "Only one of -u and -i may be specified\n" msgid "" @@ -5978,7 +5999,7 @@ msgid "" "specified\n" msgstr "يمكن تحديد -u أو -i فقط\n" -#: src/main.cc:1098 +#: src/main.cc:1082 #, fuzzy #| msgid "" #| "-u and -i may not be specified in command-line mode (eg, with 'install')" @@ -5987,23 +6008,23 @@ msgid "" "(eg, with 'install')" msgstr "-u و -i لا يمكن تحديدها في وضع سطر الأوامر (مثلاً، مع 'install')" -#: src/main.cc:1115 +#: src/main.cc:1099 #, fuzzy #| msgid "-u and -i may not be specified with a command" msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "لا يمكن تحديد -u و -i مع أمر واحد" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "أمر غير معروف \"%s\"\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "استثناء غير معالج: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, fuzzy, c-format msgid "" "Backtrace:\n" @@ -6012,7 +6033,8 @@ msgstr "" "تتبع راجع:\n" "%s" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "البحث عن: " @@ -6889,23 +6911,27 @@ msgstr "يستبدل" msgid "obsoletes" msgstr "يلغي" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (مزوَّد من قبل %F)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." msgstr "إن اخترت حزمة، فإن شرحاً عن وضعها الحالي سيظهر في هذه المساحة." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -6913,92 +6939,92 @@ msgstr "" "تم تثبيت %B%s%b تلقائياً؛ يجري إزالتها بسبب أن كل الحزم التي تعتمد عليها تتم " "إزالتها:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "ستتم إزالة %B%s%b تلقائياً بسبب أخطاء في المعتمدات:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "سيتم تثبيت %B%s%b تلقائياً لإرضاء المعتمدات التالية:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." msgstr "" "لا يمكن ترقية %B%s%b الآن، وإن كان ممكناً، فسيتم إبقاءها غلى النسخة %B%s%b." -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" msgstr "لن تتم ترقية %B%s%b إلى النسخة %B%s%b لتفادي عطب المعتمدات التالية:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b مثبت حالياً." -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b غير مثبت حالياً." -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "لم يتم إرضاء بعض معتمدات %B%s%b:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "سيتم تثبيط %B%s%b." -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "لن تتم ترقية %B%s%b إلى النسخة المحظورة %B%s%b." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." msgstr "" "يمكن ترقية %B%s%b إلى النسخة %B%s%b، إلا أنّها مبقاة على النسخة %B%s%b." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "ستتم إعادة تثبيت %B%s%b." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "سيتم تثبيت %B%s%b." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "ستتم إزالة %B%s%b." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "ستتم ترقية %B%s%b من النسخة %B%s%b إلى النسخة %B%s%b." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 #, fuzzy msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "%s غير مثبتة حالياً، لذا لن يتم تثبيتها مجدداً.\n" -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "الحزم التالية تعتمد على %B%s%b وستعطب بإزالته:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "الحزم التالية تعتمد على %B%s%b وهي معطوبة:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" msgstr "الحزم التالية تتعارض مع %B%s%b وستعطب بتثبيته:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -7007,38 +7033,38 @@ msgstr "" "الحزم التالية تعتمد على نسخة من %B%s%b غير النسخة %B%s%b والتي هي مثبتة " "حالياً، أو تتعارض مع النسخة المثبتة حالياً:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." msgstr "الحزم التالية تتعارض مع %B%s%b،أو تعتمد على نسخة منه لن يتم تثبيتها." -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "الحزم التالية تتعارض مع %B%s%b:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" msgstr "" "الحزم التالية تعتمد على نسخة من %B%s%b غير %B%s%b والتي هي مثبتة حالياً:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." msgstr "الحزم التالية تعتمد على نسخة من %B%s%b والتي لن يتم تثبيتها." -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "مُرقّى" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "مثبط" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7047,13 +7073,13 @@ msgstr "" "الحزم التالية تعتمد على النسخة المثبتة حالياً من %B%s%b (%B%s%b)، أو تتعارض " "مع النسخة التي سوف تكون %s إلى (%B%s%b)، وستصبح معطوبة إن كانت %s." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." msgstr "الحزم التالية تتعارض مع النسخة %B%s%b من %B%s%b، وسوف تُعطب إن كانت %s." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7087,47 +7113,47 @@ msgstr "تطبيق" msgid "Close" msgstr "إغلاق" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s يتعارض مع %s [الذي توفره %s %s]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "إزالة %s" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "تثبيت %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%Bإزالة%b الحزم التالية:%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%Bتثبيت%b الحزم التالية:%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%Bإبقاء%b الحزم التالية على نسختها الحالية:%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%Bترقية%b الحزم التالية:%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%Bتثبيط%b الحزم التالية:%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "ترك المعتمدات التالية غير محلولة:%n" @@ -7225,10 +7251,6 @@ msgstr "E:" msgid "W:" msgstr "W:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "البحث عن:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7597,7 +7619,9 @@ msgid "Error while dumping resolver state" msgstr "خطأ أثناء حفظ حالة مقدم الحلول" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "الملف الذي يجب أن يستخدمه مقدم الحلول للحفظ:" #: src/ui.cc:2265 @@ -8103,6 +8127,12 @@ msgstr "تنزيل سجل التغيير" msgid "You can only view changelogs of official Debian packages." msgstr "يمكنك عرض سجلات تغيير حزم دبيان الرسميّة فقط." +#~ msgid "Press Return to continue" +#~ msgstr "إضغط زر الإدخال للاستمرار" + +#~ msgid "Search for:" +#~ msgstr "البحث عن:" + #, fuzzy #~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." @@ -8230,11 +8260,6 @@ msgstr "يمكنك عرض سجلات تغيير حزم دبيان الرسميّ #~ msgid "gtk-yes" #~ msgstr "نعم" -#, fuzzy -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "عملية غير صالحة %s" - #~ msgid "but it is not installable" #~ msgstr "إلا أنّها غير قابلة للتثبيت" @@ -8400,10 +8425,6 @@ msgstr "يمكنك عرض سجلات تغيير حزم دبيان الرسميّ #~ " lead to a conflict with the given package if installed\n" #~ msgstr " -V إظهار نسخة الحزم التي سيتم تثبيتها.\n" -#, fuzzy -#~ msgid " indicators.\n" -#~ msgstr " -h نص المساعدة هذا\n" - #~ msgid "Downloading " #~ msgstr "تحميل " @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: aptitude 0.4.11.11\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" -"PO-Revision-Date: 2009-04-26 17:44+0100\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" +"PO-Revision-Date: 2012-02-01 01:11+0800\n" "Last-Translator: Marcos Alvarez Costales <marcos.alvarez.costales@gmail." "com>\n" "Language-Team: Asturian <softast-xeneral@lists.sourceforge.net>\n" @@ -13,42 +13,35 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" -msgstr "" -"%BOpción:%b %s\n" -"%BPor defeutu:%b %s\n" -"%BValor:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " +msgstr "%BOpción:%b " -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " +msgstr "%BPor defeutu:%b " + +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "Cierto" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "Falso" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " -msgstr "%BOpción:%b " - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "%BPor defeutu:%b " - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "%BValor:%b " -#: src/apt_config_treeitems.cc:279 +#: src/apt_config_treeitems.cc:280 #, c-format -msgid "Editing \"%ls\"" -msgstr "Editando \"%ls\"" +msgid "Editing \"%ls\": " +msgstr "Editando \"%ls\": " -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "%BEscoyer:%b " @@ -636,8 +629,8 @@ msgstr "Fallu grave al iguar" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] Resolviendo dependencies" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "Fallu internu: Solución vacía nun esperada." @@ -931,7 +924,7 @@ msgstr "" "con --full-resolver.\n" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "Albortar.\n" @@ -961,50 +954,38 @@ msgstr "" "llocal o obsoletu?" #: src/cmdline/cmdline_download_progress_display.cc:154 -#, fuzzy -#| msgid "Hit " msgid "Hit" -msgstr "Oxe " +msgstr "Oxe" #. ForTranslators: this stands for "ignored" and should be #. the same width as the translation of "Err". #: src/cmdline/cmdline_download_progress_display.cc:181 -#, fuzzy -#| msgid "Ign " msgid "Ign" -msgstr "Ign " +msgstr "Ign" #. ForTranslators: this stands for "error" and should be the #. same width as the translation of "Ign". #: src/cmdline/cmdline_download_progress_display.cc:185 -#, fuzzy -#| msgid "Err " msgid "Err" -msgstr "Err " +msgstr "Err" #: src/cmdline/cmdline_download_progress_display.cc:211 -#, fuzzy, c-format -#| msgid "Fetched %sB in %s (%sB/s)\n" +#, c-format msgid "Fetched %sB in %s (%sB/s)" -msgstr "Baxaos %sB en %s (%sB/s)\n" +msgstr "Baxaos %sB en %s (%sB/s)" #: src/cmdline/cmdline_download_progress_display.cc:230 -#, fuzzy, c-format -#| msgid "" -#| "Media Change: Please insert the disc labeled '%s' in the drive '%s' and " -#| "press [Enter].\n" +#, c-format msgid "" "Media change: Please insert the disc labeled '%s' into the drive '%s' and " "press [Enter]." msgstr "" "cambéu de Mediu: Por favor, inxerta'l discu etiquetáu con '%s' na unidá '%s' " -"y calca [Enter].\n" +"y calca [Enter]." #: src/cmdline/cmdline_download_progress_display.cc:435 -#, fuzzy -#| msgid " [Working]" msgid "[Working]" -msgstr " [Trabayando]" +msgstr "[Trabayando]" #: src/cmdline/cmdline_extract_cache_subset.cc:56 #, c-format @@ -1295,7 +1276,7 @@ msgstr "" "Ensin paquete a amosar -- introduz los nomes de los paquetes na llinia " "dempués de '¡'.\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "Calca Volver pa siguir." @@ -1306,10 +1287,6 @@ msgstr "" "Ensin paquetes atopaos -- introduz los nomes de los paquetes na llinia " "dempués 'c'.\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "Calca Enter pa siguir" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1618,14 +1595,11 @@ msgstr "¡Escritu dafechu l'estáu del iguador!" #: src/cmdline/cmdline_resolver.cc:222 #, fuzzy, c-format -#| msgid "" -#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: " -#| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr paq ver ...: %F%na paq ver ...: %F" +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr paq ver ...: %F%na paq ver ...: %F" "%n<AICIÓN> paq... : %F%n%F%F%F%F%F%F%F%F" #: src/cmdline/cmdline_resolver.cc:243 @@ -1900,7 +1874,7 @@ msgstr "" "dependencies." #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "Resolviendo dependencies..." @@ -1931,7 +1905,7 @@ msgstr "Los siguienes comandos tan disponibles" #: src/cmdline/cmdline_resolver.cc:999 msgid "File to write resolver state to: " -msgstr "Ficheru nel qu'escribir l'estáu del iguador:" +msgstr "Ficheru nel qu'escribir l'estáu del iguador: " #: src/cmdline/cmdline_resolver.cc:1031 msgid "Invalid response; please enter one of the following commands:" @@ -1939,8 +1913,9 @@ msgstr "" "Rempuesta nun válida; por favor, introduz un de los siguientes comandos:" #: src/cmdline/cmdline_resolver.cc:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" -msgstr "Nun s'atopó nenguna solución nel tiempu esperáu. ¿Intentalo más? [Y/n]" +msgid "No solution found within the allotted time. Try harder? [Y/n] " +msgstr "" +"Nun s'atopó nenguna solución nel tiempu esperáu. ¿Intentalo más? [Y/n] " #: src/cmdline/cmdline_resolver.cc:1080 msgid "Invalid response; please enter 'y' or 'n'." @@ -2142,7 +2117,7 @@ msgstr "Paquete: " msgid "State" msgstr "Estáu" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "Dau por" @@ -2250,27 +2225,31 @@ msgstr "Troca" msgid "Obsoletes" msgstr "Fae obsoletu a" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Proporciona" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Descripción: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "Páxina d'aniciu: " -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "Nun puede llocalizase paquete %s" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "Nun puede interpretase'l patrón %s" @@ -2401,10 +2380,9 @@ msgid "Archive %s:" msgstr "Archivu" #: src/cmdline/cmdline_versions.cc:294 -#, fuzzy, c-format -#| msgid "No such package \"%s\".\n" +#, c-format msgid "No such package \"%s\"." -msgstr "Ensin paquete coincidente \"%s\".\n" +msgstr "Ensin paquete coincidente \"%s\"." #: src/cmdline/cmdline_versions.cc:494 msgid "--group-by|archive" @@ -2589,6 +2567,11 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "Seleición de versión desconocida, dalgo ta permal." +#: src/cmdline_parse.cc:22 +#, c-format +msgid "Invalid command-line option '%s'" +msgstr "Opción de llinia de comandu '%s' nun válida" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "Nun esperáu final de ficheru na entrada standard" @@ -2606,7 +2589,7 @@ msgstr "[FALLU]" msgid "UNSATISFIED" msgstr "NON SATISFECHO" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "NUN DISPONIBLE" @@ -2614,7 +2597,7 @@ msgstr "NUN DISPONIBLE" msgid "Tags" msgstr "Etiquetes" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "Etiquetes d'Usuariu" @@ -3032,16 +3015,21 @@ msgstr "Nun puede criase caché truncada: %s" msgid "Unable to open %s to log actions" msgstr "Nun puede abrise %s p'acciones de rexistru" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "Fallu xenerando la hora llocal (%s)" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "informe de rexistru" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -3053,81 +3041,81 @@ msgstr "" "por fallos de dpkg nun sedrán completaes.\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "Instalaránse %li paquetes, y desaniciaránse %li paquetes.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "sedrá usáu %sB d'espaciu en discu\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "Usaráse %sB d'espaciu en discu\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[ACTUALIZAR] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[BAXAR DE VERSIÓN] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "DESANICIA" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "INSTALA" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "REINSTALA" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "RETIEN" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "FRAYÁR" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "DESANICIAR, NON USÁU" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "DESANICIA, DEPENDENCIES" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "INSTALA, DEPENDENCIES" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "RETIEN, DEPENDENCIES" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "NON_CONFIGURÁU" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -3150,46 +3138,46 @@ msgstr "" msgid "Filtering packages" msgstr "Baxando paquetes" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "Acción de triba desconocida: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "Dempués de cadena %s lliteral non termináu" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "Prioridá desconocida %s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "Patrón de coincidencia finó inesperadamente (esperábase '%c')." -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "Esperábase '%c', atopose '%c'." -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "Triba de dependencia desconocida: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, c-format msgid "Unknown term type: \"%s\"." msgstr "Triba de patrón desconocía: «%s»" #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, c-format msgid "" "The ?%s term must be used in a \"wide\" context (a top-level context, or a " @@ -3198,33 +3186,33 @@ msgstr "" "El patrón ?%s debe usase nun contestu \"wide\" (d'un contestu de primer " "nivel o nun contestu rodeáu de ?%s)." -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "Ensin zarrar '('" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "Provee: Nun puede frayase" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "Triba de patrón desconocida: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "Nun puede guetase por \"\"" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "Espresión vacía nun esperada" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, c-format msgid "Badly formed expression: expected '|', got '%c'" msgstr "Espresión mal formada: esperábase '|', obtúvose '%c'" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "Nun esperáu ')'" @@ -3272,8 +3260,7 @@ msgid "Failed to download changelogs: unexpected exception." msgstr "Falló al descargar el cambéu de rexistru: %s" #: src/generic/apt/pkg_changelog.cc:589 -#, fuzzy, c-format -#| msgid "ChangeLog of %s" +#, c-format msgid "Changelog of %s" msgstr "Rexistru de cambeos de %s" @@ -3451,10 +3438,8 @@ msgid "Expected %s" msgstr "Nun esperáu ')'" #: src/generic/util/parsers.h:2007 -#, fuzzy -#| msgid " or" msgid " or " -msgstr " o" +msgstr " o " #: src/generic/util/parsers.h:2770 #, fuzzy, c-format @@ -4119,22 +4104,22 @@ msgstr "Fallu internu: ¡El nome d'enchufe temporal \"%s\" ye mui llargu!" msgid "%s: Unable to accept a connection: %s" msgstr "%s: Nun puede aceutase una conexón: %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "[%s] procesu dpkg entamando...\n" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "[%s] procesu dpkg completáu.\n" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "[%s] falló procesu dpkg.\n" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "[%s] procesu dpkg completáu; hai más paquetes a procesar.\n" @@ -4777,7 +4762,7 @@ msgstr "" msgid "Virtual package" msgstr "Primer paquete" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "Ensin Instalar" @@ -4957,205 +4942,211 @@ msgstr "%s camuda %s" msgid "%s obsoletes %s" msgstr "%s fae obsoletu a %s" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s camuda %s" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "Desaniciar los siguientes paquetes:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "Instalar los siguientes paquetes:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 msgid "Keep the following packages:" msgstr "Caltener los siguientes paquetes:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "Anovar los paquetes siguientes:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "Baxar de versión los siguientes paquetes:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 msgid "Leave the following dependencies unresolved:" msgstr "Dexar les siguientes dependencies ensin resolver:" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, c-format msgid "Remove %s [<big>%s</big> (%s)]" msgstr "Desaniciar %s [<big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, c-format msgid "Install %s [<big>%s</big> (%s)]" msgstr "Instalar %s [<big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, c-format msgid "Cancel the installation of %s" msgstr "Encaboxar la instalación de %s" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, c-format msgid "Cancel the removal of %s" msgstr "Encaboxar el desaniciu de %s" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, c-format msgid "Keep %s at version <big>%s</big> (%s)" msgstr "Calterner %s na versión <big>%s</big> (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, c-format msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Actualizar %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, c-format msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Baxar %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, c-format msgid "<b>Remove</b> %s" msgstr "<b>Desaniciar</b> %s" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, c-format msgid "<b>remove</b> %s" msgstr "<b>desaniciar</b> %s" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, c-format msgid "<b>Keep</b> %s at version %s" msgstr "<b>Caltener</b> %s na versión %s" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, c-format msgid "<b>keep</b> %s at version %s" msgstr "<b>caltener</b> %s na versión %s" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %s" msgid "<b>Cancel</b> the installation of %s" msgstr "Encaboxar la instalación de %s" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %s" msgid "<b>cancel</b> the installation of %s" msgstr "Encaboxar la instalación de %s" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, c-format msgid "<b>Install</b> %s %s" msgstr "<b>Instalar</b> %s %s" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, c-format msgid "<b>install</b> %s %s" msgstr "<b>instalar</b> %s %s" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>Downgrade</b> %s to version %s" msgstr "<b>Baxar</b> %s a versión %s" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>downgrade</b> %s to version %s" msgstr "<b>baxar</b> %s a versión %s" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>Upgrade</b> %s to version %s" msgstr "<b>Actualizar</b> %s a versión %s" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>upgrade</b> %s to version %s" msgstr "<b>actualizar</b> %s a versión %s" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "Dexar %s ensín resolver" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "dexar %s ensín resolver" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, c-format msgid "%s install" msgid_plural "%s installs" msgstr[0] "%s instalación" msgstr[1] "%s instalaciones" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, c-format msgid "%s remove" msgid_plural "%s removes" msgstr[0] "%s desaniciación" msgstr[1] "%s desaniciaciones" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, c-format msgid "%s keep" msgid_plural "%s keeps" msgstr[0] "%s calteniu" msgstr[1] "%s calteníos" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, c-format msgid "%s upgrade" msgid_plural "%s upgrades" msgstr[0] "%s actualización" msgstr[1] "%s actualizaciones" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, c-format msgid "%s downgrade" msgid_plural "%s downgrades" msgstr[0] "%s baxada" msgstr[1] "%s baxaes" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, c-format msgid "%s unresolved recommendation" msgid_plural "%s unresolved recommendations" msgstr[0] "%s recomendación non resuelta" msgstr[1] "%s recomendaciones non resueltes" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 msgid "No solutions yet." msgstr "Nun hai más soluciones." -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 msgid "No dependency solution was found." msgstr "Nun s'alcontraron soluciones de dependencia." -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 msgid "No solutions." msgstr "Nun hai soluciones." -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "Pa ver una solución, seleicionala dende la llista de la mandrecha." -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, c-format msgid "%u solutions." msgstr "%u soluciones." -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Solution %s of %s (tier %s)." msgid "Solution %s of %s." @@ -5466,12 +5457,12 @@ msgstr " Desactiváu'l sofitu d'Ept.\n" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s compiláu en %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5523,36 +5514,31 @@ msgstr "" "\n" #: src/main.cc:198 -#, fuzzy, c-format -#| msgid " install - Install/upgrade packages\n" +#, c-format msgid " install - Install/upgrade packages.\n" -msgstr " install - Instala/actualiza paquetes\n" +msgstr " install - Instala/actualiza paquetes.\n" #: src/main.cc:199 -#, fuzzy, c-format -#| msgid " remove - Remove packages\n" +#, c-format msgid " remove - Remove packages.\n" -msgstr " remove - Desanicia paquetes\n" +msgstr " remove - Desanicia paquetes.\n" #: src/main.cc:200 -#, fuzzy, c-format -#| msgid " purge - Remove packages and their configuration files\n" +#, c-format msgid " purge - Remove packages and their configuration files.\n" msgstr "" " purge - Desanicia paquetes xunto colos sos ficheros de " -"configuración\n" +"configuración.\n" #: src/main.cc:201 -#, fuzzy, c-format -#| msgid " hold - Place packages on hold\n" +#, c-format msgid " hold - Place packages on hold.\n" -msgstr " hold - Bloquea paquetes\n" +msgstr " hold - Bloquea paquetes.\n" #: src/main.cc:202 -#, fuzzy, c-format -#| msgid " unhold - Cancel a hold command for a package\n" +#, c-format msgid " unhold - Cancel a hold command for a package.\n" -msgstr " unhold - Desbloquea un paquete\n" +msgstr " unhold - Desbloquea un paquete.\n" #: src/main.cc:203 #, fuzzy, c-format @@ -5577,10 +5563,9 @@ msgstr "" "paquete.\n" #: src/main.cc:206 -#, fuzzy, c-format -#| msgid " update - Download lists of new/upgradable packages\n" +#, c-format msgid " update - Download lists of new/upgradable packages.\n" -msgstr " update - Baxa les llistes de paquetes nuevos/actualizables\n" +msgstr " update - Baxa les llistes de paquetes nuevos/actualizables.\n" #: src/main.cc:207 #, fuzzy, c-format @@ -5589,16 +5574,14 @@ msgid " safe-upgrade - Perform a safe upgrade.\n" msgstr " safe-upgrade - realiza una actualización segura\n" #: src/main.cc:208 -#, fuzzy, c-format -#| msgid "" -#| " full-upgrade - Perform an upgrade, possibly installing and removing " -#| "packages\n" +#, c-format msgid "" " full-upgrade - Perform an upgrade, possibly installing and removing " "packages.\n" msgstr "" " full-upgrade - Fae una actualización, posiblemente instalando y " -"desaniciando paquetes\n" +"desaniciando\n" +" paquetes.\n" #: src/main.cc:209 #, fuzzy, c-format @@ -5607,77 +5590,67 @@ msgid " build-dep - Install the build-dependencies of packages.\n" msgstr "'&BD' pa instalar les dependencies pa construyir d'un paquete." #: src/main.cc:210 -#, fuzzy, c-format -#| msgid " forget-new - Forget what packages are \"new\"\n" +#, c-format msgid " forget-new - Forget what packages are \"new\".\n" -msgstr " forget-new - Escaez qué paquetes son \"nuevos\"\n" +msgstr " forget-new - Escaez qué paquetes son \"nuevos\".\n" #: src/main.cc:211 -#, fuzzy, c-format -#| msgid " search - Search for a package by name and/or expression\n" +#, c-format msgid " search - Search for a package by name and/or expression.\n" -msgstr " search - Gueta un paquete por nome y/o espresión\n" +msgstr " search - Gueta un paquete por nome y/o espresión.\n" #: src/main.cc:212 -#, fuzzy, c-format -#| msgid " show - Display detailed information about a package\n" +#, c-format msgid " show - Display detailed information about a package.\n" -msgstr " show - Visualiza información detallada d'un paquete\n" +msgstr " show - Visualiza información detallada d'un paquete.\n" #: src/main.cc:213 #, fuzzy, c-format -#| msgid " clean - Erase downloaded package files\n" -msgid " clean - Erase downloaded package files.\n" -msgstr " clean - Desanicia los ficheros de paquetes baxaos\n" +#| msgid " show - Display detailed information about a package\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - Visualiza información detallada d'un paquete\n" #: src/main.cc:214 -#, fuzzy, c-format -#| msgid " autoclean - Erase old downloaded package files\n" -msgid " autoclean - Erase old downloaded package files.\n" -msgstr " autoclean - Desanicia los ficheros de paquetes baxaos obsoletos\n" +#, c-format +msgid " clean - Erase downloaded package files.\n" +msgstr " clean - Desanicia los ficheros de paquetes baxaos.\n" #: src/main.cc:215 -#, fuzzy, c-format -#| msgid " changelog - View a package's changelog\n" -msgid " changelog - View a package's changelog.\n" -msgstr " changelog - Ver el rexistru de cambeos del paquete\n" +#, c-format +msgid " autoclean - Erase old downloaded package files.\n" +msgstr " autoclean - Desanicia los ficheros de paquetes baxaos obsoletos.\n" #: src/main.cc:216 -#, fuzzy, c-format -#| msgid " download - Download the .deb file for a package\n" -msgid " download - Download the .deb file for a package.\n" -msgstr " download - Baxa los ficheros .deb pa un paquete\n" +#, c-format +msgid " changelog - View a package's changelog.\n" +msgstr " changelog - Ver el rexistru de cambeos del paquete.\n" #: src/main.cc:217 -#, fuzzy, c-format -#| msgid "" -#| " reinstall - Download and (possibly) reinstall a currently installed " -#| "package\n" +#, c-format +msgid " download - Download the .deb file for a package.\n" +msgstr " download - Baxa los ficheros .deb pa un paquete.\n" + +#: src/main.cc:218 +#, c-format msgid "" " reinstall - Download and (possibly) reinstall a currently installed " "package.\n" msgstr "" -" reinstall - Baxa y (posiblemente) reinstala un paquete ya instaláu\n" +" reinstall - Baxa y (posiblemente) reinstala un paquete ya instaláu.\n" -#: src/main.cc:218 +#: src/main.cc:219 #, c-format msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " why - Amosa los paquetes manualmente instalaos que necesiten un " "paquete, o\n" " o por qué ún de los paquetes necesita un paquete concretu.\n" -#: src/main.cc:220 -#, fuzzy, c-format -#| msgid "" -#| " why-not - Show the manually installed packages that lead to a " -#| "conflict\n" -#| " with the given package, or why one or more packages " -#| "would\n" -#| " lead to a conflict with the given package if installed\n" +#: src/main.cc:221 +#, c-format msgid "" " why-not - Show the manually installed packages that lead to a " "conflict\n" @@ -5690,36 +5663,35 @@ msgstr "" " un o más paquetes llevaríen a un conflictu con dicho " "paquete.\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " Opciones:\n" -#: src/main.cc:225 -#, fuzzy, c-format -#| msgid " -h This help text\n" +#: src/main.cc:226 +#, c-format msgid " -h This help text.\n" -msgstr " -h Esti testu d'aida\n" +msgstr " -h Esti testu d'aida.\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" " --gui Usar la GUI GTK incluso si ta desactivo na configuración.\n" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr " --gui Non usar la GUI GTK incluso si ta disponible.\n" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h Esti testu d'aida\n" -#: src/main.cc:232 +#: src/main.cc:233 #, fuzzy, c-format #| msgid "" #| " --gui Use the GTK GUI even if disabled in the configuration.\n" @@ -5728,214 +5700,191 @@ msgid "" msgstr "" " --gui Usar la GUI GTK incluso si ta desactivo na configuración.\n" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s Simula les aiciones, pero en realida nun les fae.\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr " -d Sólo baxa paquetes, non instala o desinstala na.\n" -#: src/main.cc:236 -#, fuzzy, c-format -#| msgid " -P Always prompt for confirmation or actions\n" -msgid " -P Always prompt for confirmation or actions.\n" -msgstr " -P Siempre pide confirmación de les aiciones\n" - #: src/main.cc:237 -#, fuzzy, c-format -#| msgid "" -#| " -y Assume that the answer to simple yes/no questions is " -#| "'yes'\n" +#, c-format +msgid " -P Always prompt for confirmation of actions.\n" +msgstr " -P Siempre pide confirmación de les aiciones.\n" + +#: src/main.cc:238 +#, c-format msgid "" " -y Assume that the answer to simple yes/no questions is 'yes'.\n" msgstr "" " -y Supón que la rempuesta a entrugues simples de la triba sí/" -"non ye 'sí'\n" +"non ye 'sí'.\n" -#: src/main.cc:238 -#, fuzzy, c-format -#| msgid "" -#| " -F format Specify a format for displaying search results; see the " -#| "manual\n" +#: src/main.cc:239 +#, c-format msgid "" " -F format Specify a format for displaying search results; see the " "manual.\n" msgstr "" " -F formatu Especifica'l formatu pa visualizar los resultaos de la " -"gueta; ver el manual\n" +"gueta;\n" +" ver el manual.\n" -#: src/main.cc:239 -#, fuzzy, c-format -#| msgid "" -#| " -O order Specify how search results should be sorted; see the " -#| "manual\n" +#: src/main.cc:240 +#, c-format msgid "" " -O order Specify how search results should be sorted; see the " "manual.\n" msgstr "" -" -O orde Especifica como se deben ordenar los resultados de la gueta; " -"ver el manual\n" +" -O orde Especifica como se deben ordenar los resultados de la gueta;\n" +" ver el manual.\n" -#: src/main.cc:240 -#, fuzzy, c-format -#| msgid "" -#| " -w width Specify the display width for formatting search results\n" +#: src/main.cc:241 +#, c-format msgid "" " -w width Specify the display width for formatting search results.\n" msgstr "" " -w anchu Especifica l'anchu del visor pa dar formatu a los resultaos " -"de la gueta\n" +"de\n" +" la gueta.\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr " -f Intenta iguar paquetes frayaos de mou agresivu.\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr " -V Amosa qué versiones de los paquetes van a instalase.\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr " -D Amosa les dependencies de los paquetes camudaos\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr " -Z Amosa'l cambéu nel tamañu instaláu de cada paquete.\n" -#: src/main.cc:245 -#, fuzzy, c-format -#| msgid "" -#| " -v Display extra information. (may be supplied multiple " -#| "times)\n" +#: src/main.cc:246 +#, c-format msgid "" " -v Display extra information. (may be supplied multiple " "times).\n" msgstr "" -" -v Amosa información extra (puede dase más d'una vegada)\n" +" -v Amosa información extra (puede dase más d'una vegada).\n" -#: src/main.cc:246 -#, fuzzy, c-format -#| msgid "" -#| " -t [release] Set the release from which packages should be installed\n" +#: src/main.cc:247 +#, c-format msgid "" " -t [release] Set the release from which packages should be installed.\n" msgstr "" -" -t [distrib] Afita la distribución dende la que s'instalen los paquetes\n" +" -t [distrib] Afita la distribución dende la que s'instalen los paquetes.\n" -#: src/main.cc:247 -#, fuzzy, c-format -#| msgid "" -#| " -q In command-line mode, suppress the incremental progress\n" -#| " indicators.\n" +#: src/main.cc:248 +#, c-format msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" " -q Non amosa los indicadores de progresu incrementales nel\n" " mou de llinia de comandos.\n" -#: src/main.cc:249 -#, fuzzy, c-format -#| msgid " -o key=val Directly set the configuration option named 'key'\n" +#: src/main.cc:250 +#, c-format msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr "" " -o opconf=val Establez direutamente la opción de configuración nomada " -"'key'\n" +"'key'.\n" -#: src/main.cc:250 -#, fuzzy, c-format -#| msgid "" -#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" -#| " strong dependencies\n" +#: src/main.cc:251 +#, c-format msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" -" --with(out)-recommends,\tEspecifica si se traten o non " -"les recomendaciones como dependencies " -"fuertes\n" +" --with(out)-recommends,\tEspecifica si se traten o non les\n" +" recomendaciones como dependencies fuertes.\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr "" " -S fnombre Llee la información d'estáu estendida d'aptitude de " "fnombre.\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u Baxa una nueva llista de paquetes al aniciar.\n" -#: src/main.cc:254 src/main.cc:256 +#: src/main.cc:255 src/main.cc:257 #, c-format -msgid " (terminal interface only)" +msgid " (terminal interface only)\n" msgstr "" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i Fae una instalación al aniciar.\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " Esti aptitude nun tien poderes de Super Xatu.\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 msgid "trace" msgstr "traza" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "debug" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 msgid "info" msgstr "info" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "avisu" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 msgid "error" msgstr "Fallu" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 msgid "fatal" msgstr "fatal" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "off" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " @@ -5944,77 +5893,77 @@ msgstr "" "Nome de nivel de rexistru desconocíu \"%s\" (esperáu \"traza\", \"debug\", " "\"info\", \"avisu\", \"fallu\", \"fatal\", o \"off\")." -#: src/main.cc:487 +#: src/main.cc:488 #, c-format msgid "Invalid logger name \"%s\"." msgstr "Nome logeáu nun válidu \"%s\"." -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "Esperábase un númberu dempués de -q=\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "Esperábase un númberu dempués de -q=, garró %s\n" -#: src/main.cc:802 +#: src/main.cc:794 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o requier un argumentu de la forma opción=valor, díose %s\n" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "Ensin coma dempués del nome d'etiqueta \"%s\".\n" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "RAREZA: Recibiu códigu d'opción desconocíu\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "ensín sumariu" -#: src/main.cc:1039 +#: src/main.cc:1023 msgid "first-package" msgstr "Primer paquete" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "primer paquete y triba" -#: src/main.cc:1043 +#: src/main.cc:1027 msgid "all-packages" msgstr "Tolos paquetes" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "tolos paquetes coles sos versiones de dependencia" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -6025,7 +5974,7 @@ msgstr "" "\"primer paquete\", \"primer paquete y triba\", \"tolos paquetes\", o " "\"tolos paquetes con versiones de dependencia\"." -#: src/main.cc:1089 +#: src/main.cc:1073 #, fuzzy #| msgid "Only one of -u and -i may be specified\n" msgid "" @@ -6033,7 +5982,7 @@ msgid "" "specified\n" msgstr "Sólo ún de -u ya -i puede ser especificáu\n" -#: src/main.cc:1098 +#: src/main.cc:1082 #, fuzzy #| msgid "" #| "-u and -i may not be specified in command-line mode (eg, with 'install')" @@ -6044,23 +5993,23 @@ msgstr "" "Puede que -u ya -i nun deban especificase nel mou llinia de comandos (p.e, " "con 'install')" -#: src/main.cc:1115 +#: src/main.cc:1099 #, fuzzy #| msgid "-u and -i may not be specified with a command" msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "Puede que -u ya -i nun deban especificase con un comandu" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "Comandu desconocíu \"%s\"\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "Esceición non xestionada: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" @@ -6069,7 +6018,8 @@ msgstr "" "Volcáu:\n" "%s\n" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "Guetar por: " @@ -6964,17 +6914,21 @@ msgstr "camuda" msgid "obsoletes" msgstr "fae obsoleto a" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (proporcionáu por %F)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." @@ -6982,7 +6936,7 @@ msgstr "" "Si seleiciones un paquete, nesti espaciu aparecerá una desplicación del so " "estáu actual." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -6990,17 +6944,17 @@ msgstr "" "Instalóse %B%s%b automáticamente; desaníciase porque tolos paquetes que " "dependen d'él van desaniciase:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "Desaniciaráse %B%s%b automáticamente por fallos de dependencies:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" "Instalaráse %B%s%b automáticamente pa satisfacer les siguientes dependencies:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -7008,7 +6962,7 @@ msgstr "" "Nun puede anovase agora %B%s%b, pero si se pudiere, entá tendríes que " "caltenelu na versión %B%s%b" -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -7016,27 +6970,27 @@ msgstr "" "%B%s%b nun s'anovará a la versión %B%s%b, pa evitar frayar les siguientes " "dependencies:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b ta anguaño instaláu." -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b nun ta anguaño instaláu." -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "Dalgunes dependencies de %B%s%b nun tán satisfeches:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "Baxaráse de versión %B%s%b." -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "Nun s'anovará %B%s%b a la versión prohibida %B%s%b." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." @@ -7044,37 +6998,37 @@ msgstr "" "%B%s%b puede anovase a la versión %B%s%b, pero ta siendo reteníu na versión " "%B%s%b." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b sedrá reinstaláu." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b sedrá instaláu." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b sedrá desaniciáu." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "Anovaráse %B%s%b dende la versión %B%s%b a la versión %B%s%b." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "%B%s%b ta parcialmente instaláu; Completaráse la so instalación." -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "" "Los siguientes paquetes dependen de %B%s%b y frayaránse pol so desaniciu:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "Los siguientes paquetes dependen de %B%s%b y tan frayaos:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" @@ -7082,7 +7036,7 @@ msgstr "" "Los siguientes paquetes tienen conflictos con %B%s%b y frayaránse pola so " "instalación:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -7092,7 +7046,7 @@ msgstr "" "versión instalada anguaño de %B%s%b, o tienen conflictos cola versión " "anguaño instalada:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -7100,11 +7054,11 @@ msgstr "" "Los siguientes paquetes tienen conflictos con %B%s%b, o dependen d'una " "versión d'esti que nun va instalase." -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "Los siguientes paquetes tienen conflictos con %B%s%b:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -7112,7 +7066,7 @@ msgstr "" "Los siguientes paquetes dependen d'una versión de %B%s%b distinta de la " "versión anguaño instalada de %B%s%b:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." @@ -7120,15 +7074,15 @@ msgstr "" "Los siguientes paquetes dependen d'una versión de %B%s%b que nun va " "instalase." -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "anováu" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "baxáu de versión" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7138,7 +7092,7 @@ msgstr "" "(%B%s%b), o tienen conflictos cola versión en que se convertirá %s (%B%s%b), " "y frayaránse si ye %s." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7146,7 +7100,7 @@ msgstr "" "Los siguientes paquetes tienen conflictos cola versión %B%s%b de %B%s%b, y " "frayaránse si ye %s." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7182,47 +7136,47 @@ msgstr "Aplicar" msgid "Close" msgstr "Zarrar" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s tien conflictos con %s [proporcionáu por %s %s]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "Desaniciando %s" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "Instalando %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "Dexar %ls nun resueltos." -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%BDesaniciar%b los paquetes siguientes:%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%BInstalar%b los siguientes paquetes:%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%BCaltener%b los siguientes paquetes na so versión actual:%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%BAnovar%b los siguientes paquetes:%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%BDesanovar%b los siguientes paquetes:%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "Dexar les siguientes dependencies ensin resolver:%n" @@ -7321,10 +7275,6 @@ msgstr "E:" msgid "W:" msgstr "W:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "Guetar por:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7700,8 +7650,8 @@ msgid "Error while dumping resolver state" msgstr "Fallu volcando l'estáu del iguador" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" -msgstr "Ficheru al que se tien que volcar l'estáu del iguador:" +msgid "File to which the resolver state should be dumped: " +msgstr "Ficheru al que se tien que volcar l'estáu del iguador: " #: src/ui.cc:2265 msgid "^Install/remove packages" @@ -8338,9 +8288,6 @@ msgstr "Sólo puedes ver rexistros de cambéu de paquetes oficiales de Debian." #~ msgid "gtk-no" #~ msgstr "gtk-non" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "Opción de llinia de comandu '%s' nun válida" - #~ msgid "" #~ "The package %s has no candidate version and will not be upgraded; unable " #~ "to show its changelog." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+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" @@ -16,40 +16,36 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +#, fuzzy +msgid "%BOption:%b " +msgstr "Opcije" + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -#, fuzzy -msgid "%BOption:%b " -msgstr "Opcije" - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "" - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:279 +#: src/apt_config_treeitems.cc:280 #, c-format -msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "" @@ -523,8 +519,8 @@ msgstr "" msgid "[%d(%d)/...] Resolving dependencies" msgstr "" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "" @@ -790,7 +786,7 @@ msgid "" msgstr "" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "" @@ -1123,7 +1119,7 @@ msgstr "" msgid "No packages to show -- enter the package names on the line after 'i'.\n" msgstr "" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "" @@ -1132,10 +1128,6 @@ msgstr "" msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1410,7 +1402,7 @@ msgstr "" #: src/cmdline/cmdline_resolver.cc:222 #, c-format msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" @@ -1657,7 +1649,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created." msgstr "" #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "" @@ -1694,7 +1686,7 @@ msgid "Invalid response; please enter one of the following commands:" msgstr "" #: src/cmdline/cmdline_resolver.cc:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +msgid "No solution found within the allotted time. Try harder? [Y/n] " msgstr "" #: src/cmdline/cmdline_resolver.cc:1080 @@ -1891,7 +1883,7 @@ msgstr "Paket:" msgid "State" msgstr "" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "" @@ -2000,27 +1992,31 @@ msgstr "Zamjenjuje" msgid "Obsoletes" msgstr "Zastarijeva" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "" -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "" -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "" @@ -2334,6 +2330,11 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "" +#: src/cmdline_parse.cc:22 +#, c-format +msgid "Invalid command-line option '%s'" +msgstr "" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "" @@ -2350,7 +2351,7 @@ msgstr "" msgid "UNSATISFIED" msgstr "" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "" @@ -2358,7 +2359,7 @@ msgstr "" msgid "Tags" msgstr "" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "" @@ -2741,16 +2742,21 @@ msgstr "" msgid "Unable to open %s to log actions" msgstr "" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -2758,81 +2764,81 @@ msgid "" "\n" msgstr "" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, fuzzy, c-format msgid "%sB of disk space will be freed\n" msgstr "S'alliberaran %sB de l'espai de disc" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "UKLONI" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "INSTALIRAJ" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "REINSTALIRAJ" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "ZADRŽI" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "OŠTEĆEN" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "UKLONI, NIJE KORIŠTEN" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "UKLONI, ZAVISNOSTI" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "INSTALIRAJ, ZAVISNOSTI" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "ZADRŽI, ZAVISNOSTI" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -2851,79 +2857,79 @@ msgstr "" msgid "Filtering packages" msgstr "Paket:" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "" -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "" -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, c-format msgid "Unknown term type: \"%s\"." msgstr "" #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, c-format msgid "" "The ?%s term must be used in a \"wide\" context (a top-level context, or a " "context enclosed by ?%s)." msgstr "" -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, c-format msgid "Badly formed expression: expected '|', got '%c'" msgstr "" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "" @@ -3760,22 +3766,22 @@ msgstr "" msgid "%s: Unable to accept a connection: %s" msgstr "" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4383,7 +4389,7 @@ msgstr "" msgid "Virtual package" msgstr "Paket:" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 #, fuzzy msgid "Not Installed" msgstr "Automatski nadogradi instalirane pakete" @@ -4546,210 +4552,215 @@ msgstr "Zamjenjuje" msgid "%s obsoletes %s" msgstr "Zastarijeva" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +msgid "%s enhances %s" +msgstr "Zamjenjuje" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 #, fuzzy msgid "Remove the following packages:" msgstr "Slijedeći paketi su OŠTEĆENI:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 #, fuzzy msgid "Install the following packages:" msgstr "Slijedeći paketi su OŠTEĆENI:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 #, fuzzy msgid "Keep the following packages:" msgstr "Slijedeći paketi su OŠTEĆENI:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 #, fuzzy msgid "Upgrade the following packages:" msgstr "Slijedeći paketi su OŠTEĆENI:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 #, fuzzy msgid "Downgrade the following packages:" msgstr "Slijedeći paketi su OŠTEĆENI:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 #, fuzzy msgid "Leave the following dependencies unresolved:" msgstr "Slijedeći paketi su OŠTEĆENI:" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, c-format msgid "Remove %s [<big>%s</big> (%s)]" msgstr "" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, fuzzy, c-format msgid "Install %s [<big>%s</big> (%s)]" msgstr "Verzija:" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, c-format msgid "Cancel the installation of %s" msgstr "" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, c-format msgid "Cancel the removal of %s" msgstr "" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, fuzzy, c-format msgid "Keep %s at version <big>%s</big> (%s)" msgstr "Verzija:" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, c-format msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, c-format msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, c-format msgid "<b>Remove</b> %s" msgstr "" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, c-format msgid "<b>remove</b> %s" msgstr "" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format msgid "<b>Keep</b> %s at version %s" msgstr "Verzija:" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format msgid "<b>keep</b> %s at version %s" msgstr "Verzija:" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, c-format msgid "<b>Cancel</b> the installation of %s" msgstr "" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, c-format msgid "<b>cancel</b> the installation of %s" msgstr "" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format msgid "<b>Install</b> %s %s" msgstr "Verzija:" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format msgid "<b>install</b> %s %s" msgstr "Verzija:" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format msgid "<b>Downgrade</b> %s to version %s" msgstr "Verzija:" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format msgid "<b>downgrade</b> %s to version %s" msgstr "Verzija:" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format msgid "<b>Upgrade</b> %s to version %s" msgstr "Verzija:" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format msgid "<b>upgrade</b> %s to version %s" msgstr "Verzija:" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format msgid "%s install" msgid_plural "%s installs" msgstr[0] "Automatski nadogradi instalirane pakete" msgstr[1] "Automatski nadogradi instalirane pakete" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, fuzzy, c-format msgid "%s remove" msgid_plural "%s removes" msgstr[0] "Automatski prikazuj zašto su paketi oštećeni" msgstr[1] "Automatski prikazuj zašto su paketi oštećeni" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, c-format msgid "%s keep" msgid_plural "%s keeps" msgstr[0] "" msgstr[1] "" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, c-format msgid "%s upgrade" msgid_plural "%s upgrades" msgstr[0] "" msgstr[1] "" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, c-format msgid "%s downgrade" msgid_plural "%s downgrades" msgstr[0] "" msgstr[1] "" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, fuzzy, c-format msgid "%s unresolved recommendation" msgid_plural "%s unresolved recommendations" msgstr[0] "Preporučuje" msgstr[1] "Preporučuje" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 msgid "No solutions yet." msgstr "" -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 msgid "No dependency solution was found." msgstr "" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 #, fuzzy msgid "No solutions." msgstr "Opcije" -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, fuzzy, c-format msgid "%u solutions." msgstr "Opcije" -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format msgid "Solution %s of %s." msgstr "Verzija:" @@ -5043,12 +5054,12 @@ msgstr "" #: src/main.cc:179 #, c-format -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5175,40 +5186,45 @@ msgstr "" #: src/main.cc:213 #, c-format -msgid " clean - Erase downloaded package files.\n" +msgid " versions - Displays the versions of specified packages.\n" msgstr "" #: src/main.cc:214 #, c-format -msgid " autoclean - Erase old downloaded package files.\n" +msgid " clean - Erase downloaded package files.\n" msgstr "" #: src/main.cc:215 #, c-format -msgid " changelog - View a package's changelog.\n" +msgid " autoclean - Erase old downloaded package files.\n" msgstr "" #: src/main.cc:216 #, c-format -msgid " download - Download the .deb file for a package.\n" +msgid " changelog - View a package's changelog.\n" msgstr "" #: src/main.cc:217 #, c-format +msgid " download - Download the .deb file for a package.\n" +msgstr "" + +#: src/main.cc:218 +#, c-format msgid "" " reinstall - Download and (possibly) reinstall a currently installed " "package.\n" msgstr "" -#: src/main.cc:218 +#: src/main.cc:219 #, c-format msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" -#: src/main.cc:220 +#: src/main.cc:221 #, c-format msgid "" " why-not - Show the manually installed packages that lead to a " @@ -5217,284 +5233,284 @@ msgid "" " lead to a conflict with the given package if installed.\n" msgstr "" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr "" -#: src/main.cc:225 +#: src/main.cc:226 #, c-format msgid " -h This help text.\n" msgstr "" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" -#: src/main.cc:231 +#: src/main.cc:232 #, c-format msgid " --qt Use the Qt GUI.\n" msgstr "" -#: src/main.cc:232 +#: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr "" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr "" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr "" -#: src/main.cc:236 +#: src/main.cc:237 #, fuzzy, c-format #| msgid "Prompt for confirmation at exit" -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr "Tražiti potvrdu prilikom izlaska" -#: src/main.cc:237 +#: src/main.cc:238 #, c-format msgid "" " -y Assume that the answer to simple yes/no questions is 'yes'.\n" msgstr "" -#: src/main.cc:238 +#: src/main.cc:239 #, c-format msgid "" " -F format Specify a format for displaying search results; see the " "manual.\n" msgstr "" -#: src/main.cc:239 +#: src/main.cc:240 #, c-format msgid "" " -O order Specify how search results should be sorted; see the " "manual.\n" msgstr "" -#: src/main.cc:240 +#: src/main.cc:241 #, c-format msgid "" " -w width Specify the display width for formatting search results.\n" msgstr "" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr "" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr "" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr "" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr "" -#: src/main.cc:245 +#: src/main.cc:246 #, c-format msgid "" " -v Display extra information. (may be supplied multiple " "times).\n" msgstr "" -#: src/main.cc:246 +#: src/main.cc:247 #, c-format msgid "" " -t [release] Set the release from which packages should be installed.\n" msgstr "" -#: src/main.cc:247 +#: src/main.cc:248 #, c-format msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" -#: src/main.cc:249 +#: src/main.cc:250 #, c-format msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr "" -#: src/main.cc:250 +#: src/main.cc:251 #, c-format msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr "" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr "" -#: src/main.cc:254 src/main.cc:256 +#: src/main.cc:255 src/main.cc:257 #, c-format -msgid " (terminal interface only)" +msgid " (terminal interface only)\n" msgstr "" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr "" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 msgid "trace" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 msgid "info" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 msgid "error" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 msgid "fatal" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " "\"warn\", \"error\", \"fatal\", or \"off\")." msgstr "" -#: src/main.cc:487 +#: src/main.cc:488 #, c-format msgid "Invalid logger name \"%s\"." msgstr "" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "" -#: src/main.cc:802 +#: src/main.cc:794 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "" -#: src/main.cc:1039 +#: src/main.cc:1023 #, fuzzy #| msgid "Package: " msgid "first-package" msgstr "Paket:" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "" -#: src/main.cc:1043 +#: src/main.cc:1027 #, fuzzy msgid "all-packages" msgstr "Paket:" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -5502,40 +5518,41 @@ msgid "" "versions\"." msgstr "" -#: src/main.cc:1089 +#: src/main.cc:1073 msgid "" "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be " "specified\n" msgstr "" -#: src/main.cc:1098 +#: src/main.cc:1082 msgid "" "-u, -i, and --clean-on-startup may not be specified in command-line mode " "(eg, with 'install')" msgstr "" -#: src/main.cc:1115 +#: src/main.cc:1099 msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" "%s\n" msgstr "" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "" @@ -6369,161 +6386,165 @@ msgstr "" msgid "obsoletes" msgstr "" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr "" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." msgstr "" -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" msgstr "" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." msgstr "" -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" msgstr "" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "" -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "" -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "" -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "" -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." msgstr "" -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "" -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "" -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "" -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "" -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "" -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" msgstr "" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " "installed version:" msgstr "" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." msgstr "" -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" msgstr "" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." msgstr "" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " "be broken if it is %s." msgstr "" -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." msgstr "" -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -6558,51 +6579,51 @@ msgstr "" msgid "Close" msgstr "" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 #, fuzzy msgid "%BRemove%b the following packages:%n" msgstr "Slijedeći paketi su OŠTEĆENI:" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 #, fuzzy msgid "%BInstall%b the following packages:%n" msgstr "Slijedeći paketi su OŠTEĆENI:" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 #, fuzzy msgid "%BUpgrade%b the following packages:%n" msgstr "Slijedeći paketi su OŠTEĆENI:" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 #, fuzzy msgid "%BDowngrade%b the following packages:%n" msgstr "Slijedeći paketi su OŠTEĆENI:" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, fuzzy, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "Slijedeći paketi su OŠTEĆENI:" @@ -6701,10 +6722,6 @@ msgstr "" msgid "W:" msgstr "" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7039,7 +7056,7 @@ msgid "Error while dumping resolver state" msgstr "" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "" #: src/ui.cc:2265 @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: aptitude 0.4.11.9\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" -"PO-Revision-Date: 2008-09-19 00:45+0200\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" +"PO-Revision-Date: 2012-02-01 01:15+0800\n" "Last-Translator: Jordi Mallach <jordi@debian.org>\n" "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n" "Language: ca\n" @@ -18,42 +18,35 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n!=1;\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" -msgstr "" -"%BOpció:%b %s\n" -"%BPredeterminat:%b %s\n" -"%BValor:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " +msgstr "%BOpció:%b " + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " +msgstr "%BPredeterminat:%b " -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "Cert" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "Fals" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " -msgstr "%BOpció:%b " - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "%BPredeterminat:%b " - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "%BValor:%b " -#: src/apt_config_treeitems.cc:279 +#: src/apt_config_treeitems.cc:280 #, c-format -msgid "Editing \"%ls\"" -msgstr "S'està editant «%ls»" +msgid "Editing \"%ls\": " +msgstr "S'està editant «%ls»: " -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "%BSelecció:%b " @@ -537,8 +530,8 @@ msgstr "S'ha produït un error fatal al sistema de resolució" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] S'estan resolent les dependències" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "S'ha produït un error intern: solució nul·la no esperada." @@ -596,10 +589,9 @@ msgid "Unable to find the source package for \"%s\".\n" msgstr "No s'ha pogut trobar el paquet font per a «%s».\n" #: src/cmdline/cmdline_action.cc:212 -#, fuzzy, c-format -#| msgid "Unable to satisfy the build-depends: %s." +#, c-format msgid "Unable to satisfy the build-depends: %s.\n" -msgstr "No s'ha pogut satisfer les dependències de construcció: %s." +msgstr "No s'ha pogut satisfer les dependències de construcció: %s.\n" #: src/cmdline/cmdline_action.cc:249 #, c-format @@ -832,7 +824,7 @@ msgstr "" "ho amb --full-resolver.\n" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "Avorta.\n" @@ -884,28 +876,22 @@ msgid "Err" msgstr "Err " #: src/cmdline/cmdline_download_progress_display.cc:211 -#, fuzzy, c-format -#| msgid "Fetched %sB in %s (%sB/s)\n" +#, c-format msgid "Fetched %sB in %s (%sB/s)" -msgstr "S'han obtingut %sB en %s (%sB/s)\n" +msgstr "S'han obtingut %sB en %s (%sB/s)" #: src/cmdline/cmdline_download_progress_display.cc:230 -#, fuzzy, c-format -#| msgid "" -#| "Media Change: Please insert the disc labeled '%s' in the drive '%s' and " -#| "press [Enter].\n" +#, c-format msgid "" "Media change: Please insert the disc labeled '%s' into the drive '%s' and " "press [Enter]." msgstr "" "Canvi del medi: introduïu el disc amb l'etiqueta «%s» a la unitat «%s» i feu " -"clic en [Retorn].\n" +"clic en [Retorn]." #: src/cmdline/cmdline_download_progress_display.cc:435 -#, fuzzy -#| msgid " [Working]" msgid "[Working]" -msgstr " [S'està treballant]" +msgstr "[S'està treballant]" #: src/cmdline/cmdline_extract_cache_subset.cc:56 #, c-format @@ -1197,7 +1183,7 @@ msgstr "" "No s'ha trobat cap paquet a mostrar -- introduïu els noms dels paquets a la " "línia a continuació de 'i'.\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "Per continuar premeu la tecla de retorn." @@ -1208,10 +1194,6 @@ msgstr "" "No s'ha trobat cap paquet -- introduïu els noms dels paquets a la línia a " "continuació de 'c'.\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "Per continuar premeu la tecla de retorn." - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1513,13 +1495,13 @@ msgstr "L'estat del sistema de resolució s'ha desat correctament!" #: src/cmdline/cmdline_resolver.cc:222 #, fuzzy, c-format #| msgid "" -#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: " +#| "y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: " #| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: %F" +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: %F" "%n<ACCIÓ> pkg... : %F%n%F%F%F%F%F%F%F%F" #: src/cmdline/cmdline_resolver.cc:243 @@ -1777,7 +1759,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created." msgstr "" #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "S'estan resolent les dependències..." @@ -1813,10 +1795,11 @@ 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:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +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]" +"provar\n" +"amb més insistència? [Y/n] " #: src/cmdline/cmdline_resolver.cc:1080 msgid "Invalid response; please enter 'y' or 'n'." @@ -1882,8 +1865,7 @@ msgid "but %s is installed." msgstr "però el %s està instal·lat." #: src/cmdline/cmdline_show_broken.cc:85 -#, fuzzy, c-format -#| msgid "but it is not installable" +#, c-format msgid "but it is not installable." msgstr "però no es pot instal·lar." @@ -1988,16 +1970,14 @@ msgid " [held]" msgstr " [retingut]" #: src/cmdline/cmdline_show.cc:325 -#, fuzzy, c-format -#| msgid "%s; will be installed" +#, c-format msgid "%s%s; will be installed" -msgstr "%s; s'instal·larà" +msgstr "%s%s; s'instal·larà" #: src/cmdline/cmdline_show.cc:327 -#, fuzzy, c-format -#| msgid "%s; will be installed automatically" +#, c-format msgid "%s%s; will be installed automatically" -msgstr "%s; s'instal·larà automàticament" +msgstr "%s%s; s'instal·larà automàticament" #: src/cmdline/cmdline_show.cc:347 #, c-format @@ -2018,7 +1998,7 @@ msgstr "Paquet: " msgid "State" msgstr "Estat" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "Proporcionat per" @@ -2126,27 +2106,31 @@ msgstr "Substitueix" msgid "Obsoletes" msgstr "Obsolet" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Proporciona" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Descripció: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "" -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "No s'ha pogut ubicar el paquet %s" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "No s'ha pogut analitzar el patró %s" @@ -2276,10 +2260,9 @@ msgid "Archive %s:" msgstr "Arxiu" #: src/cmdline/cmdline_versions.cc:294 -#, fuzzy, c-format -#| msgid "No such package \"%s\".\n" +#, c-format msgid "No such package \"%s\"." -msgstr "El paquet «%s» no existeix.\n" +msgstr "El paquet «%s» no existeix." #: src/cmdline/cmdline_versions.cc:494 msgid "--group-by|archive" @@ -2454,18 +2437,22 @@ msgid "Unable to parse some match patterns." msgstr "No s'ha pogut analitzar alguns patrons de coincidència." #: src/cmdline/cmdline_why.cc:1417 -#, fuzzy, c-format -#| msgid "" -#| "%s: this command requires at least one argument (the package to query)." +#, c-format msgid "" "%s: this command requires at least one argument (the package to query).\n" msgstr "" -"%s: aquesta ordre requereix almenys un argument (el paquet a consultar)." +"%s: aquesta ordre requereix almenys un argument (el paquet a consultar).\n" #: src/cmdline/cmdline_why.h:212 msgid "Unknown version selection, something is very wrong." msgstr "" +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "L'operació %s no és vàlida" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "" @@ -2484,7 +2471,7 @@ msgstr "[Error]" msgid "UNSATISFIED" msgstr "No satisfetes" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "No disponible" @@ -2492,7 +2479,7 @@ msgstr "No disponible" msgid "Tags" msgstr "Marcadors" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "Marcadors d'usuari" @@ -2900,16 +2887,21 @@ msgstr "No s'ha pogut ubicar el paquet %s" msgid "Unable to open %s to log actions" msgstr "No s'ha pogut obrir el %s per registrar les accions" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "S'ha produït un error en generar l'hora local (%s)" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "informe del registre" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -2920,81 +2912,81 @@ msgstr "" "que no es realitzen correctament arran de problemes del dpkg no es " "completaran.\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "S'instal·laran %li paquets i se'n suprimiran %li.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "s'utilitzarà %sB d'espai en disc\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "s'alliberarà %sB d'espai en disc\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[Actualitza] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[Desactualitza] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "Suprimeix" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "Instal·la" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "Reinstal·la" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "Retingut" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "Trencats" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "Suprimeix, no utilitzat" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "Suprimeix, dependències" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "Instal·la, dependències" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "Retingut, dependències" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "No configurat" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -3017,39 +3009,39 @@ msgstr "" msgid "Filtering packages" msgstr "S'estan baixant les paquets" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "El tipus d'acció és desconegut: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "Cadena literal inacabada a continuació de %s" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "La prioritat %s és desconeguda" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "" -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "S'esperava «%c», s'ha obtingut «%c»." -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "El tipus de dependència és desconegut: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, fuzzy, c-format #| msgid "Unknown matcher type: \"%s\"." msgid "Unknown term type: \"%s\"." @@ -3057,41 +3049,41 @@ msgstr "El tipus de coincidència és desconegut: «%s»." #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, c-format msgid "" "The ?%s term must be used in a \"wide\" context (a top-level context, or a " "context enclosed by ?%s)." msgstr "" -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "«(» no emparellat" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "Proporciona: no hi pot haver errors" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "El tipus de patró és desconegut: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "No es pot cercar \"\"" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "L'expressió, inesperadament, és buida" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, fuzzy, c-format #| msgid "Badly formed expression" msgid "Badly formed expression: expected '|', got '%c'" msgstr "L'expressió està mal formada" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "El ')' és inesperat" @@ -4054,22 +4046,22 @@ msgid "%s: Unable to accept a connection: %s" msgstr "" "No s'ha pogut crear el directori temporal a partir de la plantilla \"%s\": %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4796,7 +4788,7 @@ msgstr "" msgid "Virtual package" msgstr "Paquet" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "No instal·lat" @@ -4966,163 +4958,169 @@ msgstr "%s substitueix %s" msgid "%s obsoletes %s" msgstr "%s deixa obsolet %s" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s substitueix %s" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "Suprimeix els següents paquets:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "Instal·la els següents paquets:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 #, fuzzy #| msgid "Remove the following packages:" msgid "Keep the following packages:" msgstr "Suprimeix els següents paquets:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "Actualitza els següents paquets:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "Desactualitza els següents paquets:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 #, fuzzy #| msgid "Leave the following dependencies unresolved:%n" msgid "Leave the following dependencies unresolved:" msgstr "Deixa les dependències següents pendents de resolució:%n" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, fuzzy, c-format #| msgid "Remove %F [%s (%s)]" msgid "Remove %s [<big>%s</big> (%s)]" msgstr "Suprimeix %F [%s (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "Install %s [<big>%s</big> (%s)]" msgstr "Instal·la %F [%s (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "Cancel the installation of %s" msgstr "Cancel·la la instal·lació de %F" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Cancel the removal of %s" msgstr "Cancel·la la supressió de %F" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "Keep %s at version <big>%s</big> (%s)" msgstr "Mantín %F a la versió %s (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, fuzzy, c-format #| msgid "Upgrade %F [%s (%s) -> %s (%s)]" msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Actualitza %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, fuzzy, c-format #| msgid "Downgrade %F [%s (%s) -> %s (%s)]" msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Desactualitza %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>Remove</b> %s" msgstr "Suprimeix(%s)" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>remove</b> %s" msgstr "Suprimeix(%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>Keep</b> %s at version %s" msgstr "Mantín %F a la versió %s (%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>keep</b> %s at version %s" msgstr "Mantín %F a la versió %s (%s)" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>Cancel</b> the installation of %s" msgstr "Cancel·la la instal·lació de %F" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>cancel</b> the installation of %s" msgstr "Cancel·la la instal·lació de %F" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>Install</b> %s %s" msgstr "Instal·la %F [%s (%s)]" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>install</b> %s %s" msgstr "Instal·la %F [%s (%s)]" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "<b>Downgrade</b> %s to version %s" msgstr " Versió de les cwidget: %s\n" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "<b>downgrade</b> %s to version %s" msgstr " Versió de les cwidget: %s\n" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>Upgrade</b> %s to version %s" msgstr "%s versions" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>upgrade</b> %s to version %s" msgstr "%s versions" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format #| msgid "%d install" #| msgid_plural "%d installs" @@ -5131,7 +5129,7 @@ msgid_plural "%s installs" msgstr[0] "%d instal·lació" msgstr[1] "%d instal·lacions" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, fuzzy, c-format #| msgid "%d removal" #| msgid_plural "%d removals" @@ -5140,7 +5138,7 @@ msgid_plural "%s removes" msgstr[0] "%d supressió" msgstr[1] "%d supressions" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, fuzzy, c-format #| msgid "%d keep" #| msgid_plural "%d keeps" @@ -5149,7 +5147,7 @@ msgid_plural "%s keeps" msgstr[0] "%d mantingut" msgstr[1] "%d mantinguts" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, fuzzy, c-format #| msgid "%d upgrade" #| msgid_plural "%d upgrades" @@ -5158,7 +5156,7 @@ msgid_plural "%s upgrades" msgstr[0] "%d actualitzat" msgstr[1] "%d actualitzats" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, fuzzy, c-format #| msgid "%d downgrade" #| msgid_plural "%d downgrades" @@ -5167,7 +5165,7 @@ msgid_plural "%s downgrades" msgstr[0] "$d desactualitzat" msgstr[1] "%d desactualitzats" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, fuzzy, c-format #| msgid "Audit ^Recommendations" msgid "%s unresolved recommendation" @@ -5175,35 +5173,35 @@ msgid_plural "%s unresolved recommendations" msgstr[0] "Audita les ^recomanacions" msgstr[1] "Audita les ^recomanacions" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 #, fuzzy #| msgid "No more solutions." msgid "No solutions yet." msgstr "No hi ha més solucions." -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 #, fuzzy #| msgid "Dependency handling" msgid "No dependency solution was found." msgstr "Gestió de les dependències" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 #, fuzzy #| msgid "No more solutions." msgid "No solutions." msgstr "No hi ha més solucions." -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, fuzzy, c-format #| msgid "No more solutions." msgid "%u solutions." msgstr "No hi ha més solucions." -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Could not open file \"%s\"" msgid "Solution %s of %s." @@ -5522,12 +5520,12 @@ msgstr " Suport d'ept inhabilitat\n" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s compilat el %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5579,49 +5577,41 @@ msgstr "" "\n" #: src/main.cc:198 -#, fuzzy, c-format -#| msgid " install - Install/upgrade packages\n" +#, c-format msgid " install - Install/upgrade packages.\n" -msgstr " install - Instal·la/actualitza els paquets\n" +msgstr " install - Instal·la/actualitza els paquets.\n" #: src/main.cc:199 -#, fuzzy, c-format -#| msgid " remove - Remove packages\n" +#, c-format msgid " remove - Remove packages.\n" -msgstr " remove - Suprimeix els paquets\n" +msgstr " remove - Suprimeix els paquets.\n" #: src/main.cc:200 -#, fuzzy, c-format -#| msgid " purge - Remove packages and their configuration files\n" +#, c-format msgid " purge - Remove packages and their configuration files.\n" msgstr "" -" purge - Suprimeix els paquets i els corresponents fitxers de " -"configuració\n" +" purge - Suprimeix els paquets i els corresponents fitxers de\n" +" configuració.\n" #: src/main.cc:201 -#, fuzzy, c-format -#| msgid " hold - Place packages on hold\n" +#, c-format msgid " hold - Place packages on hold.\n" -msgstr " hold - Deixa els paquets retinguts\n" +msgstr " hold - Deixa els paquets retinguts.\n" #: src/main.cc:202 -#, fuzzy, c-format -#| msgid " unhold - Cancel a hold command for a package\n" +#, c-format msgid " unhold - Cancel a hold command for a package.\n" -msgstr " unhold - Cancel·la l'ordre de retenció d'un paquet\n" +msgstr " unhold - Cancel·la l'ordre de retenció d'un paquet.\n" #: src/main.cc:203 -#, fuzzy, c-format -#| msgid "" -#| " markauto - Mark packages as having been automatically installed\n" +#, c-format msgid " markauto - Mark packages as having been automatically installed.\n" -msgstr " markauto - Marca els paquets com a instal·lats automàticament\n" +msgstr " markauto - Marca els paquets com a instal·lats automàticament.\n" #: src/main.cc:204 -#, fuzzy, c-format -#| msgid " unmarkauto - Mark packages as having been manually installed\n" +#, c-format msgid " unmarkauto - Mark packages as having been manually installed.\n" -msgstr " unmarkauto - Marca els paquets com a instal·lats manualment\n" +msgstr " unmarkauto - Marca els paquets com a instal·lats manualment.\n" #: src/main.cc:205 #, c-format @@ -5633,18 +5623,17 @@ msgstr "" "paquet.\n" #: src/main.cc:206 -#, fuzzy, c-format -#| msgid " update - Download lists of new/upgradable packages\n" +#, c-format msgid " update - Download lists of new/upgradable packages.\n" -msgstr " update - Baixa les llistes dels paquets nous/actualitzables\n" +msgstr " update - Baixa les llistes dels paquets nous/actualitzables.\n" #: src/main.cc:207 -#, fuzzy, c-format -#| msgid " safe-upgrade - Perform a safe upgrade\n" +#, c-format msgid " safe-upgrade - Perform a safe upgrade.\n" -msgstr " safe-upgrade - Realitza una actualització segura\n" +msgstr " safe-upgrade - Realitza una actualització segura.\n" #: src/main.cc:208 +#, c-format msgid "" " full-upgrade - Perform an upgrade, possibly installing and removing " "packages.\n" @@ -5659,71 +5648,67 @@ msgid " build-dep - Install the build-dependencies of packages.\n" msgstr "«&BD» per a instal·lar les dependències de construcció d'un paquet." #: src/main.cc:210 -#, fuzzy, c-format -#| msgid " forget-new - Forget what packages are \"new\"\n" +#, c-format msgid " forget-new - Forget what packages are \"new\".\n" -msgstr " forget-new - Oblida quins paquets són \"nous\"\n" +msgstr " forget-new - Oblida quins paquets són \"nous\".\n" #: src/main.cc:211 -#, fuzzy, c-format -#| msgid " search - Search for a package by name and/or expression\n" +#, c-format msgid " search - Search for a package by name and/or expression.\n" -msgstr " search - Cerca un paquet pel seu nom i/o expressió\n" +msgstr " search - Cerca un paquet pel seu nom i/o expressió.\n" #: src/main.cc:212 -#, fuzzy, c-format -#| msgid " show - Display detailed information about a package\n" +#, c-format msgid " show - Display detailed information about a package.\n" -msgstr " show - Mostra informació detallada d'un paquet\n" +msgstr " show - Mostra informació detallada d'un paquet.\n" #: src/main.cc:213 #, fuzzy, c-format -#| msgid " clean - Erase downloaded package files\n" -msgid " clean - Erase downloaded package files.\n" -msgstr " clean - Suprimeix els fitxers dels paquets baixats\n" +#| msgid " show - Display detailed information about a package\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - Mostra informació detallada d'un paquet\n" #: src/main.cc:214 -#, fuzzy, c-format -#| msgid " autoclean - Erase old downloaded package files\n" -msgid " autoclean - Erase old downloaded package files.\n" -msgstr " autoclean - Suprimeix els fitxers dels paquets baixats antics\n" +#, c-format +msgid " clean - Erase downloaded package files.\n" +msgstr " clean - Suprimeix els fitxers dels paquets baixats.\n" #: src/main.cc:215 -#, fuzzy, c-format -#| msgid " changelog - View a package's changelog\n" -msgid " changelog - View a package's changelog.\n" -msgstr " changelog - Visualitza un registre de canvis d'un paquet\n" +#, c-format +msgid " autoclean - Erase old downloaded package files.\n" +msgstr " autoclean - Suprimeix els fitxers dels paquets baixats antics.\n" #: src/main.cc:216 -#, fuzzy, c-format -#| msgid " download - Download the .deb file for a package\n" -msgid " download - Download the .deb file for a package.\n" -msgstr " download - Baixa el fitxer .deb d'un paquet\n" +#, c-format +msgid " changelog - View a package's changelog.\n" +msgstr " changelog - Visualitza un registre de canvis d'un paquet.\n" #: src/main.cc:217 -#, fuzzy, c-format -#| msgid "" -#| " reinstall - Download and (possibly) reinstall a currently installed " -#| "package\n" +#, c-format +msgid " download - Download the .deb file for a package.\n" +msgstr " download - Baixa el fitxer .deb d'un paquet.\n" + +#: src/main.cc:218 +#, c-format msgid "" " reinstall - Download and (possibly) reinstall a currently installed " "package.\n" msgstr "" -" reinstall - Descarrega i (possiblament) torna a instal·lar un paquet ja " -"instal·lat\n" +" reinstall - Descarrega i (possiblament) torna a instal·lar un paquet ja\n" +" instal·lat.\n" -#: src/main.cc:218 -#, fuzzy, c-format +#: src/main.cc:219 +#, c-format msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " why - Mostra els paquets instal·lats manualment que requereix un\n" " paquet, o per què un o més paquets requeriria el paquet " -"donat\n" +"donat.\n" -#: src/main.cc:220 +#: src/main.cc:221 #, fuzzy, c-format msgid "" " why-not - Show the manually installed packages that lead to a " @@ -5735,112 +5720,99 @@ msgstr "" " paquet, o per què un o més paquets requeriria el paquet " "donat\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " Opcions:\n" -#: src/main.cc:225 -#, fuzzy, c-format -#| msgid " -h This help text\n" +#: src/main.cc:226 +#, c-format msgid " -h This help text.\n" -msgstr " -h Aquest text d'ajuda\n" +msgstr " -h Aquest text d'ajuda.\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h Aquest text d'ajuda\n" -#: src/main.cc:232 +#: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr "" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s Simula les accions però no les duguis a terme.\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr " -d Baixa els paquets però n'instal·lis o suprimeixis cap.\n" -#: src/main.cc:236 -#, fuzzy, c-format -#| msgid " -P Always prompt for confirmation or actions\n" -msgid " -P Always prompt for confirmation or actions.\n" -msgstr " -P Pregunta permanentment les confirmacions o accions\n" - #: src/main.cc:237 -#, fuzzy, c-format -#| msgid "" -#| " -y Assume that the answer to simple yes/no questions is " -#| "'yes'\n" +#, c-format +msgid " -P Always prompt for confirmation of actions.\n" +msgstr " -P Pregunta permanentment les confirmacions o accions.\n" + +#: src/main.cc:238 +#, c-format msgid "" " -y Assume that the answer to simple yes/no questions is 'yes'.\n" msgstr "" -" -y Assumeix que la resposta a les preguntes sí/noo és 'sí'\n" +" -y Assumeix que la resposta a les preguntes sí/noo és 'sí'.\n" -#: src/main.cc:238 -#, fuzzy, c-format -#| msgid "" -#| " -F format Specify a format for displaying search results; see the " -#| "manual\n" +#: src/main.cc:239 +#, c-format msgid "" " -F format Specify a format for displaying search results; see the " "manual.\n" msgstr "" -" -F format Especifica un format per a la visualització dels resultats " -"de la cerca; fes una ullada al manual\n" +" -F format Especifica un format per a la visualització dels resultats\n" +" de la cerca; fes una ullada al manual.\n" -#: src/main.cc:239 -#, fuzzy, c-format -#| msgid "" -#| " -O order Specify how search results should be sorted; see the " -#| "manual\n" +#: src/main.cc:240 +#, c-format msgid "" " -O order Specify how search results should be sorted; see the " "manual.\n" msgstr "" -" -O ordre Especifica el mode en que s'han d'ordenar els resultats de " -"la cerca, fes una ullada al manual\n" +" -O ordre Especifica el mode en que s'han d'ordenar els resultats\n" +" de la cerca; fes una ullada al manual.\n" -#: src/main.cc:240 +#: src/main.cc:241 #, fuzzy, c-format -#| msgid "" -#| " -w width Specify the display width for formatting search results\n" msgid "" " -w width Specify the display width for formatting search results.\n" msgstr "" -" -w amplada Especifica l'amplada de la visualització pel formatat dels " -"resultats de la cerca\n" +" -w amplada Especifica l'amplada de la visualització pel formatat dels\n" +" resultats de la cerca.\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr " -f Intent agressiu de resoldre els errors dels paquets.\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr " -V Mostra les versions dels programes a instal·lar.\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" @@ -5848,88 +5820,80 @@ msgstr "" " -D Mostra les dependències dels paquets modificats " "automàticament.\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr " -Z Mostra els canvis de la mida instal·lada per a cada paquet.\n" -#: src/main.cc:245 -#, fuzzy, c-format -#| msgid "" -#| " -v Display extra information. (may be supplied multiple " -#| "times)\n" +#: src/main.cc:246 +#, c-format msgid "" " -v Display extra information. (may be supplied multiple " "times).\n" -msgstr " -v Mostra la informació extra. (s'utilitza múltiples vegades)\n" +msgstr "" +" -v Mostra la informació extra. (s'utilitza múltiples vegades).\n" -#: src/main.cc:246 -#, fuzzy, c-format -#| msgid "" -#| " -t [release] Set the release from which packages should be installed\n" +#: src/main.cc:247 +#, c-format msgid "" " -t [release] Set the release from which packages should be installed.\n" msgstr "" -" -t [versió] Especifica la versió de llançament de la qual s'haurien " -"d'instal·lar les paquets\n" +" -t [versió] Especifica la versió de llançament de la qual s'haurien\n" +" d'instal·lar les paquets.\n" -#: src/main.cc:247 -#, fuzzy, c-format +#: src/main.cc:248 +#, c-format msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" -" -q En mode línies d'ordres, suprimeix els indicadors de progrés " -"incremental.\n" +" -q En mode línies d'ordres, suprimeix els indicadors de progrés\n" +" incremental.\n" -#: src/main.cc:249 -#, fuzzy, c-format -#| msgid " -o key=val Directly set the configuration option named 'key'\n" +#: src/main.cc:250 +#, c-format msgid " -o key=val Directly set the configuration option named 'key'.\n" -msgstr " -o clau=val Defineix directament l'opció de configuració 'clau'\n" +msgstr " -o clau=val Defineix directament l'opció de configuració 'clau'.\n" -#: src/main.cc:250 -#, fuzzy, c-format -#| msgid "" -#| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" -#| " strong dependencies\n" +#: src/main.cc:251 +#, c-format msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends Especifica si s'han de tractar o no les " -"recomanacions com\n" -" dependències fortes\n" +"recomanacions\n" +" com dependències fortes.\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr "" " -S nomf: Llegeix la informació d'estat estesa de l'aptitude del nom.\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u : Baixa una nova llista de paquets a l'inici.\n" -#: src/main.cc:254 src/main.cc:256 -#, c-format -msgid " (terminal interface only)" -msgstr "" +#: src/main.cc:255 src/main.cc:257 +#, fuzzy, c-format +msgid " (terminal interface only)\n" +msgstr " -h Aquest text d'ajuda\n" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr "-i : Executa la instal·lació a l'inici.\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " L'aptitude no té super poders bovins.\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 #, fuzzy #| msgid "true" msgid "trace" @@ -5937,13 +5901,13 @@ msgstr "cert" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 #, fuzzy #| msgid "no" msgid "info" @@ -5951,13 +5915,13 @@ msgstr "no" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 #, fuzzy #| msgid "Err " msgid "error" @@ -5965,7 +5929,7 @@ msgstr "Err " #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 #, fuzzy #| msgid "false" msgid "fatal" @@ -5973,95 +5937,95 @@ msgstr "fals" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " "\"warn\", \"error\", \"fatal\", or \"off\")." msgstr "" -#: src/main.cc:487 +#: src/main.cc:488 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "Invalid logger name \"%s\"." msgstr "L'operació %s no és vàlida" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "S'esperava un número a continuació de -q=\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "S'esperava un número a continuació de -q=, s'ha obtingut %s\n" -#: src/main.cc:802 -#, fuzzy, c-format +#: src/main.cc:794 +#, c-format msgid "-o requires an argument of the form key=value, got %s\n" -msgstr "-o precisa d'un argument del tipus clau=valor, s'ha obtingut %s" +msgstr "-o precisa d'un argument del tipus clau=valor, s'ha obtingut %s\n" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "Rar: s'ha rebut un codi d'opció desconegut\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "" -#: src/main.cc:1039 +#: src/main.cc:1023 #, fuzzy #| msgid "Package" msgid "first-package" msgstr "Paquet" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "" -#: src/main.cc:1043 +#: src/main.cc:1027 #, fuzzy #| msgid "All Packages" msgid "all-packages" msgstr "Tots els paquets" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -6069,7 +6033,7 @@ msgid "" "versions\"." msgstr "" -#: src/main.cc:1089 +#: src/main.cc:1073 #, fuzzy #| msgid "Only one of -u and -i may be specified\n" msgid "" @@ -6077,7 +6041,7 @@ msgid "" "specified\n" msgstr "Només es pot utilitzar un -u o -i\n" -#: src/main.cc:1098 +#: src/main.cc:1082 #, fuzzy #| msgid "" #| "-u and -i may not be specified in command-line mode (eg, with 'install')" @@ -6088,23 +6052,23 @@ msgstr "" "-u i -i no es poden utilitzar en el mode de línia d'ordres (ex, amb " "'install')" -#: src/main.cc:1115 +#: src/main.cc:1099 #, fuzzy #| msgid "-u and -i may not be specified with a command" msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "-u i -i no s'han d'utilitzar amb una ordre" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "Ordre desconeguda \"%s\"\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "Excepció no detectada: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, fuzzy, c-format msgid "" "Backtrace:\n" @@ -6113,7 +6077,8 @@ msgstr "" "Backtrace:\n" "%s" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "Cerca: " @@ -7011,24 +6976,28 @@ msgstr "substitueix" msgid "obsoletes" msgstr "obsolet" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (proporcionat per %F)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." msgstr "" "Si seleccioneu un paquet l'espai mostrarà una explicació de l'estat actual." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -7036,20 +7005,20 @@ msgstr "" "El paquet %B%s%b es va instal·lar automàticament. S'està suprimint perquè " "tots els paquets que en depenien s'estan suprimint:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "" "El paquet %B%s%b se suprimirà automàticament perquè s'han produït errors de " "dependències:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" "El paquet %B%s%b s'instal·larà automàticament per resoldre les dependències " "següents:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -7057,7 +7026,7 @@ msgstr "" "El paquet %B%s%b no es pot actualitzar ara mateix, però si fora possible, " "estaria retingut a la versió %B%s%b." -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -7065,27 +7034,27 @@ msgstr "" "El%B%s%b no s'actualitzarà a la versió %B%s%b per evitar trencar les " "dependències següents:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "El paquet %B%s%b està instal·lat." -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "El paquet %B%s%b no està instal·lat." -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "Algunes dependències del paquet %B%s%b no estan resoltes:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "El paquet %B%s%b es desactualitzarà." -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b no s'actualitzarà a la versió prohibida %B%s%b." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." @@ -7093,41 +7062,41 @@ msgstr "" "El paquet %B%s%b es podria actualitzar a la versió %B%s%b, però està " "retingut a la versió %B%s%b." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "Es tornarà a instal·lar el paquet %B%s%b." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "S'instal·larà el paquet %B%s%b." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "Se suprimirà el paquet %B%s%b." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "" "S'actualitzarà el paquet %B%s%b de la versió %B%s%b a la versió %B%s%b." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "" "El paquet %B%s%b només està instal·lat parcialment, es completarà la seua " "instal·lació." -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "" "El següents paquets depenen de %B%s%b i contindran errors arran de la " "supressió:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "El següents paquets depen de %B%s%b i contenen error:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" @@ -7135,7 +7104,7 @@ msgstr "" "Els següents paquets entren en conflicte amb el %B%s%b i contindran errors " "arran de la instal·lació:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -7144,7 +7113,7 @@ msgstr "" "Els següents paquets depèn d'una versió del %B%s%b diferent a l'instal·lada " "%B%s%b o entren en conflicte amb la versió instal·lada:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -7152,11 +7121,11 @@ msgstr "" "Els paquets següents entren en conflicte amb el %B%s%b, o en depenen d'una " "versió que no s'instal·larà." -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "El següents paquets entren en conflicte amb el %B%s%b:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -7164,22 +7133,22 @@ msgstr "" "Els següents paquets depenen d'una versió del %B%s%b diferent a la versió " "instal·lada actual del %B%s%b:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." msgstr "" "Els següents paquets depenen d'una versió del %B%s%b que no s'instal·larà." -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "actualitzat" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "desactualitzat" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7189,7 +7158,7 @@ msgstr "" "instal·lada, o entren en conflicte amb la versió que es %s a (%B%s%b) i es " "trencarà si es %s." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7197,7 +7166,7 @@ msgstr "" "Els següents paquets entren en conflicte amb la versió %B%s%b del %B%s%b i " "contindran errors si és %s." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7233,47 +7202,47 @@ msgstr "Aplica" msgid "Close" msgstr "Tanca" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s entra en conflicte amb %s [proporcionat per %s %s]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "S'està suprimint %s" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "S'està instal·lant %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%BSuprimeix%b els següents paquets:%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%BInstal·la%b els següents paquets:%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%BMantín%b la versió actual dels següents paquets:%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%BActualitza%b els següents paquets:%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%BDesactualitza%b els següents paquets:%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "Deixa les dependències següents pendents de resolució:%n" @@ -7372,10 +7341,6 @@ msgstr "E:" msgid "W:" msgstr "W:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "Cerca:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7759,8 +7724,8 @@ msgid "Error while dumping resolver state" msgstr "S'ha produït un error en volcar l'estat del sistema de resolució" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" -msgstr "Fitxer on s'ha de volcar l'estat del sistema de resolució:" +msgid "File to which the resolver state should be dumped: " +msgstr "Fitxer on s'ha de volcar l'estat del sistema de resolució: " #: src/ui.cc:2265 msgid "^Install/remove packages" @@ -8407,11 +8372,6 @@ msgstr "" #~ msgid "gtk-yes" #~ msgstr "sí" -#, fuzzy -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "L'operació %s no és vàlida" - #~ msgid "but it is not installable" #~ msgstr "però no es pot instal·lar." @@ -8586,10 +8546,6 @@ msgstr "" #~ " lead to a conflict with the given package if installed\n" #~ msgstr " -V Mostra les versions dels programes a instal·lar.\n" -#, fuzzy -#~ msgid " indicators.\n" -#~ msgstr " -h Aquest text d'ajuda\n" - #~ msgid "Downloading " #~ msgstr "S'està baixant" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2009-09-05 10:59+0200\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" @@ -17,42 +17,36 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" -msgstr "" -"%BVolba:%b %s\n" -"%BVýchozí:%b %s\n" -"%BHodnota:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " +msgstr "%BVolba:%b " + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " +msgstr "%BVýchozí:%b " -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "Povoleno" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "Zakázáno" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " -msgstr "%BVolba:%b " - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "%BVýchozí:%b " - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "%BHodnota:%b " -#: src/apt_config_treeitems.cc:279 -#, c-format -msgid "Editing \"%ls\"" +#: src/apt_config_treeitems.cc:280 +#, fuzzy, c-format +#| msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "Upravuji „%ls“" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "%BMožnost:%b " @@ -628,8 +622,8 @@ msgstr "Fatální chyba v řešiteli" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] Řeším závislosti" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "Vnitřní chyba: neočekávané prázdné řešení." @@ -919,7 +913,7 @@ msgid "" msgstr "Nemohu vyřešit závislosti, zkuste parametr --full-resolver.\n" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "Přerušeno.\n" @@ -1284,7 +1278,7 @@ msgstr "Po rozbalení bude uvolněno %sB.\n" msgid "No packages to show -- enter the package names on the line after 'i'.\n" msgstr "Není co zobrazit -- zadejte názvy balíků na řádek za „i“.\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "Pro pokračování stiskněte Enter." @@ -1293,10 +1287,6 @@ msgstr "Pro pokračování stiskněte Enter." msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "Žádné balíky nenalezeny -- zadejte názvy balíků na řádek za „c“.\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "Pro pokračování stiskněte Enter" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1602,7 +1592,7 @@ msgstr "Stav řešitele byl úspěšně zapsán!" #| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: " #| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr balík verze ...: %F%na balík " @@ -1872,7 +1862,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created." msgstr "Chci řešit závislosti, ale žádný řešitel závislostí nebyl vytvořen." #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "Řeším závislosti..." @@ -1908,7 +1898,9 @@ 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:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +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:1080 @@ -2111,7 +2103,7 @@ msgstr "Balík: " msgid "State" msgstr "Stav" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "Poskytován" @@ -2219,27 +2211,31 @@ msgstr "Nahrazuje" msgid "Obsoletes" msgstr "Zastarává" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Poskytuje" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Popis: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "Domovská stránka: " -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "Nemohu nalézt balík %s" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "Nemohu zpracovat vzor %s" @@ -2558,6 +2554,11 @@ msgstr "%s: tento příkaz vyžaduje nejméně jeden argument (zkoumaný balík) msgid "Unknown version selection, something is very wrong." msgstr "Výběr neznámé verze, něco je velmi špadně." +#: src/cmdline_parse.cc:22 +#, c-format +msgid "Invalid command-line option '%s'" +msgstr "Neplatná volba „%s“" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "Neočekávaný konec souboru na standardním vstupu" @@ -2575,7 +2576,7 @@ msgstr "[CHYBA]" msgid "UNSATISFIED" msgstr "NESPLNĚNO" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "NEDOSTUPNÝ" @@ -2583,7 +2584,7 @@ msgstr "NEDOSTUPNÝ" msgid "Tags" msgstr "Štítky" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "Uživatelské štítky" @@ -2985,16 +2986,21 @@ msgstr "Nemohu vytvořit ořezanou cache: %s." msgid "Unable to open %s to log actions" msgstr "Nemohu otevřít %s pro záznam akcí" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "Chyba při vytváření místního času (%s)" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "záznam hlášení" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -3005,81 +3011,81 @@ msgstr "" "kvůli problémům v dpkg nemusí být dokončeny.\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "Budu instalovat %li balíků a odstraňovat %li balíků.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "%sB místa na disku bude použito\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "%sB místa na disku bude uvolněno\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[AKTUALIZACE] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[DEGRADACE] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "ODSTRANIT" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "INSTALOVAT" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "REINSTALOVAT" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "PODRŽET" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "PORUŠENÝ" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "ODSTRANIT, NEPOUŽÍVANÝ" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "ODSTRANIT, ZÁVISLOSTI" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "INSTALOVAT, ZÁVISLOSTI" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "PODRŽET, ZÁVISLOSTI" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "NENAKONFIGUROVANÝ" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -3102,46 +3108,46 @@ msgstr "" msgid "Filtering packages" msgstr "Stahuji balíky" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "Neznámá akce: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "Neukončený řetězec za %s" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "Neznámá priorita: %s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "Vyhledávací vzor skončil neočekávaně (očekáváno „%c“)." -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "Očekáván znak „%c“, obdržen „%c“." -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "Neznámý typ závislosti: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, c-format msgid "Unknown term type: \"%s\"." msgstr "Neznámý typ termu: „%s“." #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, c-format msgid "" "The ?%s term must be used in a \"wide\" context (a top-level context, or a " @@ -3150,33 +3156,33 @@ msgstr "" "Term ?%s se musí použít v „širokém“ kontextu (v nejvyšším kontextu, nebo v " "kontextu uzavřeném do ?%s)." -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "Nepárová „(“" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "Poskytuje: nemůže být porušený" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "Neznámý vzor: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "Nemohu hledat \"\"" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "Neočekávaný prázdný výraz" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, c-format msgid "Badly formed expression: expected '|', got '%c'" msgstr "Špatně zformulovaný výraz: očekáván „|“, obdržen „%c“" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "Neočekávaná „)“" @@ -4070,22 +4076,22 @@ msgstr "Interní chyba: jméno dočasného socketu „%s“ je příliš dlouhé msgid "%s: Unable to accept a connection: %s" msgstr "%s: Nelze přijmout spojení: %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "[%s] spouští se proces dpkg...\n" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "[%s] proces dpkg skončil.\n" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "[%s] proces dpkg selhal.\n" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "[%s] proces dpkg skončil; další balíky čekají na zpracování.\n" @@ -4725,7 +4731,7 @@ msgstr "" msgid "Virtual package" msgstr "Virtuální balík" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "Nenainstalovaný" @@ -4910,140 +4916,146 @@ msgstr "%s nahrazuje %s" msgid "%s obsoletes %s" msgstr "%s zastarává %s" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s nahrazuje %s" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "Odstranit následující balíky:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "Instalovat následující balíky:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 msgid "Keep the following packages:" msgstr "Ponechat následující balíky:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "Aktualizovat následující balíky:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "Degradovat následující balíky:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 msgid "Leave the following dependencies unresolved:" msgstr "Ponechat následující závislosti nevyřešené:" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, c-format msgid "Remove %s [<big>%s</big> (%s)]" msgstr "Odstranění %s [<big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, c-format msgid "Install %s [<big>%s</big> (%s)]" msgstr "Instalace %s [<big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, c-format msgid "Cancel the installation of %s" msgstr "Zrušení instalace %s" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, c-format msgid "Cancel the removal of %s" msgstr "Zrušení odstranění %s" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, c-format msgid "Keep %s at version <big>%s</big> (%s)" msgstr "Ponechání %s ve verzi <big>%s</big> (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, c-format msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Aktualizace %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, c-format msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Degradace %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, c-format msgid "<b>Remove</b> %s" msgstr "<b>Odstranění</b> %s" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, c-format msgid "<b>remove</b> %s" msgstr "<b>odstranění</b> %s" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, c-format msgid "<b>Keep</b> %s at version %s" msgstr "<b>Ponechání</b> %s ve verzi %s" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, c-format msgid "<b>keep</b> %s at version %s" msgstr "<b>ponechání</b> %s ve verzi %s" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, c-format msgid "<b>Cancel</b> the installation of %s" msgstr "<b>Zrušení</b> instalace %s" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, c-format msgid "<b>cancel</b> the installation of %s" msgstr "<b>zrušení</b> instalace %s" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, c-format msgid "<b>Install</b> %s %s" msgstr "<b>Instalace</b> %s %s" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, c-format msgid "<b>install</b> %s %s" msgstr "<b>instalace</b> %s %s" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>Downgrade</b> %s to version %s" msgstr "<b>Degradace</b> %s na verzi %s" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>downgrade</b> %s to version %s" msgstr "<b>degradace</b> %s na verzi %s" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>Upgrade</b> %s to version %s" msgstr "<b>Aktualizace</b> %s na verzi %s" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>upgrade</b> %s to version %s" msgstr "<b>aktualizace</b> %s na verzi %s" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "Ponechat závislost %s nevyřešenou" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "ponechat závislost %s nevyřešenou" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, c-format msgid "%s install" msgid_plural "%s installs" @@ -5051,7 +5063,7 @@ msgstr[0] "%s instalace" msgstr[1] "%s instalace" msgstr[2] "%s instalací" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, c-format msgid "%s remove" msgid_plural "%s removes" @@ -5059,7 +5071,7 @@ msgstr[0] "%s odstranění" msgstr[1] "%s odstranění" msgstr[2] "%s odstranění" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, c-format msgid "%s keep" msgid_plural "%s keeps" @@ -5067,7 +5079,7 @@ msgstr[0] "%s ponechání" msgstr[1] "%s ponechání" msgstr[2] "%s ponechání" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, c-format msgid "%s upgrade" msgid_plural "%s upgrades" @@ -5075,7 +5087,7 @@ msgstr[0] "%s aktualizace" msgstr[1] "%s aktualizace" msgstr[2] "%s aktualizací" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, c-format msgid "%s downgrade" msgid_plural "%s downgrades" @@ -5083,7 +5095,7 @@ msgstr[0] "%s degradace" msgstr[1] "%s degradace" msgstr[2] "%s degradací" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, c-format msgid "%s unresolved recommendation" msgid_plural "%s unresolved recommendations" @@ -5091,28 +5103,28 @@ msgstr[0] "%s nevyřešené doporučení" msgstr[1] "%s nevyřešené doporučení" msgstr[2] "%s nevyřešených doporučení" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 msgid "No solutions yet." msgstr "Zatím žádná řešení." -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 msgid "No dependency solution was found." msgstr "Žádné řešení závislostí nebylo nalezeno." -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 msgid "No solutions." msgstr "Žádná řešení." -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "Pro zobrazení řešení jej vyberte ze seznamu na pravé straně." -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, c-format msgid "%u solutions." msgstr "%u řešení." -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Solution %s of %s (tier %s)." msgid "Solution %s of %s." @@ -5415,12 +5427,12 @@ msgstr " Podpora Ept zakázána.\n" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s zkompilován %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5572,29 +5584,35 @@ msgstr " show - Zobrazí podrobné informace o balíku\n" #: src/main.cc:213 #, fuzzy, c-format +#| msgid " show - Display detailed information about a package\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - Zobrazí podrobné informace o balíku\n" + +#: src/main.cc:214 +#, fuzzy, c-format #| msgid " clean - Erase downloaded package files\n" msgid " clean - Erase downloaded package files.\n" msgstr " clean - Smaže stažené .deb soubory balíků\n" -#: src/main.cc:214 +#: src/main.cc:215 #, fuzzy, c-format #| msgid " autoclean - Erase old downloaded package files\n" msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean - Smaže staré stažené .deb soubory balíků\n" -#: src/main.cc:215 +#: src/main.cc:216 #, fuzzy, c-format #| msgid " changelog - View a package's changelog\n" msgid " changelog - View a package's changelog.\n" msgstr " changelog - Zobrazí seznam změn balíku\n" -#: src/main.cc:216 +#: src/main.cc:217 #, fuzzy, c-format #| msgid " download - Download the .deb file for a package\n" msgid " download - Download the .deb file for a package.\n" msgstr " download - Stáhne .deb soubor balíku\n" -#: src/main.cc:217 +#: src/main.cc:218 #, fuzzy, c-format #| msgid "" #| " reinstall - Download and (possibly) reinstall a currently installed " @@ -5604,17 +5622,21 @@ msgid "" "package.\n" msgstr " reinstall - Stáhne a (možná) přeinstaluje již instalovaný balík\n" -#: src/main.cc:218 -#, c-format +#: src/main.cc:219 +#, fuzzy, c-format +#| msgid "" +#| " why - Show the manually installed packages that require a " +#| "package, or\n" +#| " why one or more packages would require the given package\n" msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " why - Zobrazí ručně instalované balíky, které vyžadují balík,\n" " nebo proč by jeden či více balíků vyžadovalo daný balík.\n" -#: src/main.cc:220 +#: src/main.cc:221 #, fuzzy, c-format #| msgid "" #| " why-not - Show the manually installed packages that lead to a " @@ -5632,35 +5654,35 @@ msgstr "" " se zadaným balíkem, nebo proč by jeden či více balíků\n" " vedlo ke konfliktu s daným balíkem, kdyby byl instalován.\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " Volby:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " -h This help text.\n" msgstr " -h Tato nápověda\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr " --gui Použije GTK GUI, i když je v konfiguraci zakázáno.\n" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr " --no-gui Nepoužije GTK GUI, i když je dostupné.\n" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h Tato nápověda\n" -#: src/main.cc:232 +#: src/main.cc:233 #, fuzzy, c-format #| msgid "" #| " --gui Use the GTK GUI even if disabled in the configuration.\n" @@ -5668,25 +5690,25 @@ msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr " --gui Použije GTK GUI, i když je v konfiguraci zakázáno.\n" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s Pouze simuluje, nic reálně neprovádí.\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr "" " -d Stáhne balíky, ale nic neinstaluje nebo neodstraňuje.\n" -#: src/main.cc:236 +#: src/main.cc:237 #, fuzzy, c-format #| msgid " -P Always prompt for confirmation or actions\n" -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P Vždy vyžaduje potvrzení akcí\n" -#: src/main.cc:237 +#: src/main.cc:238 #, fuzzy, c-format #| msgid "" #| " -y Assume that the answer to simple yes/no questions is " @@ -5695,7 +5717,7 @@ msgid "" " -y Assume that the answer to simple yes/no questions is 'yes'.\n" msgstr " -y Na jednoduché ano/ne otázky odpoví automaticky „ano“\n" -#: src/main.cc:238 +#: src/main.cc:239 #, fuzzy, c-format #| msgid "" #| " -F format Specify a format for displaying search results; see the " @@ -5706,7 +5728,7 @@ msgid "" msgstr "" " -F formát Určí formát pro zobrazení výsledků hledání; viz manuál\n" -#: src/main.cc:239 +#: src/main.cc:240 #, fuzzy, c-format #| msgid "" #| " -O order Specify how search results should be sorted; see the " @@ -5717,7 +5739,7 @@ msgid "" msgstr "" " -O řazení Určí, jak se mají výsledky hledání seřadit; viz manuál\n" -#: src/main.cc:240 +#: src/main.cc:241 #, fuzzy, c-format #| msgid "" #| " -w width Specify the display width for formatting search results\n" @@ -5725,29 +5747,29 @@ msgid "" " -w width Specify the display width for formatting search results.\n" msgstr " -w šířka Určí šířku zobrazení výsledků hledání\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr " -f Agresivně zkusí opravit porušené balíky.\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr " -V Zobrazí verze balíků, které se mají instalovat.\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr " -D Zobrazí závislosti automaticky změněných balíků.\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr "" " -Z Zobrazí změnu v instalované velikosti každého balíku.\n" -#: src/main.cc:245 +#: src/main.cc:246 #, fuzzy, c-format #| msgid "" #| " -v Display extra information. (may be supplied multiple " @@ -5758,7 +5780,7 @@ msgid "" msgstr "" " -v Zobrazí dodatečné informace. (Můžete zadat několikrát.)\n" -#: src/main.cc:246 +#: src/main.cc:247 #, fuzzy, c-format #| msgid "" #| " -t [release] Set the release from which packages should be installed\n" @@ -5767,104 +5789,104 @@ msgid "" msgstr "" " -t [verze] Vybere verzi Debianu, ze které se mají balíky instalovat\n" -#: src/main.cc:247 +#: src/main.cc:248 #, fuzzy, c-format #| msgid "" #| " -q In command-line mode, suppress the incremental progress\n" #| " indicators.\n" msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr " -q V příkazovém režimu potlačí indikátory postupu.\n" -#: src/main.cc:249 +#: src/main.cc:250 #, fuzzy, c-format #| msgid " -o key=val Directly set the configuration option named 'key'\n" msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr " -o klíč=hodn Nastaví konfigurační volbu nazvanou „klíč“\n" -#: src/main.cc:250 +#: src/main.cc:251 #, fuzzy, c-format #| msgid "" #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" #| " strong dependencies\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends\tNastaví, zda se mají doporučené závislosti\n" " brát jako silné závislosti\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr " -S jmsou Načte rozšířené stavové informace ze souboru jmsou.\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u Při startu stáhne nové seznamy balíků.\n" -#: src/main.cc:254 src/main.cc:256 +#: src/main.cc:255 src/main.cc:257 #, c-format -msgid " (terminal interface only)" +msgid " (terminal interface only)\n" msgstr "" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i Při startu spustí instalaci.\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " Tato aptitude nemá schopnosti svaté krávy.\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 msgid "trace" msgstr "trace" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "debug" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 msgid "info" msgstr "info" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "warn" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 msgid "error" msgstr "error" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 msgid "fatal" msgstr "fatal" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "off" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " @@ -5873,77 +5895,77 @@ msgstr "" "Neznámý název logovací úrovně „%s“ (očekáváno „trace“, „debug“, „info“, " "„warn“, „error“, „fatal“ nebo „off“)." -#: src/main.cc:487 +#: src/main.cc:488 #, c-format msgid "Invalid logger name \"%s\"." msgstr "Neplatný název „%s“." -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "Za -q= je očekáváno číslo\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "Za -q= je očekáváno číslo, zadáno %s\n" -#: src/main.cc:802 +#: src/main.cc:794 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o vyžaduje argument ve tvaru klíč=hodnota, zadáno %s\n" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "Název štítku „%s“ nenásleduje čárka.\n" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "PODIVNÉ: obdržen kód neznámé volby\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "no-summary" -#: src/main.cc:1039 +#: src/main.cc:1023 msgid "first-package" msgstr "first-package" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "first-package-and-type" -#: src/main.cc:1043 +#: src/main.cc:1027 msgid "all-packages" msgstr "all-packages" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "all-packages-with-dep-versions" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -5954,7 +5976,7 @@ msgstr "" "package“, „first-package-and-type“, „all-packages“ nebo „all-packages-with-" "dep-versions“)." -#: src/main.cc:1089 +#: src/main.cc:1073 #, fuzzy #| msgid "Only one of -u and -i may be specified\n" msgid "" @@ -5962,7 +5984,7 @@ msgid "" "specified\n" msgstr "Můžete zadat pouze jednu z voleb -u a -i\n" -#: src/main.cc:1098 +#: src/main.cc:1082 #, fuzzy #| msgid "" #| "-u and -i may not be specified in command-line mode (eg, with 'install')" @@ -5971,23 +5993,23 @@ msgid "" "(eg, with 'install')" msgstr "-u a -i nemohou být použity v řádkovém módu (např. s „install“)" -#: src/main.cc:1115 +#: src/main.cc:1099 #, fuzzy #| msgid "-u and -i may not be specified with a command" msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "-u a -i nemohou být použity společně s příkazem" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "Neznámý příkaz „%s“\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "Neodchycená výjimka: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" @@ -5996,7 +6018,8 @@ msgstr "" "Výpis:\n" "%s\n" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "Hledat: " @@ -6881,23 +6904,27 @@ msgstr "nahrazuje" msgid "obsoletes" msgstr "zastarává" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (poskytován %F)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." msgstr "Pokud vyberete balík, objeví se zde popis jeho aktuálního stavu." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -6905,17 +6932,17 @@ msgstr "" "%B%s%b byl instalován automaticky; nyní bude odstraněn, protože všechny " "balíky, které na něm závisely, budou odstraněny:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "%B%s%b bude automaticky odstraněn kvůli chybám v závislostech:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" "%B%s%b bude instalován automaticky pro splnění následujících závislostí:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -6923,7 +6950,7 @@ msgstr "" "%B%s%b nemůže být aktualizován, a i kdyby mohl, stejně by byl podržen ve " "verzi %B%s%b." -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -6931,27 +6958,27 @@ msgstr "" "%B%s%b nebude aktualizován na verzi %B%s%b, aby neporušil následující " "závislosti:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b je nainstalovaný.%n%n" -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b není nainstalovaný." -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "Některé závislosti %B%s%b nejsou splněny:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "%B%s%b bude degradován." -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b nebude aktualizován na zakázanou verzi %B%s%b." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." @@ -6959,43 +6986,43 @@ msgstr "" "%B%s%b by mohl být aktualizován na verzi %B%s%b, ale je podržen ve verzi %B%s" "%b." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b bude reinstalován." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b bude instalován." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b bude odstraněn." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b bude aktualizován z verze %B%s%b na verzi %B%s%b." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "%B%s%b je nainstalován jen částečně, jeho instalce bude dokončena." -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "Následující balíky závisí na %B%s%b a budou jeho odstraněním porušeny:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "Následující balíky závisí na %B%s%b a jsou porušeny:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" msgstr "" "Následující balíky jsou v konfliktu s %B%s%b a budou jeho instalací porušeny:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -7004,7 +7031,7 @@ msgstr "" "Následující balíky závisí na balíku %B%s%b v jiné verzi, než je aktuálně " "instalovaná %B%s%b, nebo jsou s ní v konfliktu:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -7012,11 +7039,11 @@ msgstr "" "Následující balíky jsou v konfliktu s %B%s%b, nebo závisí na jeho verzi, " "která nebude instalována." -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "Následující balíky jsou v konfliktu s %B%s%b:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -7024,22 +7051,22 @@ msgstr "" "Následující balíky závisí na balíku %B%s%b v jiné verzi, než je aktuálně " "instalovaná %B%s%b:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." msgstr "" "Následující balíky závisí na verzi balíku %B%s%b, která se nebude instalovat." -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "aktualizován" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "degradován" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7049,7 +7076,7 @@ msgstr "" "%b), nebo jsou v konfliktu s verzí, na kterou bude balík %s (%B%s%b). Pokud " "bude balík %s, budou tyto balíky porušeny." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7057,7 +7084,7 @@ msgstr "" "Následující balíky jsou v konfliktu s verzí %B%s%b balíku %B%s%b. Pokud bude " "balík %s, budou tyto balíky porušeny." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7093,47 +7120,47 @@ msgstr "Použít" msgid "Close" msgstr "Zavřít" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s koliduje s %s [poskytován %s %s]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "Odstraňuji %s" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "Instaluji %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "Ponechat %ls nevyřešené." -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%BOdstranit%b následující balíky:%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%BInstalovat%b následující balíky:%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%BPonechat%b následující balíky v jejich aktuální verzi:%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%BAktualizovat%b následující balíky:%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%BDegradovat%b následující balíky:%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "Ponechat následující závislosti nevyřešené:%n" @@ -7232,10 +7259,6 @@ msgstr "E:" msgid "W:" msgstr "W:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "Hledat:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7604,7 +7627,9 @@ msgid "Error while dumping resolver state" msgstr "Chyba při ukládání stavu řešitele" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "Soubor, do kterého se má uložit stav řešitele:" #: src/ui.cc:2265 @@ -8117,6 +8142,21 @@ msgid "You can only view changelogs of official Debian packages." msgstr "Můžete prohlížet seznamy změn pouze u oficiálních debianích balíků." #~ msgid "" +#~ "%BOption:%b %s\n" +#~ "%BDefault:%b %s\n" +#~ "%BValue:%b %s\n" +#~ msgstr "" +#~ "%BVolba:%b %s\n" +#~ "%BVýchozí:%b %s\n" +#~ "%BHodnota:%b %s\n" + +#~ msgid "Press Return to continue" +#~ msgstr "Pro pokračování stiskněte Enter" + +#~ msgid "Search for:" +#~ msgstr "Hledat:" + +#~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." #~ msgstr "Nemohu vyřešit závislosti pro aktualizaci (řešiteli vypršel čas)." @@ -8234,9 +8274,6 @@ msgstr "Můžete prohlížet seznamy změn pouze u oficiálních debianích bal #~ msgid "gtk-no" #~ msgstr "gtk-no" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "Neplatná volba „%s“" - #~ msgid "" #~ "The package %s has no candidate version and will not be upgraded; unable " #~ "to show its changelog." @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude 0.6.3-3.2\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2011-01-01 19:22+0100\n" "Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n" "Language-Team: Danish <dansk@dansk-gruppen.dk>\n" @@ -25,42 +25,36 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1)\n" "X-Generator: Jed w/po-mode\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" -msgstr "" -"%BTilvalg:%b %s\n" -"%BForvalgt:%b %s\n" -"%BVærdi:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " +msgstr "%BTilvalg:%b " + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " +msgstr "%BForvalgt:%b " -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "Sand" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "Falsk" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " -msgstr "%BTilvalg:%b " - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "%BForvalgt:%b " - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "%BVærdi:%b " -#: src/apt_config_treeitems.cc:279 -#, c-format -msgid "Editing \"%ls\"" +#: src/apt_config_treeitems.cc:280 +#, fuzzy, c-format +#| msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "Redigerer \"%ls\"" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "%BValg:%b " @@ -652,8 +646,8 @@ msgstr "Kritisk fejl i afhængighedsudreder" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] Udreder afhængigheder" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "Intern fejl: Løsning returnerede uventet nul." @@ -944,7 +938,7 @@ msgstr "" "--full-resolver.\n" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "Afbryd.\n" @@ -1311,7 +1305,7 @@ msgstr "Efter udpakning vil %sB blive frigjort.\n" msgid "No packages to show -- enter the package names on the line after 'i'.\n" msgstr "Ingen pakker at vise - angiv pakkenavne på linjen efter \"i\".\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "Tryk retur for at fortsætte." @@ -1320,10 +1314,6 @@ msgstr "Tryk retur for at fortsætte." msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "Ingen pakker fundet - angiv pakkenavne på linjen efter \"c\".\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "Tryk retur for at fortsætte" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1633,9 +1623,12 @@ msgid "Resolver state successfully written!" msgstr "Status for afhængighedsudreder gemt!" #: src/cmdline/cmdline_resolver.cc:222 -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +#| "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " @@ -1909,7 +1902,7 @@ msgstr "" "afhængighedsudreder for disse." #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "Udreder afhængigheder ..." @@ -1947,7 +1940,9 @@ msgid "Invalid response; please enter one of the following commands:" msgstr "Ugyldigt svar. Anfør en af følgende kommandoer:" #: src/cmdline/cmdline_resolver.cc:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +msgid "No solution found within the allotted time. Try harder? [Y/n] " msgstr "" "Ingen løsning fundet indenfor den fastsatte tid. Prøv mere ihærdigt? [Y/n]" @@ -2151,7 +2146,7 @@ msgstr "Pakke: " msgid "State" msgstr "Status" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "Givet af" @@ -2259,27 +2254,31 @@ msgstr "Erstatter" msgid "Obsoletes" msgstr "Forælder" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Giver" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Beskrivelse: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "Hjemmeside: " -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "Kunne ikke finde pakke %s" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "Kunne ikke fortolke mønster %s" @@ -2594,6 +2593,11 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "Ukendt version valgt, noget er helt galt." +#: src/cmdline_parse.cc:22 +#, c-format +msgid "Invalid command-line option '%s'" +msgstr "Ugyldigt kommandolinje-tilvalg \"%s\"" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "Uventet filafslutning på standardinddata" @@ -2610,7 +2614,7 @@ msgstr "[FEJL] %s" msgid "UNSATISFIED" msgstr "UOPFYLDT" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "UTILGÆNGELIG" @@ -2618,7 +2622,7 @@ msgstr "UTILGÆNGELIG" msgid "Tags" msgstr "Mærkater" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "Brugers mærkater" @@ -3026,16 +3030,21 @@ msgstr "Kunne ikke oprette forkortet cache: %s." msgid "Unable to open %s to log actions" msgstr "Kunne ikke åbne %s til at logge handlinger" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "Fejl ved generering af lokaltid (%s)" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "log-rapport" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -3045,81 +3054,81 @@ msgstr "" "VIGTIGT: denne log opregner kun påtænkte handlinger; handlinger som slår\n" "fejl pga. problemer med dpkg kan muligvis ikke fuldføres.\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "Vil installere %li pakker og afinstallere %li pakker.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "%sB diskplads vil blive brugt\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "%sB diskplads vil blive frigjort\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[OPGRADER] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[NEDGRADER] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "AFINSTALLÉR" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "INSTALLÉR" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "GENINSTALLÉR" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "TILBAGEHOLD" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "BRUDTE" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "AFINSTALLÉR, UBRUGTE" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "AFINSTALLÉR, AFHÆNGIGHEDER" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "INSTALLÉR, AFHÆNGIGHEDER" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "TILBAGEHOLD, AFHÆNGIGHEDER" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "UKONFIGURERET" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -3140,46 +3149,46 @@ msgstr "Tilgår indeks" msgid "Filtering packages" msgstr "Filtrerer pakker" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "Ukendt handlingstype: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "Ubestemt tekststreng efter %s" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "Ukendt prioritetstype: %s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "Sammenligningsmønster forkert afsluttet (forventede \"%c\")." -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "Forventede \"%c\", modtog \"%c\"." -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "Ukendt afhængighedstype: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, c-format msgid "Unknown term type: \"%s\"." msgstr "Ukendt type af mønstersammenligner: \"%s\"." #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, c-format msgid "" "The ?%s term must be used in a \"wide\" context (a top-level context, or a " @@ -3188,33 +3197,33 @@ msgstr "" "Mønstersammenligneren ?%s skal bruges i en \"bred\" sammenhæng (en " "sammenhæng fra topniveau eller en sammenhæng omgivet at ?%s)." -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "Ubalanceret \"(\"" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "Giver: kan ikke være brudt" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "Ukendt mønstertype: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "Kan ikke søge efter \"\"" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "Uventet tomt udtryk" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, c-format msgid "Badly formed expression: expected '|', got '%c'" msgstr "Forkert udformet udtryk: forventede \"|\", fik \"%c\"" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "Uventet \")\"" @@ -4063,22 +4072,22 @@ msgstr "Intern fejl: navnet på den midlertidige sokkel \"%s\" er for langt!" msgid "%s: Unable to accept a connection: %s" msgstr "%s: Kunne ikke acceptere en forbindelse: %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "[%s] dpkg-proces begynder ...\n" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "[%s] dpkg-proces fuldført.\n" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "[%s] dpkg-proces mislykkedes.\n" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "[%s] dpkg-proces fuldført; der resterer flere pakker til behandling.\n" @@ -4718,7 +4727,7 @@ msgstr "" msgid "Virtual package" msgstr "Virtuel pakke" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "Ikke installeret" @@ -4904,203 +4913,209 @@ msgstr "%s erstatter %s" msgid "%s obsoletes %s" msgstr "%s gør %s forældet" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s erstatter %s" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "Afinstallér de følgende pakker:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "Installér de følgende pakker:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 msgid "Keep the following packages:" msgstr "Behold de følgende pakker:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "Opgradér de følgende pakker:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "Nedgradér de følgende pakker:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 msgid "Leave the following dependencies unresolved:" msgstr "Efterlad de følgende afhængigheder uafklaret:" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, c-format msgid "Remove %s [<big>%s</big> (%s)]" msgstr "Afinstallér %s [<big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, c-format msgid "Install %s [<big>%s</big> (%s)]" msgstr "Installér %s [<big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, c-format msgid "Cancel the installation of %s" msgstr "Annullér installeringen af %s" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, c-format msgid "Cancel the removal of %s" msgstr "Annullér afinstalleringen af %s" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, c-format msgid "Keep %s at version <big>%s</big> (%s)" msgstr "Behold %s i version <big>%s</big> (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, c-format msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Opgradér %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, c-format msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Nedgradér %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, c-format msgid "<b>Remove</b> %s" msgstr "<b>Afinstallér</b> %s" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, c-format msgid "<b>remove</b> %s" msgstr "<b>afinstallér</b> %s" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, c-format msgid "<b>Keep</b> %s at version %s" msgstr "<b>Behold</b> %s i version %s" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, c-format msgid "<b>keep</b> %s at version %s" msgstr "<b>behold</b> %s i version %s" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, c-format msgid "<b>Cancel</b> the installation of %s" msgstr "<b>Annullér</b> installeringen af %s" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, c-format msgid "<b>cancel</b> the installation of %s" msgstr "<b>annullér</b> installeringen af %s" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, c-format msgid "<b>Install</b> %s %s" msgstr "<b>Installér</b> %s %s" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, c-format msgid "<b>install</b> %s %s" msgstr "<b>installér</b> %s %s" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>Downgrade</b> %s to version %s" msgstr "<b>Nedgradér</b> %s til version %s" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>downgrade</b> %s to version %s" msgstr "<b>nedgradér</b> %s til version %s" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>Upgrade</b> %s to version %s" msgstr "<b>Opgradér</b> %s til version %s" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>upgrade</b> %s to version %s" msgstr "<b>opgradér</b> %s til version %s" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "Efterlad %s uløst" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "efterlad %s uløst" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, c-format msgid "%s install" msgid_plural "%s installs" msgstr[0] "%s installering" msgstr[1] "%s installeringer" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, c-format msgid "%s remove" msgid_plural "%s removes" msgstr[0] "%s afinstallering" msgstr[1] "%s afinstalleringer" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, c-format msgid "%s keep" msgid_plural "%s keeps" msgstr[0] "%s beholdes" msgstr[1] "%s beholdes" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, c-format msgid "%s upgrade" msgid_plural "%s upgrades" msgstr[0] "%s opgradering" msgstr[1] "%s opgraderinger" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, c-format msgid "%s downgrade" msgid_plural "%s downgrades" msgstr[0] "%s nedgradering" msgstr[1] "%s nedgraderinger" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, c-format msgid "%s unresolved recommendation" msgid_plural "%s unresolved recommendations" msgstr[0] "%s uafklaret anbefaling" msgstr[1] "%s uafklarede anbefalinger" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 msgid "No solutions yet." msgstr "Ingen løsninger endnu." -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 msgid "No dependency solution was found." msgstr "Ingen løsning på afhængighed blev fundet." -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 msgid "No solutions." msgstr "Ingen løsninger." -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "For at se en løsning, skal den vælges fra listen til højre." -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, c-format msgid "%u solutions." msgstr "%u løsninger." -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, c-format msgid "Solution %s of %s." msgstr "Løsning %s af %s." @@ -5400,12 +5415,12 @@ msgstr " Gtk+-understøttelse slået fra.\n" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s oversat på %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5540,26 +5555,32 @@ msgid " show - Display detailed information about a package.\n" msgstr " show - Vis detaljerede oplysninger om en pakke.\n" #: src/main.cc:213 +#, fuzzy, c-format +#| msgid " show - Display detailed information about a package.\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - Vis detaljerede oplysninger om en pakke.\n" + +#: src/main.cc:214 #, c-format msgid " clean - Erase downloaded package files.\n" msgstr " clean - Slet hentede pakkefiler.\n" -#: src/main.cc:214 +#: src/main.cc:215 #, c-format msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean - Slet gamle, hentede pakkefiler.\n" -#: src/main.cc:215 +#: src/main.cc:216 #, c-format msgid " changelog - View a package's changelog.\n" msgstr " changelog - Vis en pakkes ændringslog.\n" -#: src/main.cc:216 +#: src/main.cc:217 #, c-format msgid " download - Download the .deb file for a package.\n" msgstr " download - Hent en pakkes .deb-fil.\n" -#: src/main.cc:217 +#: src/main.cc:218 #, c-format msgid "" " reinstall - Download and (possibly) reinstall a currently installed " @@ -5568,18 +5589,22 @@ msgstr "" " reinstall - Hent og (om muligt) geninstallér en aktuelt installeret " "pakke.\n" -#: src/main.cc:218 -#, c-format +#: src/main.cc:219 +#, fuzzy, c-format +#| msgid "" +#| " why - Show the manually installed packages that require a " +#| "package, or\n" +#| " why one or more packages would require the given package\n" msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " why - Vis de manuelt installerede pakker som kræver en pakke, \n" "eller\n" " hvorfor en eller flere pakker kræver den angivne pakke\n" -#: src/main.cc:220 +#: src/main.cc:221 #, c-format msgid "" " why-not - Show the manually installed packages that lead to a " @@ -5593,17 +5618,17 @@ msgstr "" " føre til en konflikt med den angivne pakke hvis " "installeret.\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " Tilvalg:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, c-format msgid " -h This help text.\n" msgstr " -h Denne hjælpetekst.\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" @@ -5611,20 +5636,20 @@ msgstr "" " --gui Anvend den grafiske brugerflade GTK, selvom den er slået fra " "i opsætningen.\n" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" " --no-gui Anvend ikke den grafiske brugerflade, GTK, selvom den er " "tilgængelig,\n" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text.\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h Denne hjælpetekst.\n" -#: src/main.cc:232 +#: src/main.cc:233 #, fuzzy, c-format #| msgid "" #| " --gui Use the GTK GUI even if disabled in the configuration.\n" @@ -5634,31 +5659,32 @@ msgstr "" " --gui Anvend den grafiske brugerflade GTK, selvom den er slået fra " "i opsætningen.\n" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s Simulér handlinger uden faktisk at udføre dem.\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr "" " -d Hent kun pakker, installér eller afinstallér ikke noget.\n" -#: src/main.cc:236 -#, c-format -msgid " -P Always prompt for confirmation or actions.\n" +#: src/main.cc:237 +#, fuzzy, c-format +#| msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P Spørg altid om bekræftelse eller handlinger.\n" -#: src/main.cc:237 +#: src/main.cc:238 #, c-format msgid "" " -y Assume that the answer to simple yes/no questions is 'yes'.\n" msgstr "" " -y Antag at svaret til simple ja/nej-spørgsmål er \"ja\".\n" -#: src/main.cc:238 +#: src/main.cc:239 #, c-format msgid "" " -F format Specify a format for displaying search results; see the " @@ -5667,7 +5693,7 @@ msgstr "" " -F format Anfør et format til oversigt over søgeresultater; se " "manualen.\n" -#: src/main.cc:239 +#: src/main.cc:240 #, c-format msgid "" " -O order Specify how search results should be sorted; see the " @@ -5675,143 +5701,150 @@ msgid "" msgstr "" " -O order Anfør sorteringsorden for søgeresultater; se manualen.\n" -#: src/main.cc:240 +#: src/main.cc:241 #, c-format msgid "" " -w width Specify the display width for formatting search results.\n" msgstr "" " -w width Angiv en skærmbredde til formatering af søgeresultater.\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr "" " -f Prøv aggressivt at reparere brudte pakkeafhængigheder.\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr " -V Vis hvilke versioner af pakker der skal installeres.\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr "" " -D Vis afhængigheder for pakker der er ændret automatisk.\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr " -Z Vis ændring i hver installeret pakkes pladsforbrug.\n" -#: src/main.cc:245 +#: src/main.cc:246 #, c-format msgid "" " -v Display extra information. (may be supplied multiple " "times).\n" msgstr " -v Vis ekstra oplysninger (kan anføres flere gange).\n" -#: src/main.cc:246 +#: src/main.cc:247 #, c-format msgid "" " -t [release] Set the release from which packages should be installed.\n" msgstr " -t [udgave] Angiv hvilken udgave pakker skal installeres fra.\n" -#: src/main.cc:247 -#, c-format +#: src/main.cc:248 +#, fuzzy, c-format +#| msgid "" +#| " -q In command-line mode, suppress the incremental progress.\n" +#| " indicators.\n" msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" " -q I kommandolinjetilstand, undertryk de fortløbende\n" " fremgangsinformation.\n" -#: src/main.cc:249 +#: src/main.cc:250 #, c-format msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr "" " -o nøgle=værdi Tildel værdi direkte til opsætningstilvalget \"nøgle\".\n" -#: src/main.cc:250 -#, c-format +#: src/main.cc:251 +#, fuzzy, c-format +#| msgid "" +#| " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +#| " strong dependencies.\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends\tAngiv om anbefalede pakker skal behandles som\n" " stærke afhængigheder.\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr " -S fname læs aptitudes udvidede statusinfo fra fnavn.\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u Hent nye pakkelister ved opstart\n" -#: src/main.cc:254 src/main.cc:256 -#, c-format -msgid " (terminal interface only)" +#: src/main.cc:255 src/main.cc:257 +#, fuzzy, c-format +#| msgid " (terminal interface only)" +msgid " (terminal interface only)\n" msgstr " (kun terminal-brugerflade)" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i Udfør en installeringskørsel ved opstart\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " Denne aptitude har ikke \"Super Cow Powers\".\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 msgid "trace" msgstr "sporing" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "fejlsøg" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 msgid "info" msgstr "info" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "advar" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 msgid "error" msgstr "fejl" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 msgid "fatal" msgstr "kritisk" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "slået fra" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " @@ -5821,49 +5854,49 @@ msgstr "" "\"fejlsøg\", \"info\", \"advar\", \"fejl\", \"kritisk\", eller \"slået fra" "\")." -#: src/main.cc:487 +#: src/main.cc:488 #, c-format msgid "Invalid logger name \"%s\"." msgstr "Ugyldigt logningsbetegnelse \"%s\"." -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "Forventede et tal efter -q=\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "Forventede et tal efter -q=, fik %s\n" -#: src/main.cc:802 +#: src/main.cc:794 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o kræver et argument på formen taste=værdi, fik %s\n" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "Intet komma efter mærkatnavn \"%s\".\n" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "MYSTISK: modtog en ukendt kode for tilvalg\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "aldrig" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "auto" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "altid" # Begge dele tillades jf. kildekoden -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " @@ -5872,29 +5905,29 @@ msgstr "" "Ugyldig tilstand \"%s\" til visning af pakkenavne (skal være \"aldrig\", " "\"auto\" eller \"altid\", eller engelsk \"never\"/\"always\")." -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "ingen-opsummering" -#: src/main.cc:1039 +#: src/main.cc:1023 msgid "first-package" msgstr "første-pakke" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "første-pakke-og-type" -#: src/main.cc:1043 +#: src/main.cc:1027 msgid "all-packages" msgstr "alle-pakker" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "alle-pakke-med-afh-versioner" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -5905,7 +5938,7 @@ msgstr "" "\", \"første-pakke\", \"første-pakke-og-type\", \"alle-pakker\", eller " "\"alle-pakker-med-afh-versioner\"." -#: src/main.cc:1089 +#: src/main.cc:1073 msgid "" "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be " "specified\n" @@ -5913,7 +5946,7 @@ msgstr "" "Kun en af --auto-clean-on-startup, --clean-on-startup, -i, and -u kan " "angives\n" -#: src/main.cc:1098 +#: src/main.cc:1082 msgid "" "-u, -i, and --clean-on-startup may not be specified in command-line mode " "(eg, with 'install')" @@ -5921,22 +5954,22 @@ msgstr "" "-u, -i, og --clean-on-startup må ikke angive i kommandolinjetilstand (f." "eks., med \"install\")" -#: src/main.cc:1115 +#: src/main.cc:1099 msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "-u, -i, og --clean-on-startup må ikke angives i en kommando" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "Ukendt kommando \"%s\"\n" # Uncaught? -MBJ -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "Uncaught exception: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" @@ -5945,7 +5978,8 @@ msgstr "" "Backtrace:\n" "%s\n" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "Søg efter: " @@ -6839,17 +6873,21 @@ msgstr "erstatter" msgid "obsoletes" msgstr "forælder" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (givet af %F)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." @@ -6857,7 +6895,7 @@ msgstr "" "Hvis du vælger en pakke, vil en forklaring af dens nuværende tilstand blive " "vist på dette sted." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -6865,17 +6903,17 @@ msgstr "" "%B%s%b blev installeret automatisk; den afinstalleres fordi alle de pakker " "der afhænger af den er ved at blive afinstalleret:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "%B%s%b vil blive afinstalleret automatisk p.g.a. afhængighedsfejl:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" "%B%s%b vil blive installeret automatisk for at opfylde flg. afhængigheder:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -6883,7 +6921,7 @@ msgstr "" "%B%s%b kan ikke opgraderes nu, men hvis den kunne, ville den stadig blive " "tilbageholdt på version %B%s%b." -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -6891,27 +6929,27 @@ msgstr "" "%B%s%b vil ikke blive opgraderet til version %B%s%b, for at undgå at " "følgende afhængigheder brydes:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b er aktuelt installeret." -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b er aktuelt ikke installeret." -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "Visse afhængigheder af %B%s%b er ikke opfyldt:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "%B%s%b vil blive nedgraderet." -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b vil ikke blive opgraderet til den forbudte version %B%s%b." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." @@ -6919,39 +6957,39 @@ msgstr "" "%B%s%b kunne opgraderes til version %B%s%b, men bliver tilbageholdt i " "version %B%s%b." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b vil blive geninstalleret." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b vil blive installeret." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b vil blive afinstalleret." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b vil blive opgraderet fra version %B%s%b til version %B%s%b." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "" "%B%s%b er kun delvis installeret, dens installering vil blive fuldført." -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "" "Følgende pakker afhænger af %B%s%b og vil blive brudte ved dens " "afinstallering:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "Følgende pakker afhænger af %B%s%b og er brudte:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" @@ -6959,7 +6997,7 @@ msgstr "" "Følgende pakker konflikter med %B%s%b og vil blive brudte ved dens " "installering:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -6968,7 +7006,7 @@ msgstr "" "Følgende pakker afhænger af en anden version af %B%s%b end den aktuelt " "installerede, eller konflikter med denne:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -6976,11 +7014,11 @@ msgstr "" "Følgende pakker konflikter med %B%s%b, eller afhænger af en version af den " "som ikke vil blive installeret." -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "Følgende pakker konflikter med %B%s%b:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -6988,7 +7026,7 @@ msgstr "" "Følgende pakker afhænger af en anden version af %B%s%b end den som aktuelt " "er installeret:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." @@ -6996,15 +7034,15 @@ msgstr "" "Følgende pakker afhænger af en version af %B%s%b som ikke vil blive " "installeret." -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "opgraderet" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "nedgraderet" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7014,7 +7052,7 @@ msgstr "" "%b), eller konflikter med versionen den vil blive %s til (%B%s%b), og de vil " "blive brudt hvis de bliver %s." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7022,7 +7060,7 @@ msgstr "" "Følgende pakker konflikter med version %B%s%b af %B%s%b og vil blive brudte " "hvis den bliver %s." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7058,47 +7096,47 @@ msgstr "Anvend" msgid "Close" msgstr "Luk" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s konflikter med %s [givet af %s %s]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "Afinstallerer %s" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "Installerer %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "Efterlad %ls uløst." -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%BAfinstallér%b de følgende pakker:%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%BInstallér%b de følgende pakker:%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%BBehold%b de følgende pakker i deres nuværende version:%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%BOpgradér%b de følgende pakker:%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%BNedgradér%b de følgende pakker:%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "Efterlad de følgende afhængigheder uafklaret:%n" @@ -7197,10 +7235,6 @@ msgstr "E:" msgid "W:" msgstr "W:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "Søg efter:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7564,7 +7598,9 @@ msgid "Error while dumping resolver state" msgstr "Fejl ved dumpning af status for afhængighedsudreder" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "Fil som status for afhængighedsudreder skal skrives til:" #: src/ui.cc:2265 @@ -8076,6 +8112,21 @@ msgid "You can only view changelogs of official Debian packages." msgstr "Du kan kun se ændringslogfiler for officielle Debian-pakker." #~ msgid "" +#~ "%BOption:%b %s\n" +#~ "%BDefault:%b %s\n" +#~ "%BValue:%b %s\n" +#~ msgstr "" +#~ "%BTilvalg:%b %s\n" +#~ "%BForvalgt:%b %s\n" +#~ "%BVærdi:%b %s\n" + +#~ msgid "Press Return to continue" +#~ msgstr "Tryk retur for at fortsætte" + +#~ msgid "Search for:" +#~ msgstr "Søg efter:" + +#~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." #~ msgstr "" #~ "Opgraderingens afhængigheder kunne ikke udredes (tidsudløb på " @@ -8181,9 +8232,6 @@ msgstr "Du kan kun se ændringslogfiler for officielle Debian-pakker." #~ msgid "gtk-no" #~ msgstr "gtk-no" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "Ugyldigt kommandolinje-tilvalg \"%s\"" - #~ msgid "" #~ "The package %s has no candidate version and will not be upgraded; unable " #~ "to show its changelog." @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude 0.6.3\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2010-11-15 18:00+0100\n" "Last-Translator: Holger Wansing <linux@wansing-online.de>\n" "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n" @@ -20,42 +20,36 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n!=1;\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" -msgstr "" -"%BOption:%b %s\n" -"%BStandard:%b %s\n" -"%BWert:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " +msgstr "%BOption:%b " -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " +msgstr "%BStandard:%b " + +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "Wahr" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "Falsch" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " -msgstr "%BOption:%b " - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "%BStandard:%b " - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "%BWert:%b " -#: src/apt_config_treeitems.cc:279 -#, c-format -msgid "Editing \"%ls\"" +#: src/apt_config_treeitems.cc:280 +#, fuzzy, c-format +#| msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "Bearbeiten von »%ls«" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "%BWahl:%b " @@ -647,8 +641,8 @@ msgstr "Fataler Fehler im Auflöser" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] Abhängigkeiten werden aufgelöst" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "Interner Fehler: unerwartete Null-Lösung." @@ -953,7 +947,7 @@ msgstr "" "der Option --full-resolver.\n" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "Abbruch.\n" @@ -1330,7 +1324,7 @@ msgstr "Nach dem Entpacken werden %sB frei werden.\n" msgid "No packages to show -- enter the package names on the line after 'i'.\n" msgstr "Keine Pakete anzuzeigen -- geben Sie den Paketnamen nach dem 'i' an.\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "Drücken Sie zum Fortsetzen die Eingabetaste." @@ -1339,10 +1333,6 @@ msgstr "Drücken Sie zum Fortsetzen die Eingabetaste." msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "Keine Pakete anzuzeigen -- geben Sie den Paketnamen nach dem 'c' an.\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "Drücken Sie zum Fortsetzen die Eingabetaste" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1661,9 +1651,12 @@ msgid "Resolver state successfully written!" msgstr "Auflösungsstatus wurde erfolgreich geschrieben!" #: src/cmdline/cmdline_resolver.cc:222 -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +#| "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|Pak-Ver) ...: %F%na (ID|Pak-" @@ -1944,7 +1937,7 @@ msgstr "" "Abhängigkeitsauflöser erzeugt." #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "Auflösen der Abhängigkeiten ..." @@ -1982,7 +1975,9 @@ msgid "Invalid response; please enter one of the following commands:" msgstr "Ungültige Antwort. Bitte geben Sie einen der folgenden Befehle ein:" #: src/cmdline/cmdline_resolver.cc:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +msgid "No solution found within the allotted time. Try harder? [Y/n] " msgstr "" "Es wurde in der zugewiesenen Zeit keine Lösung gefunden. Intensiver suchen? " "[Y/n]" @@ -2191,7 +2186,7 @@ msgstr "Paket: " msgid "State" msgstr "Zustand" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "Bereitgestellt von" @@ -2299,27 +2294,31 @@ msgstr "Ersetzt" msgid "Obsoletes" msgstr "Ersetzt (löst ab)" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Liefert" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Beschreibung: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "Homepage: " -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "Das Paket %s konnte nicht gefunden werden" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "Das Muster %s konnte nicht ausgewertet werden" @@ -2640,6 +2639,13 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "Unbekannte Versionsauswahl, irgendetwas ist ziemlich falsch." +# Should never happen. +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "Ungültige Operation: %s" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "Unerwartetes Dateiende auf Standardeingabe" @@ -2659,7 +2665,7 @@ msgstr "[FEHL] %s" msgid "UNSATISFIED" msgstr "NICHT ERFÜLLT" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "NICHT VERFÜGBAR" @@ -2667,7 +2673,7 @@ msgstr "NICHT VERFÜGBAR" msgid "Tags" msgstr "Marken" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "Benutzermarkierungen" @@ -3098,16 +3104,21 @@ msgstr "Eingekürzter Zwischenspeicher konnte nicht erzeugt werden: %s." msgid "Unable to open %s to log actions" msgstr "%s konnte nicht geöffnet werden, um Aktionen zu protokollieren" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "Fehler beim Erzeugen lokaler Zeit (%s)" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "Protokoll" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -3119,81 +3130,81 @@ msgstr "" "dpkg-Problemen fehlschlagen, sind vielleicht nicht abgeschlossen.\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "%li Pakete werden installiert und %li Pakete entfernt.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "%sB der Festplatte werden belegt\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "%sB der Festplatte werden freigegeben\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[AKTUALISIERUNG] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[DOWNGRADE] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "ENTFERNEN" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "INSTALLIEREN" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "ERNEUT INST." -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "HALTEN" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "BESCHÄDIGT" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "ENTFERNEN, NICHT VERWENDET" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "ENTFERNEN, ABHÄNGIGKEITEN" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "INSTALLIEREN, ABHÄNGIGKEITEN" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "HALTEN, ABHÄNGIGKEITEN" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "NICHT KONFIGURIERT" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -3214,46 +3225,46 @@ msgstr "Zugriff auf Index" msgid "Filtering packages" msgstr "Filtern von Paketen" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "Unbekannter Aktionstyp: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "Nicht begrenzte Zeichenkette nach %s" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "Unbekannte Priorität %s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "Unerwartetes Ende des Suchmusters (»%c« erwartet)." -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "»%c« erwartet, »%c« erhalten." -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "Unbekannter Abhängigkeitstyp: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, c-format msgid "Unknown term type: \"%s\"." msgstr "Unbekannter Ausdruckstyp: »%s«." #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, c-format msgid "" "The ?%s term must be used in a \"wide\" context (a top-level context, or a " @@ -3262,33 +3273,33 @@ msgstr "" "Der Ausdruck ?%s muss im Kontext von »wide« verwendet werden (einem " "übergeordneten Kontext oder einem in »?%s« eingeschlossenen Kontext)." -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "Offene '('" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "Provides: kann nicht beschädigt sein" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "Unbekannter Mustertyp: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "Es konnte nicht nach »« gesucht werden" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "Unerwarteter leerer Ausdruck" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, c-format msgid "Badly formed expression: expected '|', got '%c'" msgstr "Ungültiger Ausdruck: »|« erwartet, »%c« erhalten" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "Unerwartete ')'" @@ -4166,22 +4177,22 @@ msgstr "Interner Fehler: der temporäre Socket-Name »%s« ist zu lang!" msgid "%s: Unable to accept a connection: %s" msgstr "%s: Akzeptieren einer Verbindung nicht möglich: %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "[%s] dpkg-Prozess startet ...\n" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "[%s] dpkg-Prozess abgeschlossen.\n" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "[%s] dpkg-Prozess fehlgeschlagen.\n" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4831,7 +4842,7 @@ msgstr "" msgid "Virtual package" msgstr "Virtuelles Paket" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "Nicht installiert" @@ -5016,204 +5027,210 @@ msgstr "%s ersetzt %s" msgid "%s obsoletes %s" msgstr "%s löst %s ab" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s ersetzt %s" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "Die folgenden Pakete entfernen:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "Die folgenden Pakete installieren:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 msgid "Keep the following packages:" msgstr "Die folgenden Pakete beibehalten:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "Die folgenden Pakete aktualisieren:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "" "Die folgenden Pakete werden durch ältere Versionen ersetzt (Downgrade):" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 msgid "Leave the following dependencies unresolved:" msgstr "Die folgenden Abhängigkeiten unaufgelöst lassen:" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, c-format msgid "Remove %s [<big>%s</big> (%s)]" msgstr "Entfernen von %s [<big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, c-format msgid "Install %s [<big>%s</big> (%s)]" msgstr "Installieren von %s [<big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, c-format msgid "Cancel the installation of %s" msgstr "Abbrechen der Installation von %s" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, c-format msgid "Cancel the removal of %s" msgstr "Abbrechen der Entfernung von %s" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, c-format msgid "Keep %s at version <big>%s</big> (%s)" msgstr "Beibehalten von %s in Version <big>%s</big> (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, c-format msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Aktualisieren von %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, c-format msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Downgrade von %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, c-format msgid "<b>Remove</b> %s" msgstr "<b>Entfernen</b> von %s" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, c-format msgid "<b>remove</b> %s" msgstr "<b>entfernen</b> von %s" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, c-format msgid "<b>Keep</b> %s at version %s" msgstr "<b>Beibehalten</b> von %s in Version %s" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, c-format msgid "<b>keep</b> %s at version %s" msgstr "<b>beibehalten</b> von %s in Version %s" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, c-format msgid "<b>Cancel</b> the installation of %s" msgstr "<b>Abbrechen</b> der Installation von %s" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, c-format msgid "<b>cancel</b> the installation of %s" msgstr "<b>abbrechen</b> der Installation von %s" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, c-format msgid "<b>Install</b> %s %s" msgstr "<b>Installieren</b> von %s %s" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, c-format msgid "<b>install</b> %s %s" msgstr "<b>installieren</b> von %s %s" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>Downgrade</b> %s to version %s" msgstr "<b>Downgrade</b> von %s auf Version %s" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>downgrade</b> %s to version %s" msgstr "<b>downgrade</b> von %s auf Version %s" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>Upgrade</b> %s to version %s" msgstr "<b>Aktualisieren</b> von %s auf Version %s" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>upgrade</b> %s to version %s" msgstr "<b>aktualisieren</b> von %s auf Version %s" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "%s unaufgelöst lassen" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "%s unaufgelöst lassen" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, c-format msgid "%s install" msgid_plural "%s installs" msgstr[0] "%s Installation" msgstr[1] "%s Installationen" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, c-format msgid "%s remove" msgid_plural "%s removes" msgstr[0] "%s Entfernung" msgstr[1] "%s Entfernungen" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, c-format msgid "%s keep" msgid_plural "%s keeps" msgstr[0] "%s Beibehaltung" msgstr[1] "%s Beibehaltungen" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, c-format msgid "%s upgrade" msgid_plural "%s upgrades" msgstr[0] "%s Paketaktualisierung" msgstr[1] "%s Paketaktualisierungen" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, c-format msgid "%s downgrade" msgid_plural "%s downgrades" msgstr[0] "%s Downgrade" msgstr[1] "%s Downgrades" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, c-format msgid "%s unresolved recommendation" msgid_plural "%s unresolved recommendations" msgstr[0] "%s unaufgelöste Empfehlung" msgstr[1] "%s unaufgelöste Empfehlungen" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 msgid "No solutions yet." msgstr "Bis jetzt keine Lösungen." -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 msgid "No dependency solution was found." msgstr "Keine Lösung für die Abhängigkeiten gefunden." -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 msgid "No solutions." msgstr "Keine Lösungen." -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "Um eine Lösung anzuzeigen, wählen Sie sie aus der Liste rechts aus." -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, c-format msgid "%u solutions." msgstr "%u Lösungen." -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, c-format msgid "Solution %s of %s." msgstr "Lösung %s von %s." @@ -5521,12 +5538,12 @@ msgstr " Gtk+-Unterstützung nicht aktiviert.\n" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s kompiliert am %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5660,26 +5677,32 @@ msgid " show - Display detailed information about a package.\n" msgstr " show Details über ein Paket anzeigen\n" #: src/main.cc:213 +#, fuzzy, c-format +#| msgid " show - Display detailed information about a package.\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show Details über ein Paket anzeigen\n" + +#: src/main.cc:214 #, c-format msgid " clean - Erase downloaded package files.\n" msgstr " clean Heruntergeladene Paketdateien löschen\n" -#: src/main.cc:214 +#: src/main.cc:215 #, c-format msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean Alte heruntergeladene Paketdateien löschen\n" -#: src/main.cc:215 +#: src/main.cc:216 #, c-format msgid " changelog - View a package's changelog.\n" msgstr " changelog Änderungsprotokoll (Changelog) eines Pakets anzeigen\n" -#: src/main.cc:216 +#: src/main.cc:217 #, c-format msgid " download - Download the .deb file for a package.\n" msgstr " download Die .deb-Datei eines Pakets herunterladen\n" -#: src/main.cc:217 +#: src/main.cc:218 #, c-format msgid "" " reinstall - Download and (possibly) reinstall a currently installed " @@ -5688,18 +5711,22 @@ msgstr "" " reinstall Herunterladen und (eventuell) neuinstallieren eines aktuell\n" " installierten Pakets\n" -#: src/main.cc:218 -#, c-format +#: src/main.cc:219 +#, fuzzy, c-format +#| msgid "" +#| " why - Show the manually installed packages that require a " +#| "package, or\n" +#| " why one or more packages would require the given package\n" msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " why Anzeigen der manuell installierten Pakete, die ein Paket\n" " benötigen, oder warum ein oder mehrere Pakete das gegebene\n" " Paket benötigen\n" -#: src/main.cc:220 +#: src/main.cc:221 #, c-format msgid "" " why-not - Show the manually installed packages that lead to a " @@ -5713,17 +5740,17 @@ msgstr "" " Pakete zu einem Konflikt mit dem gegebenen Paket führen\n" " würden, falls installiert\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr "Optionen:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, c-format msgid " -h This help text.\n" msgstr " -h Dieser Hilfetext\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" @@ -5731,19 +5758,19 @@ msgstr "" " --gui Die GTK-Oberfläche verwenden, selbst wenn dies in der\n" " Konfiguration deaktiviert ist\n" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" " --no-gui Nicht die GTK-Oberfläche verwenden, selbst wenn verfügbar\n" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text.\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h Dieser Hilfetext\n" -#: src/main.cc:232 +#: src/main.cc:233 #, fuzzy, c-format #| msgid "" #| " --gui Use the GTK GUI even if disabled in the configuration.\n" @@ -5753,12 +5780,12 @@ msgstr "" " --gui Die GTK-Oberfläche verwenden, selbst wenn dies in der\n" " Konfiguration deaktiviert ist\n" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s Aktionen simulieren, aber nicht wirklich durchführen\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" @@ -5766,12 +5793,13 @@ msgstr "" " -d Pakete nur herunterladen, nichts installieren oder " "entfernen\n" -#: src/main.cc:236 -#, c-format -msgid " -P Always prompt for confirmation or actions.\n" +#: src/main.cc:237 +#, fuzzy, c-format +#| msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P Immer zur Bestätigung nachfragen\n" -#: src/main.cc:237 +#: src/main.cc:238 #, c-format msgid "" " -y Assume that the answer to simple yes/no questions is 'yes'.\n" @@ -5779,7 +5807,7 @@ msgstr "" " -y Annehmen, dass die Antwort auf einfache ja/nein-Fragen »ja« " "ist\n" -#: src/main.cc:238 +#: src/main.cc:239 #, c-format msgid "" " -F format Specify a format for displaying search results; see the " @@ -5787,7 +5815,7 @@ msgid "" msgstr "" " -F format Format für die Suchergebnisse angeben; vgl. das Handbuch\n" -#: src/main.cc:239 +#: src/main.cc:240 #, c-format msgid "" " -O order Specify how search results should be sorted; see the " @@ -5796,40 +5824,40 @@ msgstr "" " -O reihenfolge Wie die Suchergebnisse sortiert werden sollen; vgl. das " "Handbuch\n" -#: src/main.cc:240 +#: src/main.cc:241 #, c-format msgid "" " -w width Specify the display width for formatting search results.\n" msgstr "" " -w breite Die Breite für die Formatierung der Suchergebnisse angeben\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr "" " -f Aggressiv versuchen, beschädigte Pakete zu reparieren\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr "" " -V Anzeigen, welche Version eines Pakets installiert wird\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr "" " -D Abhängigkeiten automatisch veränderter Pakete anzeigen\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr "" " -Z Änderungen bei der installierten Größe jedes Pakets " "anzeigen\n" -#: src/main.cc:245 +#: src/main.cc:246 #, c-format msgid "" " -v Display extra information. (may be supplied multiple " @@ -5838,7 +5866,7 @@ msgstr "" " -v Mehr Informationen ausgeben (kann mehrfach verwendet " "werden)\n" -#: src/main.cc:246 +#: src/main.cc:247 #, c-format msgid "" " -t [release] Set the release from which packages should be installed.\n" @@ -5847,100 +5875,107 @@ msgstr "" "sollen\n" " (z.B. stable, unstable, squeeze, ...)\n" -#: src/main.cc:247 -#, c-format +#: src/main.cc:248 +#, fuzzy, c-format +#| msgid "" +#| " -q In command-line mode, suppress the incremental progress.\n" +#| " indicators.\n" msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr " -q Keine Fortschrittsanzeige im Kommandozeilenmodus.\n" -#: src/main.cc:249 +#: src/main.cc:250 #, c-format msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr " -o opt=wert Die Konfigurationsoption »schl« direkt setzen\n" -#: src/main.cc:250 -#, c-format +#: src/main.cc:251 +#, fuzzy, c-format +#| msgid "" +#| " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +#| " strong dependencies.\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends\n" " Angeben, ob »Empfehlungen« wie starke Abhängigkeiten\n" " gehandhabt werden sollen (»with-«) oder nicht (»without-«)\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr "" " -S fname Die erweiterten Aptitude-Statusinformationen aus »fname« " "laden\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u Neue Paketlisten beim Start herunterladen\n" -#: src/main.cc:254 src/main.cc:256 -#, c-format -msgid " (terminal interface only)" +#: src/main.cc:255 src/main.cc:257 +#, fuzzy, c-format +#| msgid " (terminal interface only)" +msgid " (terminal interface only)\n" msgstr " (nur Terminal-Oberfläche)" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i Installationslauf beim Start durchführen\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " Dieses Aptitude hat keine Super-Kuh-Kräfte.\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 msgid "trace" msgstr "trace" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "debug" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 msgid "info" msgstr "info" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "warn" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 msgid "error" msgstr "error" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 msgid "fatal" msgstr "fatal" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "off" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " @@ -5950,48 +5985,48 @@ msgstr "" "»info«, »warn«, »error«, »fatal« oder »off«.)" # Should never happen. -#: src/main.cc:487 +#: src/main.cc:488 #, c-format msgid "Invalid logger name \"%s\"." msgstr "Ungültiger Logger-Name »%s«." -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "Nach -q= wurde eine Nummer erwartet\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "Nach -q= wurde eine Nummer erwartet, nicht %s\n" -#: src/main.cc:802 +#: src/main.cc:794 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o erfordert ein Argument der Form option=wert, angeben wurde %s\n" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "Kein Komma nach der Markierung »%s«.\n" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "MERKWÜRDIG: unbekannten Optionscode erhalten\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "--show-package-names|never" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "--show-package-names|auto" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "--show-package-names|always" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " @@ -6000,29 +6035,29 @@ msgstr "" "Ungültiger Wert »%s« für den Paketnamen-Anzeigemodus (sollte »never«, »auto« " "oder »always« sein)." -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "no-summary" -#: src/main.cc:1039 +#: src/main.cc:1023 msgid "first-package" msgstr "first-package" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "first-package-and-type" -#: src/main.cc:1043 +#: src/main.cc:1027 msgid "all-packages" msgstr "all-packages" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "all-packages-with-dep-versions" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -6033,7 +6068,7 @@ msgstr "" "»first-package«, »first-package-and-type«, »all-packages« oder »all-packages-" "with-dep-versions«." -#: src/main.cc:1089 +#: src/main.cc:1073 msgid "" "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be " "specified\n" @@ -6041,7 +6076,7 @@ msgstr "" "Nur eines von den folgenden darf angegeben werden: --auto-clean-on-startup, " "--clean-on-startup, -i oder -u\n" -#: src/main.cc:1098 +#: src/main.cc:1082 msgid "" "-u, -i, and --clean-on-startup may not be specified in command-line mode " "(eg, with 'install')" @@ -6049,22 +6084,22 @@ msgstr "" "-u, -i und --clean-on-startup dürfen nicht im Kommandozeilenmodus verwendet " "werden (z.B. mit »install«)" -#: src/main.cc:1115 +#: src/main.cc:1099 msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "" "-u, -i und --clean-on-startup dürfen nicht mit einem Befehl verwendet werden" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "Unbekannter Befehl »%s«\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "Nicht abgefangene Ausnahme: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" @@ -6073,7 +6108,8 @@ msgstr "" "Backtrace:\n" "%s\n" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "Suchen nach: " @@ -7004,17 +7040,21 @@ msgstr "ersetzt" msgid "obsoletes" msgstr "löst ab" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (bereitgestellt von %F)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." @@ -7022,7 +7062,7 @@ msgstr "" "Wenn Sie ein Paket auswählen, wird hier eine Erläuterung seines derzeitigen " "Status erscheinen." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -7030,19 +7070,19 @@ msgstr "" "%B%s%b wurde automatisch installiert; es wird entfernt, weil alle Pakete, " "die von ihm abhängen, entfernt werden:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "" "%B%s%b wird aufgrund von verletzten Abhängigkeiten automatisch entfernt:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" "%B%s%b wird automatisch installiert, um die folgenden Abhängigkeiten zu " "erfüllen:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -7050,7 +7090,7 @@ msgstr "" "%B%s%b kann derzeit nicht aktualisiert werden; wäre dies möglich, würde es " "trotzdem auf Version %B%s%b gehalten werden." -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -7058,27 +7098,27 @@ msgstr "" "%B%s%b wird nicht auf Version %B%s%b aktualisiert, um folgende " "Abhängigkeiten nicht zu verletzen:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b ist zurzeit installiert." -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b ist zurzeit nicht installiert." -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "Einige Abhängigkeiten von %B%s%b sind nicht erfüllt:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "%B%s%b wird durch eine ältere Version ersetzt (Downgrade)." -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b wird nicht auf die verbotene Version %B%s%b aktualisiert." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." @@ -7086,39 +7126,39 @@ msgstr "" "%B%s%b könnte auf Version %B%s%b aktualisiert werden, wird aber auf Version " "%B%s%b gehalten." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b wird erneut installiert." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b wird installiert." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b wird entfernt." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b wird von Version %B%s%b auf Version %B%s%b aktualisiert." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "" "%B%s%b ist nur teilweise installiert; die Installation wird abgeschlossen." -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "" "Die folgenden Pakete hängen von %B%s%b ab und werden nach dessen Entfernen " "beschädigt sein:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "Die folgenden Pakete hängen von %B%s%b ab und sind beschädigt:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" @@ -7126,7 +7166,7 @@ msgstr "" "Die folgenden Pakete kollidieren mit %B%s%b und werden nach dessen " "Installation beschädigt sein:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -7136,7 +7176,7 @@ msgstr "" "momentan installierten (%B%s%b) ab oder kollidieren mit der momentan " "installierten:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -7144,11 +7184,11 @@ msgstr "" "Die folgenden Pakete kollidieren mit %B%s%b oder hängen von einer Version " "ab, die nicht installiert wird:" -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "Die folgenden Pakete kollidieren mit %B%s%b:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -7156,7 +7196,7 @@ msgstr "" "Die folgenden Pakete hängen von einer anderen Version von %B%s%b als der " "momentan installierten Version von %B%s%b ab:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." @@ -7164,18 +7204,18 @@ msgstr "" "Die folgenden Pakete hängen von einer Version von %B%s%b ab, die nicht " "installiert wird:" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "aktualisiert" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "durch eine ältere Version ersetzt" # I hope this is ok for the translators :-/ -- # factoring out upgraded/downgraded in its two senses # would be a royal pain even if gettext supported it. -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7185,7 +7225,7 @@ msgstr "" "Pakets %B%s%b (%B%s%b) ab oder kollidieren mit der Version, auf die es %s " "wird (%B%s%b). Sie werden beschädigt sein, wenn es %s wird." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7193,7 +7233,7 @@ msgstr "" "Die folgenden Pakete kollidieren mit Version %B%s%b des Pakets %B%s%b und " "werden beschädigt sein, wenn es %s wird." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7229,47 +7269,47 @@ msgstr "Anwenden" msgid "Close" msgstr "Schließen" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s kollidiert mit %s [angeboten von %s %s]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "Entfernen von %s" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "Installieren von %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "%ls unaufgelöst lassen." -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%BEntfernen%b der folgenden Pakete:%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%BInstallieren%b der folgenden Pakete:%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%BBeibehalten%b der folgenden Pakete in ihrer aktuellen Version:%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%BAktualisieren%b der folgenden Pakete:%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%BDowngrade%b der folgenden Pakete:%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "Die folgenden Abhängigkeiten unaufgelöst lassen:%n" @@ -7368,10 +7408,6 @@ msgstr "F:" msgid "W:" msgstr "W:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "Suchen nach:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7753,7 +7789,9 @@ msgid "Error while dumping resolver state" msgstr "Fehler beim Ausgeben des Auflösungsstatus" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "Datei, in welche der Auflösungsstatus gesichert werden soll:" #: src/ui.cc:2265 @@ -8276,6 +8314,21 @@ msgstr "" "anzeigen." #~ msgid "" +#~ "%BOption:%b %s\n" +#~ "%BDefault:%b %s\n" +#~ "%BValue:%b %s\n" +#~ msgstr "" +#~ "%BOption:%b %s\n" +#~ "%BStandard:%b %s\n" +#~ "%BWert:%b %s\n" + +#~ msgid "Press Return to continue" +#~ msgstr "Drücken Sie zum Fortsetzen die Eingabetaste" + +#~ msgid "Search for:" +#~ msgstr "Suchen nach:" + +#~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." #~ msgstr "" #~ "Abhängigkeiten für die Aktualisierung konnten nicht aufgelöst werden " @@ -8403,12 +8456,6 @@ msgstr "" #~ msgid "gtk-yes" #~ msgstr "ja" -# Should never happen. -#, fuzzy -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "Ungültige Operation: %s" - #~ msgid "but it is not installable" #~ msgstr "ist aber nicht installationsfähig" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2007-06-14 03:27+0530\n" "Last-Translator: Tshewang Norbu <bumthap2006@hotmail.com>\n" "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n" @@ -20,41 +20,37 @@ msgstr "" "X-Poedit-Country: Bhutan\n" "X-Poedit-SourceCharset: utf-8\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +#, fuzzy +msgid "%BOption:%b " +msgstr "གདམ་ཁ་ཚུ།" + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 #, fuzzy msgid "False" msgstr "ཁ་བསྡམས།" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -#, fuzzy -msgid "%BOption:%b " -msgstr "གདམ་ཁ་ཚུ།" - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "" - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:279 +#: src/apt_config_treeitems.cc:280 #, c-format -msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "" @@ -541,8 +537,8 @@ msgstr "མུས་མཐུན་པ་ནང་ཚུབ་ཅན་གྱི msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] རྟེན་འབྲེལ་ཚུ་མོས་མཐུན་འབད་དོ།" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "ནང་འཁོད་འཛོལ་བ:རེ་འདུན་མེད་པའི་ ཐབས་ཤེས་སྟོང་ཆ།" @@ -834,7 +830,7 @@ msgid "" msgstr "རྟེན་འབྲེལ་ཚུ་མོས་མཐུན་འབད་མ་ཚུགས།" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "བར་བཤོལ།\n" @@ -1198,7 +1194,7 @@ msgstr "སྒམ་བཤུབ་ཚར་ཞིནམ་ལས་%sBདེ་ msgid "No packages to show -- enter the package names on the line after 'i'.\n" msgstr "ཐུམ་སྒྲིལ་ཚུ་སྟོན་ནི་མེད -- 'i' གི་ཤུལ་ལས་གྲལ་ཐིག་གུར་ཐུམ་སྒྲིལ་ཚུ་གི་མིང་ཐོབཀད་འབད།\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "འཕྲོ་མཐུད་ནིའི་དོན་ལུ་ སལར་ལལོག་ལུ་ཨེབ་གཏང་འབད།" @@ -1207,10 +1203,6 @@ msgstr "འཕྲོ་མཐུད་ནིའི་དོན་ལུ་ ས msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "ཐུམ་སྒྲིལ་ཚུ་མ་ཐོབ་་-- 'c'་གི་ཤུལ་ལས་གྲལ་ཐིག་གུར་ཐུམ་སྒྲིལ་དེ་གི་ཚུ་མིང་ཚུ་ཐོ་བཀོད་འབད།\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "འཕྲོ་མཐུད་ནིའི་དོན་ལུ་ སླར་ལོག་ལུ་ཨེབ་གཏང་འབད།" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1512,7 +1504,7 @@ msgstr "མོས་མཐུན་པའི་གནས་ལུགས་དེ #| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F" #| "%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F" @@ -1779,7 +1771,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created." msgstr "" #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "རྟེན་འབྲེལ་ཚུ་མོས་མཐུན་འབད་དོ།" @@ -1815,7 +1807,9 @@ msgid "Invalid response; please enter one of the following commands:" msgstr "ནུས་མེད་ལན་གསལ། འོག་ལུ་ཡོད་མི་བརྡ་བཀོད་ཚུ་ལས་ཅིག་ཐོ་བཀད་འབད་གནང་:" #: src/cmdline/cmdline_resolver.cc:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +msgid "No solution found within the allotted time. Try harder? [Y/n] " msgstr "" "སྤྲོད་དེ་ཡོད་པའི་དུས་ཚོད་ཀྱི་ནང་འཁོད་ལུ་ཐབས་ཤེས་ཐོབ་མ་ཚུགས། ལྷག་པར་འབད་རྩོལ་བསྐྱེད་ནི་ཨིན་ན? [Y/n]" @@ -2020,7 +2014,7 @@ msgstr "ཐུམ་་སྒྲིལ་:" msgid "State" msgstr "གནས་ལུགས།" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "གིས་འབྱིན་བྱིནམ་ཨིན།" @@ -2128,27 +2122,31 @@ msgstr "ཚབ་བཙུགཔ་ཨིན།" msgid "Obsoletes" msgstr "ཕན་ཐོག་མེདཔ་ཨིན།" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "བྱིནམ་ཨིན།" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "འགྲེལ་བཤད: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "" -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "ཐུམ་སྒྲིལ་%sདེ་ག་ཡོད་འཚོལ་མ་ཚུགས།" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "དཔེ་གཞི་%s་དེ་མིང་དཔྱད་འབད་མ་ཚུགས།" @@ -2477,6 +2475,12 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "" +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "ནུས་མེད་བཀོལ་སྤྱོད་ %s" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "ཨིན་པུཊི་ཚད་ལྡན་གུར་རེ་འདུན་མེད་པའི་ཡིག་སྣོད་ཀྱི་-མཇུག" @@ -2494,7 +2498,7 @@ msgstr "[འཛོལ་བ།]" msgid "UNSATISFIED" msgstr "ངལ་རངས་མ་བྱུང་།" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "འཐོབ་ཚུགསཔ་སྦེ་མེད།" @@ -2502,7 +2506,7 @@ msgstr "འཐོབ་ཚུགསཔ་སྦེ་མེད།" msgid "Tags" msgstr "ངོ་རྟགས་ཚུ།" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 #, fuzzy #| msgid "Tags" msgid "User Tags" @@ -2906,16 +2910,21 @@ msgstr "ཐུམ་སྒྲིལ་%sདེ་ག་ཡོད་འཚོལ msgid "Unable to open %s to log actions" msgstr "བྱ་བ་ཚུ་བསྡམ་བཞག་ནིའི་དོན་ལུ་%sདེ་ཁ་ཕྱེ་མ་ཚུགས།" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "ཉེ་གནས་ཀྱི་ཆུ་ཚོད་(%s)བཟོ་བཏོན་འབད་ནི་ལུ་འཛོལ་བ་འདུག" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "དྲན་དེབ་སྙན་ཞུ།" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -2927,81 +2936,81 @@ msgstr "" "འཐུས་ཤོར་བྱུང་ཡོད་མི་བྱ་བ་ཚུ་མཇུག་མི་བསྡུ་ནིའི་ཉེན་ཁ་ཡོད།\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "%li ཐུམ་སྒྲིལ་ཚུ་གཞི་བཙུགས་འབད་ནི་ཨིནམ་དང་་%li ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏང་འོང་།\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "ཌིཀསི་བར་སྟོང་གི་%sB དེ་ལག་ལེན་འཐབ་འོང་།\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "ཌིཀསི་བར་སྟོང་གི་%sB དེ་རང་དབང་སྦེ་བཞག་འོང་།\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[ཡར་བསྐྱེད་འབད།] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[མར་ཕབ་འབད།] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "རྩ་བསྐྲད།" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "གཞི་བཙུགས།" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "བསྐྱར་བཙུགས།" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "འཆང།" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "ཆག་ཡོདཔ།" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "ལག་ལེན་མ་འཐབ་པར་ཡོདཔ་ལས་རྩ་བསྐྲད་གཏང་།" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "བརྟེན་འབྲེལ་ཚུ་རྩ་བསྐྲད་གཏང།" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "བརྟེན་འབྲེལ་ཚུ་གཞི་བཙུགས་འབད།" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "བརྟེན་འབྲེལ་ཚུ་འཆང།" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -3024,40 +3033,40 @@ msgstr "" msgid "Filtering packages" msgstr "ཐུམ་སྒྲིལ་ཚུ་ཕབ་ལེན་འབད་དོ།" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "ཤེས་པའི་བྱ་བའི་དབྱེ་བ:%s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "%sཤུལ་མ་རྩ་གྲོལ་མ་གཏང་མི་ཐད་དོན་གྱི་ཡིག་རྒྱུན།" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "མ་ཤེས་པའི་གཙོ་རིམ་%s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "" -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, fuzzy, c-format #| msgid "Expected ',' or '(', got '%c'" msgid "Expected '%c', got '%c'." msgstr "རེ་བ་ཡོད་མི་','ཡང་ན་ '(',ཐོབ་ཡོདཔ།'%c'" -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "མ་ཤེས་པའི་གཞན་བརྟེན་གྱི་དབྱེ་བ:%s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, fuzzy, c-format #| msgid "Unknown pattern type: %c" msgid "Unknown term type: \"%s\"." @@ -3065,41 +3074,41 @@ msgstr "མ་ཤེས་པའི་དཔེ་གཞི་གྱི་དབ #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, c-format msgid "" "The ?%s term must be used in a \"wide\" context (a top-level context, or a " "context enclosed by ?%s)." msgstr "" -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "མཐུན་སྒྲིག་མེད་མི། '('" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "བྱིནམ་ཨིན: ཆག་མི་ཚུགས།" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "མ་ཤེས་པའི་དཔེ་གཞི་གྱི་དབྱེ་བ: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "\"\" དེ་གི་དོན་ལུ་འཚོལ་མ་ཚགས།" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "རེ་འདོན་མེད་པའི་གསལ་བརྗོད་སྟོངམ།" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, fuzzy, c-format #| msgid "Badly formed expression" msgid "Badly formed expression: expected '|', got '%c'" msgstr "གསལ་བརྗོད་གཞི་སྒྲུབ་འབད་ཡོད་མི་དེ་བྱང་ཉེས་ཨིན་པས།" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "རེ་འདུན་མེད་མི་')'" @@ -4042,22 +4051,22 @@ msgstr "" msgid "%s: Unable to accept a connection: %s" msgstr "\"%s\": %s ནང་ལས་གནས་སྐབས་ཀྱི་སྣོད་འཛིན་གསར་བསྐྲུན་འབད་མི་ཚུགས་པས།" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4783,7 +4792,7 @@ msgstr "" msgid "Virtual package" msgstr "ཐུམ་སྒྲིལ།" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "གཞི་བཙུགས་མ་འབད་བས།" @@ -4953,161 +4962,167 @@ msgstr "%s དེགིས་%sདེ་ཚབ་བཙུགསཔ་ཨིན msgid "%s obsoletes %s" msgstr "%s དེགིས་%s ཕན་མེད་བཟོཝ་ཨིན།" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s དེགིས་%sདེ་ཚབ་བཙུགསཔ་ཨིན།" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་རཙ་བསྐྲད་གཏང:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་དེ་ཚུ་གཞི་བཙུགས་འབད:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 #, fuzzy #| msgid "Remove the following packages:" msgid "Keep the following packages:" msgstr "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་རཙ་བསྐྲད་གཏང:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་དེ་ཚུ་ཡར་བསྐྱེད་འབད:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་དེ་ཚུ་མར་ཕབ་འབད:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 #, fuzzy #| msgid "Leave the following dependencies unresolved:%n" msgid "Leave the following dependencies unresolved:" msgstr "འོག་ལུ་ཡོད་མི་རྟེན་འབྲེལ་ཚུ་མོས་མཐུན་མ་འབད་བར་་བཞག:%n" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, fuzzy, c-format #| msgid "Remove %F [%s (%s)]" msgid "Remove %s [<big>%s</big> (%s)]" msgstr "%F [%s (%s)] དེ་རྩ་བསྐྲད་གཏང་།" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "Install %s [<big>%s</big> (%s)]" msgstr "%F [%s (%s)] དེ་གཞི་བཙུགས་འབད།" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "Cancel the installation of %s" msgstr " %F གཞི་བཙུགས་འབད་ནི་དེ་ཆ་མེད་གཏང་།" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Cancel the removal of %s" msgstr "%F རཙ་བསྐྲད་གཏང་ནིདེ་ཆ་མེད་གཏང་།" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "Keep %s at version <big>%s</big> (%s)" msgstr "%Fདེ་ཐོན་རིམ་%s (%s)གུར་བཞག" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, fuzzy, c-format #| msgid "Upgrade %F [%s (%s) -> %s (%s)]" msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "%F [%s (%s) -> %s (%s)] དེ་ཡར་བསྐྱེད་འབད།" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, fuzzy, c-format #| msgid "Downgrade %F [%s (%s) -> %s (%s)]" msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "%F [%s (%s) -> %s (%s)] དེ་མར་ཕབ་འབད།" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format msgid "<b>Remove</b> %s" msgstr "རྩ་བསྐྲད།" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format msgid "<b>remove</b> %s" msgstr "རྩ་བསྐྲད།" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>Keep</b> %s at version %s" msgstr "%Fདེ་ཐོན་རིམ་%s (%s)གུར་བཞག" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>keep</b> %s at version %s" msgstr "%Fདེ་ཐོན་རིམ་%s (%s)གུར་བཞག" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>Cancel</b> the installation of %s" msgstr " %F གཞི་བཙུགས་འབད་ནི་དེ་ཆ་མེད་གཏང་།" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>cancel</b> the installation of %s" msgstr " %F གཞི་བཙུགས་འབད་ནི་དེ་ཆ་མེད་གཏང་།" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>Install</b> %s %s" msgstr "%F [%s (%s)] དེ་གཞི་བཙུགས་འབད།" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>install</b> %s %s" msgstr "%F [%s (%s)] དེ་གཞི་བཙུགས་འབད།" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid "libsigc++ version: %s\n" msgid "<b>Downgrade</b> %s to version %s" msgstr "libsigc++ཐོན་རིམ་: %s\n" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid "libsigc++ version: %s\n" msgid "<b>downgrade</b> %s to version %s" msgstr "libsigc++ཐོན་རིམ་: %s\n" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>Upgrade</b> %s to version %s" msgstr "%s ཐོན་རིམ་ཚུ།" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>upgrade</b> %s to version %s" msgstr "%s ཐོན་རིམ་ཚུ།" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format #| msgid "%d install" #| msgid_plural "%d installs" @@ -5116,7 +5131,7 @@ msgid_plural "%s installs" msgstr[0] "%d གཞི་བཙུགས་འབད་ནི།" msgstr[1] "%d གཞི་བཙུགས་འབད་ནི་ཚུ།" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, fuzzy, c-format #| msgid "%d removal" #| msgid_plural "%d removals" @@ -5125,7 +5140,7 @@ msgid_plural "%s removes" msgstr[0] "%d རྩ་བསྐྲད།" msgstr[1] "%d རྩ་བསྐྲད་ཚུ།" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, fuzzy, c-format #| msgid "%d keep" #| msgid_plural "%d keeps" @@ -5134,7 +5149,7 @@ msgid_plural "%s keeps" msgstr[0] "%d བདག་འཛིན་སྦེ་བཞག" msgstr[1] "%d བདག་འཛིན་སྦེ་བཞགཔ་ཨིན།" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, fuzzy, c-format #| msgid "%d upgrade" #| msgid_plural "%d upgrades" @@ -5143,7 +5158,7 @@ msgid_plural "%s upgrades" msgstr[0] "%d ཡར་བསྐྱེད་འབད།" msgstr[1] "%d ཡར་བསྐྱེད་འབདཝ་ཨིན། " -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, fuzzy, c-format #| msgid "%d downgrade" #| msgid_plural "%d downgrades" @@ -5152,7 +5167,7 @@ msgid_plural "%s downgrades" msgstr[0] "%d མར་ཕབ་འབད།" msgstr[1] "%d མར་ཕབ་འབདཝ་ཨིན།" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, fuzzy, c-format #| msgid "Audit ^Recommendations" msgid "%s unresolved recommendation" @@ -5160,35 +5175,35 @@ msgid_plural "%s unresolved recommendations" msgstr[0] "རྩིས་ཞིབ་འོས་སྦྱོར།(^R)" msgstr[1] "རྩིས་ཞིབ་འོས་སྦྱོར།(^R)" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 #, fuzzy #| msgid "No more solutions." msgid "No solutions yet." msgstr "ཐབས་ཤེས་དེ་ལས་ལྷག་སྟེ་མེད།" -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 #, fuzzy #| msgid "^Dependency handling" msgid "No dependency solution was found." msgstr "རྟེན་འབྲེལ་ལེགས་སྐྱོང་འཐབ་ནི།(^D)" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 #, fuzzy #| msgid "No more solutions." msgid "No solutions." msgstr "ཐབས་ཤེས་དེ་ལས་ལྷག་སྟེ་མེད།" -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, fuzzy, c-format #| msgid "No more solutions." msgid "%u solutions." msgstr "ཐབས་ཤེས་དེ་ལས་ལྷག་སྟེ་མེད།" -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Could not open file \"%s\"" msgid "Solution %s of %s." @@ -5507,12 +5522,12 @@ msgstr "" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s དེ་%s %sགུར་ཕྱོགས་སྒྲིག་འབད་བཞག་ནུག།\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5679,29 +5694,35 @@ msgstr "སྟོན་ - ཐུམ་སྒྲིལ་ཅིག་གི་ #: src/main.cc:213 #, fuzzy, c-format +#| msgid " show - Display detailed information about a package\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr "སྟོན་ - ཐུམ་སྒྲིལ་ཅིག་གི་སྐོར་ལས་རྒྱས་ཤིང་རྒྱསཔ་སྦེ་ཡོད་མི་བརྡ་དོན་ཚུ་བཀྲམ་སྟོན་འབད།\n" + +#: src/main.cc:214 +#, fuzzy, c-format #| msgid " clean - Erase downloaded package files\n" msgid " clean - Erase downloaded package files.\n" msgstr "སེལ - ཕབ་ལེན་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཡིག་སྣོད་ཚུ་ཀྲེག་གཏང་།\n" -#: src/main.cc:214 +#: src/main.cc:215 #, fuzzy, c-format #| msgid " autoclean - Erase old downloaded package files\n" msgid " autoclean - Erase old downloaded package files.\n" msgstr "རང་བཞིན་གྱིས་སེལ་ནི་ - ཕབ་ལེན་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཡིཡག་སྣོད་་རྙིངམ་ཚུ་ཀྲེག་གཏང་།\n" -#: src/main.cc:215 +#: src/main.cc:216 #, fuzzy, c-format #| msgid " changelog - View a package's changelog\n" msgid " changelog - View a package's changelog.\n" msgstr "བསྒྱུར་བཅོས་དྲན་དེབ - ཐུམ་སྒྲིལ་གྱི་བསྒྱུར་བཅོས་དྲན་དེབ་ཅིག་སྟོན།\n" -#: src/main.cc:216 +#: src/main.cc:217 #, fuzzy, c-format #| msgid " download - Download the .deb file for a package\n" msgid " download - Download the .deb file for a package.\n" msgstr "ཕབ་ལེན་འབད- ཐུམ་སྒྲིལ་ཅིག་གི་དོན་ལུ་ཌེབ་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད།\n" -#: src/main.cc:217 +#: src/main.cc:218 #, fuzzy, c-format #| msgid "" #| " reinstall - Download and (possibly) reinstall a currently installed " @@ -5713,15 +5734,15 @@ msgstr "" "བསྐྱར་བཙུགས་འབད - འཕྲལ་ཁམས་གཞི་བཙུགས་འབད་ཡོད་མི་ཐུམ་སྒརིལ་དེ་ཕབ་ལེན་འབད་དེ་སླར་གཞི་བཙུགས་" "འབད།\n" -#: src/main.cc:218 +#: src/main.cc:219 #, c-format msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" -#: src/main.cc:220 +#: src/main.cc:221 #, c-format msgid "" " why-not - Show the manually installed packages that lead to a " @@ -5730,58 +5751,58 @@ msgid "" " lead to a conflict with the given package if installed.\n" msgstr "" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr "གདམ་ཁ་ཚུ་:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " -h This help text.\n" msgstr " -h འདི་གྲོགས་རམ་ཚིག་ཡིག་ཨིན།\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h འདི་གྲོགས་རམ་ཚིག་ཡིག་ཨིན།\n" -#: src/main.cc:232 +#: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr "" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s བྱ་བ་ཚུ་རྫུས་མ་བཟོ་ དེ་འབདཝ་ད་ དེ་ཚུ་ངོ་མ་སྦེ་ལག་ལེན་འཐབ།\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr " -d་ ཐུམ་སྒྲིལ་ཚུ་ཕབ་ལེན་འབད་ནི་མ་གཏོགས་ ག་ནི་ཡང་གཞི་བཙུགས་དང་རྩ་བསྐྲད་མ་གཏང་།\n" -#: src/main.cc:236 +#: src/main.cc:237 #, fuzzy, c-format #| msgid " -P Always prompt for confirmation or actions\n" -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P ཨ་རྟག་རང་ ངེས་དཔྱད་འབད་ནི་དང་བྱ་བ་ཚུ་གི་དོན་ལུ་ནུས་སྤེལ་འབད།\n" -#: src/main.cc:237 +#: src/main.cc:238 #, fuzzy, c-format #| msgid "" #| " -y Assume that the answer to simple yes/no questions is " @@ -5790,7 +5811,7 @@ msgid "" " -y Assume that the answer to simple yes/no questions is 'yes'.\n" msgstr " -y བཏུབ་/མི་བཏུབ་ཀྱི་དྲི་བའི་ལན་དེ་ 'yes' ཨིན་ཟེར་མནོ་རུང་བཏུབ།\n" -#: src/main.cc:238 +#: src/main.cc:239 #, fuzzy, c-format #| msgid "" #| " -F format Specify a format for displaying search results; see the " @@ -5802,7 +5823,7 @@ msgstr "" " -F format འཚོལ་ཞིབ་འབད་ཡོད་པའི་གྲུབ་འབྲས་ཚུ་བཀྲམ་སྟོན་འབད་ནིའི་དོན་ལུ་ རྩ་སྒྲིག་ཅིག་གསལ་བཀོད་" "འབད། ལག་དེབ་ལུ་བལྟ།\n" -#: src/main.cc:239 +#: src/main.cc:240 #, fuzzy, c-format #| msgid "" #| " -O order Specify how search results should be sorted; see the " @@ -5814,7 +5835,7 @@ msgstr "" " -O order འཚོལ་ཞིབ་འབད་ཡོད་པའི་གྲུབ་འབྲས་ཚུ་ག་དེ་སྦེ་གསོག་འཇོག་འབད་ནི་ཨིན་ན་གསལ་བཀོད་འབད། " "ལག་དེབ་ལུ་བལྟ།\n" -#: src/main.cc:240 +#: src/main.cc:241 #, fuzzy, c-format #| msgid "" #| " -w width Specify the display width for formatting search results\n" @@ -5823,29 +5844,29 @@ msgid "" msgstr "" " -w width འཚོལ་ཞིབ་གྲུབ་འབྲས་རྩ་སྒྲིག་འབད་ནིའི་དོན་ལུ་ བཀྲམ་སྟོན་གྱི་རྒྱ་ཚད་དེ་གསལ་བཀོད་འབད།\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr "" " -f ཐུམ་སྒྲིལ་ཆག་འགྱོ་ཡོད་མི་ཚུ་ བཙན་ཤུགས་ཅན་གྱི་ཐོག་ལས་ཚུད་སྒྲིག་འབད་ནི་ལུ་འབད་རྩོལ་བསྐྱེད།\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr "-V ཐུམ་སྒྲིལ་ཚུ་གི་ཐོན་རིམ་ག་འདི་གཞི་བཙུགས་འབད་ནི་ཨིན་ན་སྟོན།\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr " -D རང་བཞིན་གྱིས་བསྒྱུར་བཅོས་འགྱོ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་གི་བརྟེན་འབྲེལ་དེ་སྟོན།\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr " -Z ཐུམ་སྒྲིལ་རེ་རེ་བཞིན་གྱི་གཞི་བཙུགས་འབད་ཡོད་པའི་ཚད་ནང་གི་བསྒྱུར་བཅོས་སྟོན།\n" -#: src/main.cc:245 +#: src/main.cc:246 #, fuzzy, c-format #| msgid "" #| " -v Display extra information. (may be supplied multiple " @@ -5855,7 +5876,7 @@ msgid "" "times).\n" msgstr " -v བརྡ་དོན་ཐེབས་བཀྲམསྟོན་འབད།(ཐེངས་ལེ་ཤ་ཅིག་བཀྲམ་སྤེལ་འབད་འབདཝ་འོང་།)\n" -#: src/main.cc:246 +#: src/main.cc:247 #, fuzzy, c-format #| msgid "" #| " -t [release] Set the release from which packages should be installed\n" @@ -5865,63 +5886,63 @@ msgstr "" " -t[གསར་བཏོན་འབད་ནི་] གསར་སྟོན་དེ་ ཐུམ་སྒྲིལ་ག་འདི་གཞི་བཙུགས་འབད་དགོཔ་ཨིན་ན་གི་ནང་ལས་ གཞི་སྒྲིག་" "འབད།\n" -#: src/main.cc:247 +#: src/main.cc:248 #, fuzzy, c-format #| msgid "" #| " -q In command-line mode, suppress the incremental progress " #| "indicators.\n" msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" "-q བརྡ་བཀོད་-གྲལ་ཐིག་གི་ཐབས་ལམ་ནང་ལུ་ ཡར་འཕར་ཡར་འཕེལ་གྱི་བརྡ་སྟོན་པ་དེ་མར་མནོན་འབད།\n" -#: src/main.cc:249 +#: src/main.cc:250 #, fuzzy, c-format #| msgid " -o key=val Directly set the configuration option named 'key'\n" msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr " -o key=val རིམ་སྒྲིག་གདམ་ཁའི་མིང་'key'ཟེར་མི་དེ་ཐད་ཀར་དུ་གཞི་སྒྲིག་འབད།'\n" -#: src/main.cc:250 +#: src/main.cc:251 #, fuzzy, c-format #| msgid "" #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" #| " strong dependencies\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends\tའོས་སྦྱོར་ཚུ་སྒྲིང་སྒྲིང་ཡོད་པའི་བརྟེན་འབྲེལ་་བཟུམ་སྦེ་\n" " བརྩིའཇོག་འབད་དགོ་དང་མི་དགོ་གསལ་བཀོད་འབད།\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr "-S fname ཨེཕི་མིང་ནང་ལས་ གོམས་འདྲིས་བརྒྱ་བསྐྱེད་འབད་ཡོད་པའི་གནས་ཚད་བརྡ་དོན་དེ་ལྷག།\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u འགོ་བཙུགས་གུར་ ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་གསརཔ་ཚུ་ཕབ་ལེན་འབད།\n" -#: src/main.cc:254 src/main.cc:256 +#: src/main.cc:255 src/main.cc:257 #, c-format -msgid " (terminal interface only)" +msgid " (terminal interface only)\n" msgstr "" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i འགོ་བཙུགས་གུར་གཞི་བཙུགས་གཡོག་བཀོལ་དེ་ལག་ལེན་འཐབ།\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " གོམས་འདྲིས་འདི་ལུ་ཡང་དག་པའི་ཀཱའུ་ནུས་ཤུགས་དེ་མེད།.\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 #, fuzzy #| msgid "replaces" msgid "trace" @@ -5929,13 +5950,13 @@ msgstr "ཚབ་བཙུགསཔ་ཨིན།" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 #, fuzzy #| msgid "no" msgid "info" @@ -5943,13 +5964,13 @@ msgstr "མེན།" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 #, fuzzy #| msgid "Err " msgid "error" @@ -5957,103 +5978,103 @@ msgstr "ཨི་ཨཱར་ཨཱར།" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 #, fuzzy msgid "fatal" msgstr "ཁ་བསྡམས།" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " "\"warn\", \"error\", \"fatal\", or \"off\")." msgstr "" -#: src/main.cc:487 +#: src/main.cc:488 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "Invalid logger name \"%s\"." msgstr "ནུས་མེད་བཀོལ་སྤྱོད་ %s" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "-q= དེ་གི་ཤུལ་ལས་ཨང་ཡིག་ཅིག་རེ་བ་བསྐྱེད་ཅི།\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "-q=, got %sདེ་གི་ཤུལ་ལས་ཨང་ཡིག་ཅིག་རེ་བ་བསྐྱེད་ཅི།\n" -#: src/main.cc:802 +#: src/main.cc:794 #, fuzzy, c-format #| msgid "-o requires an argument of the form key=value, got %s" msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o དེ་ལུ་རྣམ་པའི་ལྡེ་མིིིག་=གནས་གོང་གི་སྒྲུབ་རྟགས་དེ་དགོས་མཁོ་ཡོདཔ་ཨིན། %s་ ཐོབ་ཅི།" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "WEIRDNESS:མ་ཤེས་པའི་གདམ་ཁའི་ཨང་རྟགས་ཐོབ་ཡོདཔ།\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "" -#: src/main.cc:1039 +#: src/main.cc:1023 #, fuzzy #| msgid "Package" msgid "first-package" msgstr "ཐུམ་སྒྲིལ།" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "" -#: src/main.cc:1043 +#: src/main.cc:1027 #, fuzzy #| msgid "All Packages" msgid "all-packages" msgstr "ཐུམ་སྒྲིལ་ཆ་མཉམ།" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -6061,7 +6082,7 @@ msgid "" "versions\"." msgstr "" -#: src/main.cc:1089 +#: src/main.cc:1073 #, fuzzy #| msgid "Only one of -u and -i may be specified\n" msgid "" @@ -6069,7 +6090,7 @@ msgid "" "specified\n" msgstr "-uདང་ -i གི་ནང་གཅིག་རྐྱངམ་ཅིག་གསལ་བཀོད་འབད་འོང་ག་མི་ཤེས།\n" -#: src/main.cc:1098 +#: src/main.cc:1082 #, fuzzy #| msgid "" #| "-u and -i may not be specified in command-line mode (eg, with 'install')" @@ -6080,23 +6101,23 @@ msgstr "" "-u དང་ -i དེ་བརྡ་བཀོད་-གྲལ་ཐིག་ཐབས་ལམ་ནང་ལུ་གསལ་བཀོད་མི་འབད་འོང་།(དཔེ་འབད་བ་ཅིན་, 'གཞི་" "བཙུགས'དང་གཅིག་ཁར།)" -#: src/main.cc:1115 +#: src/main.cc:1099 #, fuzzy #| msgid "-u and -i may not be specified with a command" msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "-u དང་ -i དེ་བརྡ་བཀོད་དང་གཅིག་ཁར་གསལ་བཀོད་མི་འབད་འོང་།" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "མ་ཤེས་པའི་བརྡ་བཀོད་\"%s\"\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "མ་འཛིན་པའི་དང་ལེན: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, fuzzy, c-format #| msgid "" #| "Backtrace:\n" @@ -6108,7 +6129,8 @@ msgstr "" "རྒྱབ་འཚོn:\n" "%s" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "དོན་ལུ་འཚོལ་ཞིབ་འབད:" @@ -6998,17 +7020,21 @@ msgstr "ཚབ་བཙུགསཔ་ཨིན།" msgid "obsoletes" msgstr "ཕན་མེདཔ་ཨིན།" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr "(%F དེ་གིས་བྱིན་ཡོདཔ་ཨིན།)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." @@ -7016,7 +7042,7 @@ msgstr "" "ཁྱོད་ཀྱིས་ཐུམ་སྒྲིལ་ཧེལ་འཐུ་འབད་བ་ཅིན་ དེ་གི་ད་ལྟོའི་གནས་ལུགས་ཀྱི་འགྲེལ་བཤད་དེ་ བར་སྟོང་འདི་ནང་་ལུ་འབྱུང་" "འོང་།" -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -7024,17 +7050,17 @@ msgstr "" "%B%s%b དེ་རང་བཞིན་གྱིས་གཞི་བཙུགས་འབད་ནུག འདི་རྩ་བསྐྲད་གཏང་མི་དེ་ཡང་ འདི་ལུ་བརྟེན་མི་ཐུམ་སྒྲིལ་ཆ་" "མཉམ་རྩ་བསྐྲད་གཏང་སྟེ་ཡོདཔ་ཨིན:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "%B%s%b དེ་ རྟེན་འབྲེལ་གྱི་འཛོལ་བ་ཡོདཔ་ལས་རང་བཞིན་གྱིས་རྩ་བསྐྲད་གཏང་འོང་:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" "%B%s%b དེ་འོག་བཀོད་དེ་ཡོད་མི་རྟེན་འབྲེལ་ཚུ་ལུ་ངལ་རངས་འབྱུང་དོན་ལུ་ རང་བཞིན་གྱིས་གཞི་བཙུགས་འབད་འོང་།" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -7042,7 +7068,7 @@ msgstr "" "%B%s%b དེ་ད་ལྟོ་ཡར་བསྐྱེད་འབད་དམི་བཏུབ་ དེ་འབདཝ་ད་ ག་དེ་ཅིག་སྦེ་འབད་ཚུགས་པ་ཅིན་ འདི་གིས་ད་ལྟོ་" "ཡང་ཐོན་རིམ་%B%s%bདེ་གུར་འཆང་སྟེ་འོང་།" -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -7050,27 +7076,27 @@ msgstr "" "%B%s%b དེ་གིས་འོག་ལུ་བཀོད་དེ་ཡོད་མི་རྟེན་འབྲེལ་ཚུ་རྒྱུན་ཆད་མི་བཅུག་ནིའི་དོན་ལུ་ ཐོན་རིམ་ %B%s%bལུ་ཡར་" "བསྐྱེད་འབད་མི་བཏུབ།" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b དེ་ད་ལྟོ་གཞི་བཙུགས་འབད་དེེ་ཡོདཔ་ཨིན།" -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b་དེ་ད་ལྟོ་གཞི་བཙུགས་འབད་དེ་མེད།" -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "%B%s%b དེ་གི་རྟེན་འབྲེལ་ལ་ལུ་ཅིག་ལུ་ངལ་རངས་མ་བྱུང་པས:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "%B%s%b དེ་མར་ཕབ་འབད་ནི་ཨིན།" -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b དེ་མ་ཆོག་སྦེེ་ཡོད་མི་ཐོན་རིམ་%B%s%b ལུ་ཡར་བསྐྱེད་མི་འབད།" -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." @@ -7078,38 +7104,38 @@ msgstr "" "%B%s%b དེ་ཐོན་རིམ་%B%s%b ཡར་བསྐྱེད་འབད་མི་ཚུགས་དེ་འབདཝ་ད་ འ་ནི་དེ་ཐོན་རིམ་%B%s%bདེ་གུར་འཆང་" "སྟེ་ཡོདཔ་ཨིན།" -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b དེ་སླར་གཞི་བཙུགས་འབད་ནི་ཨིན།" -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b དེ་གཞི་བཙུགས་འབད་ནི་ཨིན།" -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b དེ་རྩ་བསྐྲད་གཏང་ནི་ཨིན།" -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b དེ་ཐོན་རིམ་%B%s%b དེ་ནང་ལས་ཐོན་རིམ་%B%s%b ལུ་ཡར་བསྐྱེད་འབད་ནི་ཨིན།" -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 #, fuzzy msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "%s ད་ལྟོ་གཞི་བཙུགས་མ་འབད་བས། དེ་འབདཝ་ལས་ འ་ནི་དེ་སླར་གཞི་བཙུགས་མི་འབད། \n" -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "" "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་ %B%s%b དེ་ལུ་བརྟེན་དོ་ཡོདཔ་ད་ འ་ནི་དེ་རྩ་བསྐྲད་གཏང་མི་དེ་གིས་ཆག་འགྱོ་འོང་:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་ %B%s%b དེ་ལུ་བརྟེན་དོ་ཡོདཔ་མི་དེ་ཆད་འགྱོ་ནུག:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" @@ -7117,7 +7143,7 @@ msgstr "" "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་གིས་ %B%s%b རྩོད་རྙོག་བཀོད་ཨིནམ་དང་ འ་ནི་དེ་གཞི་བཙུགས་འབད་མི་དེ་གིས་ཆད་" "འགྱོཝ་ཨིན།" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -7126,7 +7152,7 @@ msgstr "" "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་གིས་ ད་ལྟོ་གཞི་བཙུགས་འབད་ཡོད་མི་ B%s%b་དེ་གི་ཐོནརིམ་དེ་མེན་པར་ %B%s%b " "དེལུ་བརྟེནམ་ཨིནམ་འང་ ཡང་ན་ ད་ལྟོ་གཞི་བཙུགས་འབད་ཡོད་མི་ཐོན་རིམ་དང་གཅིག་ཁར་རྩོད་རྙོག་བཀོདཔ་ཨིན།" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -7134,11 +7160,11 @@ msgstr "" "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་དེ་ཚུ་ %B%s%b་དང་གཅིག་ཁར་མི་མཐུནམ་ཨིནམ་དང་ གཞི་བཙུགས་མི་འབད་ནི་ཨིན་མི་ " "དེའི་ཐོན་རིམ་གུར་བརྟེནམ་ཨིན།" -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "འོགལུ་ཡོད་མི་ཐུམ་སྒྲིལ་དེ་གིས་ %B%s%b དེ་དང་གཅིག་ཁར་རྩོད་རྙོག་བཀོདཔ་ཨིན:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -7146,21 +7172,21 @@ msgstr "" "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་དེ་གིས་ད་ལྟོ་གཞི་བཙུགས་འབད་ཡོད་མི་%B%s%b དེ་གི་ཐོན་རིམ་དེ་མེན་པར་ %B%s%b གི་" "ཐོན་རིམ་དེ་ལུ་བརྟེནམ་ཨིན:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." msgstr "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་དེ་གིས་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་མི་ %B%s%b གི་ཐོན་རིམ་གུར་བརྟེནམ་ཨིན།" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "ཡར་བསྐྱེད་འབད་ཡོདཔ།" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "མར་ཕབ་འབད་ཡོདཔ།" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7170,7 +7196,7 @@ msgstr "" "ཡོདཔ་ཨིནམ་དང་ ཡང་ན་ ཐོན་རིམ་དང་གཅིག་ཁར་མ་མཐུན་པ་ཅིན་ འད་ནི་དེ་(%B%s%b) ལུ་ %s སྦེ་འོང་ནི་" "ཨིནམ་དང་ འ་ནི་དེ་%s ཨིན་པ་ཅིན་རྒྱུན་ཆད་འགྱོཝ་ཨིན།" -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7178,7 +7204,7 @@ msgstr "" "འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་གིས་%B%s%b་གི་ཐོན་རིམ་%B%s%b དང་གཅིག་ཁར་རྩོད་རྙོག་བཀོདཔ་ཨིནམ་དང་ འ་ནི་" "དེ་ %s ཨིན་པ་ཅིན་རྒྱུན་ཆད་འགྱོཝ་ཨིན།" -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7214,47 +7240,47 @@ msgstr "འཇུག་སྤྱོད།" msgid "Close" msgstr "ཁ་བསྡམས།" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s དེ་%s དང་གཅིག་ཁར་མི་མཐུན་དོ་ཡོདཔ་ཨིན།[%s %s དེ་གིས་བྱིན་ཡོདཔ་ཨིན།]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "%sདེ་རྩ་བསྐྲད་གཏང་དོ།" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "%s %s (%s) དེ་གཞི་བཙུགས་འབད་དོ།" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%B འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་%bརྩ་བསྐྲད་གཏང:%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%Bའོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་ %b གཞི་བཙུགས་འབད:%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%B འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་ཁོང་རའི་ད་ལྟོའི་ཐོན་རིམ་གུར་Keep བཞག:%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%B འོག་ལུ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་ %b ཡར་བསྐྱེད་མ་འབད:%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%B འོག་ལུ་ཡོད་མི་ཐུམ་སྒརིལ་ཚུ་ %b མར་ཕབ་འབད:%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "འོག་ལུ་ཡོད་མི་རྟེན་འབྲེལ་ཚུ་མོས་མཐུན་མ་འབད་བར་་བཞག:%n" @@ -7353,10 +7379,6 @@ msgstr "ཨི:" msgid "W:" msgstr "ཌབ་ལུ:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "དོན་ལུ་འཚོལ་ཞིབ་འབད:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7743,7 +7765,9 @@ msgid "Error while dumping resolver state" msgstr "མོས་མཐུན་བཟོ་མི་གནས་ལུགས་དེ་བཀོག་བཞག་པའི་སྐབས་ལུ་འཛོལ་བ་བྱུང་ནུག" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "མོས་མཐུན་བཟོ་མི་གནས་ལུགས་དེ་བཀོག་བཞག་དགོ་སའི་ཡིག་སྣོད:" #: src/ui.cc:2265 @@ -8254,6 +8278,12 @@ msgstr "བསྒྱུར་བཅོས་དྲེན་དེབ་ཕབ་ msgid "You can only view changelogs of official Debian packages." msgstr "ཁྱོད་ཀྱིས་གཞུང་འབྲེལ་གྱི་ཌེ་བི་ཡཱན་ཐུམ་སྒྲིལ་ཚུ་གི་བསྒྱུར་བཅོས་དྲན་དེབ་རྐྱངམ་ཅིག་སྟོན་ཚུགས།" +#~ msgid "Press Return to continue" +#~ msgstr "འཕྲོ་མཐུད་ནིའི་དོན་ལུ་ སླར་ལོག་ལུ་ཨེབ་གཏང་འབད།" + +#~ msgid "Search for:" +#~ msgstr "དོན་ལུ་འཚོལ་ཞིབ་འབད:" + #, fuzzy #~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." @@ -8382,11 +8412,6 @@ msgstr "ཁྱོད་ཀྱིས་གཞུང་འབྲེལ་གྱི #~ msgid "gtk-yes" #~ msgstr "ཨིན།" -#, fuzzy -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "ནུས་མེད་བཀོལ་སྤྱོད་ %s" - #~ msgid "but it is not installable" #~ msgstr "དེ་འབདཝ་ད་ འདི་གཞི་བཙུགས་འབད་བཏུབ་མི་མེན་པས།" @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2008-09-11 15:53+0200\n" "Last-Translator: quad-nrg.net <yodesy@quad-nrg.net>\n" "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n" @@ -24,42 +24,36 @@ msgstr "" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" -msgstr "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " +msgstr "%BOption:%b " + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " +msgstr "%BDefault:%b " -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "Αληθές" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "Ψευδές" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " -msgstr "%BOption:%b " - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "%BDefault:%b " - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "%BValue:%b " -#: src/apt_config_treeitems.cc:279 -#, c-format -msgid "Editing \"%ls\"" +#: src/apt_config_treeitems.cc:280 +#, fuzzy, c-format +#| msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "Διόρθωση του \"%ls\"" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "%BChoice:%b " @@ -661,8 +655,8 @@ msgstr "Μοιραίο σφάλμα στον επιλυτή" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] Ανάλυση των εξαρτήσεων" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "Εσωτερικό σφάλμα: απρόσμενη κενή λύση" @@ -956,7 +950,7 @@ msgstr "" "Αδύνατη η ασφαλής επίλυση των εξαρτήσεων, προσπάθεια με --full-resolver.\n" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "Εγκατάλειψη.\n" @@ -1334,7 +1328,7 @@ msgstr "" "Δεν υπάρχουν πακέτα για εμφάνιση -- δώστε τα ονόματα των πακέτων μετά το " "'i'.\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "Πατήστε Return για συνέχεια" @@ -1343,10 +1337,6 @@ msgstr "Πατήστε Return για συνέχεια" msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "Δεν βρέθηκαν πακέτα -- γράψτε τα ονόματα των πακέτων μετά το 'c'.\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "Πατήστε Return για συνέχεια " - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1665,7 +1655,7 @@ msgstr "Η κατάσταση του resolver γράφτηκε με επιτυχ #| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: " #| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: %F" @@ -1948,7 +1938,7 @@ msgstr "" "εξαρτήσεων." #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "Επίλυση εξαρτήσεων..." @@ -1986,7 +1976,9 @@ msgid "Invalid response; please enter one of the following commands:" msgstr "Μη έγκυρη απόκριση. Παρακαλώ εισάγετε μια από τις ακόλουθες εντολές:" #: src/cmdline/cmdline_resolver.cc:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +msgid "No solution found within the allotted time. Try harder? [Y/n] " msgstr "Δεν βρέθηκε λύση μέσα στον διατιθέμενο χρόνο. Δοκιμή κεφαλίδας;[Y/n]" #: src/cmdline/cmdline_resolver.cc:1080 @@ -2194,7 +2186,7 @@ msgstr "Πακέτο: " msgid "State" msgstr "Κατάσταση" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "Παρέχεται από" @@ -2302,27 +2294,31 @@ msgstr "Αντικαθιστά" msgid "Obsoletes" msgstr "Αχρηστεύει" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Παρέχει" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Περιγραφή: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "Homepage: " -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "Αδύνατος ο εντοπισμός του πακέτου %s" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "Αδύνατο το parse του προτύπου %s" @@ -2642,6 +2638,12 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "" +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "Ακυρη λειτουργία %s" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "Απρόσμενο τέλος-αρχείου στην στάνταρ είσοδο" @@ -2659,7 +2661,7 @@ msgstr "[ΣΦΑΛΜΑ]" msgid "UNSATISFIED" msgstr "ΜΗ ΙΚΑΝΟΠΟΙΗΜΕΝΑ" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "ΜΗ ΔΙΑΘΕΣΙΜΑ" @@ -2667,7 +2669,7 @@ msgstr "ΜΗ ΔΙΑΘΕΣΙΜΑ" msgid "Tags" msgstr "Ετικέτες" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "Ετικέτες Χρήστη" @@ -3081,16 +3083,21 @@ msgstr "Αδύνατος ο εντοπισμός του πακέτου %s" msgid "Unable to open %s to log actions" msgstr "Αδύνατο το άνοιγμα του %s για την καταγραφή ενεργειών" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "Σφάλμα κατά την δημιουργία τοπικού χρόνου (%s)" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "αναφορά σφαλμάτων" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -3102,81 +3109,81 @@ msgstr "" "που αποτυγχάνουν εξαιτίας προβλημάτων του dpkg δεν θα ολοκληρωθούν.\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "Θα εγκαταστήσει %li πακέτα, και θα αφαιρέσει %li πακέτα.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "%sB χώρος από το σκληρό δίσκο θα χρησιμοποιηθούν\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "Θα απελευθερωθούν %sB χώρου στον δίσκο\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[ΑΝΑΒΑΘΜΙΣΗ] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[ΥΠΟΒΑΘΜΙΣΗ] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "ΑΦΑΙΡΕΣΗ" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "ΕΓΚΑΤΑΣΤΑΣΗ" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "ΕΠΑΝΕΓΚΑΤΑΣΤΑΣΗ" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "ΑΝΑΜΟΝΗ" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "ΣΠΑΣΜΕΝΑ" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "ΑΦΑΙΡΕΣΗ, ΜΗ ΧΡΗΣΗΜΟΠΟΙΗΜΕΝΑ" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "ΑΦΑΙΡΕΣΗ, ΕΞΑΡΤΗΣΕΙΣ" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "ΕΓΚΑΤΑΣΤΑΣΗ, ΕΞΑΡΤΗΣΕΙΣ" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "ΑΝΑΜΟΝΗ, ΕΞΑΡΤΗΣΕΙΣ" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "ΜΗ ΡΥΘΜΙΣΜΕΝΟ" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -3199,40 +3206,40 @@ msgstr "" msgid "Filtering packages" msgstr "Μεταφόρτωση πακέτων" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "Άγνωστος τύπος εργασίας: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "Μη τερματιζόμενη literal συμβολοσειρά μετά το %s" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "Άγνωστη προτεραιότητα %s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "" "Το σχήμα ταιριάσματος τερματίζεται με μη αναμενόμενο τρόπο (περίμενα '%c')." -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "Περίμενα %c', έλαβα '%c'." -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "Άγνωστος τύπος εξάρτησης: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, fuzzy, c-format #| msgid "Unknown matcher type: \"%s\"." msgid "Unknown term type: \"%s\"." @@ -3240,7 +3247,7 @@ msgstr "Άγνωστος τύπος matcher:\"%s\"." #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, fuzzy, c-format #| msgid "" #| "The ?%s matcher must be used in a \"wide\" context (a top-level context, " @@ -3252,34 +3259,34 @@ msgstr "" "O ?%s matcher πρέπει να χρησιμοποιείται σε ένα \"ευρύ\" πλαίσιο (ένα " "πλαίσιο top-level, ή ένα πλαίσιο που περικλείεται από ?%s)." -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "Αταίριαστη '('" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "Παρέχει: δεν μπορεί να είναι \"σπασμένο\"" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "Άγνωστος τύπος κανονικής παράστασης: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "Αδυναμία έρευνας για \"\"" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "Μη αναμενόμενη κενή παράσταση" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, fuzzy, c-format #| msgid "Badly formed expression" msgid "Badly formed expression: expected '|', got '%c'" msgstr "Λάθος διαμορφωμένη παράσταση" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "Μή αναμενόμενη ')'" @@ -4228,22 +4235,22 @@ msgstr "" msgid "%s: Unable to accept a connection: %s" msgstr "Αδυναμία δημιοουργίας προσωρινού καταλόγου από το πρότυπο \"%s\": %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4975,7 +4982,7 @@ msgstr "" msgid "Virtual package" msgstr "Πακέτο" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "Μη εγκατεστημένο" @@ -5145,163 +5152,169 @@ msgstr "το %s αντικαθιστά το %s" msgid "%s obsoletes %s" msgstr "το %s καθιστά άχρηστο το %s" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "το %s αντικαθιστά το %s" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "Αφαίρεσε τα ακόλουθα πακέτα:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "Εγκατάσταση των ακόλουθων πακέτων:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 #, fuzzy #| msgid "Remove the following packages:" msgid "Keep the following packages:" msgstr "Αφαίρεσε τα ακόλουθα πακέτα:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "Αναβάθμιση των ακόλουθων πακέτων:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "Υποβάθμιση των ακόλουθων πακέτων:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 #, fuzzy #| msgid "Leave the following dependencies unresolved:%n" msgid "Leave the following dependencies unresolved:" msgstr "Μην επιλύσεις τις ακόλουθες εξαρτήσεις: %n" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, fuzzy, c-format #| msgid "Remove %F [%s (%s)]" msgid "Remove %s [<big>%s</big> (%s)]" msgstr "Αφαίρεση του %F [%s (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "Install %s [<big>%s</big> (%s)]" msgstr "Εγκατάσταση του %F [%s (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "Cancel the installation of %s" msgstr "Ακύρωση της εγκατάστασης του %F" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Cancel the removal of %s" msgstr "Ακύρωση της αφαίρεσης του %F" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "Keep %s at version <big>%s</big> (%s)" msgstr "Διατήρηση του %F στην έκδοση %s (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, fuzzy, c-format #| msgid "Upgrade %F [%s (%s) -> %s (%s)]" msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Αναβάθμιση του %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, fuzzy, c-format #| msgid "Downgrade %F [%s (%s) -> %s (%s)]" msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Υποβάθμιση έκδοσης %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>Remove</b> %s" msgstr "Αφαίρεση(%s)" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>remove</b> %s" msgstr "Αφαίρεση(%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>Keep</b> %s at version %s" msgstr "Διατήρηση του %F στην έκδοση %s (%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>keep</b> %s at version %s" msgstr "Διατήρηση του %F στην έκδοση %s (%s)" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>Cancel</b> the installation of %s" msgstr "Ακύρωση της εγκατάστασης του %F" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>cancel</b> the installation of %s" msgstr "Ακύρωση της εγκατάστασης του %F" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>Install</b> %s %s" msgstr "Εγκατάσταση του %F [%s (%s)]" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>install</b> %s %s" msgstr "Εγκατάσταση του %F [%s (%s)]" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "<b>Downgrade</b> %s to version %s" msgstr " έκδοση cwidget: %s\n" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "<b>downgrade</b> %s to version %s" msgstr " έκδοση cwidget: %s\n" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>Upgrade</b> %s to version %s" msgstr "Εκδόσεις του %s" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>upgrade</b> %s to version %s" msgstr "Εκδόσεις του %s" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format #| msgid "%d install" #| msgid_plural "%d installs" @@ -5310,7 +5323,7 @@ msgid_plural "%s installs" msgstr[0] "%d εγκατάσταση" msgstr[1] "%d εγκαταστάσεις" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, fuzzy, c-format #| msgid "%d removal" #| msgid_plural "%d removals" @@ -5319,7 +5332,7 @@ msgid_plural "%s removes" msgstr[0] "%d αφαίρεση" msgstr[1] "%d αφαιρέσεις" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, fuzzy, c-format #| msgid "%d keep" #| msgid_plural "%d keeps" @@ -5328,7 +5341,7 @@ msgid_plural "%s keeps" msgstr[0] "%d διατήρηση" msgstr[1] "%d διατηρήσεις" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, fuzzy, c-format #| msgid "%d upgrade" #| msgid_plural "%d upgrades" @@ -5337,7 +5350,7 @@ msgid_plural "%s upgrades" msgstr[0] "%d αναβάθμιση" msgstr[1] "%d αναβαθμίσεις" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, fuzzy, c-format #| msgid "%d downgrade" #| msgid_plural "%d downgrades" @@ -5346,7 +5359,7 @@ msgid_plural "%s downgrades" msgstr[0] "%d υποβαθμίζεται" msgstr[1] "%d υποβαθμίζονται" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, fuzzy, c-format #| msgid "Audit ^Recommendations" msgid "%s unresolved recommendation" @@ -5354,35 +5367,35 @@ msgid_plural "%s unresolved recommendations" msgstr[0] "Εξέταση ^Συστάσεων" msgstr[1] "Εξέταση ^Συστάσεων" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 #, fuzzy #| msgid "No more solutions." msgid "No solutions yet." msgstr "Δεν υπάρχουν περισσότερες λύσεις." -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 #, fuzzy #| msgid "Dependency handling" msgid "No dependency solution was found." msgstr "Διαχείριση εξαρτήσεων" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 #, fuzzy #| msgid "No more solutions." msgid "No solutions." msgstr "Δεν υπάρχουν περισσότερες λύσεις." -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, fuzzy, c-format #| msgid "No more solutions." msgid "%u solutions." msgstr "Δεν υπάρχουν περισσότερες λύσεις." -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Could not open file \"%s\"" msgid "Solution %s of %s." @@ -5699,12 +5712,12 @@ msgstr " Απενεργοποίηση υποστήριξης Ept.\n" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s μεταγλωττίστηκε στις %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5860,29 +5873,35 @@ msgstr " show - Εμφάνιση λεπτομερειών σχετικά #: src/main.cc:213 #, fuzzy, c-format +#| msgid " show - Display detailed information about a package\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - Εμφάνιση λεπτομερειών σχετικά με ένα πακέτο\n" + +#: src/main.cc:214 +#, fuzzy, c-format #| msgid " clean - Erase downloaded package files\n" msgid " clean - Erase downloaded package files.\n" msgstr " clean - Διαγραφή μεταφορτομένων πακέτων\n" -#: src/main.cc:214 +#: src/main.cc:215 #, fuzzy, c-format #| msgid " autoclean - Erase old downloaded package files\n" msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean - Διαγραφή παλαιότερα μεταφορτομένων αρχεία πακέτων\n" -#: src/main.cc:215 +#: src/main.cc:216 #, fuzzy, c-format #| msgid " changelog - View a package's changelog\n" msgid " changelog - View a package's changelog.\n" msgstr " ημερ. αλλαγών -Εμφάνισε το ημερολόγιο αλλαγών ενός πακέτου\n" -#: src/main.cc:216 +#: src/main.cc:217 #, fuzzy, c-format #| msgid " download - Download the .deb file for a package\n" msgid " download - Download the .deb file for a package.\n" msgstr " download - Μεταφόρτωση ενός αρχείου .deb για ένα πακέτο\n" -#: src/main.cc:217 +#: src/main.cc:218 #, fuzzy, c-format #| msgid "" #| " reinstall - Download and (possibly) reinstall a currently installed " @@ -5894,19 +5913,23 @@ msgstr "" "επανεγκατάσταση - Κατέβασμα και (πιθανόν) επανεγκατάσταση ενός ήδη " "εγκατεστημένου πακέτου\n" -#: src/main.cc:218 -#, c-format +#: src/main.cc:219 +#, fuzzy, c-format +#| msgid "" +#| " why - Show the manually installed packages that require a " +#| "package, or\n" +#| " why one or more packages would require the given package\n" msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " γιατί - Εμφάνιση των εγκατεστημένων με το χέρι πακέτων που " "απαιτούν ένα πακέτο ή \n" " του γιατί ένα ή περισσότερα πακέτα θα απαιτούσαν το " "συγκεκριμένο πακέτο\n" -#: src/main.cc:220 +#: src/main.cc:221 #, fuzzy, c-format #| msgid "" #| " why-not - Show the manually installed packages that lead to a " @@ -5927,48 +5950,48 @@ msgstr "" " οδηγήσουν σε μια σύγκρουση με το δοσμένο πακέτο αν " "εγκατασταθούν\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " Επιλογές:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " -h This help text.\n" msgstr " -h Αυτό το κείμενο βοήθειας\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h Αυτό το κείμενο βοήθειας\n" -#: src/main.cc:232 +#: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr "" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr "" " -s Εξομοίωση ενεργειών, αλλά να μην πραγματοποιηθούν στην " "πραγματικότητα.\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" @@ -5976,13 +5999,13 @@ msgstr "" " -d Μόνο μεταφόρτωση των πακέτων, να μην γίνει εγκατάσταση ή " "απεγκατάσταση κάτι.\n" -#: src/main.cc:236 +#: src/main.cc:237 #, fuzzy, c-format #| msgid " -P Always prompt for confirmation or actions\n" -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr "-P Να γίνονται πάντα ερωτήσεις επιβεβαίωσης ή ενέργειες\n" -#: src/main.cc:237 +#: src/main.cc:238 #, fuzzy, c-format #| msgid "" #| " -y Assume that the answer to simple yes/no questions is " @@ -5992,7 +6015,7 @@ msgid "" msgstr "" "-y Υπέθεσε ότι η απάντηση σε απλές ερωτήσεις ναι/όχι είναι 'ναι'\n" -#: src/main.cc:238 +#: src/main.cc:239 #, fuzzy, c-format #| msgid "" #| " -F format Specify a format for displaying search results; see the " @@ -6004,7 +6027,7 @@ msgstr "" "-F format Ορισμός του τρόπου εμφάνισης των αποτελεσμάτων αναζήτησης, " "δείτε εγχειρίδιο χρήσης\n" -#: src/main.cc:239 +#: src/main.cc:240 #, fuzzy, c-format #| msgid "" #| " -O order Specify how search results should be sorted; see the " @@ -6016,7 +6039,7 @@ msgstr "" "-O order Ορισμός του τρόπου ταξινόμησης των αποτελεσμάτων αναζήτησης, " "δείτε το εγχειρίδιο χρήσης\n" -#: src/main.cc:240 +#: src/main.cc:241 #, fuzzy, c-format #| msgid "" #| " -w width Specify the display width for formatting search results\n" @@ -6026,32 +6049,32 @@ msgstr "" " -w width Καθορισμός του πλάτους εμφάνισης των αποτελεσμάτων " "αναζήτησης\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr "-f Επιθετική προσπάθεια επίλυσης των σπασμένων πακέτων.\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr "" "-V Εμφάνιση των εκδόσεων των πακέτων που πρόκειται να " "εγκατασταθούν.\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr "" "-D Εμφάνιση των εξαρτήσεων των αυτόματα αλλαγμένων πακέτων.\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr "" "-Z\t\t Εμφάνιση της αλλαγής μεγέθους στο εγκατεστημένο κάθε πακέτου.\n" -#: src/main.cc:245 +#: src/main.cc:246 #, fuzzy, c-format #| msgid "" #| " -v Display extra information. (may be supplied multiple " @@ -6063,7 +6086,7 @@ msgstr "" "-v Εμφανίζει επιπλέον πληροφορίες (μπορεί να οριστεί πολλαπλές " "φορές)\n" -#: src/main.cc:246 +#: src/main.cc:247 #, fuzzy, c-format #| msgid "" #| " -t [release] Set the release from which packages should be installed\n" @@ -6073,66 +6096,66 @@ msgstr "" " -t [release] Ορίστε την έκδοση από ποια πακέτα θα πρέπει να " "εγκατασταθούν\n" -#: src/main.cc:247 +#: src/main.cc:248 #, fuzzy, c-format #| msgid "" #| " -q In command-line mode, suppress the incremental progress\n" #| " indicators.\n" msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" " -q Σε κατάσταση γραμμής-εντολών, απόκρυψη των δεικτών " "σταδιακής\n" " προόδου.\n" -#: src/main.cc:249 +#: src/main.cc:250 #, fuzzy, c-format #| msgid " -o key=val Directly set the configuration option named 'key'\n" msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr " -o key=val Άμεσος καθορισμός μια παραμέτρου με όνομα 'key'\n" -#: src/main.cc:250 +#: src/main.cc:251 #, fuzzy, c-format #| msgid "" #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" #| " strong dependencies\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends\tΚαθορισμός αντιμετώπισης των συνιστώμενων ως\n" " ισχυρών εξαρτήσεων\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr "" " -S fname Ανάγνωση των εκτεταμένων πληροφοριών από το αρχείο fname.\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr "u : Μεταφόρτωση νέας λίστας πακέτων κατά την εκκίνηση.\n" -#: src/main.cc:254 src/main.cc:256 -#, c-format -msgid " (terminal interface only)" -msgstr "" +#: src/main.cc:255 src/main.cc:257 +#, fuzzy, c-format +msgid " (terminal interface only)\n" +msgstr " -h Αυτό το κείμενο βοήθειας\n" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr "-i Εκτέλεση μιας εγκατάστασης κατά την εκκίνηση.\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " Αυτό το APT έχει Δυνάμεις ΥπερΑγελάδας.\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 #, fuzzy #| msgid "true" msgid "trace" @@ -6140,13 +6163,13 @@ msgstr "αληθές" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 #, fuzzy #| msgid "no" msgid "info" @@ -6154,13 +6177,13 @@ msgstr "όχι" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 #, fuzzy #| msgid "Err " msgid "error" @@ -6168,7 +6191,7 @@ msgstr "Σφάλμα " #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 #, fuzzy #| msgid "false" msgid "fatal" @@ -6176,95 +6199,95 @@ msgstr "ψευδές" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " "\"warn\", \"error\", \"fatal\", or \"off\")." msgstr "" -#: src/main.cc:487 +#: src/main.cc:488 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "Invalid logger name \"%s\"." msgstr "Ακυρη λειτουργία %s" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "Περίμενα έναν αριθμό μετά το -q=\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "Περίμενα έναν αριθμό μετά το -q=, έλαβα %s\n" -#: src/main.cc:802 +#: src/main.cc:794 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o απαιτεί μια παράμετρο της μορφής key=value, έλαβα %s\n" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "Δεν υπάρχει ερωτηματικό που να ακολουθεί το όνομα του tag \"%s\".\n" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "ΠΑΡΑΞΕΝΟ: ελήφθη άγνωστος κώδικας παράμετρου\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "" -#: src/main.cc:1039 +#: src/main.cc:1023 #, fuzzy #| msgid "Package" msgid "first-package" msgstr "Πακέτο" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "" -#: src/main.cc:1043 +#: src/main.cc:1027 #, fuzzy #| msgid "All Packages" msgid "all-packages" msgstr "Όλα πακέτα" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -6272,7 +6295,7 @@ msgid "" "versions\"." msgstr "" -#: src/main.cc:1089 +#: src/main.cc:1073 #, fuzzy #| msgid "Only one of -u and -i may be specified\n" msgid "" @@ -6280,7 +6303,7 @@ msgid "" "specified\n" msgstr "Μόνο ένα από το -u και i μπορούν να οριστούν\n" -#: src/main.cc:1098 +#: src/main.cc:1082 #, fuzzy #| msgid "" #| "-u and -i may not be specified in command-line mode (eg, with 'install')" @@ -6291,23 +6314,23 @@ msgstr "" "το -u και -i δεν μπορεί να οριστούν στη λειτουργία γραμμής εντολών(π.χ. με " "το 'install')" -#: src/main.cc:1115 +#: src/main.cc:1099 #, fuzzy #| msgid "-u and -i may not be specified with a command" msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "το -u και -i δεν μπορούν να οριστούν στην ίδια εντολή" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "Αγνωστη εντολή \"%s\"\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "Uncaught exception: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" @@ -6316,7 +6339,8 @@ msgstr "" "Backtrace:\n" "%s\n" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "Αναζήτηση του: " @@ -7211,17 +7235,21 @@ msgstr "αντικαθιστά" msgid "obsoletes" msgstr "αχρηστεύει" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (παρέχεται από %F)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." @@ -7229,7 +7257,7 @@ msgstr "" "Αν επιλέξετε ένα πακέτο, θα εμφανιστεί η τρέχουσα κατάσταση του σε αυτόν τον " "χώρο." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -7237,18 +7265,18 @@ msgstr "" "το %B%s%b εγκαταστάθηκε αυτόματα. Θα αφαιρεθεί γιατί όλα τα πακέτα που " "εξαρτώνται από αυτό θα αφαιρεθούν:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "το %B%s%b θα αφαιρεθεί αυτόματα λόγω προβλημάτων με τις εξαρτήσεις:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" "το %B%s%b θα εγκατασταθεί αυτόματα για να ικανοποιηθούν οι ακόλουθες " "εξαρτήσεις:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -7256,7 +7284,7 @@ msgstr "" "το %B%s%b δεν είναι δυνατό να αναβαθμιστεί τώρα, αλλά αν μπορούσε, και πάλι " "θα κρατείτο στη έκδοση %B%s%b." -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -7264,27 +7292,27 @@ msgstr "" "το %B%s%b δεν θα αναβαθμιστεί στην έκδοση %B%s%b, για να αποφευχθεί το " "σπάσιμο των παρακάτω εξαρτήσεων:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "το %B%s%b είναι εγκατεστημένο." -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "το %B%s%b δεν είναι εγκατεστημένο." -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "Μερικές εξαρτήσεις του %B%s%b δεν ικανοποιήθηκαν:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "το %B%s%b θα υποβαθμιστεί." -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "το %B%s%b δεν θα αναβαθμιστεί στη απαγορευμένη έκδοση %B%s%b." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." @@ -7292,39 +7320,39 @@ msgstr "" "το %B%s%b θα μπορούσε να αναβαθμιστεί στην έκδοση %B%s%b, αλλά κρατείται " "στην έκδοση %B%s%b." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "το %B%s%b θα επανεγκατασταθεί." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "το %B%s%b θα εγκατασταθεί." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "το %B%s%b θα αφαιρεθεί." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "το %B%s%b θα αναβαθμιστεί από την έκδοση %B%s%b στην έκδοση %B%s%b." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "" "Το %B%s%b είναι μόνο μερικά εγκατεστημένο. Η εγκατάστασή του θα ολοκληρωθεί." -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "" "Τα ακόλουθα πακέτα εξαρτώνται από το %B%s%b και θα χαλάσουν από την αφαίρεσή " "του:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "Τα ακόλουθα πακέτα εξαρτώνται από το %B%s%b και είναι χαλασμένα:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" @@ -7332,7 +7360,7 @@ msgstr "" "Τα ακόλουθα πακέτα συγκρούονται με το %B%s%b και θα χαλάσουν από την " "εγκατάστασή του:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -7342,7 +7370,7 @@ msgstr "" "εγκατεστημένη έκδοση του %B%s%b, ή συγκρούονται με την τρέχουσα " "εγκατεστημένη έκδοση:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -7350,11 +7378,11 @@ msgstr "" "Τα ακόλουθα πακέτα συγκρούονται με το %B%s%b, ή εξαρτώνται από μια έκδοση " "του , που δεν θα εγκατασταθεί." -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "Τα ακόλουθα πακέτα συγκρούονται με το %B%s%b:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -7362,7 +7390,7 @@ msgstr "" "Τα ακόλουθα πακέτα εξαρτώνται από μια έκδοση του %B%s%b διαφορετική από την " "τρέχουσα εγκατεστημένη έκδοση του %B%s%b:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." @@ -7370,15 +7398,15 @@ msgstr "" "Τα ακόλουθα πακέτα εξαρτώνται από μια έκδοση του %B%s%b η οποία δεν θα " "εγκατασταθεί." -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "αναβαθμίζονται" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "υποβαθμίζονται" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7388,7 +7416,7 @@ msgstr "" "%b (%B%s%b), ή συγκρούονται αν η έκδοση θα είναι %s σε (%B%s%b), και θα " "χαλάσουν αν είναι %s." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7396,7 +7424,7 @@ msgstr "" "Τα ακόλουθα πακέτα συγκρούονται με την έκδοση %B%s%b του %B%s%b, και θα " "χαλάσουν εάν είναι %s." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7432,47 +7460,47 @@ msgstr "Εφαρμογή" msgid "Close" msgstr "Κλείσιμο" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "το πακέτο %s συγκρούεται με το %s [που παρέχεται από το %s %s]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "Αφαίρεση το %s" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "Εγκατάσταση %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%BΑφαίρεση%b των παρακάτω πακέτων:%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%BΕγκατάσταση%b των παρακάτω πακέτων:%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%BΔιατήρηση%b των παρακάτω πακέτων στις τωρινές τους εκδόσεις:%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%BΑναβάθμιση%b των παρακάτω πακέτων:%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%BΥποβάθμιση%b των παρακάτω πακέτων:%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "Μην επιλύσεις τις ακόλουθες εξαρτήσεις: %n" @@ -7571,10 +7599,6 @@ msgstr "E:" msgid "W:" msgstr "W:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "Αναζήτηση του:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7959,7 +7983,9 @@ msgid "Error while dumping resolver state" msgstr "Λάθος κατά το \"άδειασμα\" της κατάστασης του resolver" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "Αρχείο για το \"άδειασμα\" της κατάστασης του resolver:" #: src/ui.cc:2265 @@ -8480,6 +8506,21 @@ msgid "You can only view changelogs of official Debian packages." msgstr "Μπορείτε να εμφανίσετε ημερολόγια αλλαγών μόνο για επίσημα πακέτα." #~ msgid "" +#~ "%BOption:%b %s\n" +#~ "%BDefault:%b %s\n" +#~ "%BValue:%b %s\n" +#~ msgstr "" +#~ "%BOption:%b %s\n" +#~ "%BDefault:%b %s\n" +#~ "%BValue:%b %s\n" + +#~ msgid "Press Return to continue" +#~ msgstr "Πατήστε Return για συνέχεια " + +#~ msgid "Search for:" +#~ msgstr "Αναζήτηση του:" + +#~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." #~ msgstr "" #~ "Αδύνατη η επίλυση των εξαρτήσεων για την αναβάθμιση (ο επιλύτης εξάντλησε " @@ -8607,11 +8648,6 @@ msgstr "Μπορείτε να εμφανίσετε ημερολόγια αλλα #~ msgid "gtk-yes" #~ msgstr "ναι" -#, fuzzy -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "Ακυρη λειτουργία %s" - #~ msgid "but it is not installable" #~ msgstr "αλλά δεν είναι εγκατάστασιμο" @@ -9379,10 +9415,6 @@ msgstr "Μπορείτε να εμφανίσετε ημερολόγια αλλα #~ "εγκατασταθούν.\n" #, fuzzy -#~ msgid " indicators.\n" -#~ msgstr " -h Αυτό το κείμενο βοήθειας\n" - -#, fuzzy #~ msgid "Downloading " #~ msgstr "Μεταφόρτωση... " @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude 0.4.11\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2009-06-15 01:22+0200\n" "Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n" "Language-Team: Debian-l10n-Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -30,42 +30,36 @@ msgstr "" "Content-Transfer-Encoding: 8 bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" -msgstr "" -"%BOpción:%b %s\n" -"%BPor omisión:%b %s\n" -"%BValor:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " +msgstr "%BOpción:%b " + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " +msgstr "%BPor omisión:%b " -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "Verdadero" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "Falso" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " -msgstr "%BOpción:%b " - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "%BPor omisión:%b " - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "%BValor:%b " -#: src/apt_config_treeitems.cc:279 -#, c-format -msgid "Editing \"%ls\"" +#: src/apt_config_treeitems.cc:280 +#, fuzzy, c-format +#| msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "Editando «%ls»" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "%BSelección:%b " @@ -673,8 +667,8 @@ msgstr "Error falta al resolver" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] Resolviendo las dependencias" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "Error interno: solución nula inesperada." @@ -971,7 +965,7 @@ msgstr "" "resolver».\n" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "Cancela.\n" @@ -1345,7 +1339,7 @@ msgstr "" "Ningún paquete a mostrar -- introduzca los nombres de los paquetes en la " "línea después de «i».\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "Presione Enter para continuar." @@ -1356,10 +1350,6 @@ msgstr "" "Ningún paquete encontrado -- introduzca los nombres de los paquetes en la " "línea después de «c».\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "Presione Enter para continuar" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1677,7 +1667,7 @@ msgstr "El estado del solucionador se escribió correctamente!" #| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: " #| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr paq ver ...: %F%na paq ver ...: %F" @@ -1956,7 +1946,7 @@ msgstr "" "de dependencias." #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "Resolviendo las dependencias..." @@ -1995,7 +1985,9 @@ msgstr "" "Respuesta inválida. Por favor, introduzca una de las órdenes siguientes:" #: src/cmdline/cmdline_resolver.cc:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +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]" @@ -2202,7 +2194,7 @@ msgstr "Paquete: " msgid "State" msgstr "Estado" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "Proporcionado por" @@ -2310,27 +2302,31 @@ msgstr "Reemplaza" msgid "Obsoletes" msgstr "Hace obsoleto a" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Proporciona" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Descripción: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "Página principal: " -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "No se pudo localizar el paquete %s" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "No se pudo interpretar el patrón %s" @@ -2650,6 +2646,12 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "" +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "Operación %s inválida" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "No se esperaba un final de fichero en la entrada estándar" @@ -2667,7 +2669,7 @@ msgstr "[ERROR]" msgid "UNSATISFIED" msgstr "INSATISFECHO" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "NO DISPONIBLE" @@ -2675,7 +2677,7 @@ msgstr "NO DISPONIBLE" msgid "Tags" msgstr "Marcas" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "Marcas de usuario" @@ -3091,16 +3093,21 @@ msgstr "No se pudo localizar el paquete %s" msgid "Unable to open %s to log actions" msgstr "Imposible abrir %s para registrar las acciones" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "Error al generar la hora local (%s)" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "informe de registro" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -3111,81 +3118,81 @@ msgstr "" "realizar. Puede que no se completen algunas acciones por fallos de dpkg.\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "Se instalarán %li paquetes y se eliminarán %li.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "Se usará %sB de espacio en disco\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "Se usará %sB de espacio en disco\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[ACTUALIZA] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[DESACTUALIZA] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "ELIMINA" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "INSTALA" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "REINSTALA" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "RETIENE" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "ROTO" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "ELIMINA, NO USADO" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "ELIMINA, DEPENDENCIAS" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "INSTALA, DEPENDENCIAS" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "RETIENE, DEPENDENCIAS" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "NO_CONFIGURADO" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -3208,46 +3215,46 @@ msgstr "" msgid "Filtering packages" msgstr "Descargando paquetes" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "Tipo de acción desconocida: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "Cadena literal después de %s sin terminar" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "Prioridad %s desconocida" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "El patrón de búsqueda termina de forma inesperada (se esperaba «%c»)." -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "Se esperaba «%c» se encontró «%c»." -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "Tipo de dependencia desconocida: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, c-format msgid "Unknown term type: \"%s\"." msgstr "Tipo de patrón desconocido: «%s»." #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, fuzzy, c-format #| msgid "" #| "The ?%s matcher must be used in a \"wide\" context (a top-level context, " @@ -3259,33 +3266,33 @@ msgstr "" "El patrón ?%s debe utilizarse en el contexto «amplio» (de un contexto de " "primer nivel o en un contexto rodeado de «?%s»)." -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "«(» sin cerrar" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "Provee: no puede romperse" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "Tipo de patrón desconocido: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "No se puede buscar por \"\"" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "Expresión vacía no esperada" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, c-format msgid "Badly formed expression: expected '|', got '%c'" msgstr "Expresión mal formada: esperaba «|», obtuve «%c»" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "«)» inesperado" @@ -4178,22 +4185,22 @@ msgstr "" msgid "%s: Unable to accept a connection: %s" msgstr "%s: No se puedo aceptar una conexión: %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4850,7 +4857,7 @@ msgstr "" msgid "Virtual package" msgstr "Paquetes virtuales" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "Sin instalar" @@ -5016,151 +5023,157 @@ msgstr "%s reemplaza %s" msgid "%s obsoletes %s" msgstr "%s hace obsoleto a %s" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s reemplaza %s" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "Eliminar los paquetes siguientes:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "Instalar los paquetes siguientes:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 msgid "Keep the following packages:" msgstr "Mantener los siguientes paquetes:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "Actualizar los paquetes siguientes:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "Desactualizar los paquetes siguientes:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 msgid "Leave the following dependencies unresolved:" msgstr "Dejar las siguientes dependencias sin resolver:" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, fuzzy, c-format #| msgid "Remove %F [%s (%s)]" msgid "Remove %s [<big>%s</big> (%s)]" msgstr "Eliminar %F [%s (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, c-format msgid "Install %s [<big>%s</big> (%s)]" msgstr "Instalar %s [<big>%s</big>(%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, c-format msgid "Cancel the installation of %s" msgstr "Cancelar la instalación de %s" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, c-format msgid "Cancel the removal of %s" msgstr "Cancelar la eliminación de %s" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, c-format msgid "Keep %s at version <big>%s</big> (%s)" msgstr "Mantener %s en la versión <big>%s</big> (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, fuzzy, c-format #| msgid "Upgrade %F [%s (%s) -> %s (%s)]" msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Actualizar %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, c-format msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Desactualizar %s [<big>%s<big> (%s) -> <big>%s<big> (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, c-format msgid "<b>Remove</b> %s" msgstr "<b>Eliminar</b> %s" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>remove</b> %s" msgstr "Eliminar(%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>Keep</b> %s at version %s" msgstr "Mantener %F en la versión %s (%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>keep</b> %s at version %s" msgstr "Mantener %F en la versión %s (%s)" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %s" msgid "<b>Cancel</b> the installation of %s" msgstr "Cancelar la instalación de %s" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %s" msgid "<b>cancel</b> the installation of %s" msgstr "Cancelar la instalación de %s" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>Install</b> %s %s" msgstr "Instalar %F [%s (%s)]" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>install</b> %s %s" msgstr "Instalar %F [%s (%s)]" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>Downgrade</b> %s to version %s" msgstr "<b>Desactualizar</b> %s a la versión %s" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "<b>downgrade</b> %s to version %s" msgstr " Versión de cwidget: %s\n" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>Upgrade</b> %s to version %s" msgstr "" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>upgrade</b> %s to version %s" msgstr "%s versiones" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "Dejar %s sin resolver" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "dejar %s sin resolver" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format #| msgid "%d install" #| msgid_plural "%d installs" @@ -5169,7 +5182,7 @@ msgid_plural "%s installs" msgstr[0] "%d instalación" msgstr[1] "%d instalaciones" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, fuzzy, c-format #| msgid "%d removal" #| msgid_plural "%d removals" @@ -5178,7 +5191,7 @@ msgid_plural "%s removes" msgstr[0] "%d eliminación" msgstr[1] "%d eliminaciones" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, fuzzy, c-format #| msgid "%d keep" #| msgid_plural "%d keeps" @@ -5187,7 +5200,7 @@ msgid_plural "%s keeps" msgstr[0] "%d mantenido" msgstr[1] "%d mantenidos" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, fuzzy, c-format #| msgid "%d upgrade" #| msgid_plural "%d upgrades" @@ -5196,7 +5209,7 @@ msgid_plural "%s upgrades" msgstr[0] "%d actualización" msgstr[1] "%d actualizaciones" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, fuzzy, c-format #| msgid "%d downgrade" #| msgid_plural "%d downgrades" @@ -5205,7 +5218,7 @@ msgid_plural "%s downgrades" msgstr[0] "%d desactualización" msgstr[1] "%d desactualizaciones" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, fuzzy, c-format #| msgid "Audit ^Recommendations" msgid "%s unresolved recommendation" @@ -5213,28 +5226,28 @@ msgid_plural "%s unresolved recommendations" msgstr[0] "Auditar ^Recomendaciones" msgstr[1] "Auditar ^Recomendaciones" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 msgid "No solutions yet." msgstr "No hay más soluciones." -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 msgid "No dependency solution was found." msgstr "No se encontró ninguna solución a las dependencias." -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 msgid "No solutions." msgstr "No hay soluciones." -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "Para ver una solución, seleccionela de la lista a la derecha." -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, c-format msgid "%u solutions." msgstr "%u soluciones." -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Could not open file \"%s\"" msgid "Solution %s of %s." @@ -5549,12 +5562,12 @@ msgstr " Desactivado el soporte de Ept.\n" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s compilado en %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5709,30 +5722,36 @@ msgstr " show - muestra información detallada de un paquete\n" #: src/main.cc:213 #, fuzzy, c-format +#| msgid " show - Display detailed information about a package\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - muestra información detallada de un paquete\n" + +#: src/main.cc:214 +#, fuzzy, c-format #| msgid " clean - Erase downloaded package files\n" msgid " clean - Erase downloaded package files.\n" msgstr " clean - elimina los ficheros de paquetes descargados\n" -#: src/main.cc:214 +#: src/main.cc:215 #, fuzzy, c-format #| msgid " autoclean - Erase old downloaded package files\n" msgid " autoclean - Erase old downloaded package files.\n" msgstr "" " autoclean - elimina los ficheros de paquetes descargados obsoletos\n" -#: src/main.cc:215 +#: src/main.cc:216 #, fuzzy, c-format #| msgid " changelog - View a package's changelog\n" msgid " changelog - View a package's changelog.\n" msgstr " changelog - muestra el registro de cambios del paquete\n" -#: src/main.cc:216 +#: src/main.cc:217 #, fuzzy, c-format #| msgid " download - Download the .deb file for a package\n" msgid " download - Download the .deb file for a package.\n" msgstr " download - descarga los ficheros .deb para un paquete\n" -#: src/main.cc:217 +#: src/main.cc:218 #, fuzzy, c-format #| msgid "" #| " reinstall - Download and (possibly) reinstall a currently installed " @@ -5743,19 +5762,23 @@ msgid "" msgstr "" " reinstall - descarga y (posiblemente) reinstala un paquete ya instalado\n" -#: src/main.cc:218 -#, c-format +#: src/main.cc:219 +#, fuzzy, c-format +#| msgid "" +#| " why - Show the manually installed packages that require a " +#| "package, or\n" +#| " why one or more packages would require the given package\n" msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " why - Muestra los paquetes manualmente instalados que necesitan " "un paquete\n" " o por qué uno de los paquetes necesita un paquete concreto.\n" "\n" -#: src/main.cc:220 +#: src/main.cc:221 #, fuzzy, c-format #| msgid "" #| " why-not - Show the manually installed packages that lead to a " @@ -5775,18 +5798,18 @@ msgstr "" " uno o más paquetes llevarían a un conflicto con dicho " "paquete.\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " Opciones:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " -h This help text.\n" msgstr "-h Este texto de ayuda\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" @@ -5794,18 +5817,18 @@ msgstr "" " --gui use la interfaz GTK aunque esté desactivada en la " "configuración.\n" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr " --no-gui No use la interfaz GTK aunque este disponible.\n" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " --qt Use the Qt GUI.\n" msgstr "-h Este texto de ayuda\n" -#: src/main.cc:232 +#: src/main.cc:233 #, fuzzy, c-format #| msgid "" #| " --gui Use the GTK GUI even if disabled in the configuration.\n" @@ -5815,26 +5838,26 @@ msgstr "" " --gui use la interfaz GTK aunque esté desactivada en la " "configuración.\n" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr "" "-s Simula las acciones, pero en realidad no las realiza.\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr "" "-d Sólo descarga paquetes, no instala o desinstala nada.\n" -#: src/main.cc:236 +#: src/main.cc:237 #, fuzzy, c-format #| msgid " -P Always prompt for confirmation or actions\n" -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr "-p Siempre pide confirmación de las acciones\n" -#: src/main.cc:237 +#: src/main.cc:238 #, fuzzy, c-format #| msgid "" #| " -y Assume that the answer to simple yes/no questions is " @@ -5845,7 +5868,7 @@ msgstr "" "-y Supone que la respuesta a preguntas simples del tipo sí/no " "es «sí»\n" -#: src/main.cc:238 +#: src/main.cc:239 #, fuzzy, c-format #| msgid "" #| " -F format Specify a format for displaying search results; see the " @@ -5857,7 +5880,7 @@ msgstr "" "-F formato Especifica el formato para mostrar los resultados de las " "búsquedas, lea el manual\n" -#: src/main.cc:239 +#: src/main.cc:240 #, fuzzy, c-format #| msgid "" #| " -O order Specify how search results should be sorted; see the " @@ -5869,7 +5892,7 @@ msgstr "" "-O orden Especifica como se deben ordenar los resultados de la " "búsqueda, lea el manual\n" -#: src/main.cc:240 +#: src/main.cc:241 #, fuzzy, c-format #| msgid "" #| " -w width Specify the display width for formatting search results\n" @@ -5879,17 +5902,17 @@ msgstr "" "-w ancho Especifica el ancho del visor para dar formato a los " "resultado de la búsqueda\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr "-f Trata de arreglar paquetes rotos de forma agresiva.\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr "-V Muestra la versión de los paquetes a instalar.\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" @@ -5897,12 +5920,12 @@ msgstr "" "-D Muestra las dependencias de los paquetes cambiados " "automáticamente.\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr "-Z\t\t Muestra el cambio del tamaño instalado de cada paquete.\n" -#: src/main.cc:245 +#: src/main.cc:246 #, fuzzy, c-format #| msgid "" #| " -v Display extra information. (may be supplied multiple " @@ -5913,7 +5936,7 @@ msgid "" msgstr "" "-v Muestra información extra (puede darse más de una vez)\n" -#: src/main.cc:246 +#: src/main.cc:247 #, fuzzy, c-format #| msgid "" #| " -t [release] Set the release from which packages should be installed\n" @@ -5923,19 +5946,19 @@ msgstr "" "-t [distrib] Establece la distribución desde la que se instalan los " "paquetes\n" -#: src/main.cc:247 +#: src/main.cc:248 #, fuzzy, c-format #| msgid "" #| " -q In command-line mode, suppress the incremental progress\n" #| " indicators.\n" msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" " -q No muestra los indicadores de progreso incrementales \n" " en el modo de línea de órdenes.\n" -#: src/main.cc:249 +#: src/main.cc:250 #, fuzzy, c-format #| msgid " -o key=val Directly set the configuration option named 'key'\n" msgid " -o key=val Directly set the configuration option named 'key'.\n" @@ -5943,47 +5966,47 @@ msgstr "" " -o opconf=val Establecer directamente la opción de configuración " "llamada «opconf»\n" -#: src/main.cc:250 +#: src/main.cc:251 #, fuzzy, c-format #| msgid "" #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" #| " strong dependencies\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends,\tEspecifica si se tratan o no las " "recomendaciones como dependencias fuertes\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr "" "-S fnombre: lee la información de estado extendida de aptitude de fnombre.\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr "-u : Descarga una nueva lista de paquetes al arrancar.\n" -#: src/main.cc:254 src/main.cc:256 -#, c-format -msgid " (terminal interface only)" -msgstr "" +#: src/main.cc:255 src/main.cc:257 +#, fuzzy, c-format +msgid " (terminal interface only)\n" +msgstr "-h Este texto de ayuda\n" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr "-i : Realiza una instalación al arrancar.\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " Este aptitude no tiene poderes de Super Vaca.\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 #, fuzzy #| msgid "true" msgid "trace" @@ -5991,13 +6014,13 @@ msgstr "verdadero" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 #, fuzzy #| msgid "no" msgid "info" @@ -6005,113 +6028,113 @@ msgstr "no" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "avisar" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 msgid "error" msgstr "error" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 msgid "fatal" msgstr "fatal" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " "\"warn\", \"error\", \"fatal\", or \"off\")." msgstr "" -#: src/main.cc:487 +#: src/main.cc:488 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "Invalid logger name \"%s\"." msgstr "Operación %s inválida" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "Se esperaba una número después de -q=\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "Se esperaba un número después de -q=, se obtuvo %s\n" -#: src/main.cc:802 +#: src/main.cc:794 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o requiere un argumento de la forma opción=valor, se proporcionó %s\n" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "No hay una coma después del nombre de marca siguente «%s».\n" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "RAREZA: recibido código de opción desconocido\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "" -#: src/main.cc:1039 +#: src/main.cc:1023 #, fuzzy #| msgid "Package" msgid "first-package" msgstr "Paquete" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "" -#: src/main.cc:1043 +#: src/main.cc:1027 #, fuzzy #| msgid "All Packages" msgid "all-packages" msgstr "Todos los paquetes" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -6119,7 +6142,7 @@ msgid "" "versions\"." msgstr "" -#: src/main.cc:1089 +#: src/main.cc:1073 #, fuzzy #| msgid "Only one of -u and -i may be specified\n" msgid "" @@ -6127,7 +6150,7 @@ msgid "" "specified\n" msgstr "No se puede especificar -u y -i a la vez\n" -#: src/main.cc:1098 +#: src/main.cc:1082 #, fuzzy #| msgid "" #| "-u and -i may not be specified in command-line mode (eg, with 'install')" @@ -6138,23 +6161,23 @@ msgstr "" "-u e -i puede que no deban especificarse en la línea de órdenes (p.ej., con " "«install»)" -#: src/main.cc:1115 +#: src/main.cc:1099 #, fuzzy #| msgid "-u and -i may not be specified with a command" msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "-u e -i puede que no deban especificarse con una orden" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "Orden desconocida \"%s\"\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "Excepción no gestionada: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" @@ -6163,7 +6186,8 @@ msgstr "" "Volcado:\n" "%s\n" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "Buscar:" @@ -7066,17 +7090,21 @@ msgstr "reemplaza" msgid "obsoletes" msgstr "hace obsoleto a" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (proporcionado por %F)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." @@ -7084,7 +7112,7 @@ msgstr "" "Si selecciona un paquetes, en este espacio aparecerá una explicación de su " "estado actual." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -7092,18 +7120,18 @@ msgstr "" "%B%s%b se instaló automáticamente, se elimina porque todos los paquetes que " "dependen de él van a ser eliminados:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "%B%s%b se eliminará automáticamente por errores de dependencias:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" "%B%s%b se instalará automáticamente para satisfacer las siguientes " "dependencias:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -7111,7 +7139,7 @@ msgstr "" "%B%s%b no puede actualizarse ahora, pero si se pudiera, aún se tendría que " "mantener en la versión %B%s%b." -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -7119,27 +7147,27 @@ msgstr "" "%B%s%b no se actualizará a la versión %B%s%b, para evitar romper las " "siguientes dependencias:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b está actualmente instalado." -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b no está instalado actualmente." -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "Algunas dependencias de %B%s%b no están satisfechas:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "se desactualizará %B%s%b." -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "No se actualizará %B%s%b a la versión prohibida %B%s%b." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." @@ -7147,38 +7175,38 @@ msgstr "" "%B%s%b puede actualizarse a la versión %B%s%b, pero está siendo retenido en " "la versión %B%s%b." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "Se reinstalará %B%s%b." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "Se instalará %B%s%b." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "Se eliminará %B%s%b." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "Se actualizará %B%s%b de la versión %B%s%b a la versión %B%s%b." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "" "%B%s%B está ahora parcialmente instalado. Se completará su instalación." -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "" "Los siguientes dependen de %B%s%b y se romperán debido a su eliminación:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "Los siguientes paquetes dependen de %B%s%b y están rotos:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" @@ -7186,7 +7214,7 @@ msgstr "" "Los siguientes paquetes tienen conflictos con %B%s%b y se romperán debido a " "su instalación:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -7196,7 +7224,7 @@ msgstr "" "versión actualmente instalada de %B%s%b, o tienen conflictos con la versión " "actualmente instalada:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -7204,11 +7232,11 @@ msgstr "" "Los siguientes paquetes tienen conflictos con %B%s%b, o dependen de una " "versión de éste que no va a instalarse." -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "Los siguientes paquetes tienen conflictos con %B%s%b:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -7216,7 +7244,7 @@ msgstr "" "Los siguientes paquetes dependen de una versión de %B%s%b distinta de la " "versión actualmente instalada de %B%s%b:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." @@ -7224,15 +7252,15 @@ msgstr "" "Los siguientes paquetes dependen de una versión de %B%s%b que no va a " "instalarse." -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "actualizado" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "desactualizado" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7242,7 +7270,7 @@ msgstr "" "%b (%B%s%b), o tienen conflictos con la versión en que se convertirá %s (%B%s" "%b), y se romperán si es %s." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7250,7 +7278,7 @@ msgstr "" "Los siguientes paquetes tienen conflictos con la versión %B%s%b de %B%s%b, y " "se romperán si es %s." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7286,47 +7314,47 @@ msgstr "Aplicar" msgid "Close" msgstr "Cerrar" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s tiene conflictos con %s [proporcionado por %s %s]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "Eliminando %s" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "Instalando %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "Dejar %ls sin resolver." -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%BEliminar%b los paquetes siguientes:%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%BInstalar%b los paquetes siguientes:%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%BMantener%b los paquetes siguientes en la versión actual:%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%BActualizar%b los paquetes siguientes:%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%BDesactualizar%b los paquetes siguientes:%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "Dejar las siguientes dependencias sin resolver:%n" @@ -7425,10 +7453,6 @@ msgstr "E:" msgid "W:" msgstr "A:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "Buscar por:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7815,7 +7839,9 @@ msgid "Error while dumping resolver state" msgstr "Error las volcar el estado del solucionador" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "Fichero al que se debe volcar de el estado del solucionador:" #: src/ui.cc:2265 @@ -8333,6 +8359,21 @@ msgid "You can only view changelogs of official Debian packages." msgstr "Sólo puede ver registros de cambios de paquetes de Debian oficiales." #~ msgid "" +#~ "%BOption:%b %s\n" +#~ "%BDefault:%b %s\n" +#~ "%BValue:%b %s\n" +#~ msgstr "" +#~ "%BOpción:%b %s\n" +#~ "%BPor omisión:%b %s\n" +#~ "%BValor:%b %s\n" + +#~ msgid "Press Return to continue" +#~ msgstr "Presione Enter para continuar" + +#~ msgid "Search for:" +#~ msgstr "Buscar por:" + +#~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." #~ msgstr "" #~ "Incapaz de resolver las dependencias para la actualización (la resolución " @@ -8457,11 +8498,6 @@ msgstr "Sólo puede ver registros de cambios de paquetes de Debian oficiales." #~ msgid "gtk-yes" #~ msgstr "sí" -#, fuzzy -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "Operación %s inválida" - #~ msgid "but it is not installable" #~ msgstr "pero no es instalable" @@ -8663,10 +8699,6 @@ msgstr "Sólo puede ver registros de cambios de paquetes de Debian oficiales." #~ " lead to a conflict with the given package if installed\n" #~ msgstr "-V Muestra la versión de los paquetes a instalar.\n" -#, fuzzy -#~ msgid " indicators.\n" -#~ msgstr "-h Este texto de ayuda\n" - #~ msgid "There are now %F." #~ msgstr "Ahora hay %F." @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude_po_eu\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2008-05-05 22:00+0200\n" "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n" "Language-Team: Basque <itzulpena@euskalgnu.org>\n" @@ -20,42 +20,36 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.4\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" -msgstr "" -"%BAukera:%b %s\n" -"%BLehenetsia:%b %s\n" -"%BBalioa:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " +msgstr "%BAukera:%b " + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " +msgstr "%BLehenetsia:%b " -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "Egia" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "Faltsua" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " -msgstr "%BAukera:%b " - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "%BLehenetsia:%b " - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "%BBalioa:%b " -#: src/apt_config_treeitems.cc:279 -#, c-format -msgid "Editing \"%ls\"" +#: src/apt_config_treeitems.cc:280 +#, fuzzy, c-format +#| msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "\"%ls\" editatzen" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "%BAukera:%b " @@ -652,8 +646,8 @@ msgstr "Errore konponezina atzitzean" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] Mendekotasunak ebaztea" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "Barne-errorea: ustegabeko 'null' emaitza." @@ -948,7 +942,7 @@ msgstr "" "aukerarekin.\n" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "Abortatu.\n" @@ -1315,7 +1309,7 @@ msgstr "" "Ez dago paketerik erakusteko -- sartu paketearen izena 'i'-ren azpiko " "lerroan.\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "Jarraitzeko, sakatu 'Sartu' tekla." @@ -1325,10 +1319,6 @@ msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "" "Ez da paketerik aurkitu -- sartu paketeen izenak 'c'-ren azpiko lerroan.\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "Jarraitzeko , sakatu 'Sartu' tekla" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1640,7 +1630,7 @@ msgstr "Ebazpen-egoera ongi idatzi da." #| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: " #| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkt bert ...: %F%na pkt bert ...: " @@ -1915,7 +1905,7 @@ msgstr "" "sortu." #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "Mendekotasunak ebazten..." @@ -1953,7 +1943,9 @@ msgid "Invalid response; please enter one of the following commands:" msgstr "Erantzun baliogabea. Sartu hurrengo komandoetariko bat:" #: src/cmdline/cmdline_resolver.cc:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +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:1080 @@ -2161,7 +2153,7 @@ msgstr "Paketea: " msgid "State" msgstr "Egoera" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "Honek hornitua:" @@ -2269,27 +2261,31 @@ msgstr "Ordezten du:" msgid "Obsoletes" msgstr "Zaharkitzea:" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Hornitzen du:" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Azalpena: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "Etxe orria " -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "Ezin da %s paketea aurkitu" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "Ezin da %s eredua analizatu" @@ -2609,6 +2605,12 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "" +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "Eragiketa baliogabea: %s" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "Ustegabeko fitxategi-amaiera (EOF) sarrera estandarrean" @@ -2626,7 +2628,7 @@ msgstr "[ERROREA]" msgid "UNSATISFIED" msgstr "BETEGABEA" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "EZ ERABILGARRIA" @@ -2634,7 +2636,7 @@ msgstr "EZ ERABILGARRIA" msgid "Tags" msgstr "Etiketak" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "Erabiltzailearen etiketak" @@ -3041,16 +3043,21 @@ msgstr "Ezin da %s paketea aurkitu" msgid "Unable to open %s to log actions" msgstr "Ezin izan da %s irakurri ekintzak egunkarian erregistratzeko" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "Errorea ordu lokala (%s) sortzean" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "erregistro txostena" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -3061,81 +3068,81 @@ msgstr "" "honetan; dpkg arazoengatik huts egiten dutenak ez dira burutuko.\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "%li pakete instalatuko dira, eta %li pakete kenduko dira.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "%sB erabiliko dira diskoan\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "Diskoan %sB leku libre utziko dira\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[BERTSIO-BERRITU] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[AURREKO BERTSIORA ITZULI] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "KENDU" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "INSTALATU" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "BERRINSTALATU" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "ATXIKI" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "HAUTSITA" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "KENDU, ERABILI GABE" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "KENDU, MENDEKOTASUNAK" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "INSTALATU, MENDEKOTASUNAK" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "ATXIKI, MENDEKOTASUNAK" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "KONFIGURATU GABE" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -3158,39 +3165,39 @@ msgstr "" msgid "Filtering packages" msgstr "Paketeak deskargatzen" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "Ekintza mota ezezaguna: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "Amaitu gabeko kate literala %s(r)en ondoren" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "%s lehentasun ezezaguna" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "Parekatze patroia espero gabe amaitzen da ('%c' espero zen)." -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "'%c' espero zen, '%c' eskuratua." -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "Mendekotasun mota ezezaguna: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, fuzzy, c-format #| msgid "Unknown matcher type: \"%s\"." msgid "Unknown term type: \"%s\"." @@ -3198,7 +3205,7 @@ msgstr "Eredu mota ezezaguna: \"%s\"." #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, fuzzy, c-format #| msgid "" #| "The ?%s matcher must be used in a \"wide\" context (a top-level context, " @@ -3210,34 +3217,34 @@ msgstr "" "?%s eredua kontestu \"zabal\"batetan etabili behar da (maila altueneko " "kontestua edo ?%s artean)." -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "Itxi gabeko '('" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "Hornitzea: ezin da hondaturik egon" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "Eredu-mota ezezaguna: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "Ezin da \"\" bilatu" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "Espero gabeko adierazpen hutsa" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, fuzzy, c-format #| msgid "Badly formed expression" msgid "Badly formed expression: expected '|', got '%c'" msgstr "Gaizki osatutako adierazpena" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "Espero ez zen ')'" @@ -4189,22 +4196,22 @@ msgstr "" msgid "%s: Unable to accept a connection: %s" msgstr "Ezin da aldi baterako direktorioa \"%s\" txantiloitik sortu: %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4940,7 +4947,7 @@ msgstr "" msgid "Virtual package" msgstr "Paketea" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "Ez dago instalatuta" @@ -5110,163 +5117,169 @@ msgstr "%s-ek %s ordezkatzen du" msgid "%s obsoletes %s" msgstr "%s-ek %s zaharkiturik uzten du" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s-ek %s ordezkatzen du" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "Kendu hurrengo paketeak:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "Instalatu hurrengo bertsio-beritzeak:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 #, fuzzy #| msgid "Remove the following packages:" msgid "Keep the following packages:" msgstr "Kendu hurrengo paketeak:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "Bertsio-berritu hurrengo paketeak:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "Bertsioa atzeratu hurrengo paketeetan:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 #, fuzzy #| msgid "Leave the following dependencies unresolved:%n" msgid "Leave the following dependencies unresolved:" msgstr "Utzi honako mendekotasunak ebatzi gabe:%n" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, fuzzy, c-format #| msgid "Remove %F [%s (%s)]" msgid "Remove %s [<big>%s</big> (%s)]" msgstr "Kendu %F [%s (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "Install %s [<big>%s</big> (%s)]" msgstr "Instalatu %F [%s (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "Cancel the installation of %s" msgstr "Bertan behera utzi %F(r)en instalazioa" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Cancel the removal of %s" msgstr "Bertanb behera utzi %F kentzea" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "Keep %s at version <big>%s</big> (%s)" msgstr "Mantendu %F %s bertsioan (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, fuzzy, c-format #| msgid "Upgrade %F [%s (%s) -> %s (%s)]" msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Eguneratu %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, fuzzy, c-format #| msgid "Downgrade %F [%s (%s) -> %s (%s)]" msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Bertsio-zahartu %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>Remove</b> %s" msgstr "Kendu(%s)" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>remove</b> %s" msgstr "Kendu(%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>Keep</b> %s at version %s" msgstr "Mantendu %F %s bertsioan (%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>keep</b> %s at version %s" msgstr "Mantendu %F %s bertsioan (%s)" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>Cancel</b> the installation of %s" msgstr "Bertan behera utzi %F(r)en instalazioa" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>cancel</b> the installation of %s" msgstr "Bertan behera utzi %F(r)en instalazioa" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>Install</b> %s %s" msgstr "Instalatu %F [%s (%s)]" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>install</b> %s %s" msgstr "Instalatu %F [%s (%s)]" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "<b>Downgrade</b> %s to version %s" msgstr " cwidget bertsioa: %s\n" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "<b>downgrade</b> %s to version %s" msgstr " cwidget bertsioa: %s\n" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>Upgrade</b> %s to version %s" msgstr "%s - bertsioak" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>upgrade</b> %s to version %s" msgstr "%s - bertsioak" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format #| msgid "%d install" #| msgid_plural "%d installs" @@ -5275,7 +5288,7 @@ msgid_plural "%s installs" msgstr[0] "%d instalatu" msgstr[1] "%d instalatu" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, fuzzy, c-format #| msgid "%d removal" #| msgid_plural "%d removals" @@ -5284,7 +5297,7 @@ msgid_plural "%s removes" msgstr[0] "%d kendu" msgstr[1] "%d kendu" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, fuzzy, c-format #| msgid "%d keep" #| msgid_plural "%d keeps" @@ -5293,7 +5306,7 @@ msgid_plural "%s keeps" msgstr[0] "%d mantendu" msgstr[1] "%d mantendu" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, fuzzy, c-format #| msgid "%d upgrade" #| msgid_plural "%d upgrades" @@ -5302,7 +5315,7 @@ msgid_plural "%s upgrades" msgstr[0] "%d eguneratu" msgstr[1] "%d eguneratu" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, fuzzy, c-format #| msgid "%d downgrade" #| msgid_plural "%d downgrades" @@ -5311,7 +5324,7 @@ msgid_plural "%s downgrades" msgstr[0] "%d aurreko bertsiora itzuli" msgstr[1] "%d aurreko bertsiora itzuli" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, fuzzy, c-format #| msgid "Audit ^Recommendations" msgid "%s unresolved recommendation" @@ -5319,35 +5332,35 @@ msgid_plural "%s unresolved recommendations" msgstr[0] "^Gomendioak Auditatu:" msgstr[1] "^Gomendioak Auditatu:" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 #, fuzzy #| msgid "No more solutions." msgid "No solutions yet." msgstr "Ez dago irtenbide gehiagorik." -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 #, fuzzy #| msgid "Dependency handling" msgid "No dependency solution was found." msgstr "Mendekotasun kudeaketa" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 #, fuzzy #| msgid "No more solutions." msgid "No solutions." msgstr "Ez dago irtenbide gehiagorik." -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, fuzzy, c-format #| msgid "No more solutions." msgid "%u solutions." msgstr "Ez dago irtenbide gehiagorik." -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Could not open file \"%s\"" msgid "Solution %s of %s." @@ -5662,12 +5675,12 @@ msgstr " Ept euskarria desgaituta\n" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s konpilatua -> %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5824,29 +5837,35 @@ msgstr " show - Bistaratu pakete bati buruzko informazio xehea\n" #: src/main.cc:213 #, fuzzy, c-format +#| msgid " show - Display detailed information about a package\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - Bistaratu pakete bati buruzko informazio xehea\n" + +#: src/main.cc:214 +#, fuzzy, c-format #| msgid " clean - Erase downloaded package files\n" msgid " clean - Erase downloaded package files.\n" msgstr " clean - Ezabatu deskargatutako pakete-fitxategiak\n" -#: src/main.cc:214 +#: src/main.cc:215 #, fuzzy, c-format #| msgid " autoclean - Erase old downloaded package files\n" msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean - Ezabatu deskargatutako pakete-fitxategi zaharrak\n" -#: src/main.cc:215 +#: src/main.cc:216 #, fuzzy, c-format #| msgid " changelog - View a package's changelog\n" msgid " changelog - View a package's changelog.\n" msgstr " changelog - Ikusi paketearen aldaketa egunkaria\n" -#: src/main.cc:216 +#: src/main.cc:217 #, fuzzy, c-format #| msgid " download - Download the .deb file for a package\n" msgid " download - Download the .deb file for a package.\n" msgstr " download - Deskargatu pakete baten .deb fitxategia\n" -#: src/main.cc:217 +#: src/main.cc:218 #, fuzzy, c-format #| msgid "" #| " reinstall - Download and (possibly) reinstall a currently installed " @@ -5858,19 +5877,23 @@ msgstr "" " reinstall - Instalaturik dagoen paketea deskargatu eta (posibleki) " "berrinstalatu\n" -#: src/main.cc:218 -#, c-format +#: src/main.cc:219 +#, fuzzy, c-format +#| msgid "" +#| " why - Show the manually installed packages that require a " +#| "package, or\n" +#| " why one or more packages would require the given package\n" msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " why - Erakutsi eskuz instalatutako paketeak (pakete bat \n" " behar dutena) edo\n" " zergatik pakete batek edo gehiagok behar duten emandako " "paketea\n" -#: src/main.cc:220 +#: src/main.cc:221 #, fuzzy, c-format #| msgid "" #| " why-not - Show the manually installed packages that lead to a " @@ -5890,59 +5913,59 @@ msgstr "" " diren emandako paketearekin (azken hau instalatzen " "bada)\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " Aukerak:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " -h This help text.\n" msgstr " -h Laguntza-testu hau\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h Laguntza-testu hau\n" -#: src/main.cc:232 +#: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr "" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s Simulatu ekintzak, baina ez burutu.\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr "" " -d Soilik deskargatu paketeak; ez instalatu edo kendu ezer.\n" -#: src/main.cc:236 +#: src/main.cc:237 #, fuzzy, c-format #| msgid " -P Always prompt for confirmation or actions\n" -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P Beti eskatu berrespena\n" -#: src/main.cc:237 +#: src/main.cc:238 #, fuzzy, c-format #| msgid "" #| " -y Assume that the answer to simple yes/no questions is " @@ -5952,7 +5975,7 @@ msgid "" msgstr "" " -y Bai/ez erantzuneko galdera soilen erantzuna 'bai' izango da\n" -#: src/main.cc:238 +#: src/main.cc:239 #, fuzzy, c-format #| msgid "" #| " -F format Specify a format for displaying search results; see the " @@ -5964,7 +5987,7 @@ msgstr "" " -F format Zehaztu bilaketa-emaitzak bistaratzeko formatu bat; ikus " "eskuliburua\n" -#: src/main.cc:239 +#: src/main.cc:240 #, fuzzy, c-format #| msgid "" #| " -O order Specify how search results should be sorted; see the " @@ -5976,7 +5999,7 @@ msgstr "" " -O order Zehaztu bilaketa-emaitzak nola ordenatuko diren; ikus " "eskuliburua\n" -#: src/main.cc:240 +#: src/main.cc:241 #, fuzzy, c-format #| msgid "" #| " -w width Specify the display width for formatting search results\n" @@ -5984,30 +6007,30 @@ msgid "" " -w width Specify the display width for formatting search results.\n" msgstr " -w width Zehaztu bilaketa-emaitzak erakusteko zabalera\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr " -f Agresiboki saiatu hautsitako paketeak konpontzen.\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr " -V Erakutsi paketeen zein bertsio instalatuko diren.\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr "" " -D Erakutsi automatikoki aldatutako paketeen mendekotasunak.\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr "" " -Z\t\t Erakutsi pakete bakoitzaren instalatutako tamainaren aldaketa.\n" -#: src/main.cc:245 +#: src/main.cc:246 #, fuzzy, c-format #| msgid "" #| " -v Display extra information. (may be supplied multiple " @@ -6019,7 +6042,7 @@ msgstr "" " -v Bistaratu informazio gehigarria. (hainbat aldiz eman " "daiteke)\n" -#: src/main.cc:246 +#: src/main.cc:247 #, fuzzy, c-format #| msgid "" #| " -t [release] Set the release from which packages should be installed\n" @@ -6027,66 +6050,66 @@ msgid "" " -t [release] Set the release from which packages should be installed.\n" msgstr " -t [release] Ezarri zein banaketatatik instalatuko diren paketeak\n" -#: src/main.cc:247 +#: src/main.cc:248 #, fuzzy, c-format #| msgid "" #| " -q In command-line mode, suppress the incremental progress\n" #| " indicators.\n" msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" " -q Komando-lerro moduan, progresio-gehikuntzaren adierazlea\n" " kentzen du.\n" -#: src/main.cc:249 +#: src/main.cc:250 #, fuzzy, c-format #| msgid " -o key=val Directly set the configuration option named 'key'\n" msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr " -o key=balioa 'key' aukeraren konfigurazioa ezartzen du zuzenean\n" -#: src/main.cc:250 +#: src/main.cc:251 #, fuzzy, c-format #| msgid "" #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" #| " strong dependencies\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends,\tZehaztu gomendioak (iradokizunak) mendekotasun " "sendotzat\n" " joko diren ala ez\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr "" " -S fname Irakurri aptitude-ren egoera-informazio hedatua fname-tik.\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u Deskargatu pakete-zerrenda berriak abioan.\n" -#: src/main.cc:254 src/main.cc:256 +#: src/main.cc:255 src/main.cc:257 #, c-format -msgid " (terminal interface only)" +msgid " (terminal interface only)\n" msgstr "" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i Burutu instalazio-exekuzioa abioan.\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " Aptitude honek ez dauka Superbehiaren ahalmenik.\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 #, fuzzy #| msgid "true" msgid "trace" @@ -6094,13 +6117,13 @@ msgstr "egia" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 #, fuzzy #| msgid "no" msgid "info" @@ -6108,13 +6131,13 @@ msgstr "ez" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 #, fuzzy #| msgid "Err " msgid "error" @@ -6122,7 +6145,7 @@ msgstr "Err " #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 #, fuzzy #| msgid "false" msgid "fatal" @@ -6130,95 +6153,95 @@ msgstr "faltsua" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " "\"warn\", \"error\", \"fatal\", or \"off\")." msgstr "" -#: src/main.cc:487 +#: src/main.cc:488 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "Invalid logger name \"%s\"." msgstr "Eragiketa baliogabea: %s" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "-q= -ren ondoren zenbaki bat espero da\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "q= -ren ondoren zenbaki bat espero zen, %s eskuratu da\n" -#: src/main.cc:802 +#: src/main.cc:794 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o aukerak gakoa=balioa formako argumentua behar du, %s lortu da\n" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "Ez dago komarik \"%s\" etiketa-izenaren ostean.\n" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "ARRAROA: aukera-kode ezezaguna jaso da\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "" -#: src/main.cc:1039 +#: src/main.cc:1023 #, fuzzy #| msgid "Package" msgid "first-package" msgstr "Paketea" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "" -#: src/main.cc:1043 +#: src/main.cc:1027 #, fuzzy #| msgid "All Packages" msgid "all-packages" msgstr "Pakete guztiak" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -6226,7 +6249,7 @@ msgid "" "versions\"." msgstr "" -#: src/main.cc:1089 +#: src/main.cc:1073 #, fuzzy #| msgid "Only one of -u and -i may be specified\n" msgid "" @@ -6234,7 +6257,7 @@ msgid "" "specified\n" msgstr "-u edo -i, bietako bat bakarrik zehatz daiteke\n" -#: src/main.cc:1098 +#: src/main.cc:1082 #, fuzzy #| msgid "" #| "-u and -i may not be specified in command-line mode (eg, with 'install')" @@ -6244,23 +6267,23 @@ msgid "" msgstr "" "-u eta -i ezin dira zehaztu komando-lerroaren moduan (adib. 'install'ekin)" -#: src/main.cc:1115 +#: src/main.cc:1099 #, fuzzy #| msgid "-u and -i may not be specified with a command" msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "-u eta -i ezin dira zehaztu komando batekin" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "Komando ezezaguna: \"%s\"\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "Salbuespena: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" @@ -6269,7 +6292,8 @@ msgstr "" "Aztarna:\n" "%s\n" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "Bilatu hau: " @@ -7159,17 +7183,21 @@ msgstr "hau ordezten du:" msgid "obsoletes" msgstr "hau zaharkitzen du:" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (honek hornitua: %F)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." @@ -7177,7 +7205,7 @@ msgstr "" "Pakete bat hautatzen baduzu, paketearen uneko egoeraren azalpen bat agertuko " "da hemen." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -7185,17 +7213,17 @@ msgstr "" "%B%s%b automatikoki instalatu zen; kendu egingo da, haren mendeko pakete " "guztiak ere kendu egingo baitira:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "%B%s%b automatikoki kenduko da, mendekotasun-erroreen ondorioz:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" "%B%s%b automatikoki instalatuko da, ondorengo mendekotasunak betetzeko:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -7203,7 +7231,7 @@ msgstr "" "%B%s%b ezin da orain bertsio-berritu, baina bertsio-berritzea posible izango " "balitz ere, %B%s%b bertsioan mantenduko litzateke." -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -7211,65 +7239,65 @@ msgstr "" "%B%s%b ez da %B%s%b bertsiora berrituko, ondorengo mendekotasunak hauts ez " "daitezen:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b instalatuta daukazu." -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b ez daukazu instalatuta." -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "%B%s%b - mendekotasun batzuk ez zaizkio betetzen:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "%B%s%b aurreko bertsiora itzuliko da." -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b ez da berrituko debekatutako %B%s%b bertsiora." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." msgstr "" "%B%s%b berritu liteke %B%s%b bertsiora, baina %B%s%b bertsioan atxikita dago." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b berriro instalatuko da." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b instalatu egingo da." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b kendu egingo da." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b berritu egingo da %B%s%b bertsiotik %B%s%b bertsiora." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "%B%s%b ez dago guztiz instalaturik, instalazioa burutzen saiatuko da." -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "" "Ondorengo paketeak %B%s%b(r)en mendekoak dira, eta hautsi egingo dira hori " "kentzean:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "Ondorengo paketeak %B%s%b(r)en mendekoak dira, eta hautsita daude:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" @@ -7277,7 +7305,7 @@ msgstr "" "Ondorengo paketeek gatazka dute %B%s%b(r)ekin, eta hautsi egingo dira hori " "instalatzean:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -7287,7 +7315,7 @@ msgstr "" "instalatuta dagoen %B%s%b bertsioaren mendekoak, edo gatazkan daude " "instalatuta daukazun bertsioarekin:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -7295,11 +7323,11 @@ msgstr "" "Ondorengo paketeak gatazkan daude %B%s%b(r)en bertsio batekin, edo " "instalatuko ez den bertsio baten mendekoak dira." -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "Ondorengo paketeak gatazkan daude %B%s%b(r)ekin:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -7307,22 +7335,22 @@ msgstr "" "Ondorengo paketeak %B%s%b(r)en beste bertsio baten mendekoak dira, ez unean " "instalatuta dagoen %B%s%b bertsioaren mendekoak:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." msgstr "" "Ondorengo paketeak instalatuko ez den %B%s%b bertsio baten mendekoak dira." -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "bertsio-berritzen" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "aurreko bertsiora itzultzen" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7332,7 +7360,7 @@ msgstr "" "mendekoak dira, edo gatazkan daude %s denean izango den bertsioarekin (%B%s" "%b), eta hautsi egingo dira %s bada." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7340,7 +7368,7 @@ msgstr "" "Ondorengo paketeak gatazkan daude %B%s%b bertsioarekin (%B%s%b), eta hautsi " "egingo dira %s bada." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7376,47 +7404,47 @@ msgstr "Aplikatu" msgid "Close" msgstr "Itxi" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s-ek %s-rekin elkarjotzen du [%s %s-ek hornitua]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "%s kentzen" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "Instalatzen: %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%BKendu%b honako paketeak:%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%BInstalatu%b honako paketeak:%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%BMantendu%b honako paketeak beraien uneko bertsioan:%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%BBertsio-berritu%b honako paketeak:%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%BAurreko bertsiora itzuli%b honako paketeak:%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "Utzi honako mendekotasunak ebatzi gabe:%n" @@ -7515,10 +7543,6 @@ msgstr "E:" msgid "W:" msgstr "A:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "Bilatu hau:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7895,7 +7919,9 @@ msgid "Error while dumping resolver state" msgstr "Errorea ebazpen-egoera iraultzean" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "Fitxategia ebazpen-egoera iraultzeko:" #: src/ui.cc:2265 @@ -8413,6 +8439,21 @@ msgstr "" "Debian-eko pakete ofizialen aldaketen erregistroak bakarrik ikus ditzakezu." #~ msgid "" +#~ "%BOption:%b %s\n" +#~ "%BDefault:%b %s\n" +#~ "%BValue:%b %s\n" +#~ msgstr "" +#~ "%BAukera:%b %s\n" +#~ "%BLehenetsia:%b %s\n" +#~ "%BBalioa:%b %s\n" + +#~ msgid "Press Return to continue" +#~ msgstr "Jarraitzeko , sakatu 'Sartu' tekla" + +#~ msgid "Search for:" +#~ msgstr "Bilatu hau:" + +#~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." #~ msgstr "" #~ "Ezin dira bertsio-berritzeko mendekotasunak ebatzi (ebaztea denboraz " @@ -8540,11 +8581,6 @@ msgstr "" #~ msgid "gtk-yes" #~ msgstr "bai" -#, fuzzy -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "Eragiketa baliogabea: %s" - #~ msgid "but it is not installable" #~ msgstr "baina ez da instalagarria" @@ -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: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2006-11-05 15:47+0200\n" "Last-Translator: Jaakko Kangasharju <ashar@iki.fi>\n" "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n" @@ -18,41 +18,37 @@ msgstr "" "X-Generator: KBabel 1.3.1\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +#, fuzzy +msgid "%BOption:%b " +msgstr "Asetukset" + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 #, fuzzy msgid "False" msgstr "Lopeta" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -#, fuzzy -msgid "%BOption:%b " -msgstr "Asetukset" - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "" - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:279 +#: src/apt_config_treeitems.cc:280 #, c-format -msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "" @@ -529,8 +525,8 @@ msgstr "" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] Selvitän riippuvuuksia" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "Ohjelmavirhe: odottamaton tyhjä ratkaisu." @@ -821,7 +817,7 @@ msgid "" msgstr "Riippuvuuksien selvitys ei onnistunut." #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "Keskeytys.\n" @@ -1181,7 +1177,7 @@ msgstr "Levytilaa vapautuu %sB purkamisen jälkeen.\n" msgid "No packages to show -- enter the package names on the line after 'i'.\n" msgstr "Ei näytettäviä paketteja -- anna pakettien nimet 'i':n jälkeen.\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "Paina Return jatkaaksesi." @@ -1190,10 +1186,6 @@ msgstr "Paina Return jatkaaksesi." msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "Paketteja ei löytynyt -- anna pakettien nimet 'c':n jälkeen.\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "Paina Return jatkaaksesi" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1493,7 +1485,7 @@ msgstr "Ratkaisimen tila tallennettu!" #: src/cmdline/cmdline_resolver.cc:222 #, fuzzy, c-format msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %F pkt ver ...: %F%na pkt ver ...: %F" @@ -1753,7 +1745,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created." msgstr "" #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "Selvitän riippuvuuksia..." @@ -1789,7 +1781,9 @@ msgid "Invalid response; please enter one of the following commands:" msgstr "Virheellinen syöte; anna jokin seuraavista komennoista:" #: src/cmdline/cmdline_resolver.cc:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +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]" @@ -1993,7 +1987,7 @@ msgstr "Paketti: " msgid "State" msgstr "Tila" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "Kattavat" @@ -2101,27 +2095,31 @@ msgstr "Korvaavuudet" msgid "Obsoletes" msgstr "Täydet korvaavuudet" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Katetut" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Kuvaus: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "" -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "En löytänyt pakettia %s" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "En ymmärrä kaavaa %s" @@ -2441,6 +2439,12 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "" +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "Virheellinen toiminto %s" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "Vakiosyötevirta loppui odottamatta" @@ -2458,7 +2462,7 @@ msgstr "[VIRHE]" msgid "UNSATISFIED" msgstr "TYYDYTTÄMÄTÖN" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "EI SAATAVILLA" @@ -2466,7 +2470,7 @@ msgstr "EI SAATAVILLA" msgid "Tags" msgstr "Merkit" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 #, fuzzy msgid "User Tags" msgstr "Merkit" @@ -2863,16 +2867,21 @@ msgstr "En löytänyt pakettia %s" msgid "Unable to open %s to log actions" msgstr "En pystynyt avaaamaan %s:a lokitiedostoksi" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "Virhe paikallisaikaa selvitettäessä (%s)" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "loki" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -2883,81 +2892,81 @@ msgstr "" "epäonnistuu dpkg:n ongelmien takia, sitä ei välttämättä suoritettu.\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "Asennetaan %li pakettia ja poistetaan %li pakettia.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "%s tavua levytilaa kuluu\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "%s tavua levytilaa vapautuu\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[PÄIVITYS] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[VANHENNUS] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "POISTO" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "ASENNUS" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "UUDELLEENASENNUS" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "JÄISSÄ" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "RIKKI" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "POISTO, KÄYTTÄMÄTÖN" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "POISTO, RIIPPUVUUDET" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "ASENNUS, RIIPPUVUUDET" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "JÄISSÄ, RIIPPUVUUDET" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -2980,80 +2989,80 @@ msgstr "" msgid "Filtering packages" msgstr "Noudan paketteja" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "Tuntematon toimi: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "Loppumerkitön merkkijono %s:n jäljessä" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "Tuntematon tärkeys %s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "" -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, fuzzy, c-format msgid "Expected '%c', got '%c'." msgstr "Odotin ',':a tai '(':a, oli '%c'" -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "Tuntematon riippuvuuslaji: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, fuzzy, c-format msgid "Unknown term type: \"%s\"." msgstr "Tuntematon kaavatyyppi: %c" #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, c-format msgid "" "The ?%s term must be used in a \"wide\" context (a top-level context, or a " "context enclosed by ?%s)." msgstr "" -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "Pariton '('" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "Katettu ei voi olla rikki" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "Tuntematon kaavatyyppi: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "Ei voi etsiä ehdolla \"\"" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "Virheellisesti tyhjä lauseke" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, fuzzy, c-format #| msgid "Badly formed expression" msgid "Badly formed expression: expected '|', got '%c'" msgstr "Virheellinen lauseke" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "Pariton ')'" @@ -3984,22 +3993,22 @@ msgstr "" msgid "%s: Unable to accept a connection: %s" msgstr "Tilapäishakemiston luonti kaavasta \"%s\" epäonnistui: %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4716,7 +4725,7 @@ msgstr "" msgid "Virtual package" msgstr "Näennäispaketit" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "Ei asennettu" @@ -4884,159 +4893,165 @@ msgstr "%s korvaa %s:n" msgid "%s obsoletes %s" msgstr "%s korvaa täysin %s:n" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s korvaa %s:n" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "Poista paketit:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "Asenna paketit:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 #, fuzzy #| msgid "Remove the following packages:" msgid "Keep the following packages:" msgstr "Poista paketit:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "Päivitä paketit:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "Vanhenna paketit:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 #, fuzzy #| msgid "Leave the following dependencies unresolved:%n" msgid "Leave the following dependencies unresolved:" msgstr "Jätä riippuvuudet selvittämättä:%n" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, fuzzy, c-format #| msgid "Remove %F [%s (%s)]" msgid "Remove %s [<big>%s</big> (%s)]" msgstr "Poista %F [%s (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "Install %s [<big>%s</big> (%s)]" msgstr "Asenna %F [%s (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "Cancel the installation of %s" msgstr "Peruuta %F:n asennus" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Cancel the removal of %s" msgstr "Peruuta %F:n poisto" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "Keep %s at version <big>%s</big> (%s)" msgstr "Säilytä %F versiossa %s (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, fuzzy, c-format #| msgid "Upgrade %F [%s (%s) -> %s (%s)]" msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Päivitä %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, fuzzy, c-format #| msgid "Downgrade %F [%s (%s) -> %s (%s)]" msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Vanhenna %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format msgid "<b>Remove</b> %s" msgstr "Poisto" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format msgid "<b>remove</b> %s" msgstr "Poisto" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>Keep</b> %s at version %s" msgstr "Säilytä %F versiossa %s (%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>keep</b> %s at version %s" msgstr "Säilytä %F versiossa %s (%s)" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>Cancel</b> the installation of %s" msgstr "Peruuta %F:n asennus" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>cancel</b> the installation of %s" msgstr "Peruuta %F:n asennus" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>Install</b> %s %s" msgstr "Asenna %F [%s (%s)]" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>install</b> %s %s" msgstr "Asenna %F [%s (%s)]" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format msgid "<b>Downgrade</b> %s to version %s" msgstr "libsigc++-versio: %s\n" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format msgid "<b>downgrade</b> %s to version %s" msgstr "libsigc++-versio: %s\n" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>Upgrade</b> %s to version %s" msgstr "%s: versiot" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>upgrade</b> %s to version %s" msgstr "%s: versiot" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format #| msgid "%d install" #| msgid_plural "%d installs" @@ -5045,7 +5060,7 @@ msgid_plural "%s installs" msgstr[0] "%d asennus" msgstr[1] "%d asennusta" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, fuzzy, c-format #| msgid "%d removal" #| msgid_plural "%d removals" @@ -5054,7 +5069,7 @@ msgid_plural "%s removes" msgstr[0] "%d poisto" msgstr[1] "%d poistoa" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, fuzzy, c-format #| msgid "%d keep" #| msgid_plural "%d keeps" @@ -5063,7 +5078,7 @@ msgid_plural "%s keeps" msgstr[0] "%d säilytys" msgstr[1] "%d säilytystä" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, fuzzy, c-format #| msgid "%d upgrade" #| msgid_plural "%d upgrades" @@ -5072,7 +5087,7 @@ msgid_plural "%s upgrades" msgstr[0] "%d päivitys" msgstr[1] "%d päivitystä" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, fuzzy, c-format #| msgid "%d downgrade" #| msgid_plural "%d downgrades" @@ -5081,7 +5096,7 @@ msgid_plural "%s downgrades" msgstr[0] "%d vanhennus" msgstr[1] "%d vanhennusta" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, fuzzy, c-format #| msgid "Audit ^Recommendations" msgid "%s unresolved recommendation" @@ -5089,34 +5104,34 @@ msgid_plural "%s unresolved recommendations" msgstr[0] "Näytä ^suosittelut" msgstr[1] "Näytä ^suosittelut" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 #, fuzzy #| msgid "No more solutions." msgid "No solutions yet." msgstr "Ei muita ratkaisuja" -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 #, fuzzy msgid "No dependency solution was found." msgstr "^Riippuvuuksien käsittely" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 #, fuzzy #| msgid "No more solutions." msgid "No solutions." msgstr "Ei muita ratkaisuja" -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, fuzzy, c-format #| msgid "No more solutions." msgid "%u solutions." msgstr "Ei muita ratkaisuja" -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Could not open file \"%s\"" msgid "Solution %s of %s." @@ -5422,12 +5437,12 @@ msgstr "" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s käännöspäiväys %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5578,29 +5593,35 @@ msgstr " show - Näytä paketin yksityiskohtaiset tiedot\n" #: src/main.cc:213 #, fuzzy, c-format +#| msgid " show - Display detailed information about a package\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - Näytä paketin yksityiskohtaiset tiedot\n" + +#: src/main.cc:214 +#, fuzzy, c-format #| msgid " clean - Erase downloaded package files\n" msgid " clean - Erase downloaded package files.\n" msgstr " clean - Poista noudetut pakettitiedostot\n" -#: src/main.cc:214 +#: src/main.cc:215 #, fuzzy, c-format #| msgid " autoclean - Erase old downloaded package files\n" msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean - Poista vanhat noudetut pakettitiedostot\n" -#: src/main.cc:215 +#: src/main.cc:216 #, fuzzy, c-format #| msgid " changelog - View a package's changelog\n" msgid " changelog - View a package's changelog.\n" msgstr " muutosloki - Näytä paketin muutosloki\n" -#: src/main.cc:216 +#: src/main.cc:217 #, fuzzy, c-format #| msgid " download - Download the .deb file for a package\n" msgid " download - Download the .deb file for a package.\n" msgstr " download - Nouda pakettitiedosto\n" -#: src/main.cc:217 +#: src/main.cc:218 #, fuzzy, c-format #| msgid "" #| " reinstall - Download and (possibly) reinstall a currently installed " @@ -5611,15 +5632,15 @@ msgid "" msgstr "" " reinstall - Nouda ja (mahdollisesti) asenna uudelleen asennettu paketti\n" -#: src/main.cc:218 +#: src/main.cc:219 #, fuzzy, c-format msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr " -Z\t\t Näytä asennetun koon muutos jokaisesta paketista.\n" -#: src/main.cc:220 +#: src/main.cc:221 #, fuzzy, c-format msgid "" " why-not - Show the manually installed packages that lead to a " @@ -5628,60 +5649,60 @@ msgid "" " lead to a conflict with the given package if installed.\n" msgstr " -Z\t\t Näytä asennetun koon muutos jokaisesta paketista.\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " Valitsimet:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " -h This help text.\n" msgstr " -h Tämä avustusteksti\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h Tämä avustusteksti\n" -#: src/main.cc:232 +#: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr "" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr "" " -s Tulosta suoritettavat toiminnot, mutta älä suorita niitä.\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr "" " -d Älä asenna tai poista paketteja, ainoastaan nouda ne.\n" -#: src/main.cc:236 +#: src/main.cc:237 #, fuzzy, c-format #| msgid " -P Always prompt for confirmation or actions\n" -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P Kysy aina varmistusta tai toimintoa\n" -#: src/main.cc:237 +#: src/main.cc:238 #, fuzzy, c-format #| msgid "" #| " -y Assume that the answer to simple yes/no questions is " @@ -5690,7 +5711,7 @@ msgid "" " -y Assume that the answer to simple yes/no questions is 'yes'.\n" msgstr " -y Vastaa yksinkertaisiin kyllä/ei-kysymyksiin kyllä.\n" -#: src/main.cc:238 +#: src/main.cc:239 #, fuzzy, c-format #| msgid "" #| " -F format Specify a format for displaying search results; see the " @@ -5700,7 +5721,7 @@ msgid "" "manual.\n" msgstr " -F muotoilu Määritä hakutulosten näyttömuoto; katso käyttöopasta\n" -#: src/main.cc:239 +#: src/main.cc:240 #, fuzzy, c-format #| msgid "" #| " -O order Specify how search results should be sorted; see the " @@ -5710,7 +5731,7 @@ msgid "" "manual.\n" msgstr " -O järjestys Määritä hakutulosten järjestys; katso käyttöopasta\n" -#: src/main.cc:240 +#: src/main.cc:241 #, fuzzy, c-format #| msgid "" #| " -w width Specify the display width for formatting search results\n" @@ -5718,31 +5739,31 @@ msgid "" " -w width Specify the display width for formatting search results.\n" msgstr " -w leveys Määritä näytön leveys hakutuloksia varten\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr "" " -f Yritä tosissaan korjata rikkinäisten pakettien " "riippuvuuksia.\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr " -V Näytä asennettavien pakettien versiot.\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr "" " -D Näytä automaattisesti muutettujen pakettien riippuvuudet.\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr " -Z\t\t Näytä asennetun koon muutos jokaisesta paketista.\n" -#: src/main.cc:245 +#: src/main.cc:246 #, fuzzy, c-format #| msgid "" #| " -v Display extra information. (may be supplied multiple " @@ -5752,7 +5773,7 @@ msgid "" "times).\n" msgstr " -v Näytä lisätietoa (voidaan käyttää useita kertoja)\n" -#: src/main.cc:246 +#: src/main.cc:247 #, fuzzy, c-format #| msgid "" #| " -t [release] Set the release from which packages should be installed\n" @@ -5760,59 +5781,59 @@ msgid "" " -t [release] Set the release from which packages should be installed.\n" msgstr " -t [julkaisu] Aseta julkaisu, josta paketit asennetaan\n" -#: src/main.cc:247 +#: src/main.cc:248 #, fuzzy, c-format msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr " -q Älä näytä edistymistä komentoriviltä käytettäessä.\n" -#: src/main.cc:249 +#: src/main.cc:250 #, fuzzy, c-format #| msgid " -o key=val Directly set the configuration option named 'key'\n" msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr " -o avain=arvo Anna suoraan asetuksen 'avain' arvo\n" -#: src/main.cc:250 +#: src/main.cc:251 #, fuzzy, c-format #| msgid "" #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" #| " strong dependencies\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends\tMääritä, käsitelläänkö suosituksia\n" " riippuvuuksina\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr " -S tnimi: Lue aptituden laajennetut tilatiedot tiedostosta tnimi.\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u Aloita pakettiluettelon päivitys käynnistettäessä.\n" -#: src/main.cc:254 src/main.cc:256 -#, c-format -msgid " (terminal interface only)" -msgstr "" +#: src/main.cc:255 src/main.cc:257 +#, fuzzy, c-format +msgid " (terminal interface only)\n" +msgstr " -h Tämä avustusteksti\n" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i Näytä toimenpideruutu käynnistettäessä.\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " Tällä aptitudella ei ole Lehmävoimia.\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 #, fuzzy #| msgid "replaces" msgid "trace" @@ -5820,13 +5841,13 @@ msgstr ", korvaus: " #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 #, fuzzy #| msgid "no" msgid "info" @@ -5834,13 +5855,13 @@ msgstr "ei" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 #, fuzzy #| msgid "Err " msgid "error" @@ -5848,102 +5869,102 @@ msgstr "Virhe " #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 #, fuzzy msgid "fatal" msgstr "Lopeta" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " "\"warn\", \"error\", \"fatal\", or \"off\")." msgstr "" -#: src/main.cc:487 +#: src/main.cc:488 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "Invalid logger name \"%s\"." msgstr "Virheellinen toiminto %s" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "-q=:n jäljessä tarvitaan luku\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "-q=:n jäljessä tarvitaan luku, oli %s\n" -#: src/main.cc:802 +#: src/main.cc:794 #, fuzzy, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o:n argumentin on oltava muotoa avain=arvo; se oli %s" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "OUTOA: tuntematon valitsin\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "" -#: src/main.cc:1039 +#: src/main.cc:1023 #, fuzzy #| msgid "Package" msgid "first-package" msgstr "Paketti" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "" -#: src/main.cc:1043 +#: src/main.cc:1027 #, fuzzy #| msgid "All Packages" msgid "all-packages" msgstr "Kaikki paketit" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -5951,7 +5972,7 @@ msgid "" "versions\"." msgstr "" -#: src/main.cc:1089 +#: src/main.cc:1073 #, fuzzy #| msgid "Only one of -u and -i may be specified\n" msgid "" @@ -5959,7 +5980,7 @@ msgid "" "specified\n" msgstr "Valitsimia -u ja -i ei voi käyttää yhdessä\n" -#: src/main.cc:1098 +#: src/main.cc:1082 #, fuzzy #| msgid "" #| "-u and -i may not be specified in command-line mode (eg, with 'install')" @@ -5968,23 +5989,23 @@ msgid "" "(eg, with 'install')" msgstr "Valitsimia -u ja -i ei voi käyttää komentorivitoiminnoissa" -#: src/main.cc:1115 +#: src/main.cc:1099 #, fuzzy #| msgid "-u and -i may not be specified with a command" msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "Valitsimia -u ja -i ei voi käyttää komennon kanssa" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "Tuntematon komento \"%s\"\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "Läpipäässyt poikkeus: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, fuzzy, c-format msgid "" "Backtrace:\n" @@ -5993,7 +6014,8 @@ msgstr "" "Jäljitys:\n" "%s" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "Etsi: " @@ -6890,18 +6912,22 @@ msgstr ", korvaus: " msgid "obsoletes" msgstr ", täysi korvaus: " -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (%F kattaa)" # Left as is on purpose, at least for now - JJK -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." @@ -6909,7 +6935,7 @@ msgstr "" "Kun valitset paketin, selitys sen tämänhetkisestä tilasta annetaan tässä " "tilassa." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -6917,16 +6943,16 @@ msgstr "" "%B%s%b asennettiin automaattisesti; se poistetaan nyt, koska kaikki siitä " "riippuvat paketit poistetaan myös:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "%B%s%b poistetaan automaattisesti riippuvuusristiriitojen takia:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "%B%s%b asennetaan automaattisesti seuraavien riippuvuuksien takia:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -6934,7 +6960,7 @@ msgstr "" "%B%s%b ei ole nyt päivitettävissä, mutta vaikka se olisikin, se jätettäisiin " "odottamaan versioon %B%s%b." -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -6942,27 +6968,27 @@ msgstr "" "Pakettia %B%s%b ei päivitetä versioon %B%s%b, koska tämä rikkoisi seuraavat " "riippuvuudet:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "Paketti %B%s%b on asennettu." -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "Pakettia %B%s%b ei ole asennettu." -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "Paketin %B%s%b kaikkia riippuvuuksia ei ole tyydytetty:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "Paketti %B%s%b vanhennetaan." -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "Pakettia %B%s%b ei päivitetä estettyyn versioon %B%s%b." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." @@ -6970,37 +6996,37 @@ msgstr "" "Paketin %B%s%b voisi päivittää versioon %B%s%b, mutta se on jäädytetty " "versioon %B%s%b." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b asennetaan uudelleen." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b asennetaan." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b poistetaan." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b päivitetään versiosta %B%s%b versioon %B%s%b." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 #, fuzzy msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "Pakettia %s ei ole asennettu, joten sitä ei asenneta uudelleen.\n" -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "Nämä paketit riippuvat paketista %B%s%b ja rikkoutuvat sen poistosta:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "Nämä paketit riippuvat paketista %B%s%b ja ovat hajalla:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" @@ -7008,7 +7034,7 @@ msgstr "" "Nämä paketit ovat ristiriidassa paketin %B%s%b kanssa ja hajoavat, jos se " "asennetaan:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -7018,7 +7044,7 @@ msgstr "" "asennettuna oleva %B%s%b tai ovat ristiriidassa tällä hetkellä asennetun " "version kanssa:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -7026,11 +7052,11 @@ msgstr "" "Nämä paketit ovat ristiriidassa paketin %B%s%b kanssa tai riippuvat sen " "sellaisesta versiosta, jota ei olla asentamassa." -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "Nämä paketit ovat ristiriidassa paketin %B%s%b kanssa:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -7038,7 +7064,7 @@ msgstr "" "Nämä paketit riippuvat paketin %B%s%b versiosta, joka ei ole tällä hetkellä " "asennettu versio %B%s%b:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." @@ -7046,11 +7072,11 @@ msgstr "" "Nämä paketit riippuvat paketin %B%s%b sellaisesta versiosta, jota ei olla " "asentamassa." -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "päivitys" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "vanhennus" @@ -7058,7 +7084,7 @@ msgstr "vanhennus" # Well, my attempt should sort of work; just don't use the above "upgraded" # and "downgraded" anywhere else. # JJK -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7067,7 +7093,7 @@ msgstr "" "Seuraavat paketit riippuvat paketin %B%s%b asennetusta versiosta %B%s%b tai " "ovat ristiriidassa version %B%4$s%b kanssa, johon %3$s tehdään." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7075,7 +7101,7 @@ msgstr "" "Nämä paketit ovat ristiriidassa paketin %B%2$s%b version %B%1$s%b kanssa ja " "hajoavat jos %s tehdään." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7111,47 +7137,47 @@ msgstr "Toteuta" msgid "Close" msgstr "Lopeta" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s on ristiriidassa %s:n (%s %s kattaa) kanssa" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "Poistan paketin %s" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "Asennan paketin %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%BPoista%b paketit:%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%BAsenna%b paketit:%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%BPidä%b paketit nykyisessä versiossaan:%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%BPäivitä%b paketit:%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%BVanhenna%b paketit:%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "Jätä riippuvuudet selvittämättä:%n" @@ -7249,10 +7275,6 @@ msgstr "Virhe:" msgid "W:" msgstr "Varoitus:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "Etsi:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7627,7 +7649,9 @@ msgid "Error while dumping resolver state" msgstr "Selvityksen tilan tallennuksessa tapahtui virhe" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "Mihin tiedostoon selvityksen tila tallennetaan? " #: src/ui.cc:2265 @@ -8135,6 +8159,12 @@ msgstr "Noudan muutoslokia" msgid "You can only view changelogs of official Debian packages." msgstr "Vain virallisten Debian-pakettien muutoslokit ovat saatavilla." +#~ msgid "Press Return to continue" +#~ msgstr "Paina Return jatkaaksesi" + +#~ msgid "Search for:" +#~ msgstr "Etsi:" + #, fuzzy #~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." @@ -8262,11 +8292,6 @@ msgstr "Vain virallisten Debian-pakettien muutoslokit ovat saatavilla." #~ msgid "gtk-yes" #~ msgstr "on" -#, fuzzy -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "Virheellinen toiminto %s" - #~ msgid "but it is not installable" #~ msgstr "mutta se ei ole asennettavissa" @@ -8432,10 +8457,6 @@ msgstr "Vain virallisten Debian-pakettien muutoslokit ovat saatavilla." #~ " lead to a conflict with the given package if installed\n" #~ msgstr " -V Näytä asennettavien pakettien versiot.\n" -#, fuzzy -#~ msgid " indicators.\n" -#~ msgstr " -h Tämä avustusteksti\n" - #~ msgid "Downloading " #~ msgstr "Nouto: " @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2011-06-26 14:31+0100\n" "Last-Translator: Jean-Baka Domelevo Entfellner <domelevo@gmail.com>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -23,42 +23,36 @@ msgstr "" "X-Poedit-Language: French\n" "X-Poedit-Country: FRANCE\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" -msgstr "" -"%BOption :%b %s\n" -"%BDéfaut :%b %s\n" -"%BValeur :%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " +msgstr "%BOption :%b " + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " +msgstr "%BDéfaut :%b " -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "Vrai" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "Faux" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " -msgstr "%BOption :%b " - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "%BDéfaut :%b " - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "%BValeur :%b " -#: src/apt_config_treeitems.cc:279 -#, c-format -msgid "Editing \"%ls\"" +#: src/apt_config_treeitems.cc:280 +#, fuzzy, c-format +#| msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "Modification de « %ls »" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "%BChoix :%b " @@ -658,8 +652,8 @@ msgstr "Erreur fatale du solveur" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] Résolution des dépendances" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "Erreur interne : solution « null » inattendue." @@ -961,7 +955,7 @@ msgstr "" "d'utiliser l'option --full-resolver.\n" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "Abandon.\n" @@ -1338,7 +1332,7 @@ msgid "No packages to show -- enter the package names on the line after 'i'.\n" msgstr "" "Aucun paquet à afficher — indiquez les noms de paquets à la suite de « i ».\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "Appuyez sur Entrée pour continuer." @@ -1348,10 +1342,6 @@ msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "" "Aucun paquet trouvé — indiquez les noms de paquets à la suite de « c ».\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "Appuyez sur Entrée pour continuer" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1670,9 +1660,12 @@ msgid "Resolver state successfully written!" msgstr "L'état du solveur a été enregistré avec succès." #: src/cmdline/cmdline_resolver.cc:222 -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +#| "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID| ver pqt) ...: %F%na (ID| ver " @@ -1953,7 +1946,7 @@ msgstr "" "dépendances n'a été créé." #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "Résolution des dépendances…" @@ -1992,7 +1985,9 @@ 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:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +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]" @@ -2200,7 +2195,7 @@ msgstr "Paquet : " msgid "State" msgstr "État" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "Fourni par " @@ -2308,27 +2303,31 @@ msgstr "Remplace" msgid "Obsoletes" msgstr "Rend obsolète" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Fournit" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Description : " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "Site : " -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "Paquet %s introuvable" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "Analyse du motif %s impossible" @@ -2648,6 +2647,12 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "Choix d'une version inconnue, ce qui est très inhabituel." +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "Opération non valable %s" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "Fin de fichier inattendue sur l'entrée standard" @@ -2664,7 +2669,7 @@ msgstr "[ ERR] %s" msgid "UNSATISFIED" msgstr "NON SATISFAIT(E)" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "INDISPONIBLE" @@ -2672,7 +2677,7 @@ msgstr "INDISPONIBLE" msgid "Tags" msgstr "Étiquettes" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "Étiquettes utilisateur" @@ -3105,16 +3110,21 @@ msgstr "Impossible de créer le cache tronqué : %s" msgid "Unable to open %s to log actions" msgstr "Impossible d'ouvrir %s pour enregistrer les actions" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "Erreur lors de la définition de l'heure locale (%s)" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "journal" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -3126,81 +3136,81 @@ msgstr "" "échouent à cause d'erreurs de dpkg peuvent donc ne pas être réalisées.\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "%li paquets vont être installés, et %li retirés.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "%so d'espace disque vont être utilisés\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "%so d'espace disque vont être libérés\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[MIS A JOUR] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[VERSION PRÉCÉDENTE] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "RETIRÉ" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "INSTALLÉ" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "RÉINSTALLÉ" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "CONSERVÉ" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "CASSÉ" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "SUPPRIMÉ, NON UTILISÉ" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "RETIRÉ, DÉPENDANCES" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "INSTALLÉ, DÉPENDANCES" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "CONSERVÉ, DÉPENDANCES" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "NON CONFIGURÉ" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -3221,47 +3231,47 @@ msgstr "Accès à l'index" msgid "Filtering packages" msgstr "Filtrage des paquets" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "Type d'action inconnu : %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "Chaîne littérale non terminée après %s" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "Priorité %s inconnue" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "" "Motif de correspondance terminé de manière inattendue (« %c » attendu)." -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "« %c » attendu, « %c » reçu." -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "Type de dépendance inconnu : %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, c-format msgid "Unknown term type: \"%s\"." msgstr "Type de term inconnu : « %s »." #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, c-format msgid "" "The ?%s term must be used in a \"wide\" context (a top-level context, or a " @@ -3270,33 +3280,33 @@ msgstr "" "Le terme « ?%s » doit être utilisé dans un contexte « large » (contexte de " "premier niveau ou contexte contenu dans ?%s)." -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "« ( » non fermée" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "Provides: ne peut être cassé" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "Type de modèle inconnu : %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "Impossible de rechercher \"\"" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "Expression vide" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, c-format msgid "Badly formed expression: expected '|', got '%c'" msgstr "Expression mal formulée : « | » attendu, « %c » trouvé" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "« ) » mal placée" @@ -4173,22 +4183,22 @@ msgstr "Erreur interne : « %s » est un nom trop long pour un socket tempora msgid "%s: Unable to accept a connection: %s" msgstr "%s : impossible d'accepter une connexion : %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "[%s] démarrage du processus de dpkg…\n" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "[%s] processus dpkg terminé.\n" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "[%s] échec du processus dpkg.\n" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "[%s] processus dpkg terminé ; il reste encore des paquets à traiter.\n" @@ -4841,7 +4851,7 @@ msgstr "" msgid "Virtual package" msgstr "Paquet virtuel" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "Non installé" @@ -5015,205 +5025,211 @@ msgstr "%s remplace %s" msgid "%s obsoletes %s" msgstr "%s rend obsolète %s" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s remplace %s" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "Supprimer les paquets suivants :" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "Installer les paquets suivants :" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 msgid "Keep the following packages:" msgstr "Conserver les paquets suivants :" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "Mettre à jour les paquets suivants :" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "Réinstaller à une version antérieure les paquets suivants :" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 msgid "Leave the following dependencies unresolved:" msgstr "Laisser les dépendances suivantes non satisfaites :" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, c-format msgid "Remove %s [<big>%s</big> (%s)]" msgstr "Supprimer %s [<big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, c-format msgid "Install %s [<big>%s</big> (%s)]" msgstr "Installer %s [<big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, c-format msgid "Cancel the installation of %s" msgstr "Abandonner l'installation de %s" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, c-format msgid "Cancel the removal of %s" msgstr "Abandonner la suppression de %s" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, c-format msgid "Keep %s at version <big>%s</big> (%s)" msgstr "Conserver %s à la version <big>%s</big> (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, c-format msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Mettre à jour %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, c-format msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "" "Réinstaller %s à une version antérieure [<big>%s</big> (%s) -> <big>%s</big> " "(%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, c-format msgid "<b>Remove</b> %s" msgstr "<b>Supprimer</b> %s" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, c-format msgid "<b>remove</b> %s" msgstr "<b>supprimer</b> %s" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, c-format msgid "<b>Keep</b> %s at version %s" msgstr "<b>Conserver</b> %s à la version %s" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, c-format msgid "<b>keep</b> %s at version %s" msgstr "<b>conserver</b> %s à la version %s" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, c-format msgid "<b>Cancel</b> the installation of %s" msgstr "<b>Abandonner</b> l'installation de %s" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, c-format msgid "<b>cancel</b> the installation of %s" msgstr "<b>abandonner</b> l'installation de %s" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, c-format msgid "<b>Install</b> %s %s" msgstr "<b>Installer</b> %s %s" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, c-format msgid "<b>install</b> %s %s" msgstr "<b>installer</b> %s %s" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>Downgrade</b> %s to version %s" msgstr "<b>Revenir</b> à %s version %s" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>downgrade</b> %s to version %s" msgstr "<b>revenir</b> à %s version %s" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>Upgrade</b> %s to version %s" msgstr "<b>Mettre à jour</b> %s vers la version %s" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>upgrade</b> %s to version %s" msgstr "<b>mettre à jour</b> %s vers la version %s" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "Laisser %s non résolu" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "laisser %s non résolu" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, c-format msgid "%s install" msgid_plural "%s installs" msgstr[0] "%s installation" msgstr[1] "%s installations" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, c-format msgid "%s remove" msgid_plural "%s removes" msgstr[0] "%s suppression" msgstr[1] "%s suppressions" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, c-format msgid "%s keep" msgid_plural "%s keeps" msgstr[0] "%s à conserver" msgstr[1] "%s à conserver" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, c-format msgid "%s upgrade" msgid_plural "%s upgrades" msgstr[0] "%s à mettre à jour" msgstr[1] "%s à mettre à jour" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, c-format msgid "%s downgrade" msgid_plural "%s downgrades" msgstr[0] "%s vers version antérieure" msgstr[1] "%s vers version antérieure" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, c-format msgid "%s unresolved recommendation" msgid_plural "%s unresolved recommendations" msgstr[0] "%s recommandation non résolue" msgstr[1] "%s recommandations non résolues" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 msgid "No solutions yet." msgstr "Pas de solution actuellement." -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 msgid "No dependency solution was found." msgstr "Aucune solution n'a été trouvée pour les dépendances" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 msgid "No solutions." msgstr "Pas de solution." -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "Pour afficher une solution, choisissez la dans la liste de droite." -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, c-format msgid "%u solutions." msgstr "%u solutions." -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, c-format msgid "Solution %s of %s." msgstr "Solution %s de %s." @@ -5520,12 +5536,12 @@ msgstr " prise en charge de Gtk+ désactivée.\n" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s compilé le %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5666,27 +5682,34 @@ msgstr "" " show - Afficher les informations détaillées concernant un paquet.\n" #: src/main.cc:213 +#, fuzzy, c-format +#| msgid " show - Display detailed information about a package.\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr "" +" show - Afficher les informations détaillées concernant un paquet.\n" + +#: src/main.cc:214 #, c-format msgid " clean - Erase downloaded package files.\n" msgstr " clean - Effacer les fichiers des paquets téléchargés.\n" -#: src/main.cc:214 +#: src/main.cc:215 #, c-format msgid " autoclean - Erase old downloaded package files.\n" msgstr "" " autoclean - Effacer les anciens fichiers des paquets téléchargés.\n" -#: src/main.cc:215 +#: src/main.cc:216 #, c-format msgid " changelog - View a package's changelog.\n" msgstr " changelog - Voir le journal des modifications d'un paquet.\n" -#: src/main.cc:216 +#: src/main.cc:217 #, c-format msgid " download - Download the .deb file for a package.\n" msgstr " download - Télécharger le fichier .deb d'un paquet.\n" -#: src/main.cc:217 +#: src/main.cc:218 #, c-format msgid "" " reinstall - Download and (possibly) reinstall a currently installed " @@ -5695,18 +5718,22 @@ msgstr "" " reinstall - Télécharger et (éventuellement) réinstaller un paquet déjà\n" " installé.\n" -#: src/main.cc:218 -#, c-format +#: src/main.cc:219 +#, fuzzy, c-format +#| msgid "" +#| " why - Show the manually installed packages that require a " +#| "package, or\n" +#| " why one or more packages would require the given package\n" msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " why - Montrer les paquets installés manuellement qui ont besoin\n" " d'un paquet, ou la raison pour laquelle un ou plusieurs\n" " paquets auraient besoin d'un autre paquet.\n" -#: src/main.cc:220 +#: src/main.cc:221 #, c-format msgid "" " why-not - Show the manually installed packages that lead to a " @@ -5719,17 +5746,17 @@ msgstr "" " pour laquelle un ou plusieurs paquets créeraient un\n" " conflit si le paquet en question était installé.\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " Options :\n" -#: src/main.cc:225 +#: src/main.cc:226 #, c-format msgid " -h This help text.\n" msgstr " -h Afficher ce texte d'aide.\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" @@ -5737,18 +5764,18 @@ msgstr "" " --gui Utiliser l'interface GTK même si désactivée dans la\n" " configuration.\n" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr " --no-gui Ne pas utiliser l'interface GTK même si disponible.\n" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text.\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h Afficher ce texte d'aide.\n" -#: src/main.cc:232 +#: src/main.cc:233 #, fuzzy, c-format #| msgid "" #| " --gui Use the GTK GUI even if disabled in the configuration.\n" @@ -5758,12 +5785,12 @@ msgstr "" " --gui Utiliser l'interface GTK même si désactivée dans la\n" " configuration.\n" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s Simuler les actions, sans les effectuer réellement.\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" @@ -5771,12 +5798,13 @@ msgstr "" " -d Effectuer uniquement le téléchargement d'un paquet, sans\n" " installer ou enlever quoi que ce soit.\n" -#: src/main.cc:236 -#, c-format -msgid " -P Always prompt for confirmation or actions.\n" +#: src/main.cc:237 +#, fuzzy, c-format +#| msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P Toujours demander confirmation pour les actions.\n" -#: src/main.cc:237 +#: src/main.cc:238 #, c-format msgid "" " -y Assume that the answer to simple yes/no questions is 'yes'.\n" @@ -5784,7 +5812,7 @@ msgstr "" " -y Supposer que la réponse à des questions oui/non est " "« oui ».\n" -#: src/main.cc:238 +#: src/main.cc:239 #, c-format msgid "" " -F format Specify a format for displaying search results; see the " @@ -5793,7 +5821,7 @@ msgstr "" " -F format Indiquer un format pour l'affichage des résultats d'une\n" " recherche ; voir le manuel.\n" -#: src/main.cc:239 +#: src/main.cc:240 #, c-format msgid "" " -O order Specify how search results should be sorted; see the " @@ -5802,7 +5830,7 @@ msgstr "" " -O ordre Indiquer comment les résultats d'une recherche doivent être\n" " ordonnés ; voir le manuel.\n" -#: src/main.cc:240 +#: src/main.cc:241 #, c-format msgid "" " -w width Specify the display width for formatting search results.\n" @@ -5810,19 +5838,19 @@ msgstr "" " -w largeur Indiquer la largeur de l'affichage pour le formatage des\n" " résultats d'une recherche.\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr "" " -f Tenter de corriger de manière agressive les paquets cassés.\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr "" " -V Afficher quelles versions des paquets vont être installées.\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" @@ -5830,14 +5858,14 @@ msgstr "" " -D Afficher les dépendances des paquets qui ont été modifiés\n" " automatiquement.\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr "" " -Z Afficher la modification de la taille de chacun des paquets\n" " après installation.\n" -#: src/main.cc:245 +#: src/main.cc:246 #, c-format msgid "" " -v Display extra information. (may be supplied multiple " @@ -5846,7 +5874,7 @@ msgstr "" " -v Afficher des informations supplémentaires (peut être\n" " indiquée plusieurs fois).\n" -#: src/main.cc:246 +#: src/main.cc:247 #, c-format msgid "" " -t [release] Set the release from which packages should be installed.\n" @@ -5854,105 +5882,112 @@ msgstr "" " -t [dist] Indiquer la distribution pour laquelle le paquet doit être\n" " installé.\n" -#: src/main.cc:247 -#, c-format +#: src/main.cc:248 +#, fuzzy, c-format +#| msgid "" +#| " -q In command-line mode, suppress the incremental progress.\n" +#| " indicators.\n" msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" " -q En mode ligne de commande, supprimer l'indicateur\n" " d'avancement.\n" -#: src/main.cc:249 +#: src/main.cc:250 #, c-format msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr "" " -o clé=valeur Établir directement l'option de configuration appelée\n" " « clé ».\n" -#: src/main.cc:250 -#, c-format +#: src/main.cc:251 +#, fuzzy, c-format +#| msgid "" +#| " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +#| " strong dependencies.\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends Préciser s'il faut ou non considérer les\n" " recommandations comme des dépendances fortes.\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr "" " -S nomfic Lire les informations d'état étendu d'Aptitude à partir du\n" " fichier nomfic.\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr "" " -u Télécharger les nouvelles listes de paquets au démarrage.\n" -#: src/main.cc:254 src/main.cc:256 -#, c-format -msgid " (terminal interface only)" +#: src/main.cc:255 src/main.cc:257 +#, fuzzy, c-format +#| msgid " (terminal interface only)" +msgid " (terminal interface only)\n" msgstr " (interfaces texte seulement)" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr "" " -i Effectuer une opération d'installation lors du démarrage.\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " Cet aptitude n'a pas de « Super Cow Powers ».\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 msgid "trace" msgstr "trace" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "debug" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 msgid "info" msgstr "info" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "warn" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 msgid "error" msgstr "error" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 msgid "fatal" msgstr "fatal" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "off" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " @@ -5961,48 +5996,48 @@ msgstr "" "Niveau de journalisation « %s » inconnu (attendu « trace », « debug », " "« info », « warn », « error », « fatal », or « off »)." -#: src/main.cc:487 +#: src/main.cc:488 #, c-format msgid "Invalid logger name \"%s\"." msgstr "Journaliser « %s » inconnu." -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "Un nombre est attendu après « -q= »\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "Un nombre est attendu après « -q= » alors que %s a été reçu\n" -#: src/main.cc:802 +#: src/main.cc:794 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o a besoin d'un paramètre de la forme clé=valeur (%s incorrect)\n" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "Pas de virgule après le nom d'étiquette « %s ».\n" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "BIZARRERIE : un code d'option inconnu a été reçu\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "--show-package-names|never" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "--show-package-names|auto" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "--show-package-names|always" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " @@ -6011,29 +6046,29 @@ msgstr "" "Le mode d'affichage des paquets « %s » n'est pas licite (merci de choisir " "parmi « never », « auto », or « always »)." -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "no-summary" -#: src/main.cc:1039 +#: src/main.cc:1023 msgid "first-package" msgstr "first-package" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "first-package-and-type" -#: src/main.cc:1043 +#: src/main.cc:1027 msgid "all-packages" msgstr "all-packages" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "all-packages-with-dep-versions" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -6044,7 +6079,7 @@ msgstr "" "« first-package », « first-package-and-type », « all-packages », ou « all-" "packages-with-dep-versions »." -#: src/main.cc:1089 +#: src/main.cc:1073 msgid "" "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be " "specified\n" @@ -6052,7 +6087,7 @@ msgstr "" "Seule une des options --auto-clean-on-startup, --clean-on-startup, -u et -i " "peut être indiquée à la fois\n" -#: src/main.cc:1098 +#: src/main.cc:1082 msgid "" "-u, -i, and --clean-on-startup may not be specified in command-line mode " "(eg, with 'install')" @@ -6060,22 +6095,22 @@ msgstr "" "-u, -i et --clean-on-startup ne peuvent pas être indiquées dans le mode " "ligne de commande (par exemple avec « install »)" -#: src/main.cc:1115 +#: src/main.cc:1099 msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "" "-u, -i et --clean-on-startup ne peuvent pas être indiquées avec une commande" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "Commande inconnue « %s »\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "Exception : %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" @@ -6084,7 +6119,8 @@ msgstr "" "Trace :\n" "%s\n" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "Rechercher :" @@ -6989,17 +7025,21 @@ msgstr "remplace" msgid "obsoletes" msgstr "rend obsolète" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr "(fourni par %F)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F %s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." @@ -7007,7 +7047,7 @@ msgstr "" "Si vous sélectionnez un paquet, une explication de son état courant " "apparaîtra à cet endroit." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -7015,19 +7055,19 @@ msgstr "" "%B%s%b a été installé automatiquement ; il va être enlevé parce que tous les " "paquets qui en dépendent vont être supprimés : " -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "" "%B%s%b sera automatiquement enlevé en raison d'erreurs de dépendances : " -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" "%B%s%b sera automatiquement installé pour satisfaire les dépendances " "suivantes : " -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -7035,7 +7075,7 @@ msgstr "" "%B%s%b ne peut pas être mis à jour maintenant, mais s'il le pouvait, il " "serait cependant maintenu à la version %B%s%b." -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -7043,27 +7083,27 @@ msgstr "" "%B%s%b ne sera pas mis à jour vers la version %B%s%b pour éviter de casser " "les dépendances suivantes : " -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b est actuellement installé." -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b n'est pas actuellement installé." -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "Certaines dépendances de %B%s%b ne sont pas satisfaites." -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "%B%s%b sera réinstallé avec une version antérieure." -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b ne sera pas mis à jour vers la version interdite %B%s%b." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." @@ -7071,39 +7111,39 @@ msgstr "" "%B%s%b pourrait être mis à jour vers la version %B%s%b, mais il sera " "conservé à la version %B%s%b." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b sera réinstallé." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b sera installé." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b sera enlevé." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b sera mis à jour de la version %B%s%b vers la version %B%s%b." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "" "%B%s%b n'est que partiellement installé ; son installation sera terminée." -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "" "Les paquets suivants dépendent de %B%s%b et seront cassés par sa " "suppression :" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "Les paquets suivants dépendent de %B%s%b et sont cassés :" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" @@ -7111,7 +7151,7 @@ msgstr "" "Les paquets suivants sont en conflit avec %B%s%b et seront cassés par son " "installation :" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -7121,7 +7161,7 @@ msgstr "" "de %B%s%B actuellement installée ou sont en conflit avec la version " "actuellement installée :" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -7129,11 +7169,11 @@ msgstr "" "Les paquets suivants sont en conflit avec %B%s%b ou dépendent d'une version " "de celui-ci qui n'est pas sur le point d'être installée." -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "Les paquets suivants sont en conflit avec %B%s%b :" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -7141,7 +7181,7 @@ msgstr "" "Les paquets suivants dépendent d'une version de %B%s%b différente de la " "version actuellement installée de %B%s%b :" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." @@ -7149,15 +7189,15 @@ msgstr "" "Les paquets suivants dépendent de la version de %B%s%b qui n'est pas sur le " "point d'être installée." -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "mis à jour" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "réinstallé vers une version antérieure" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7167,7 +7207,7 @@ msgstr "" "%b (%B%s%b) ou sont en conflit avec la version qui sera %s vers (%B%s%b) et " "seront cassés s'il est %s" -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7175,7 +7215,7 @@ msgstr "" "Les paquets suivants sont en conflit avec la version %B%s%b de %B%s%b et " "seront cassés s'il est %s." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7211,47 +7251,47 @@ msgstr "Appliquer" msgid "Close" msgstr "Fermer" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s est en conflit avec %s [fourni par %s %s]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "Suppression de %s" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "Installation de %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "Laisser %ls non résolu." -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%BSupprimer%b les paquets suivants :%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%BInstaller%b les paquets suivants :%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%BConserver%b les paquets suivants dans leur version actuelle :%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%BMettre à jour%b les paquets suivants :%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%BRéinstaller à une version antérieure%b les paquets suivants :%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "Laisser les dépendances suivantes non satisfaites :%n" @@ -7350,10 +7390,6 @@ msgstr "E :" msgid "W:" msgstr "W :" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "Rechercher :" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7733,7 +7769,9 @@ msgid "Error while dumping resolver state" msgstr "Erreur lors de l'écriture de l'état du solveur" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "Fichier vers lequel l'état du solveur doit être écrit :" #: src/ui.cc:2265 @@ -8255,6 +8293,21 @@ msgstr "" "paquets Debian officiels." #~ msgid "" +#~ "%BOption:%b %s\n" +#~ "%BDefault:%b %s\n" +#~ "%BValue:%b %s\n" +#~ msgstr "" +#~ "%BOption :%b %s\n" +#~ "%BDéfaut :%b %s\n" +#~ "%BValeur :%b %s\n" + +#~ msgid "Press Return to continue" +#~ msgstr "Appuyez sur Entrée pour continuer" + +#~ msgid "Search for:" +#~ msgstr "Rechercher :" + +#~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." #~ msgstr "" #~ "Impossible de résoudre les dépendances pour la mise à jour (délai " @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2008-04-19 14:12+0100\n" "Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n" "Language-Team: Galician <proxecto@trasno.net>\n" @@ -17,42 +17,36 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n!=1;\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" -msgstr "" -"%BOpción:%b %s\n" -"%BPor defecto:%b %s\n" -"%BValor:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " +msgstr "%BOpción:%b " + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " +msgstr "%BPor defecto:%b " -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "Verdadeiro" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "Falso" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " -msgstr "%BOpción:%b " - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "%BPor defecto:%b " - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "%BValor:%b " -#: src/apt_config_treeitems.cc:279 -#, c-format -msgid "Editing \"%ls\"" +#: src/apt_config_treeitems.cc:280 +#, fuzzy, c-format +#| msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "A editar \"%ls\"" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "%BElección:%b " @@ -646,8 +640,8 @@ msgstr "Erro grave no resolvedor" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] A resolver as dependencias" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "Erro interno: non se esperaba unha solución nula." @@ -941,7 +935,7 @@ msgstr "" "con --full-resolver.\n" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "Abortar.\n" @@ -1308,7 +1302,7 @@ msgid "No packages to show -- enter the package names on the line after 'i'.\n" msgstr "" "Non hai paquetes que amosar -- introduza os nomes na liña despois de \"i\".\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "Prema Intro para continuar." @@ -1319,10 +1313,6 @@ msgstr "" "Non se atopou ningún paquete -- introduza os nomes na liña despois de \"c" "\".\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "Prema Intro para continuar" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1635,7 +1625,7 @@ msgstr "Gravouse con éxito o estado do resolvedor" #| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: " #| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr ver paq ...: %F%na ver paq ...: %F" @@ -1911,7 +1901,7 @@ msgstr "" "dependencias." #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "A resolver as dependencias..." @@ -1949,7 +1939,9 @@ 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:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +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:1080 @@ -2157,7 +2149,7 @@ msgstr "Paquete: " msgid "State" msgstr "Estado" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "Fornecido por" @@ -2265,27 +2257,31 @@ msgstr "Substitúe a" msgid "Obsoletes" msgstr "Fai obsoleto" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Fornece" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Descrición: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "Páxina web: " -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "Non se puido atopar o paquete %s" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "Non se puido analizar o patrón %s" @@ -2606,6 +2602,12 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "" +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "Operación %s non válida" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "Non se esperaba a fin do ficheiro na entrada estándar" @@ -2623,7 +2625,7 @@ msgstr "[ERRO]" msgid "UNSATISFIED" msgstr "SEN SATISFACER" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "NON DISPOÑIBLES" @@ -2631,7 +2633,7 @@ msgstr "NON DISPOÑIBLES" msgid "Tags" msgstr "Etiquetas" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "Etiquetas de Usuario" @@ -3043,16 +3045,21 @@ msgstr "Non se puido atopar o paquete %s" msgid "Unable to open %s to log actions" msgstr "Non se puido abrir %s para rexistrar as accións" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "Erro ao xerar a hora local (%s)" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "informe de rexistro" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -3064,81 +3071,81 @@ msgstr "" "a problemas con dpkg poden non ter sido compledadas.\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "Hanse instalar %li paquetes e eliminar %li paquetes.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "Hanse ocupar %sB de espazo no disco\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "Hanse liberar %sB de espazo no disco\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[ACTUALIZAR] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[DESACTUALIZAR] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "ELIMINAR" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "INSTALAR" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "REINSTALAR" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "RETIDO" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "ROTO" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "ELIMINAR, SEN USO" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "ELIMINAR, DEPENDENCIAS" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "INSTALAR, DEPENDENCIAS" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "RETIDO, DEPENDENCIAS" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "SEN CONFIGURAR" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -3161,39 +3168,39 @@ msgstr "" msgid "Filtering packages" msgstr "A descargar os paquetes" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "Tipo de acción descoñecido: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "Cadea literal sen rematar despois de %s" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "Prioridade descoñecida: %s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "O patrón de busca remata de xeito inesperado (esperábase \"%c\")." -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "Esperábase \"%c\", recibiuse \"%c\"." -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "Tipo de dependencia descoñecido: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, fuzzy, c-format #| msgid "Unknown matcher type: \"%s\"." msgid "Unknown term type: \"%s\"." @@ -3201,7 +3208,7 @@ msgstr "Tipo de comparador descoñecido: \"%s\"." #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, fuzzy, c-format #| msgid "" #| "The ?%s matcher must be used in a \"wide\" context (a top-level context, " @@ -3213,34 +3220,34 @@ msgstr "" "O buscador ?%s debe empregarse nun contexto \"ancho\" (un contexto de nivel " "superior ou un contexto encerrado por ?%s)." -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "Atopouse un \"(\" sen parella" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "Non se pode romper Provides:" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "Tipo de patrón descoñecido: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "Non se pode buscar \"\"" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "Expresión baleira inesperada" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, fuzzy, c-format #| msgid "Badly formed expression" msgid "Badly formed expression: expected '|', got '%c'" msgstr "Expresión mal formada" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "Non se esperaba un \")\"" @@ -4189,22 +4196,22 @@ msgstr "" msgid "%s: Unable to accept a connection: %s" msgstr "Non se puido crear o directorio temporal do patrón \"%s\": %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4940,7 +4947,7 @@ msgstr "" msgid "Virtual package" msgstr "Paquete" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "Sen instalar" @@ -5110,163 +5117,169 @@ msgstr "%s substitúe a %s" msgid "%s obsoletes %s" msgstr "%s fai obsoleto a %s" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s substitúe a %s" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "Eliminar os seguintes paquetes:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "Instalar os seguintes paquetes:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 #, fuzzy #| msgid "Remove the following packages:" msgid "Keep the following packages:" msgstr "Eliminar os seguintes paquetes:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "Actualizar os seguintes paquetes:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "Desactualizar os seguintes paquetes:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 #, fuzzy #| msgid "Leave the following dependencies unresolved:%n" msgid "Leave the following dependencies unresolved:" msgstr "Déixanse sen resolver as seguintes dependencias:%n" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, fuzzy, c-format #| msgid "Remove %F [%s (%s)]" msgid "Remove %s [<big>%s</big> (%s)]" msgstr "Eliminar %F [%s (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "Install %s [<big>%s</big> (%s)]" msgstr "Instalar %F [%s (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "Cancel the installation of %s" msgstr "Cancelar a instalación de %F" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Cancel the removal of %s" msgstr "Cancelar a eliminación de %F" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "Keep %s at version <big>%s</big> (%s)" msgstr "Conservar %F na versión %s (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, fuzzy, c-format #| msgid "Upgrade %F [%s (%s) -> %s (%s)]" msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Actualizar %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, fuzzy, c-format #| msgid "Downgrade %F [%s (%s) -> %s (%s)]" msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Desactualizar %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>Remove</b> %s" msgstr "Eliminar(%s)" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>remove</b> %s" msgstr "Eliminar(%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>Keep</b> %s at version %s" msgstr "Conservar %F na versión %s (%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>keep</b> %s at version %s" msgstr "Conservar %F na versión %s (%s)" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>Cancel</b> the installation of %s" msgstr "Cancelar a instalación de %F" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>cancel</b> the installation of %s" msgstr "Cancelar a instalación de %F" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>Install</b> %s %s" msgstr "Instalar %F [%s (%s)]" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>install</b> %s %s" msgstr "Instalar %F [%s (%s)]" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "<b>Downgrade</b> %s to version %s" msgstr " Versión de cwidget: %s\n" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "<b>downgrade</b> %s to version %s" msgstr " Versión de cwidget: %s\n" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>Upgrade</b> %s to version %s" msgstr "Versións de %s" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>upgrade</b> %s to version %s" msgstr "Versións de %s" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format #| msgid "%d install" #| msgid_plural "%d installs" @@ -5275,7 +5288,7 @@ msgid_plural "%s installs" msgstr[0] "%d instalación" msgstr[1] "%d instalacións" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, fuzzy, c-format #| msgid "%d removal" #| msgid_plural "%d removals" @@ -5284,7 +5297,7 @@ msgid_plural "%s removes" msgstr[0] "%d eliminación" msgstr[1] "%d eliminacións" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, fuzzy, c-format #| msgid "%d keep" #| msgid_plural "%d keeps" @@ -5293,7 +5306,7 @@ msgid_plural "%s keeps" msgstr[0] "%d conservado" msgstr[1] "%d conservados" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, fuzzy, c-format #| msgid "%d upgrade" #| msgid_plural "%d upgrades" @@ -5302,7 +5315,7 @@ msgid_plural "%s upgrades" msgstr[0] "%d actualización" msgstr[1] "%d actualizacións" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, fuzzy, c-format #| msgid "%d downgrade" #| msgid_plural "%d downgrades" @@ -5311,7 +5324,7 @@ msgid_plural "%s downgrades" msgstr[0] "%d desactualización" msgstr[1] "%d desactualizacións" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, fuzzy, c-format #| msgid "Audit ^Recommendations" msgid "%s unresolved recommendation" @@ -5319,35 +5332,35 @@ msgid_plural "%s unresolved recommendations" msgstr[0] "Auditar as ^recomendacións" msgstr[1] "Auditar as ^recomendacións" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 #, fuzzy #| msgid "No more solutions." msgid "No solutions yet." msgstr "Non hai máis solucións." -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 #, fuzzy #| msgid "Dependency handling" msgid "No dependency solution was found." msgstr "Xestión de dependencias" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 #, fuzzy #| msgid "No more solutions." msgid "No solutions." msgstr "Non hai máis solucións." -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, fuzzy, c-format #| msgid "No more solutions." msgid "%u solutions." msgstr "Non hai máis solucións." -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Could not open file \"%s\"" msgid "Solution %s of %s." @@ -5668,12 +5681,12 @@ msgstr " Soporte de ept desactivado.\n" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s compilado en %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5827,29 +5840,35 @@ msgstr " show - Amosar información detallada sobre un paquete\n" #: src/main.cc:213 #, fuzzy, c-format +#| msgid " show - Display detailed information about a package\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - Amosar información detallada sobre un paquete\n" + +#: src/main.cc:214 +#, fuzzy, c-format #| msgid " clean - Erase downloaded package files\n" msgid " clean - Erase downloaded package files.\n" msgstr " clean - Borrar os ficheiros de paquetes descargados\n" -#: src/main.cc:214 +#: src/main.cc:215 #, fuzzy, c-format #| msgid " autoclean - Erase old downloaded package files\n" msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean - Borrar os ficheiros de paquetes descargados vellos\n" -#: src/main.cc:215 +#: src/main.cc:216 #, fuzzy, c-format #| msgid " changelog - View a package's changelog\n" msgid " changelog - View a package's changelog.\n" msgstr " changelog - Amosar o rexistro de cambios dun paquete\n" -#: src/main.cc:216 +#: src/main.cc:217 #, fuzzy, c-format #| msgid " download - Download the .deb file for a package\n" msgid " download - Download the .deb file for a package.\n" msgstr " download - Descargar o ficheiro .deb dun paquete\n" -#: src/main.cc:217 +#: src/main.cc:218 #, fuzzy, c-format #| msgid "" #| " reinstall - Download and (possibly) reinstall a currently installed " @@ -5860,18 +5879,22 @@ msgid "" msgstr "" " reinstall - Descargar e (tal vez) reinstalar un paquete xa instalado\n" -#: src/main.cc:218 -#, c-format +#: src/main.cc:219 +#, fuzzy, c-format +#| msgid "" +#| " why - Show the manually installed packages that require a " +#| "package, or\n" +#| " why one or more packages would require the given package\n" msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " why - Amosar os paquetes instalados manualmente que requiren un\n" " paquete, ou por que un ou máis paquetes habían requirir o\n" " paquete indicado\n" -#: src/main.cc:220 +#: src/main.cc:221 #, fuzzy, c-format #| msgid "" #| " why-not - Show the manually installed packages that lead to a " @@ -5890,59 +5913,59 @@ msgstr "" " paquetes habían conducir a un conflicto co paquete indicado\n" " se se instalaran\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " Opcións:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " -h This help text.\n" msgstr " -h Este texto de axuda\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h Este texto de axuda\n" -#: src/main.cc:232 +#: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr "" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s Simular accións pero non realizalas.\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr "" " -d Só descargar os paquetes, non instalar ou eliminar nada.\n" -#: src/main.cc:236 +#: src/main.cc:237 #, fuzzy, c-format #| msgid " -P Always prompt for confirmation or actions\n" -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P Pedir sempre confirmación para as accións\n" -#: src/main.cc:237 +#: src/main.cc:238 #, fuzzy, c-format #| msgid "" #| " -y Assume that the answer to simple yes/no questions is " @@ -5953,7 +5976,7 @@ msgstr "" " -y Supoñer que a resposta ás preguntas simples de si/non é \"si" "\"\n" -#: src/main.cc:238 +#: src/main.cc:239 #, fuzzy, c-format #| msgid "" #| " -F format Specify a format for displaying search results; see the " @@ -5965,7 +5988,7 @@ msgstr "" " -F formato Indicar un formato para os resultados das buscas; vexa o " "manual\n" -#: src/main.cc:239 +#: src/main.cc:240 #, fuzzy, c-format #| msgid "" #| " -O order Specify how search results should be sorted; see the " @@ -5976,7 +5999,7 @@ msgid "" msgstr "" " -O orde Indicar como ordear os resultados das buscas; vexa o manual\n" -#: src/main.cc:240 +#: src/main.cc:241 #, fuzzy, c-format #| msgid "" #| " -w width Specify the display width for formatting search results\n" @@ -5985,17 +6008,17 @@ msgid "" msgstr "" " -w anchura Indicar a anchura para formatar os resultados das buscas\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr " -f Tentar arranxar de xeito agresivo os paquetes rotos.\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr " -V Amosar as versións dos paquetes a instalar.\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" @@ -6003,12 +6026,12 @@ msgstr "" " -D Amosar as dependencias dos paquetes cambiados " "automaticamente.\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr " -Z Amosar o cambio no tamaño instalado de cada paquete.\n" -#: src/main.cc:245 +#: src/main.cc:246 #, fuzzy, c-format #| msgid "" #| " -v Display extra information. (may be supplied multiple " @@ -6019,7 +6042,7 @@ msgid "" msgstr "" " -v Amosar información extra (pode indicarse varias veces)\n" -#: src/main.cc:246 +#: src/main.cc:247 #, fuzzy, c-format #| msgid "" #| " -t [release] Set the release from which packages should be installed\n" @@ -6028,58 +6051,58 @@ msgid "" msgstr "" " -t [distro] Indicar de que distribución hai que instalar os paquetes\n" -#: src/main.cc:247 +#: src/main.cc:248 #, fuzzy, c-format #| msgid "" #| " -q In command-line mode, suppress the incremental progress\n" #| " indicators.\n" msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" " -q No modo de liña de ordes, eliminar os indicadores de " "progreso.\n" -#: src/main.cc:249 +#: src/main.cc:250 #, fuzzy, c-format #| msgid " -o key=val Directly set the configuration option named 'key'\n" msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr "" " -o clave=valor Establecer a opción de configuración chamada \"clave\"\n" -#: src/main.cc:250 +#: src/main.cc:251 #, fuzzy, c-format #| msgid "" #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" #| " strong dependencies\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends\tIndicar se hai que tratar as recomendacións coma\n" " dependencias fortes\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr " -S nomef Ler a información de estado estendido de nomef.\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u Descargar novas listas de paquetes ao arrincar.\n" -#: src/main.cc:254 src/main.cc:256 -#, c-format -msgid " (terminal interface only)" -msgstr "" +#: src/main.cc:255 src/main.cc:257 +#, fuzzy, c-format +msgid " (terminal interface only)\n" +msgstr " -h Este texto de axuda\n" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i Realizar unha instalación ao arrincar.\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr "" @@ -6087,7 +6110,7 @@ msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 #, fuzzy #| msgid "true" msgid "trace" @@ -6095,13 +6118,13 @@ msgstr "verdadeiro" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 #, fuzzy #| msgid "no" msgid "info" @@ -6109,13 +6132,13 @@ msgstr "non" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 #, fuzzy #| msgid "Err " msgid "error" @@ -6123,7 +6146,7 @@ msgstr "Err " #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 #, fuzzy #| msgid "false" msgid "fatal" @@ -6131,95 +6154,95 @@ msgstr "falso" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " "\"warn\", \"error\", \"fatal\", or \"off\")." msgstr "" -#: src/main.cc:487 +#: src/main.cc:488 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "Invalid logger name \"%s\"." msgstr "Operación %s non válida" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "Esperábase un número despois de -q=\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "Esperábase un número despois de -q=, recibiuse %s\n" -#: src/main.cc:802 +#: src/main.cc:794 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o precisa dun argumento da forma clave=valor, recibiuse %s\n" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "Non hai unha coma tralo nome de etiqueta \"%s\".\n" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "COUSA RARA: recibiuse un código de opción descoñecido\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "" -#: src/main.cc:1039 +#: src/main.cc:1023 #, fuzzy #| msgid "Package" msgid "first-package" msgstr "Paquete" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "" -#: src/main.cc:1043 +#: src/main.cc:1027 #, fuzzy #| msgid "All Packages" msgid "all-packages" msgstr "Tódolos paquetes" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -6227,7 +6250,7 @@ msgid "" "versions\"." msgstr "" -#: src/main.cc:1089 +#: src/main.cc:1073 #, fuzzy #| msgid "Only one of -u and -i may be specified\n" msgid "" @@ -6235,7 +6258,7 @@ msgid "" "specified\n" msgstr "Só se pode indicar un dos valores -u e -i\n" -#: src/main.cc:1098 +#: src/main.cc:1082 #, fuzzy #| msgid "" #| "-u and -i may not be specified in command-line mode (eg, with 'install')" @@ -6246,23 +6269,23 @@ msgstr "" "Non se poden indicar -u e -i en modo de liña de comandos (p.ex. con \"install" "\")" -#: src/main.cc:1115 +#: src/main.cc:1099 #, fuzzy #| msgid "-u and -i may not be specified with a command" msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "Non se poden indicar -u e -i cunha orde" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "Orde \"%s\" descoñecida\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "Excepción sen capturar: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" @@ -6271,7 +6294,8 @@ msgstr "" "Trazado:\n" "%s\n" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "Buscar: " @@ -7165,17 +7189,21 @@ msgstr "substitúe a" msgid "obsoletes" msgstr "fai obsoleto a" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (fornecido por %F)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." @@ -7183,7 +7211,7 @@ msgstr "" "Se escolle un paquete, ha aparecer nesta páxina unha explicación do seu " "estado actual." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -7191,18 +7219,18 @@ msgstr "" "%B%s%b instalouse automaticamente; vaise eliminar porque tódolos paquetes " "dos que depende se han eliminar:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "%B%s%b hase eliminar automaticamente por erros de dependencias:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" "%B%s%b hase instalar automaticamente para satisfacer as seguintes " "dependencias:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -7210,7 +7238,7 @@ msgstr "" "%B%s%b non se pode actualizar agora, pero se se puidera, reteríase na " "versión %B%s%b." -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -7218,27 +7246,27 @@ msgstr "" "%B%s%b non se ha actualizar á versión %B%s%b para evitar romper as seguintes " "dependencias:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b está instalado actualmente." -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b non está instalado actualmente." -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "Non se satisfán algunhas dependencias de %B%s%b:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "Hase desactualizar %B%s%b." -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b non se ha actualizar á versión prohibida %B%s%b." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." @@ -7246,38 +7274,38 @@ msgstr "" "%B%s%b púidose actualizar á version %B%s%b, pero estase a reter na versión %B" "%s%b." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "Hase reinstalar %B%s%b." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "Hase instalar %B%s%b." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "Hase eliminar %B%s%b." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b hase actualizar dende a versión %B%s%b á versión %B%s%b." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "" "%B%s%b só está parcialmente instalado; hase completar a súa instalación." -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "" "Os seguintes paquetes dependen de %B%s%b e han romper pola súa eliminación:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "Os seguintes paquetes dependen de %B%s%b e están rotos:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" @@ -7285,7 +7313,7 @@ msgstr "" "Os seguintes paquetes teñen conflictos con %B%s%b e han romper pola súa " "instalación:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -7295,7 +7323,7 @@ msgstr "" "instalada actualmente de %B%s%b, ou teñen conflictos coa versión instalada " "actualmente:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -7303,11 +7331,11 @@ msgstr "" "Os seguintes paquetes teñen conflictos con %B%s%b ou dependen dunha versión " "dese paquete que non se vai instalar." -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "Os seguintes paquetes teñen conflictos con %B%s%b:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -7315,7 +7343,7 @@ msgstr "" "Os seguintes paquetes dependen dunha versión de %B%s%b distinta da versión " "instalada actualmente de %B%s%b:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." @@ -7323,15 +7351,15 @@ msgstr "" "Os seguintes paquetes dependen dunha versión de %B%s%b que non se vai " "instalar." -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "actualizar" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "desactualizar" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7341,7 +7369,7 @@ msgstr "" "%s%b) ou teñen conflictos coa versión á que se vai %s (%B%s%b), e ha romper " "de se %s." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7349,7 +7377,7 @@ msgstr "" "Os seguintes paquetes teñen conflictos coa versión %B%s%b de %B%s%b e han " "romper de se %s." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7385,47 +7413,47 @@ msgstr "Aplicar" msgid "Close" msgstr "Pechar" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s ten conflictos con %s [fornecido por %s %s]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "A eliminar %s" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "A instalar %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%BEliminar%b os seguintes paquetes:%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%BInstalar%b os seguintes paquetes:%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%BConservar%b os seguintes paquetes na súa versión actual:%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%BActualizar%b os seguintes paquetes:%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%BDesactualizar%b os seguintes paquetes:%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "Déixanse sen resolver as seguintes dependencias:%n" @@ -7524,10 +7552,6 @@ msgstr "E:" msgid "W:" msgstr "A:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "Buscar:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7904,7 +7928,9 @@ msgid "Error while dumping resolver state" msgstr "Erro ao verquer o estado do resolvedor" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "Ficheiro no que se quere gravar o estado do resolvedor:" #: src/ui.cc:2265 @@ -8421,6 +8447,21 @@ msgid "You can only view changelogs of official Debian packages." msgstr "Só se poden ver rexistros de cambios de paquetes Debian oficiais." #~ msgid "" +#~ "%BOption:%b %s\n" +#~ "%BDefault:%b %s\n" +#~ "%BValue:%b %s\n" +#~ msgstr "" +#~ "%BOpción:%b %s\n" +#~ "%BPor defecto:%b %s\n" +#~ "%BValor:%b %s\n" + +#~ msgid "Press Return to continue" +#~ msgstr "Prema Intro para continuar" + +#~ msgid "Search for:" +#~ msgstr "Buscar:" + +#~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." #~ msgstr "" #~ "Non se puideron resolver as dependencias para a actualización (o " @@ -8548,11 +8589,6 @@ msgstr "Só se poden ver rexistros de cambios de paquetes Debian oficiais." #~ msgid "gtk-yes" #~ msgstr "si" -#, fuzzy -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "Operación %s non válida" - #~ msgid "but it is not installable" #~ msgstr "pero non é instalable" @@ -8747,10 +8783,6 @@ msgstr "Só se poden ver rexistros de cambios de paquetes Debian oficiais." #~ " lead to a conflict with the given package if installed\n" #~ msgstr " -V Amosar as versións dos paquetes a instalar.\n" -#, fuzzy -#~ msgid " indicators.\n" -#~ msgstr " -h Este texto de axuda\n" - #~ msgid "There are now %F." #~ msgstr "Agora hai %F." @@ -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: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+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" @@ -19,41 +19,37 @@ msgstr "" "X-Poedit-Language: Hungarian\n" "X-Poedit-Country: HUNGARY\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +#, fuzzy +msgid "%BOption:%b " +msgstr "Opciók" + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 #, fuzzy msgid "False" msgstr "Bezár" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -#, fuzzy -msgid "%BOption:%b " -msgstr "Opciók" - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "" - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:279 +#: src/apt_config_treeitems.cc:280 #, c-format -msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "" @@ -530,8 +526,8 @@ msgstr "" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] Függőségek feloldása" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "Belső hiba: váratlan üres megoldás." @@ -822,7 +818,7 @@ msgid "" msgstr "Nem sikerült feloldani a függőségeket." #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "Megszakítás.\n" @@ -1191,7 +1187,7 @@ msgstr "" "Nincs megjelenítendő csomag -- az 'i' utáni sorba kell a csomagneveket " "írni.\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "Folytatás a Return leütésével." @@ -1201,10 +1197,6 @@ msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "" "Nem találtam csomagokat -- a 'c' utáni sorba kell a csomagneveket írni.\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "Folytatás a Return leütésével" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1504,7 +1496,7 @@ msgstr "A ütközésfeloldó állapota sikeresen mentve!" #: src/cmdline/cmdline_resolver.cc:222 #, fuzzy, c-format msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F" @@ -1767,7 +1759,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created." msgstr "" #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "Függőségek feloldása..." @@ -1803,7 +1795,9 @@ 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:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +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:1080 @@ -2005,7 +1999,7 @@ msgstr "Csomag: " msgid "State" msgstr "Állapot" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "Ez biztosítja:" @@ -2113,27 +2107,31 @@ msgstr "Helyettesíti" msgid "Obsoletes" msgstr "Elavulttá teszi" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Biztosítja" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Leírás:" -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "" -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "Nem találom a(z) %s csomagot" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "Nem tudom elemezni a(z) %s mintát" @@ -2454,6 +2452,12 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "" +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "Érvénytelen művelet: %s" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "Váratlan fájl-vége jel a szabvány bemeneten" @@ -2471,7 +2475,7 @@ msgstr "[HIBA]" msgid "UNSATISFIED" msgstr "TELJESÍTETLEN" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "NEM ELÉRHETŐ" @@ -2479,7 +2483,7 @@ msgstr "NEM ELÉRHETŐ" msgid "Tags" msgstr "Tag-ek" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 #, fuzzy msgid "User Tags" msgstr "Tag-ek" @@ -2880,16 +2884,21 @@ msgstr "Nem találom a(z) %s csomagot" msgid "Unable to open %s to log actions" msgstr "Nem sikerült megnyitni a(z) %s műveletnaplót" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "Nem sikerült kiszámolni a helyi időt (%s)" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "naplójelentés" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -2900,81 +2909,81 @@ msgstr "" "által okozott gondok kimaradhatnak.\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "%li csomag lesz telepítve és %li eltávolítva.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "%sB lemezterület lesz felhasználva\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "%sB lemezterület fog felszabadulni\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[FRISSÍTÉS] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[VISSZAFEJLESZTÉS] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "TÖRLÉS" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "TELEPÍTÉS" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "ÚJRATELEPÍTÉS" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "VISSZAFOGÁS" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "TÖRÖTT" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "ELTÁVOLÍTÁS, HASZNÁLATON KÍVÜLI" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "ELTÁVOLÍTÁS, FÜGGŐSÉGEK" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "TELEPÍTÉS, FÜGGŐSÉGEK" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "VISSZAFOGÁS, FÜGGŐSÉGEK" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -2997,80 +3006,80 @@ msgstr "" msgid "Filtering packages" msgstr "Csomagok letöltése" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "Ismeretlen művelettípus: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "Befejezetlen karakterlánc %s után" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "Ismeretlen prioritás %s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "" -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, fuzzy, c-format msgid "Expected '%c', got '%c'." msgstr "'%c' helyett ',' vagy '(' kellene" -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "Ismeretlen függőségi típus: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, fuzzy, c-format msgid "Unknown term type: \"%s\"." msgstr "Ismeretlen minta: %c" #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, c-format msgid "" "The ?%s term must be used in a \"wide\" context (a top-level context, or a " "context enclosed by ?%s)." msgstr "" -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "Bezáratlan '('" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "Biztosítja: nem lehet törött" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "Ismeretlen minta: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "Nem lehet \"\"-re keresni" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "Váratlan üres kifejezés" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, fuzzy, c-format #| msgid "Badly formed expression" msgid "Badly formed expression: expected '|', got '%c'" msgstr "Rosszul formázott kifejezés" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "Váratlan ')'" @@ -4001,22 +4010,22 @@ msgstr "" msgid "%s: Unable to accept a connection: %s" msgstr "Az átmeneti könyvtár létrehozása meghiúsult e sablonból: \"%s\": %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4737,7 +4746,7 @@ msgstr "" msgid "Virtual package" msgstr "Csomag" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "Nincs telepítve" @@ -4905,159 +4914,165 @@ msgstr "a(z) %s helyettesíti a(z) %s csomagot" msgid "%s obsoletes %s" msgstr "a(z) %s elavulttá teszi a(z) %s csomagot" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "a(z) %s helyettesíti a(z) %s csomagot" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "Az alábbi csomagok eltávolítása:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "Az alábbi csomagok telepítése:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 #, fuzzy #| msgid "Remove the following packages:" msgid "Keep the following packages:" msgstr "Az alábbi csomagok eltávolítása:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "Az alábbi csomagok frissítése:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "Az alábbi csomagok visszafejlesztése:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 #, fuzzy #| msgid "Leave the following dependencies unresolved:%n" msgid "Leave the following dependencies unresolved:" msgstr "Az alábbi függőségek feloldatlanul hagyása:%n" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, fuzzy, c-format #| msgid "Remove %F [%s (%s)]" msgid "Remove %s [<big>%s</big> (%s)]" msgstr "Eltávolítás: %F [%s (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "Install %s [<big>%s</big> (%s)]" msgstr "Telepítés: %F [%s (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "Cancel the installation of %s" msgstr "A(z) %F telepítésének lemondása" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Cancel the removal of %s" msgstr "A(z) %F törlésének lemondása" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "Keep %s at version <big>%s</big> (%s)" msgstr "A(z) %F %s (%s) verzión tartása" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, fuzzy, c-format #| msgid "Upgrade %F [%s (%s) -> %s (%s)]" msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "A(z) %F frissítése [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, fuzzy, c-format #| msgid "Downgrade %F [%s (%s) -> %s (%s)]" msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "A(z) %F visszafejlesztése [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format msgid "<b>Remove</b> %s" msgstr "Eltávolít" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format msgid "<b>remove</b> %s" msgstr "Eltávolít" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>Keep</b> %s at version %s" msgstr "A(z) %F %s (%s) verzión tartása" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>keep</b> %s at version %s" msgstr "A(z) %F %s (%s) verzión tartása" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>Cancel</b> the installation of %s" msgstr "A(z) %F telepítésének lemondása" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>cancel</b> the installation of %s" msgstr "A(z) %F telepítésének lemondása" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>Install</b> %s %s" msgstr "Telepítés: %F [%s (%s)]" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>install</b> %s %s" msgstr "Telepítés: %F [%s (%s)]" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format msgid "<b>Downgrade</b> %s to version %s" msgstr "libsigc++ verzió: %s\n" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format msgid "<b>downgrade</b> %s to version %s" msgstr "libsigc++ verzió: %s\n" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>Upgrade</b> %s to version %s" msgstr "%s verziói" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>upgrade</b> %s to version %s" msgstr "%s verziói" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format #| msgid "%d install" #| msgid_plural "%d installs" @@ -5066,7 +5081,7 @@ msgid_plural "%s installs" msgstr[0] "%d telepítés" msgstr[1] "%d telepítés" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, fuzzy, c-format #| msgid "%d removal" #| msgid_plural "%d removals" @@ -5075,7 +5090,7 @@ msgid_plural "%s removes" msgstr[0] "%d eltávolítás" msgstr[1] "%d eltávolítás" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, fuzzy, c-format #| msgid "%d keep" #| msgid_plural "%d keeps" @@ -5084,7 +5099,7 @@ msgid_plural "%s keeps" msgstr[0] "%d visszatartás" msgstr[1] "%d visszatartás" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, fuzzy, c-format #| msgid "%d upgrade" #| msgid_plural "%d upgrades" @@ -5093,7 +5108,7 @@ msgid_plural "%s upgrades" msgstr[0] "%d frissítés" msgstr[1] "%d frissítés" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, fuzzy, c-format #| msgid "%d downgrade" #| msgid_plural "%d downgrades" @@ -5102,7 +5117,7 @@ msgid_plural "%s downgrades" msgstr[0] "%d visszatérés régebbi verzióra" msgstr[1] "%d visszatérés régebbi verzióra" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, fuzzy, c-format #| msgid "Audit ^Recommendations" msgid "%s unresolved recommendation" @@ -5110,34 +5125,34 @@ msgid_plural "%s unresolved recommendations" msgstr[0] "^Ajánlások vizsgálata" msgstr[1] "^Ajánlások vizsgálata" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 #, fuzzy #| msgid "No more solutions." msgid "No solutions yet." msgstr "Nincs több megoldás" -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 #, fuzzy msgid "No dependency solution was found." msgstr "^Függőség kezelés" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 #, fuzzy #| msgid "No more solutions." msgid "No solutions." msgstr "Nincs több megoldás" -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, fuzzy, c-format #| msgid "No more solutions." msgid "%u solutions." msgstr "Nincs több megoldás" -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Could not open file \"%s\"" msgid "Solution %s of %s." @@ -5451,12 +5466,12 @@ msgstr "" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s verziója lefordítva %s %s-kor\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5608,29 +5623,35 @@ msgstr " show - Részletes információ megjelenítése a csomagokról\n #: src/main.cc:213 #, fuzzy, c-format +#| msgid " show - Display detailed information about a package\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - Részletes információ megjelenítése a csomagokról\n" + +#: src/main.cc:214 +#, fuzzy, c-format #| msgid " clean - Erase downloaded package files\n" msgid " clean - Erase downloaded package files.\n" msgstr " clean - A letöltött csomagfájlok törlése\n" -#: src/main.cc:214 +#: src/main.cc:215 #, fuzzy, c-format #| msgid " autoclean - Erase old downloaded package files\n" msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean - A régi letöltött csomagfájlok törlése\n" -#: src/main.cc:215 +#: src/main.cc:216 #, fuzzy, c-format #| msgid " changelog - View a package's changelog\n" msgid " changelog - View a package's changelog.\n" msgstr " changelog - Csomag változásnaplójának megjelenítése\n" -#: src/main.cc:216 +#: src/main.cc:217 #, fuzzy, c-format #| msgid " download - Download the .deb file for a package\n" msgid " download - Download the .deb file for a package.\n" msgstr " download - Csomag .deb fájljának letöltése\n" -#: src/main.cc:217 +#: src/main.cc:218 #, fuzzy, c-format #| msgid "" #| " reinstall - Download and (possibly) reinstall a currently installed " @@ -5642,17 +5663,17 @@ msgstr "" " reinstall - Egy már telepített csomag letöltése és (lehetőség szerint) " "újratelepítése\n" -#: src/main.cc:218 +#: src/main.cc:219 #, fuzzy, c-format msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " -Z Minden telepített csomag méretbeli változásának " "megjelenítése\n" -#: src/main.cc:220 +#: src/main.cc:221 #, fuzzy, c-format msgid "" " why-not - Show the manually installed packages that lead to a " @@ -5663,60 +5684,60 @@ msgstr "" " -Z Minden telepített csomag méretbeli változásának " "megjelenítése\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " Opciók:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " -h This help text.\n" msgstr " -h Ez a súgó\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h Ez a súgó\n" -#: src/main.cc:232 +#: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr "" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr "" " -s Műveletek szimulálása a tényleges végrehajtásuk nélkül\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr "" " -d Csak csomagok letöltése telepítés vagy eltávolítás nélkül\n" -#: src/main.cc:236 +#: src/main.cc:237 #, fuzzy, c-format #| msgid " -P Always prompt for confirmation or actions\n" -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P Mindig kér megerősítést vagy művelet megadását\n" -#: src/main.cc:237 +#: src/main.cc:238 #, fuzzy, c-format #| msgid "" #| " -y Assume that the answer to simple yes/no questions is " @@ -5727,7 +5748,7 @@ msgstr "" " -y Felteszi, hogy az egyszerű igen/nem kérdésekre 'igen' a " "válasz\n" -#: src/main.cc:238 +#: src/main.cc:239 #, fuzzy, c-format #| msgid "" #| " -F format Specify a format for displaying search results; see the " @@ -5739,7 +5760,7 @@ msgstr "" " -F formátum Formátum megadása a keresési eredmények megjelenítéséhez; " "lásd a kézikönyvet\n" -#: src/main.cc:239 +#: src/main.cc:240 #, fuzzy, c-format #| msgid "" #| " -O order Specify how search results should be sorted; see the " @@ -5751,7 +5772,7 @@ msgstr "" " -O rendezés Rendezési sorrend megadása a keresési eredményekhez; lásd " "a kézikönyvet\n" -#: src/main.cc:240 +#: src/main.cc:241 #, fuzzy, c-format #| msgid "" #| " -w width Specify the display width for formatting search results\n" @@ -5760,18 +5781,18 @@ msgid "" msgstr "" " -w szélesség Szélesség megadása a keresési eredmények formázásához\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr "" " -f A törött csomagok erőszakkal való javításának megkisérlése\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr " -V A telepítendő csomagok verziójának megjelenítése\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" @@ -5779,14 +5800,14 @@ msgstr "" " -D Az automatikusan változtatott csomagok függőségeinek " "megjelenítése\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr "" " -Z Minden telepített csomag méretbeli változásának " "megjelenítése\n" -#: src/main.cc:245 +#: src/main.cc:246 #, fuzzy, c-format #| msgid "" #| " -v Display extra information. (may be supplied multiple " @@ -5798,7 +5819,7 @@ msgstr "" " -v Plusz információ megjelenítése (többszörösen is " "alkalmazható)\n" -#: src/main.cc:246 +#: src/main.cc:247 #, fuzzy, c-format #| msgid "" #| " -t [release] Set the release from which packages should be installed\n" @@ -5807,63 +5828,63 @@ msgid "" msgstr "" " -t [kiadás] A kiadás beállítása, amiből a csomagokat telepíteni kell\n" -#: src/main.cc:247 +#: src/main.cc:248 #, fuzzy, c-format msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" " -q Parancssori módban a folyamatos állapotjelzés tiltása\n" -#: src/main.cc:249 +#: src/main.cc:250 #, fuzzy, c-format #| msgid " -o key=val Directly set the configuration option named 'key'\n" msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr "" " -o kulcs=érték A 'kulcs' nevű beállítási opció 'érték'-re állítása\n" -#: src/main.cc:250 +#: src/main.cc:251 #, fuzzy, c-format #| msgid "" #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" #| " strong dependencies\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends\tAz ajánlások erős függőségként való kezelésének\n" " be/kikapcsolása\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr "" " -S fnév: Az aptitude kiterjesztett állapotinformációjának beolvasása az " "fnévből\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u Az új csomagok listájának letöltése induláskor\n" -#: src/main.cc:254 src/main.cc:256 -#, c-format -msgid " (terminal interface only)" -msgstr "" +#: src/main.cc:255 src/main.cc:257 +#, fuzzy, c-format +msgid " (terminal interface only)\n" +msgstr " -h Ez a súgó\n" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i A telepítések végrehajtása induláskor.\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " Az aptitude-nak nincs Szuper Tehén Ereje\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 #, fuzzy #| msgid "replaces" msgid "trace" @@ -5871,13 +5892,13 @@ msgstr "helyettesíti ezt:" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 #, fuzzy #| msgid "no" msgid "info" @@ -5885,13 +5906,13 @@ msgstr "nem" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 #, fuzzy #| msgid "Err " msgid "error" @@ -5899,102 +5920,102 @@ msgstr "Hib " #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 #, fuzzy msgid "fatal" msgstr "Bezár" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " "\"warn\", \"error\", \"fatal\", or \"off\")." msgstr "" -#: src/main.cc:487 +#: src/main.cc:488 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "Invalid logger name \"%s\"." msgstr "Érvénytelen művelet: %s" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "-q= után egy számot kell megadni\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "-q= után számot kell megadni, nem ezt: %s\n" -#: src/main.cc:802 +#: src/main.cc:794 #, fuzzy, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "A -o kulcs=érték formájú argumentumot vár %s helyett" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "FURCSASÁG: ismeretlen műveletkód\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "" -#: src/main.cc:1039 +#: src/main.cc:1023 #, fuzzy #| msgid "Package" msgid "first-package" msgstr "Csomag" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "" -#: src/main.cc:1043 +#: src/main.cc:1027 #, fuzzy #| msgid "All Packages" msgid "all-packages" msgstr "Minden csomag" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -6002,7 +6023,7 @@ msgid "" "versions\"." msgstr "" -#: src/main.cc:1089 +#: src/main.cc:1073 #, fuzzy #| msgid "Only one of -u and -i may be specified\n" msgid "" @@ -6010,7 +6031,7 @@ msgid "" "specified\n" msgstr "A -u és a -i közül egyszerre csak az egyiket lehet megadni\n" -#: src/main.cc:1098 +#: src/main.cc:1082 #, fuzzy #| msgid "" #| "-u and -i may not be specified in command-line mode (eg, with 'install')" @@ -6019,23 +6040,23 @@ msgid "" "(eg, with 'install')" msgstr "A -u és a -i nem adható meg parancssori módban (pl. 'install' mellett)" -#: src/main.cc:1115 +#: src/main.cc:1099 #, fuzzy #| msgid "-u and -i may not be specified with a command" msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "A -u és a -i nem adható meg parancs mellett" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "Ismeretlen parancs: \"%s\"\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "Lekezeletlen kivétel: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, fuzzy, c-format msgid "" "Backtrace:\n" @@ -6044,7 +6065,8 @@ msgstr "" "Visszakövetés:\n" "%s" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "Keresés: " @@ -6931,17 +6953,21 @@ msgstr "helyettesíti ezt:" msgid "obsoletes" msgstr "elavulttá teszi ezt:" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (biztosítja a(z) %F)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." @@ -6949,7 +6975,7 @@ msgstr "" "Csomag kiválasztásakor ezen a helyen a jelenlegi állapot magyarázata jelenik " "meg." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -6957,11 +6983,11 @@ msgstr "" "A(z) %B%s%b automatikusan volt telepítve; most el lesz távolítva, mivel az " "összes tőle függő csomag eltávolításra kerül:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "A(z) %B%s%b függőségi problémák miatt automatikusan el lesz távolítva:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" @@ -6969,7 +6995,7 @@ msgstr "" "miatt:" # az lenne? -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -6977,7 +7003,7 @@ msgstr "" "A(z) %B%s%b nem frissíthető, de ha lehetne, akkor is a(z) %B%s%b verzión " "tartanám." -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -6985,27 +7011,27 @@ msgstr "" "A(z) %B%s%b nem lesz a(z) %B%s%b verzióra frissítve ezen függőségek " "megsértésének elkerülése végett:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "A(z) %B%s%b jelenleg telepítve van" -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "A(z) %B%s%b jelenleg nincs telepítve" -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "A(z) %B%s%b néhány függősége nem teljesül:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "%B%s%b vissza lesz fejlesztve." -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "A(z) %B%s%b nem lesz frissítve a(z) %B%s%b tiltott verzióra." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." @@ -7013,39 +7039,39 @@ msgstr "" "A(z) %B%s%b frissíthető lenne a(z) %B%s%b verzióra, de a(z) %B%s%b verzión " "van tartva." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "A(z) %B%s%b újra lesz telepítve." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "A(z) %B%s%b telepítve lesz." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "A(z) %B%s%b el lesz távolítva." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "A(z) %B%s%b a(z) %B%s%b verzióról a(z) %B%s%b verzióra lesz frissítve." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 #, fuzzy msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "A(z) %s jelenleg nincs telepítve, így nem lesz újratelepítve.\n" -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "" "Az alábbi csomagok függnek a(z) %B%s%b-től és eltávolítása miatt törötté " "válnak:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "Az alábbi csomagok függnek a(z) %B%s%b-től és töröttek:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" @@ -7053,7 +7079,7 @@ msgstr "" "Az alábbi csomagok ütköznek a(z) %B%s%b csomaggal és telepítésétől törötté " "válnak:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -7062,7 +7088,7 @@ msgstr "" "A következő csomagok a(z) %B%s%b-től, egy a jelenleg telepített %B%s%b-től " "eltérő verziótól függnek, vagy ütköznek a jelenleg telepített verzióval:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -7070,11 +7096,11 @@ msgstr "" "Az alábbi csomagok ütköznek ezzel: %B%s%b, vagy olyan verziójától függnek, " "ami nem lesz telepítve" -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "Az alábbi csomagok ütköznek a(z) %B%s%b csomaggal:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -7082,7 +7108,7 @@ msgstr "" "A következő csomagok a(z) %B%s%b-től, egy a jelenleg telepített %B%s%b-től " "eltérő verziótól függnek:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." @@ -7090,15 +7116,15 @@ msgstr "" "Az alábbi csomagok a(z) %B%s%b olyan verziójától függnek, ami nem lesz " "telepítve:" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "frissít" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "visszafejleszt" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7108,7 +7134,7 @@ msgstr "" "függnek, vagy ütközni fognak a verzióval, amire %sve lesz (%B%s%b) és " "töröttek lesznek ha ez %s." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7116,7 +7142,7 @@ msgstr "" "A következő csomagok ütköznek a(z) %B%s%b verziójával a(z) %B%s%b csomagnak " "és töröttek lesznek a %sésétől." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7152,47 +7178,47 @@ msgstr "Alkalmaz" msgid "Close" msgstr "Bezár" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "a(z) %s ütközik a(z) %s csomaggal [amit a(z) %s %s biztosít]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "%s eltávolítása" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "%s %s (%s) telepítése" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "Az alábbi csomagok %Beltávolítása%b:%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "Az alábbi csomagok %Btelepítése%b:%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "Az alábbi csomagok jelenlegi verzión %Btartása%b:%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "Az alábbi csomagok %Bfrissítése%b:%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "Az alábbi csomagok %Bvisszafejlesztése%b:%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "Az alábbi függőségek feloldatlanul hagyása:%n" @@ -7293,10 +7319,6 @@ msgstr "H:" msgid "W:" msgstr "F:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "Keresés:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7676,7 +7698,9 @@ msgid "Error while dumping resolver state" msgstr "Hiba az ütközésfeloldó állapotának mentése közben" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "A fájl neve, ahova az ütközésfeloldó állapota mentődik:" #: src/ui.cc:2265 @@ -8193,6 +8217,12 @@ msgstr "Munkanapló letöltése" msgid "You can only view changelogs of official Debian packages." msgstr "Csak a hivatalos Debian csomagok munkanaplói olvashatók." +#~ msgid "Press Return to continue" +#~ msgstr "Folytatás a Return leütésével" + +#~ msgid "Search for:" +#~ msgstr "Keresés:" + #, fuzzy #~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." @@ -8320,11 +8350,6 @@ msgstr "Csak a hivatalos Debian csomagok munkanaplói olvashatók." #~ msgid "gtk-yes" #~ msgstr "igen" -#, fuzzy -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "Érvénytelen művelet: %s" - #~ msgid "but it is not installable" #~ msgstr "de nem telepíthető" @@ -8490,10 +8515,6 @@ msgstr "Csak a hivatalos Debian csomagok munkanaplói olvashatók." #~ " lead to a conflict with the given package if installed\n" #~ msgstr " -V A telepítendő csomagok verziójának megjelenítése\n" -#, fuzzy -#~ msgid " indicators.\n" -#~ msgstr " -h Ez a súgó\n" - #~ msgid "Downloading " #~ msgstr "Letöltés " @@ -43,7 +43,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude 0.4.11.10\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2009-02-23 15:46+0100\n" "Last-Translator: Danilo Piazzalunga <danilopiazza@gmail.com>\n" "Language-Team: Italian <tp@lists.linux.it>\n" @@ -53,42 +53,36 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" -msgstr "" -"%BOpzione:%b %s\n" -"%BDefault:%b %s\n" -"%BValore:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " +msgstr "%BOpzione:%b " + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " +msgstr "%BDefault:%b " -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "Vero" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "Falso" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " -msgstr "%BOpzione:%b " - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "%BDefault:%b " - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "%BValore:%b " -#: src/apt_config_treeitems.cc:279 -#, c-format -msgid "Editing \"%ls\"" +#: src/apt_config_treeitems.cc:280 +#, fuzzy, c-format +#| msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "Modifica di «%ls»" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "%BScelta:%b " @@ -684,8 +678,8 @@ msgstr "Errore grave nel risolutore" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] Risoluzione delle dipendenze" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "Errore interno: non è prevista una soluzione vuota." @@ -981,7 +975,7 @@ msgstr "" "resolver.\n" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "Uscita.\n" @@ -1354,7 +1348,7 @@ msgid "No packages to show -- enter the package names on the line after 'i'.\n" msgstr "" "Nessun pacchetto da mostrare; specificare i nomi dei pacchetti dopo «i».\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "Premere Invio per continuare." @@ -1364,10 +1358,6 @@ msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "" "Nessun pacchetto da mostrare; specificare i nomi dei pacchetti dopo «c».\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "Premere Invio per continuare" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1677,7 +1667,7 @@ msgstr "Lo stato del risolutore è stato salvato correttamente" #| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: " #| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pct ver ...: %F%na pct ver ...: %F" @@ -1952,7 +1942,7 @@ msgstr "" "Le dipendenze verrebbero risolte, ma il risolutore non è statao creato." #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "Risoluzione delle dipendenze..." @@ -1990,7 +1980,9 @@ msgid "Invalid response; please enter one of the following commands:" msgstr "Risposta non ammessa. Immettere uno dei seguenti comandi:" #: src/cmdline/cmdline_resolver.cc:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +msgid "No solution found within the allotted time. Try harder? [Y/n] " msgstr "" "Nessuna soluzione trovata nel tempo stabilito. Proseguire la ricerca? [Y/n]" @@ -2199,7 +2191,7 @@ msgstr "Pacchetto: " msgid "State" msgstr "Stato" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "Fornito da" @@ -2307,27 +2299,31 @@ msgstr "Sostituisce" msgid "Obsoletes" msgstr "Rende obsoleto" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Fornisce" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Descrizione: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "Homepage: " -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "Impossibile trovare il pacchetto %s" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "Impossibile analizzare il modello %s" @@ -2652,6 +2648,12 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "" +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "Operazione «%s» non ammessa" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "Fine del file non prevista sullo standard input" @@ -2669,7 +2671,7 @@ msgstr "[ERRORE]" msgid "UNSATISFIED" msgstr "NON SODDISFATTA" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "NON DISPONIBILE" @@ -2679,7 +2681,7 @@ msgid "Tags" msgstr "Etichette" # NdT: Tag/etichette di Debtags -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "Etichette utente" @@ -3093,16 +3095,21 @@ msgstr "Impossibile trovare il pacchetto %s" msgid "Unable to open %s to log actions" msgstr "Impossibile aprire %s per registrare le azioni" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "Errore nella generazione dell'ora locale (%s)" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "registro" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -3113,81 +3120,81 @@ msgstr "" "riuscite in seguito a problemi con dpkg potrebbero non venire completate.\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "Saranno installati %li pacchetti e rimossi %li pacchetti.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "Verranno occupati %sB di spazio su disco\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "Verranno liberati %sB di spazio su disco\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[AGGIORNATO] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[RETROCESSO (DOWNGRADED)] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "RIMOSSO" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "INSTALLATO" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "REINSTALLATO" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "BLOCCATO" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "DIFETTOSO" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "RIMOSSO, NON USATO" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "RIMOSSO, DIPENDENZA" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "INSTALLATO, DIPENDENZA" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "BLOCCATO, DIPENDENZA" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "NON CONFIGURATO" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -3210,39 +3217,39 @@ msgstr "" msgid "Filtering packages" msgstr "Scaricamento dei pacchetti" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "Azione «%s» sconosciuta" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "Costante stringa non terminata dopo %s" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "Priorità «%s» sconosciuta" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "Il modello di ricerca termina in modo inatteso (è richiesto «%c»)." -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "È richiesto «%c», non «%c»." -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "Dipendenza «%s» sconosciuta" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, fuzzy, c-format #| msgid "Unknown matcher type: \"%s\"." msgid "Unknown term type: \"%s\"." @@ -3250,7 +3257,7 @@ msgstr "Tipo di matcher «%s» sconosciuto." #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, fuzzy, c-format #| msgid "" #| "The ?%s matcher must be used in a \"wide\" context (a top-level context, " @@ -3262,34 +3269,34 @@ msgstr "" "Il matcher «?%s» va usato in un contesto «ampio» (un contesto di primo " "livello o racchiuso da ?%s)." -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "\"(\" solitaria" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "La dipendenza «Provides:» non può essere difettosa" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "Modello «%c» sconosciuto" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "Impossibile cercare «»" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "Espressione vuota non prevista" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, fuzzy, c-format #| msgid "Badly formed expression" msgid "Badly formed expression: expected '|', got '%c'" msgstr "Espressione non corretta" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "\")\" non prevista" @@ -4236,22 +4243,22 @@ msgstr "" msgid "%s: Unable to accept a connection: %s" msgstr "Impossibile analizzare il modello %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4979,7 +4986,7 @@ msgstr "" msgid "Virtual package" msgstr "Pacchetto" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "Non installato" @@ -5146,158 +5153,164 @@ msgstr "%s sostituisce %s" msgid "%s obsoletes %s" msgstr "%s rende obsoleto %s" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s sostituisce %s" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "Rimuovere i seguenti pacchetti:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "Installare i seguenti pacchetti:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 #, fuzzy #| msgid "Remove the following packages:" msgid "Keep the following packages:" msgstr "Rimuovere i seguenti pacchetti:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "Aggiornare i seguenti pacchetti:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "Retrocedere (downgrade) i seguenti pacchetti:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 #, fuzzy #| msgid "Leave the following dependencies unresolved:%n" msgid "Leave the following dependencies unresolved:" msgstr "Lasciare le seguenti dipendenze non soddisfatte:%n" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, fuzzy, c-format #| msgid "Remove %F [%s (%s)]" msgid "Remove %s [<big>%s</big> (%s)]" msgstr "Rimuovere %F [%s (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "Install %s [<big>%s</big> (%s)]" msgstr "Installare %F [%s (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "Cancel the installation of %s" msgstr "Annullare l'installazione di %F" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Cancel the removal of %s" msgstr "Annullare la rimozione di %F" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "Keep %s at version <big>%s</big> (%s)" msgstr "Mantenere %F alla versione %s (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, fuzzy, c-format #| msgid "Upgrade %F [%s (%s) -> %s (%s)]" msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Aggiornare %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, fuzzy, c-format #| msgid "Downgrade %F [%s (%s) -> %s (%s)]" msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Retrocedere (downgrade) %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>Remove</b> %s" msgstr "Rimuovere(%s)" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, c-format msgid "<b>remove</b> %s" msgstr "" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>Keep</b> %s at version %s" msgstr "Mantenere %F alla versione %s (%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>keep</b> %s at version %s" msgstr "Mantenere %F alla versione %s (%s)" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>Cancel</b> the installation of %s" msgstr "Annullare l'installazione di %F" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>cancel</b> the installation of %s" msgstr "Annullare l'installazione di %F" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>Install</b> %s %s" msgstr "Installare %F [%s (%s)]" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>install</b> %s %s" msgstr "Installare %F [%s (%s)]" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>Downgrade</b> %s to version %s" msgstr "" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>downgrade</b> %s to version %s" msgstr "" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>Upgrade</b> %s to version %s" msgstr "" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>upgrade</b> %s to version %s" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format #| msgid "%d install" #| msgid_plural "%d installs" @@ -5306,7 +5319,7 @@ msgid_plural "%s installs" msgstr[0] "%d da installare" msgstr[1] "%d da installare" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, fuzzy, c-format #| msgid "%d removal" #| msgid_plural "%d removals" @@ -5315,7 +5328,7 @@ msgid_plural "%s removes" msgstr[0] "%d da rimuovere" msgstr[1] "%d da rimuovere" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, fuzzy, c-format #| msgid "%d keep" #| msgid_plural "%d keeps" @@ -5324,7 +5337,7 @@ msgid_plural "%s keeps" msgstr[0] "%d da mantenere" msgstr[1] "%d da mantenere" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, fuzzy, c-format #| msgid "%d upgrade" #| msgid_plural "%d upgrades" @@ -5333,7 +5346,7 @@ msgid_plural "%s upgrades" msgstr[0] "%d da aggiornare" msgstr[1] "%d da aggiornare" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, fuzzy, c-format #| msgid "%d downgrade" #| msgid_plural "%d downgrades" @@ -5342,7 +5355,7 @@ msgid_plural "%s downgrades" msgstr[0] "%d da retrocedere (downgrade)" msgstr[1] "%d da retrocedere (downgrade)" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, fuzzy, c-format #| msgid "Audit ^Recommendations" msgid "%s unresolved recommendation" @@ -5350,35 +5363,35 @@ msgid_plural "%s unresolved recommendations" msgstr[0] "Controlla ^Raccomandati" msgstr[1] "Controlla ^Raccomandati" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 #, fuzzy #| msgid "No more solutions." msgid "No solutions yet." msgstr "Nessun'altra soluzione." -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 #, fuzzy #| msgid "No resolution found." msgid "No dependency solution was found." msgstr "Nessuna soluzione trovata." -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 #, fuzzy #| msgid "No more solutions." msgid "No solutions." msgstr "Nessun'altra soluzione." -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, fuzzy, c-format #| msgid "No more solutions." msgid "%u solutions." msgstr "Nessun'altra soluzione." -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Could not open file \"%s\"" msgid "Solution %s of %s." @@ -5701,12 +5714,12 @@ msgstr " Supporto a Ept disabilitato.\n" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s compilato il %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5859,29 +5872,35 @@ msgstr " show - Mostra informazioni dettagliate su un pacchetto\n" #: src/main.cc:213 #, fuzzy, c-format +#| msgid " show - Display detailed information about a package\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - Mostra informazioni dettagliate su un pacchetto\n" + +#: src/main.cc:214 +#, fuzzy, c-format #| msgid " clean - Erase downloaded package files\n" msgid " clean - Erase downloaded package files.\n" msgstr " clean - Cancella i file dei pacchetti scaricati\n" -#: src/main.cc:214 +#: src/main.cc:215 #, fuzzy, c-format #| msgid " autoclean - Erase old downloaded package files\n" msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean - Cancella i file dei vecchi pacchetti scaricati\n" -#: src/main.cc:215 +#: src/main.cc:216 #, fuzzy, c-format #| msgid " changelog - View a package's changelog\n" msgid " changelog - View a package's changelog.\n" msgstr " changelog - Mostra il changelog di un pacchetto\n" -#: src/main.cc:216 +#: src/main.cc:217 #, fuzzy, c-format #| msgid " download - Download the .deb file for a package\n" msgid " download - Download the .deb file for a package.\n" msgstr " download - Scarica il file .deb di un pacchetto\n" -#: src/main.cc:217 +#: src/main.cc:218 #, fuzzy, c-format #| msgid "" #| " reinstall - Download and (possibly) reinstall a currently installed " @@ -5893,19 +5912,23 @@ msgstr "" " reinstall - Scarica ed eventualmente reinstalla un pacchetto già " "installato\n" -#: src/main.cc:218 -#, c-format +#: src/main.cc:219 +#, fuzzy, c-format +#| msgid "" +#| " why - Show the manually installed packages that require a " +#| "package, or\n" +#| " why one or more packages would require the given package\n" msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " why - Mostra i pacchetti installati manualmente che richiedono un\n" " pacchetto oppure mostra perché uno o più pacchetti " "richiedono\n" " il pacchetto specificato\n" -#: src/main.cc:220 +#: src/main.cc:221 #, fuzzy, c-format #| msgid "" #| " why-not - Show the manually installed packages that lead to a " @@ -5925,46 +5948,46 @@ msgstr "" " uno o più pacchetti vanno in conflitto con il pacchetto " "dato\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " Opzioni:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " -h This help text.\n" msgstr " -h Questo help\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h Questo help\n" -#: src/main.cc:232 +#: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr "" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s Simula le azioni, senza eseguirle realmente\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" @@ -5972,13 +5995,13 @@ msgstr "" " -d Scarica i pacchetti e basta, senza installare o rimuovere " "nulla\n" -#: src/main.cc:236 +#: src/main.cc:237 #, fuzzy, c-format #| msgid " -P Always prompt for confirmation or actions\n" -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P Chiede sempre conferma prima di un'azione\n" -#: src/main.cc:237 +#: src/main.cc:238 #, fuzzy, c-format #| msgid "" #| " -y Assume that the answer to simple yes/no questions is " @@ -5988,7 +6011,7 @@ msgid "" msgstr "" " -y Suppone che la risposta a semplici domande sì/no sia «sì»\n" -#: src/main.cc:238 +#: src/main.cc:239 #, fuzzy, c-format #| msgid "" #| " -F format Specify a format for displaying search results; see the " @@ -6001,7 +6024,7 @@ msgstr "" "ricerca;\n" " vedere anche il manuale\n" -#: src/main.cc:239 +#: src/main.cc:240 #, fuzzy, c-format #| msgid "" #| " -O order Specify how search results should be sorted; see the " @@ -6013,7 +6036,7 @@ msgstr "" " -O ordine Specifica come ordinare i risultati di una ricerca; vedere\n" " anche il manuale\n" -#: src/main.cc:240 +#: src/main.cc:241 #, fuzzy, c-format #| msgid "" #| " -w width Specify the display width for formatting search results\n" @@ -6023,33 +6046,33 @@ msgstr "" " -w larghezza Specifica la larghezza per mostrare i risultati di una " "ricerca\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr "" " -f Prova in tutti i modi a correggere i pacchetti difettosi\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr "" " -V Mostra quali versioni dei pacchetti si sta per installare\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr "" " -D Mostra le dipendenze dei pacchetti cambiati automaticamente\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr "" " -Z Mostra i cambiamenti nella dimensione occupata da ogni " "pacchetto\n" -#: src/main.cc:245 +#: src/main.cc:246 #, fuzzy, c-format #| msgid "" #| " -v Display extra information. (may be supplied multiple " @@ -6060,7 +6083,7 @@ msgid "" msgstr "" " -v Mostra informazioni extra (può essere fornita più volte)\n" -#: src/main.cc:246 +#: src/main.cc:247 #, fuzzy, c-format #| msgid "" #| " -t [release] Set the release from which packages should be installed\n" @@ -6068,64 +6091,64 @@ msgid "" " -t [release] Set the release from which packages should be installed.\n" msgstr " -t [release] Imposta la release da cui installare i pacchetti\n" -#: src/main.cc:247 +#: src/main.cc:248 #, fuzzy, c-format #| msgid "" #| " -q In command-line mode, suppress the incremental progress\n" #| " indicators.\n" msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" " -q In modalità riga di comando, non mostra gli indicatori di\n" " avanzamento incrementali.\n" -#: src/main.cc:249 +#: src/main.cc:250 #, fuzzy, c-format #| msgid " -o key=val Directly set the configuration option named 'key'\n" msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr " -o chiave=val Imposta l'opzione di configurazione di nome «chiave»\n" -#: src/main.cc:250 +#: src/main.cc:251 #, fuzzy, c-format #| msgid "" #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" #| " strong dependencies\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends\n" " Specifica se trattare Raccomanda come una dipendenza forte\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr " -S nomefile: Legge lo stato esteso di Aptitude da nomefile\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u : Scarica il nuovo elenco dei pacchetti all'avvio\n" -#: src/main.cc:254 src/main.cc:256 +#: src/main.cc:255 src/main.cc:257 #, c-format -msgid " (terminal interface only)" +msgid " (terminal interface only)\n" msgstr "" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i : Esegue un'installazione all'avvio\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " Questo Aptitude non ha i Poteri della Super Mucca.\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 #, fuzzy #| msgid "true" msgid "trace" @@ -6133,7 +6156,7 @@ msgstr "vero" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "" @@ -6142,7 +6165,7 @@ msgstr "" # ho preferito mettere prima il nome del pacchetto. #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 #, fuzzy #| msgid "%s info" msgid "info" @@ -6150,19 +6173,19 @@ msgstr "%s: informazioni" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 msgid "error" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 #, fuzzy #| msgid "false" msgid "fatal" @@ -6170,95 +6193,95 @@ msgstr "falso" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " "\"warn\", \"error\", \"fatal\", or \"off\")." msgstr "" -#: src/main.cc:487 +#: src/main.cc:488 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "Invalid logger name \"%s\"." msgstr "Operazione «%s» non ammessa" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "-q= richiede un argomento numerico\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "-q= richiede un argomento numerico, non «%s»\n" -#: src/main.cc:802 +#: src/main.cc:794 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o richiede un argomento nel formato chiave=valore, non «%s»\n" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "Manca la virgola dopo il nome dell'etichetta «%s».\n" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "STRANEZZA: ricevuto un codice di opzione sconosciuto\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "" -#: src/main.cc:1039 +#: src/main.cc:1023 #, fuzzy #| msgid "Package" msgid "first-package" msgstr "Pacchetto" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "" -#: src/main.cc:1043 +#: src/main.cc:1027 #, fuzzy #| msgid "All Packages" msgid "all-packages" msgstr "Tutti i pacchetti" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -6266,7 +6289,7 @@ msgid "" "versions\"." msgstr "" -#: src/main.cc:1089 +#: src/main.cc:1073 #, fuzzy #| msgid "Only one of -u and -i may be specified\n" msgid "" @@ -6274,7 +6297,7 @@ msgid "" "specified\n" msgstr "-u e -i non possono essere specificate contemporaneamente\n" -#: src/main.cc:1098 +#: src/main.cc:1082 #, fuzzy #| msgid "" #| "-u and -i may not be specified in command-line mode (eg, with 'install')" @@ -6284,23 +6307,23 @@ msgid "" msgstr "" "-u e -i non sono ammesse in modalità riga di comando (es. con «install»)" -#: src/main.cc:1115 +#: src/main.cc:1099 #, fuzzy #| msgid "-u and -i may not be specified with a command" msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "-u e -i non possono essere specificate insieme a un comando" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "Comando sconosciuto: «%s»\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "Eccezione non gestita: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" @@ -6309,7 +6332,8 @@ msgstr "" "Backtrace:\n" "%s\n" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "Cerca: " @@ -7211,17 +7235,21 @@ msgstr "sostituisce" msgid "obsoletes" msgstr "rende obsoleto" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (fornito da %F)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." @@ -7229,7 +7257,7 @@ msgstr "" "Selezionando un pacchetto, una spiegazione del suo stato attuale appare in " "questo spazio." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -7237,19 +7265,19 @@ msgstr "" "%B%s%b è stato installato automaticamente; viene rimosso perché tutti i " "pacchetti che dipendono da esso stanno per essere rimossi:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "" "%B%s%b verrà rimosso automaticamente a causa di problemi con le dipendenze:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" "%B%s%b verrà installato automaticamente per soddisfare le seguenti " "dipendenze:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -7257,7 +7285,7 @@ msgstr "" "%B%s%b non può essere aggiornato ora ma, anche se fosse, sarebbe comunque " "mantenuto alla versione %B%s%b." -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -7265,27 +7293,27 @@ msgstr "" "%B%s%b non verrà aggiornato alla versione %B%s%b, per evitare di rompere le " "seguenti dipendenze:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b è attualmente installato." -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b non è attualmente installato." -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "Alcune dipendenze di %B%s%b non sono soddisfatte:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "%B%s%b saranno retrocessi (downgraded)." -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b non verrà aggiornato alla versione proibita %B%s%b." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." @@ -7293,39 +7321,39 @@ msgstr "" "%B%s%b potrebbe essere aggiornato alla versione %B%s%b ma viene mantenuto " "alla versione %B%s%b." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b sarà reinstallato." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b verrà installato." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b verrà rimosso." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b verrà aggiornato dalla versione %B%s%b alla versione %B%s%b." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "" "%B%s%b è solo parzialmente installato; la sua installazione sarà completata." -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "" "I seguenti pacchetti dipendono da %B%s%b e saranno difettosi dopo la sua " "rimozione:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "I seguenti pacchetti dipendono da %B%s%b e sono difettosi:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" @@ -7333,7 +7361,7 @@ msgstr "" "I seguenti pacchetti sono in conflitto con %B%s%b e saranno difettosi dopo " "la sua installazione:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -7343,7 +7371,7 @@ msgstr "" "attualmente installata (%B%s%b), oppure sono in conflitto con la versione " "attualmente installata:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -7351,12 +7379,12 @@ msgstr "" "I seguenti pacchetti sono in conflitto con %B%s%b, oppure dipendono da una " "versione che non sta per essere installata." -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "I seguenti pacchetti sono in conflitto con %B%s%b:" # NdT: Le %s significano: nome del pacchetto, versione attualmente installata. -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -7365,7 +7393,7 @@ msgstr "" "attualmente installata (%B%s%b):" # NdT: Le %s significano: nome del pacchetto, versione attualmente installata. -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." @@ -7373,17 +7401,17 @@ msgstr "" "I seguenti pacchetti dipendono da una versione di %B%s%b che non sta per " "essere installata." -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "aggiornato" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "retrocesso (downgraded)" # NdT: Le %s significano: nome del pacchetto, versione attualmente installata, # "aggiornato", versione candidata, "aggiornato". -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7393,7 +7421,7 @@ msgstr "" "%b (%B%s%b), oppure sono in conflitto con la versione alla quale verrà %s (%B" "%s%b); saranno quindi difettosi se verrà %s." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7401,7 +7429,7 @@ msgstr "" "I seguenti pacchetti sono in conflitto con la versione %B%s%b di %B%s%b e, " "se verrà %s, saranno difettosi." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7437,47 +7465,47 @@ msgstr "Applica" msgid "Close" msgstr "Chiudi" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s è in conflitto con %s [fornito da %s %s]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "Rimozione di %s" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "Installazione di %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%BRimuovere%b i seguenti pacchetti:%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%BInstallare%b i seguenti pacchetti:%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%BMantenere%b i seguenti pacchetti alla versione attuale:%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%BAggiornare%b i seguenti pacchetti:%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%BRetrocedere%b (downgrade) i seguenti pacchetti:%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "Lasciare le seguenti dipendenze non soddisfatte:%n" @@ -7576,10 +7604,6 @@ msgstr "E:" msgid "W:" msgstr "W:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "Cerca:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7957,7 +7981,9 @@ msgid "Error while dumping resolver state" msgstr "Impossibile salvare lo stato del risolutore" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "File su cui salvare lo stato del risolutore:" #: src/ui.cc:2265 @@ -8477,6 +8503,21 @@ msgid "You can only view changelogs of official Debian packages." msgstr "È possibile vedere i changelog solo dei pacchetti Debian ufficiali." #~ msgid "" +#~ "%BOption:%b %s\n" +#~ "%BDefault:%b %s\n" +#~ "%BValue:%b %s\n" +#~ msgstr "" +#~ "%BOpzione:%b %s\n" +#~ "%BDefault:%b %s\n" +#~ "%BValore:%b %s\n" + +#~ msgid "Press Return to continue" +#~ msgstr "Premere Invio per continuare" + +#~ msgid "Search for:" +#~ msgstr "Cerca:" + +#~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." #~ msgstr "" #~ "Impossibile risolvere le dipendenze per l'aggiornamento (timeout del " @@ -8602,11 +8643,6 @@ msgstr "È possibile vedere i changelog solo dei pacchetti Debian ufficiali." #~ msgid "gtk-yes" #~ msgstr "sì" -#, fuzzy -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "Operazione «%s» non ammessa" - #~ msgid "but it is not installable" #~ msgstr "ma non è installabile" @@ -186,7 +186,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2009-10-10 17:35+0900\n" "Last-Translator: Kenshi Muto <kmuto@debian.org>\n" "Language-Team: Japanese <debian-japanese@lists.debian.org>\n" @@ -196,42 +196,36 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" -msgstr "" -"%Bオプション:%b %s\n" -"%Bデフォルト:%b %s\n" -"%B値:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " +msgstr "%Bオプション:%b " -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " +msgstr "%Bデフォルト:%b " + +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "はい" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "いいえ" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " -msgstr "%Bオプション:%b " - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "%Bデフォルト:%b " - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "%B値:%b " -#: src/apt_config_treeitems.cc:279 -#, c-format -msgid "Editing \"%ls\"" +#: src/apt_config_treeitems.cc:280 +#, fuzzy, c-format +#| msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "「%ls」の編集" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "%B選んだ選択肢:%b " @@ -824,8 +818,8 @@ msgstr "依存関係解決器で致命的なエラーが発生しました" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] 依存関係を解決しています" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "内部エラー: 解決方法が null になるのは想定外です" @@ -1112,7 +1106,7 @@ msgstr "" "い。\n" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "中断。\n" @@ -1482,7 +1476,7 @@ msgstr "" "表示するパッケージがありません -- 'i' に続けてパッケージ名を入力してくださ" "い。\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "先に進むには Return を押してください。" @@ -1492,10 +1486,6 @@ msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "" "パッケージが見つかりません -- 'c' に続けてパッケージ名を入力してください。\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "先に進む場合は Return を押してください" - # TRANSLATION-FIXME: こんな感じ? #: src/cmdline/cmdline_prompt.cc:806 #, c-format @@ -1820,7 +1810,7 @@ msgstr "依存関係解決器の状態の書き込みに成功しました!" #| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: " #| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr パッケージ バージョン ...: %F%na " @@ -2108,7 +2098,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created." msgstr "依存関係を解決したいのですが、依存関係解決器が作成されていません。" #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "依存関係を解決中..." @@ -2144,7 +2134,9 @@ msgid "Invalid response; please enter one of the following commands:" msgstr "応答が不正です。以下のコマンドから一つを選択して入力してください:" #: src/cmdline/cmdline_resolver.cc:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +msgid "No solution found within the allotted time. Try harder? [Y/n] " msgstr "" "与えられた時間内に解決方法が見つかりませんでした。再挑戦しますか? [Y/n]" @@ -2349,7 +2341,7 @@ msgstr "パッケージ: " msgid "State" msgstr "状態" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "提供元" @@ -2458,27 +2450,31 @@ msgstr "置換" msgid "Obsoletes" msgstr "廃止" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "提供" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "説明: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "ホームページ: " -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "パッケージの場所が見つかりません: %s" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "パターンをパースできません: %s" @@ -2793,6 +2789,12 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "未知のバージョン選択です。何か大きな問題があるようです。" +# Should never happen. +#: src/cmdline_parse.cc:22 +#, c-format +msgid "Invalid command-line option '%s'" +msgstr "'%s' は不正なコマンドラインオプションです" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "標準入力中に想定外のファイル終端記号が含まれています" @@ -2809,7 +2811,7 @@ msgstr "" msgid "UNSATISFIED" msgstr "依存関係未解決" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "入手不可能" @@ -2817,7 +2819,7 @@ msgstr "入手不可能" msgid "Tags" msgstr "タグ" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "ユーザタグ" @@ -3237,18 +3239,23 @@ msgstr "切り詰めたキャッシュを作成できません: %s。" msgid "Unable to open %s to log actions" msgstr "アクション記録用に %s を開けません" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "現地時間 (%s) を生成する際にエラーが生じました" # * Log message. -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "ログ報告" # * Log message. -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -3263,98 +3270,98 @@ msgstr "" "\n" # * Log message. -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "%li 個のパッケージをインストールし、%li 個のパッケージを削除します。\n" # * Log message. -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "%sB のディスク領域を使用します\n" # * Log message. -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "%sB のディスク領域を使用します\n" # * Log message. -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[更新] %s %s -> %s\n" # * Log message. -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[ダウングレード] %s %s -> %s\n" # * Log message. -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "削除" # * Log message. -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "インストール" # * Log message. -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "再インストール" # * Log message. -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "固定" # * Log message. -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "依存関係破損" # * Log message. -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "使われていないため削除" # * Log message. -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "依存関係により削除" # * Log message. -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "依存関係によりインストール" # * Log message. -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "依存関係により固定" # * Log message. -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "未設定" # * Log message. -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" # * Log message. -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" # * Log message. -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -3378,46 +3385,46 @@ msgstr "" msgid "Filtering packages" msgstr "パッケージをダウンロード中" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "アクションの種類が不明です: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "%s の後に終端文字のないリテラル文字列があります" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "優先度が不明です: %s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "マッチパターンが想定外のかたちで終わっています ('%c' が期待されます)。" -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "'%c' を期待しましたが '%c' が与えられました。" -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "依存関係の種類が不明です: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, c-format msgid "Unknown term type: \"%s\"." msgstr "語句の種類が不明です: \"%s\"。" #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, c-format msgid "" "The ?%s term must be used in a \"wide\" context (a top-level context, or a " @@ -3426,33 +3433,33 @@ msgstr "" "?%s 語句は、「広い」コンテキスト (トップレベルのコンテキスト、または ?%s で囲" "まれたコンテキスト) で用いられなければなりません。" -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "対応する '(' がありません" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "Provides: が壊れることはありません" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "パターンの種類が不明です: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "\"\" は検索できません" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "想定外の空の式です" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, c-format msgid "Badly formed expression: expected '|', got '%c'" msgstr "不正な書式です: '|' を期待しているところに '%c' がありました" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "想定外の ')' です" @@ -4354,22 +4361,22 @@ msgstr "内部エラー: 一時ソケット名 \"%s\" は長すぎます!" msgid "%s: Unable to accept a connection: %s" msgstr "%s: 接続を許可できません: %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "[%s] dpkg の処理を開始しています...\n" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "[%s] dpkg の処理が完了しました。\n" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "[%s] dpkg の処理に失敗しました。\n" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -5017,7 +5024,7 @@ msgstr "" msgid "Virtual package" msgstr "仮想パッケージ" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "インストールされていません" @@ -5180,198 +5187,204 @@ msgstr "%s が %s を置換" msgid "%s obsoletes %s" msgstr "%s が %s を廃止" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s が %s を置換" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "以下のパッケージを削除する:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "以下のパッケージをインストールする:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 msgid "Keep the following packages:" msgstr "以下のパッケージを一時固定する:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "以下のパッケージを更新する:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "以下のパッケージをダウングレードする:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 msgid "Leave the following dependencies unresolved:" msgstr "以下の依存関係を未解決のままにする:" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, c-format msgid "Remove %s [<big>%s</big> (%s)]" msgstr "%s [<big>%s</big> (%s)] を削除する" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, c-format msgid "Install %s [<big>%s</big> (%s)]" msgstr "%s [<big>%s</big> (%s)] をインストールする" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, c-format msgid "Cancel the installation of %s" msgstr "%s のインストールを取り消す" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, c-format msgid "Cancel the removal of %s" msgstr "%s の削除を取り消す" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, c-format msgid "Keep %s at version <big>%s</big> (%s)" msgstr "%s をバージョン <big>%s</big> (%s) に一時固定する" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, c-format msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "%s を更新する [<big>%s</big> (%s) -> <big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, c-format msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "%s をダウングレードする [<big>%s</big> (%s) -> <big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, c-format msgid "<b>Remove</b> %s" msgstr "%s を<b>削除</b>" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, c-format msgid "<b>remove</b> %s" msgstr "%s を<b>削除</b>" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, c-format msgid "<b>Keep</b> %s at version %s" msgstr "%s をバージョン %s に<b>一時固定</b>" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, c-format msgid "<b>keep</b> %s at version %s" msgstr "%s をバージョン %s に<b>一時固定</b>" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, c-format msgid "<b>Cancel</b> the installation of %s" msgstr "%s のインストールを<b>取り消す</b>" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, c-format msgid "<b>cancel</b> the installation of %s" msgstr "%s のインストールを<b>取り消す</b>" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, c-format msgid "<b>Install</b> %s %s" msgstr "%s %s を<b>インストール</b>" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, c-format msgid "<b>install</b> %s %s" msgstr "%s %s を<b>インストール</b>" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>Downgrade</b> %s to version %s" msgstr "%s をバージョン %s に<b>ダウングレード</b>" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>downgrade</b> %s to version %s" msgstr "%s をバージョン %s に<b>ダウングレード</b>" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>Upgrade</b> %s to version %s" msgstr "%s を バージョン %s に<b>更新</b>" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>upgrade</b> %s to version %s" msgstr "%s を バージョン %s に<b>更新</b>" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "%s を未解決のままにする" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "%s を未解決のままにする" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, c-format msgid "%s install" msgid_plural "%s installs" msgstr[0] "%s のインストール" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, c-format msgid "%s remove" msgid_plural "%s removes" msgstr[0] "%s の削除" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, c-format msgid "%s keep" msgid_plural "%s keeps" msgstr[0] "%s の一時固定" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, c-format msgid "%s upgrade" msgid_plural "%s upgrades" msgstr[0] "%s の更新" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, c-format msgid "%s downgrade" msgid_plural "%s downgrades" msgstr[0] "%s のダウングレード" # * Item -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, c-format msgid "%s unresolved recommendation" msgid_plural "%s unresolved recommendations" msgstr[0] "%s の未解決の推奨" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 msgid "No solutions yet." msgstr "解決方法はまだありません。" -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 msgid "No dependency solution was found." msgstr "依存関係の解決方法が見つかりません。" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 msgid "No solutions." msgstr "解決方法はありません。" -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "解決方法を見るには、右のリストからそれを選択してください。" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, c-format msgid "%u solutions." msgstr "%u の解決方法。" -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Solution %s of %s (tier %s)." msgid "Solution %s of %s." @@ -5679,12 +5692,12 @@ msgstr " Ept サポート: 無効\n" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s (コンパイル日時: %s %s)\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5842,31 +5855,38 @@ msgstr " show - パッケージについての詳細な情報を表示 # * Description of action in the commandline help. #: src/main.cc:213 +#, fuzzy, c-format +#| msgid " show - Display detailed information about a package.\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - パッケージについての詳細な情報を表示します。\n" + +# * Description of action in the commandline help. +#: src/main.cc:214 #, c-format msgid " clean - Erase downloaded package files.\n" msgstr " clean - ダウンロード済みのパッケージファイルを消去します。\n" # * Description of action in the commandline help. -#: src/main.cc:214 +#: src/main.cc:215 #, c-format msgid " autoclean - Erase old downloaded package files.\n" msgstr "" " autoclean - 古い、ダウンロード済みのパッケージファイルを消去します。\n" # * Description of action in the commandline help. -#: src/main.cc:215 +#: src/main.cc:216 #, c-format msgid " changelog - View a package's changelog.\n" msgstr " changelog - パッケージの変更履歴を表示します。\n" # * Description of action in the commandline help. -#: src/main.cc:216 +#: src/main.cc:217 #, c-format msgid " download - Download the .deb file for a package.\n" msgstr " download - パッケージの .deb ファイルをダウンロードします。\n" # * Description of action in the commandline help. -#: src/main.cc:217 +#: src/main.cc:218 #, c-format msgid "" " reinstall - Download and (possibly) reinstall a currently installed " @@ -5877,12 +5897,16 @@ msgstr "" " ては) 再インストールします。\n" # * Description of action in the commandline help. -#: src/main.cc:218 -#, c-format +#: src/main.cc:219 +#, fuzzy, c-format +#| msgid "" +#| " why - Show the manually installed packages that require a " +#| "package, or\n" +#| " why one or more packages would require the given package\n" msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " why - 指定されたパッケージについて、手動でインストールされたパッ" "ケー\n" @@ -5893,7 +5917,7 @@ msgstr "" " といった説明を表示します\n" # * Description of action in the commandline help. -#: src/main.cc:220 +#: src/main.cc:221 #, c-format msgid "" " why-not - Show the manually installed packages that lead to a " @@ -5910,36 +5934,36 @@ msgstr "" " いった説明を表示します。\n" # * Description of action in the commandline help. -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " オプション: \n" # * Description of action in the commandline help. -#: src/main.cc:225 +#: src/main.cc:226 #, c-format msgid " -h This help text.\n" msgstr " -h このヘルプの文章です。\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr " --gui 設定で無効にされていても GTK GUIを使用します。\n" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr " --no-gui 利用可能だとしても GTK GUI を使いません。\n" # * Description of action in the commandline help. -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text.\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h このヘルプの文章です。\n" -#: src/main.cc:232 +#: src/main.cc:233 #, fuzzy, c-format #| msgid "" #| " --gui Use the GTK GUI even if disabled in the configuration.\n" @@ -5948,14 +5972,14 @@ msgid "" msgstr " --gui 設定で無効にされていても GTK GUIを使用します。\n" # * Description of action in the commandline help. -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr "" " -s アクションのシミュレートのみ行い、実際には実行しません。\n" # * Description of action in the commandline help. -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" @@ -5964,14 +5988,15 @@ msgstr "" " ません。\n" # * Description of action in the commandline help. -#: src/main.cc:236 -#, c-format -msgid " -P Always prompt for confirmation or actions.\n" +#: src/main.cc:237 +#, fuzzy, c-format +#| msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr "" " -P 確認やアクションのために常にプロンプトを出します。\n" # * Description of action in the commandline help. -#: src/main.cc:237 +#: src/main.cc:238 #, c-format msgid "" " -y Assume that the answer to simple yes/no questions is 'yes'.\n" @@ -5980,7 +6005,7 @@ msgstr "" "す。\n" # * Description of action in the commandline help. -#: src/main.cc:238 +#: src/main.cc:239 #, c-format msgid "" " -F format Specify a format for displaying search results; see the " @@ -5991,7 +6016,7 @@ msgstr "" " てください。\n" # * Description of action in the commandline help. -#: src/main.cc:239 +#: src/main.cc:240 #, c-format msgid "" " -O order Specify how search results should be sorted; see the " @@ -6002,43 +6027,42 @@ msgstr "" " い。\n" # * Description of action in the commandline help. -#: src/main.cc:240 +#: src/main.cc:241 #, c-format msgid "" " -w width Specify the display width for formatting search results.\n" msgstr " -w <幅> 検索結果の表示フォーマットの幅を指定します。\n" # * Description of action in the commandline help. -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr "" " -f 依存関係が壊れたパッケージを積極的に修復しようとします。\n" # * Description of action in the commandline help. -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr "" -" -V パッケージのどのバージョンがインストールされるか表示します。\n" +" -V パッケージのどのバージョンがインストールされるか表示しま" +"す。\n" # * Description of action in the commandline help. -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" -msgstr "" -" -D 自動的に変更されたパッケージの依存関係を表示します。\n" +msgstr " -D 自動的に変更されたパッケージの依存関係を表示します。\n" # * Description of action in the commandline help. -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" -msgstr "" -" -Z 各パッケージのインストールサイズの変更を表示します。\n" +msgstr " -Z 各パッケージのインストールサイズの変更を表示します。\n" # * Description of action in the commandline help. -#: src/main.cc:245 +#: src/main.cc:246 #, c-format msgid "" " -v Display extra information. (may be supplied multiple " @@ -6047,7 +6071,7 @@ msgstr "" " -v 付加的な情報を表示します (何倍もの情報が提供されます)。\n" # * Description of action in the commandline help. -#: src/main.cc:246 +#: src/main.cc:247 #, c-format msgid "" " -t [release] Set the release from which packages should be installed.\n" @@ -6055,26 +6079,32 @@ msgstr "" " -t [<リリース>] インストールするパッケージが基づくリリースを設定します。\n" # * Description of action in the commandline help. -#: src/main.cc:247 -#, c-format +#: src/main.cc:248 +#, fuzzy, c-format +#| msgid "" +#| " -q In command-line mode, suppress the incremental progress.\n" +#| " indicators.\n" msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" " -q コマンドラインモードで進行状況を逐一表示しません。\n" # * Description of action in the commandline help. -#: src/main.cc:249 +#: src/main.cc:250 #, c-format msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr "" " -o <キー>=<値> 名前「<キー>」を持つ設定オプションを直接設定します。\n" # * Description of action in the commandline help. -#: src/main.cc:250 -#, c-format +#: src/main.cc:251 +#, fuzzy, c-format +#| msgid "" +#| " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +#| " strong dependencies.\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends 推奨パッケージを強い依存関係として扱うかどうかを指定" @@ -6082,7 +6112,7 @@ msgstr "" " ます。\n" # * Description of action in the commandline help. -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr "" @@ -6090,25 +6120,26 @@ msgstr "" "す。\n" # * Description of action in the commandline help. -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr "" " -u : 起動時に新しいパッケージ一覧をダウンロードします。\n" -#: src/main.cc:254 src/main.cc:256 -#, c-format -msgid " (terminal interface only)" +#: src/main.cc:255 src/main.cc:257 +#, fuzzy, c-format +#| msgid " (terminal interface only)" +msgid " (terminal interface only)\n" msgstr " (端末インタフェースのみ)" # * Description of action in the commandline help. -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i : 起動時にインストールを行います。\n" # * Description of action in the commandline help. -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr "" @@ -6116,49 +6147,49 @@ msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 msgid "trace" msgstr "trace" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "debug" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 msgid "info" msgstr "info" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "warn" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 msgid "error" msgstr "error" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 msgid "fatal" msgstr "fatal" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "off" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " @@ -6168,77 +6199,77 @@ msgstr "" "\"、\"error\"、\"fatal\"、\"off\" のいずれかが期待されます)。" # Should never happen. -#: src/main.cc:487 +#: src/main.cc:488 #, c-format msgid "Invalid logger name \"%s\"." msgstr "ロガー名 \"%s\" は不正です。" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "-q= の後に番号が期待されます\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "-q= の後に番号が期待されますが、%s が与えられました\n" -#: src/main.cc:802 +#: src/main.cc:794 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o には <キー>=<値> の形式の引数が必要ですが、%s が与えられました\n" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "タグ名 \"%s\" の後にコンマがありません。\n" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "不可思議: 未知のオプションコードを受け取りました\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "no-summary" -#: src/main.cc:1039 +#: src/main.cc:1023 msgid "first-package" msgstr "first-package" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "first-package-and-type" -#: src/main.cc:1043 +#: src/main.cc:1027 msgid "all-packages" msgstr "all-packages" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "依存バージョン付きのすべてのパッケージ" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -6249,7 +6280,7 @@ msgstr "" "\"、\"first-package-and-type\"、\"all-packages\"、\"all-packages-with-dep-" "versions\" が期待されます。" -#: src/main.cc:1089 +#: src/main.cc:1073 msgid "" "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be " "specified\n" @@ -6257,7 +6288,7 @@ msgstr "" "--auto-clean-on-startup、--clean-on-startup、-i、-u のいずれか 1 つのみを指定" "可能です\n" -#: src/main.cc:1098 +#: src/main.cc:1082 msgid "" "-u, -i, and --clean-on-startup may not be specified in command-line mode " "(eg, with 'install')" @@ -6265,21 +6296,21 @@ msgstr "" "-u、-i、--clean-on-startup はコマンドラインモードで指定することは ('install' " "とともになど) できません" -#: src/main.cc:1115 +#: src/main.cc:1099 msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "-u、-i、--clean-on-startup はコマンドとともに指定することはできません" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "不明なコマンド \"%s\"\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "捕捉できなかった例外: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" @@ -6288,7 +6319,8 @@ msgstr "" "バックトレース:\n" "%s\n" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "検索: " @@ -7185,18 +7217,22 @@ msgstr "を置換" msgid "obsoletes" msgstr "を廃止" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (%F で提供)" # * Example: '%F%s depends on %F' -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%1$F%2$s %4$F %3$F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." @@ -7204,7 +7240,7 @@ msgstr "" "パッケージを選択すると、そのパッケージの現在の状態に関する説明がこの欄に表示" "されます。" -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -7213,17 +7249,17 @@ msgstr "" "パッケージがすべて削除予定とされているため、このパッケージも削除が予定されて" "います:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "%B%s%b は、依存関係の間違いのため自動的に削除される予定です:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" "%B%s%b は、以下の依存関係を満たすために自動的にインストールされる予定です:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -7231,7 +7267,7 @@ msgstr "" "%B%s%b は現在更新できません。たとえできたとしても、バージョン %B%s%b で固定さ" "れるでしょう。" -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -7239,27 +7275,27 @@ msgstr "" "%B%s%b はバージョン %B%s%b に更新されません。以下の依存関係を壊すのを防ぐため" "です:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b は現在インストールされています。" -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b は現在インストールされていません。" -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "%B%s%b の依存関係のいくつかが満たされていません:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "%B%s%b がダウングレードされます。" -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b は、禁止されているバージョン %B%s%b には更新されません。" -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." @@ -7267,41 +7303,41 @@ msgstr "" "%B%s%b はバージョン %B%s%b に更新可能ですが、バージョン %B%s%b で固定されてい" "ます。" -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b が再インストールされます。" -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b がインストールされます。" -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b が削除されます。" -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b がバージョン %B%s%b からバージョン %B%s%b に更新されます。" # TRANSLATION-FIMXE: "partly installed" -> "partially installed"? -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "" "%B%s%b はまだインストールが完了していません。インストールの完了を試みる予定で" "す。" -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "" "以下のパッケージが %B%s%b に依存しているため、それを削除すると依存関係が壊れ" "ます:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "以下のパッケージが %B%s%b に依存しており、依存関係が壊れています:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" @@ -7309,7 +7345,7 @@ msgstr "" "以下のパッケージが %B%s%b と競合しているため、それをインストールすると依存関" "係が壊れるでしょう:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -7319,7 +7355,7 @@ msgstr "" "外のものに依存しているか、または現在インストールされているバージョンと競合し" "ています:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -7327,11 +7363,11 @@ msgstr "" "以下のパッケージは %B%s%b と競合するか、またはその、インストール予定にない" "バージョンに依存しています" -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "以下のパッケージが %B%s%b と競合しています:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -7339,7 +7375,7 @@ msgstr "" "以下のパッケージは、%B%s%b の、現在インストールされているバージョン %B%s%b 以" "外のものに依存しています:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." @@ -7347,11 +7383,11 @@ msgstr "" "以下のパッケージは、%B%s%b の、インストール予定にないバージョンに依存していま" "す。" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "更新される" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "ダウングレードされる" @@ -7359,7 +7395,7 @@ msgstr "ダウングレードされる" # factoring out upgraded/downgraded in its two senses # would be a royal pain even if gettext supported it. # * 'upgraded' and 'downgraded' are inserted to non-bold %s-s. -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7370,7 +7406,7 @@ msgstr "" "係が壊れます。" # * 'upgraded' and 'downgraded' are inserted to an non-bold %s. -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7379,7 +7415,7 @@ msgstr "" "依存関係が壊れます。" # * 'upgraded' and 'downgraded' are inserted to an non-bold %s. -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7415,47 +7451,47 @@ msgstr "適用" msgid "Close" msgstr "閉じる" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s が %s (%s %s が提供) と競合" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "%s を削除しています" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "%s %s (%s) をインストールしています" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "%ls を未解決のままにします。" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "以下のパッケージを%B削除%bする:%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "以下のパッケージを%Bインストール%bする:%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "以下のパッケージを現在のバージョンに%B一時固定%bする:%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "以下のパッケージを%B更新%bする:%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "以下のパッケージを%Bダウングレード%bする:%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "以下の依存関係を未解決のままにする:%n" @@ -7555,10 +7591,6 @@ msgstr "エラー:" msgid "W:" msgstr "警告:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "検索:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7929,7 +7961,9 @@ msgid "Error while dumping resolver state" msgstr "依存関係解決器の状態のダンプ中にエラーが生じました" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "依存関係解決器の状態をダンプする出力ファイル:" # * Item. @@ -8551,16 +8585,26 @@ msgid "You can only view changelogs of official Debian packages." msgstr "公式の Debian パッケージのみ変更履歴を閲覧できます。" #~ msgid "" +#~ "%BOption:%b %s\n" +#~ "%BDefault:%b %s\n" +#~ "%BValue:%b %s\n" +#~ msgstr "" +#~ "%Bオプション:%b %s\n" +#~ "%Bデフォルト:%b %s\n" +#~ "%B値:%b %s\n" + +#~ msgid "Press Return to continue" +#~ msgstr "先に進む場合は Return を押してください" + +#~ msgid "Search for:" +#~ msgstr "検索:" + +#~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." #~ msgstr "" #~ "更新のための依存関係の解決ができません (依存関係解決器がタイムアウトになり" #~ "ました)。" -# Should never happen. -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "'%s' は不正なコマンドラインオプションです" - #~| msgid "Section" #~ msgid "Safe actions" #~ 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: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+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" @@ -18,41 +18,37 @@ msgstr "" "Plural-Forms: nplurals=2; plural=0;\n" "X-Generator: KBabel 1.11.2\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +#, fuzzy +msgid "%BOption:%b " +msgstr "ជម្រើស" + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 #, fuzzy msgid "False" msgstr "បិទ" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -#, fuzzy -msgid "%BOption:%b " -msgstr "ជម្រើស" - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "" - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:279 +#: src/apt_config_treeitems.cc:280 #, c-format -msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "" @@ -526,8 +522,8 @@ msgstr "" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] កំពុងដោះស្រាយភាពអាស្រ័យ" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "កំហុសខាងក្នុង ៖ មិនរំពឹងថាមានដំណោះស្រាយទទេ ។" @@ -815,7 +811,7 @@ msgid "" msgstr "មិនអាចដោះស្រាយភាពអាស្រ័យបានឡើយ ។" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "បោះបង់ ។\n" @@ -1176,7 +1172,7 @@ msgstr "បន្ទាប់ពីពន្លារួច %s បៃ msgid "No packages to show -- enter the package names on the line after 'i'.\n" msgstr "មិនមានកញ្ចប់ដើម្បីបង្ហាញឡើយ -- សូមបញ្ចូលឈ្មោះកញ្ចប់ នៅបន្ទាប់ពី 'i' ។\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "ចុចគ្រាប់ចុច បញ្ចូល ដើម្បីបន្ត ។" @@ -1185,10 +1181,6 @@ msgstr "ចុចគ្រាប់ចុច បញ្ចូល ដើម្ប msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "រកមិនឃើញកញ្ចប់ឡើយ -- សូមបញ្ចូលឈ្មោះកញ្ចប់ នៅបន្ទាប់ពី 'c' ។\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "ចុចគ្រាប់ចុច បញ្ចូល ដើម្បីបន្ត ។" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1480,7 +1472,7 @@ msgstr "បានសរសេរសភាពកម្មវិធី #: src/cmdline/cmdline_resolver.cc:222 #, fuzzy, c-format msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F" @@ -1736,7 +1728,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created." msgstr "" #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "កំពុងដោះស្រាយភាពអាស្រ័យ..." @@ -1772,7 +1764,9 @@ msgid "Invalid response; please enter one of the following commands:" msgstr "ចម្លើយតបមិនត្រឹមត្រូវ ។ សូមបញ្ចូលពាក្យបញ្ជាមួយក្នុងចំណោមខាងក្រោម ៖" #: src/cmdline/cmdline_resolver.cc:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +msgid "No solution found within the allotted time. Try harder? [Y/n] " msgstr "រកមិនឃើញដំណោះស្រាយឡើយ កំឡុងពេលបែងចែក ។ ព្យាយាមឲ្យខ្លាំងជាងមុនទៀត ? [Y/n]" #: src/cmdline/cmdline_resolver.cc:1080 @@ -1974,7 +1968,7 @@ msgstr "កញ្ចប់ ៖ " msgid "State" msgstr "ស្ថានភាព" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "ផ្ដល់ដោយ" @@ -2082,27 +2076,31 @@ msgstr "ជំនួស" msgid "Obsoletes" msgstr "លែងប្រើ" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "ផ្តល់ឲ្យ" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "សេចក្ដីពណ៌នា ៖ " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "" -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "មិនអាចរកទីតាំងកញ្ចប់ %s" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "មិនអាចញែកលំនាំ %s" @@ -2422,6 +2420,12 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "" +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "ប្រតិបត្តិការ %s មិនត្រឹមត្រូវ" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "មិនរំពឹងថាមានចុងឯកសារ នៅលើព័ត៌មានខ្នាតគំរូ" @@ -2439,7 +2443,7 @@ msgstr "[កំហុស]" msgid "UNSATISFIED" msgstr "មិនពេញចិត្ត" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "មិនមាន" @@ -2447,7 +2451,7 @@ msgstr "មិនមាន" msgid "Tags" msgstr "ស្លាក" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 #, fuzzy msgid "User Tags" msgstr "ស្លាក" @@ -2840,16 +2844,21 @@ msgstr "មិនអាចរកទីតាំងកញ្ចប់ %s msgid "Unable to open %s to log actions" msgstr "មិនអាចបើក %s ដើម្បីចុះកំណត់ហេតុសកម្មភាព" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "កំហុសក្នុងការបង្កើតពេលវេលាមូលដ្ឋាន (%s)" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "របាយការណ៍កំណត់ហេតុ" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -2860,81 +2869,81 @@ msgstr "" "ដោយសារតែ dpkg ប្រហែលជាមានមិនពេញលេញឡើយ ។\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "នឹងដំឡើងកញ្ចប់ %li ហើយនឹងយកកញ្ចប់ %li ចេញ ។\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "%s បៃ នៃទំហំថាស នឹងត្រូវបានប្រើ ។\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "%sបៃ នៃទំហំថាស នឹងត្រូវបានធ្វើឲ្យទំនេរ ។\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[ធ្វើឲ្យប្រសើរ] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[បន្ទាប] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "យកចេញ" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "ដំឡើង" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "ដំឡើងឡើងវិញ" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "រង់ចាំ" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "ខូច" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "យកចេញ, មិនប្រើ" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "យកចេញ, ភាពអាស្រ័យ" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "ដំឡើង, ភាពអាស្រ័យ" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "រង់ចាំ, ភាពអាស្រ័យ" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -2957,80 +2966,80 @@ msgstr "" msgid "Filtering packages" msgstr "កំពុងទាញយកកញ្ចប់" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "មិនស្គាល់ប្រភេទសកម្មភាព ៖ %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "មានខ្សែអក្សរន័យត្រង់មិនទាន់បានបញ្ចប់ នៅបន្ទាប់ពី %s" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "មិនស្គាល់អាទិភាព %s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "" -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, fuzzy, c-format msgid "Expected '%c', got '%c'." msgstr "បានរំពឹង ',' ឬ '(' ប៉ុន្តែបែរជាជួប '%c' ទៅវិញ" -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "មិនស្គាល់ប្រភេទភាពអាស្រ័យ ៖ %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, fuzzy, c-format msgid "Unknown term type: \"%s\"." msgstr "មិនស្គាល់ប្រភេទលំនាំ ៖ %c" #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, c-format msgid "" "The ?%s term must be used in a \"wide\" context (a top-level context, or a " "context enclosed by ?%s)." msgstr "" -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "មិនផ្គូផ្គង '('" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "ផ្ដល់ ៖ មិនអាចខូចឡើយ" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "មិនស្គាល់ប្រភេទលំនាំ ៖ %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "មិនអាចស្វែងរក \"\"" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "មិនរំពឹងថាមានកន្សោមទទេ" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, fuzzy, c-format #| msgid "Badly formed expression" msgid "Badly formed expression: expected '|', got '%c'" msgstr "កន្សោមត្រូវបានបង្កើតមិនល្អ" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "មិនរំពឹងថាមាន ')'" @@ -3959,22 +3968,22 @@ msgstr "" msgid "%s: Unable to accept a connection: %s" msgstr "មិនអាចបង្កើតថតបណ្ដោះអាសន្នពីពុម្ព \"%s\" ៖ %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4691,7 +4700,7 @@ msgstr "" msgid "Virtual package" msgstr "កញ្ចប់" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "មិនបានដំឡើង" @@ -4859,159 +4868,165 @@ msgstr "%s ជំនួស %s" msgid "%s obsoletes %s" msgstr "%s លែងប្រើ %s" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s ជំនួស %s" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "យកកញ្ចប់ខាងក្រោមចេញ ៖" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "ដំឡើងកញ្ចប់ខាងក្រោម ៖" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 #, fuzzy #| msgid "Remove the following packages:" msgid "Keep the following packages:" msgstr "យកកញ្ចប់ខាងក្រោមចេញ ៖" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "ធ្វើឲ្យកញ្ចប់ខាងក្រោមប្រសើរ ៖" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "បន្ទាបកញ្ចប់ដូចខាងក្រោមនេះ ៖" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 #, fuzzy #| msgid "Leave the following dependencies unresolved:%n" msgid "Leave the following dependencies unresolved:" msgstr "មិនបាច់ដោះស្រាយភាពអាស្រ័យដូចតទៅនេះ ៖ %n" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, fuzzy, c-format #| msgid "Remove %F [%s (%s)]" msgid "Remove %s [<big>%s</big> (%s)]" msgstr "យក %F ចេញ [%s (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "Install %s [<big>%s</big> (%s)]" msgstr "ដំឡើង %F [%s (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "Cancel the installation of %s" msgstr "បោះបង់ការដំឡើងនៃ %F" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Cancel the removal of %s" msgstr "បោះបង់ការយកចេញនៃ %F" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "Keep %s at version <big>%s</big> (%s)" msgstr "រក្សា %F ត្រឹមកំណែ %s (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, fuzzy, c-format #| msgid "Upgrade %F [%s (%s) -> %s (%s)]" msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "ធ្វើឲ្យ %F ប្រសើរ [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, fuzzy, c-format #| msgid "Downgrade %F [%s (%s) -> %s (%s)]" msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "បន្ទាប %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format msgid "<b>Remove</b> %s" msgstr "យកចេញ" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format msgid "<b>remove</b> %s" msgstr "យកចេញ" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>Keep</b> %s at version %s" msgstr "រក្សា %F ត្រឹមកំណែ %s (%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>keep</b> %s at version %s" msgstr "រក្សា %F ត្រឹមកំណែ %s (%s)" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>Cancel</b> the installation of %s" msgstr "បោះបង់ការដំឡើងនៃ %F" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>cancel</b> the installation of %s" msgstr "បោះបង់ការដំឡើងនៃ %F" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>Install</b> %s %s" msgstr "ដំឡើង %F [%s (%s)]" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>install</b> %s %s" msgstr "ដំឡើង %F [%s (%s)]" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format msgid "<b>Downgrade</b> %s to version %s" msgstr "libsigc++ កំណែ ៖ %s\n" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format msgid "<b>downgrade</b> %s to version %s" msgstr "libsigc++ កំណែ ៖ %s\n" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>Upgrade</b> %s to version %s" msgstr "%s កំណែ" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>upgrade</b> %s to version %s" msgstr "%s កំណែ" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format #| msgid "%d install" #| msgid_plural "%d installs" @@ -5020,7 +5035,7 @@ msgid_plural "%s installs" msgstr[0] "%d ដំឡើង" msgstr[1] "" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, fuzzy, c-format #| msgid "%d removal" #| msgid_plural "%d removals" @@ -5029,7 +5044,7 @@ msgid_plural "%s removes" msgstr[0] "%d យកចេញ" msgstr[1] "" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, fuzzy, c-format #| msgid "%d keep" #| msgid_plural "%d keeps" @@ -5038,7 +5053,7 @@ msgid_plural "%s keeps" msgstr[0] "%d រក្សាទុក" msgstr[1] "" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, fuzzy, c-format #| msgid "%d upgrade" #| msgid_plural "%d upgrades" @@ -5047,7 +5062,7 @@ msgid_plural "%s upgrades" msgstr[0] "%d ធ្វើឲ្យប្រសើរ" msgstr[1] "" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, fuzzy, c-format #| msgid "%d downgrade" #| msgid_plural "%d downgrades" @@ -5056,7 +5071,7 @@ msgid_plural "%s downgrades" msgstr[0] "%d បន្ទាប" msgstr[1] "" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, fuzzy, c-format #| msgid "Audit ^Recommendations" msgid "%s unresolved recommendation" @@ -5064,34 +5079,34 @@ msgid_plural "%s unresolved recommendations" msgstr[0] "ពិនិត្យការផ្ដល់អនុសាសន៍" msgstr[1] "ពិនិត្យការផ្ដល់អនុសាសន៍" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 #, fuzzy #| msgid "No more solutions." msgid "No solutions yet." msgstr "មិនមានដំណោះស្រាយផ្សេងឡើយ ។" -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 #, fuzzy msgid "No dependency solution was found." msgstr "ការដោះស្រាយភាពអាស្រ័យ" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 #, fuzzy #| msgid "No more solutions." msgid "No solutions." msgstr "មិនមានដំណោះស្រាយផ្សេងឡើយ ។" -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, fuzzy, c-format #| msgid "No more solutions." msgid "%u solutions." msgstr "មិនមានដំណោះស្រាយផ្សេងឡើយ ។" -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Could not open file \"%s\"" msgid "Solution %s of %s." @@ -5397,12 +5412,12 @@ msgstr "" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s បានចងក្រងនៅត្រង់ %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5551,29 +5566,35 @@ msgstr " show - បង្ហាញព័ត៌មានលម្ #: src/main.cc:213 #, fuzzy, c-format +#| msgid " show - Display detailed information about a package\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - បង្ហាញព័ត៌មានលម្អិតអំពីកញ្ចប់មួយ\n" + +#: src/main.cc:214 +#, fuzzy, c-format #| msgid " clean - Erase downloaded package files\n" msgid " clean - Erase downloaded package files.\n" msgstr " clean - លុបឯកសារកញ្ចប់ដែលបានទាញយក\n" -#: src/main.cc:214 +#: src/main.cc:215 #, fuzzy, c-format #| msgid " autoclean - Erase old downloaded package files\n" msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean - លុបឯកសារកញ្ចប់ចាស់ៗដែលបានទាញយក\n" -#: src/main.cc:215 +#: src/main.cc:216 #, fuzzy, c-format #| msgid " changelog - View a package's changelog\n" msgid " changelog - View a package's changelog.\n" msgstr " changelog - មើលកំណត់ហេតុការផ្លាស់ប្ដូររបស់កញ្ចប់មួយ\n" -#: src/main.cc:216 +#: src/main.cc:217 #, fuzzy, c-format #| msgid " download - Download the .deb file for a package\n" msgid " download - Download the .deb file for a package.\n" msgstr " download - ទាញយកឯកសារ .deb របស់កញ្ចប់មួយ\n" -#: src/main.cc:217 +#: src/main.cc:218 #, fuzzy, c-format #| msgid "" #| " reinstall - Download and (possibly) reinstall a currently installed " @@ -5583,15 +5604,15 @@ msgid "" "package.\n" msgstr " reinstall - ទាញយក និង (បើអាច) ដំឡើងឡើងវិញនូវកញ្ចប់ដែលបានដំឡើងបច្ចុប្បន្ន\n" -#: src/main.cc:218 +#: src/main.cc:219 #, fuzzy, c-format msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr " -Z\t\t បង្ហាញការផ្លាស់ប្ដូរនៅក្នុងទំហំដែលបានដំឡើង របស់កញ្ចប់នីមួយៗ ។\n" -#: src/main.cc:220 +#: src/main.cc:221 #, fuzzy, c-format msgid "" " why-not - Show the manually installed packages that lead to a " @@ -5600,58 +5621,58 @@ msgid "" " lead to a conflict with the given package if installed.\n" msgstr " -Z\t\t បង្ហាញការផ្លាស់ប្ដូរនៅក្នុងទំហំដែលបានដំឡើង របស់កញ្ចប់នីមួយៗ ។\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " ជម្រើស ៖\n" -#: src/main.cc:225 +#: src/main.cc:226 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " -h This help text.\n" msgstr " -h អត្ថបទជំនួយនេះ\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h អត្ថបទជំនួយនេះ\n" -#: src/main.cc:232 +#: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr "" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s ក្លែងធ្វើសកម្មភាពណាមួយ ប៉ុន្តែមិនអនុវត្តពិតឡើយ\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr " -d គ្រាន់តែទាញយកកញ្ចប់ប៉ុណ្ណោះ ដោយមិនដំឡើង ឬ យកអ្វីចេញទាំងអស់ ។\n" -#: src/main.cc:236 +#: src/main.cc:237 #, fuzzy, c-format #| msgid " -P Always prompt for confirmation or actions\n" -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P សាកសួរជានិច្ច មុននឹងធ្វើអ្វីមួយ\n" -#: src/main.cc:237 +#: src/main.cc:238 #, fuzzy, c-format #| msgid "" #| " -y Assume that the answer to simple yes/no questions is " @@ -5660,7 +5681,7 @@ msgid "" " -y Assume that the answer to simple yes/no questions is 'yes'.\n" msgstr " -y សន្មតថាចម្លើយរបស់សំណួរ បាទ/ចាស ឬ ទេ ធម្មតាៗគឺជា 'បាទ/ចាស'\n" -#: src/main.cc:238 +#: src/main.cc:239 #, fuzzy, c-format #| msgid "" #| " -F format Specify a format for displaying search results; see the " @@ -5670,7 +5691,7 @@ msgid "" "manual.\n" msgstr " -F ទ្រង់ទ្រាយ បញ្ជាក់ទ្រង់ទ្រាយមួយ ដើម្បីបង្ហាញលទ្ធផលស្វែងរក ។ សូមមើលសៀវភៅដៃ\n" -#: src/main.cc:239 +#: src/main.cc:240 #, fuzzy, c-format #| msgid "" #| " -O order Specify how search results should be sorted; see the " @@ -5680,7 +5701,7 @@ msgid "" "manual.\n" msgstr " -O លំដាប់ បញ្ជាក់របៀបតម្រៀបលទ្ធផលស្វែងរក ។ សូមមើលសៀវភៅដៃ\n" -#: src/main.cc:240 +#: src/main.cc:241 #, fuzzy, c-format #| msgid "" #| " -w width Specify the display width for formatting search results\n" @@ -5688,28 +5709,28 @@ msgid "" " -w width Specify the display width for formatting search results.\n" msgstr " -w ទទឹង បញ្ជាក់ទទឹងដើម្បីធ្វើទ្រង់ទ្រាយលទ្ធផលស្វែងរក\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr " -f ខំព្យាយាមជួសជុលកញ្ចប់ដែលខូច ។\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr " -V បង្ហាញកំណែនៃកញ្ចប់ ដែលនឹងត្រូវដំឡើង ។\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr " -D បង្ហាញភាពអាស្រ័យនៃកញ្ចប់ដែលបានផ្លាស់ប្ដូរដោយស្វ័យប្រវត្តិ ។\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr " -Z\t\t បង្ហាញការផ្លាស់ប្ដូរនៅក្នុងទំហំដែលបានដំឡើង របស់កញ្ចប់នីមួយៗ ។\n" -#: src/main.cc:245 +#: src/main.cc:246 #, fuzzy, c-format #| msgid "" #| " -v Display extra information. (may be supplied multiple " @@ -5719,7 +5740,7 @@ msgid "" "times).\n" msgstr " -v បង្ហាញព័ត៌មានបន្ថែមទៀត ។ (ប្រហែលជាផ្ដល់ច្រើនដង)\n" -#: src/main.cc:246 +#: src/main.cc:247 #, fuzzy, c-format #| msgid "" #| " -t [release] Set the release from which packages should be installed\n" @@ -5727,59 +5748,59 @@ msgid "" " -t [release] Set the release from which packages should be installed.\n" msgstr " -t [ការចេញផ្សាយ] កំណត់ការចេញផ្សាយ ដែលគួរដំឡើងកញ្ចប់ពី\n" -#: src/main.cc:247 +#: src/main.cc:248 #, fuzzy, c-format msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr " -q នៅក្នុងរបៀបបន្ទាត់ពាក្យបញ្ជា ទប់ស្កាត់ទ្រនិចបង្ហាញវឌ្ឍនភាព ។\n" -#: src/main.cc:249 +#: src/main.cc:250 #, fuzzy, c-format #| msgid " -o key=val Directly set the configuration option named 'key'\n" msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr " -o កូនសោ=តម្លៃ កំណត់ដោយផ្ទាល់នូវជម្រើសការកំណត់រចនាសម្ព័ន្ធ ដែលមានឈ្មោះ 'កូនសោ'\n" -#: src/main.cc:250 +#: src/main.cc:251 #, fuzzy, c-format #| msgid "" #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" #| " strong dependencies\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends\tបញ្ជាក់ថាតើត្រូវចាត់ទុកការផ្ដល់អនុសាសន៍ជា\n" " ភាពអាស្រ័យខ្លាំងក្លាឬទេ\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr " -S ឈ្មោះឯកសារ ៖ អានព័ត៌មានស្ថានភាពបន្ថែមទៀតរបស់ aptitude ពី ឈ្មោះឯកសារ ។\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u ៖ ទាញយកបញ្ជីកញ្ចប់ថ្មីនៅពេលចាប់ផ្ដើម ។\n" -#: src/main.cc:254 src/main.cc:256 -#, c-format -msgid " (terminal interface only)" -msgstr "" +#: src/main.cc:255 src/main.cc:257 +#, fuzzy, c-format +msgid " (terminal interface only)\n" +msgstr " -h អត្ថបទជំនួយនេះ\n" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i ៖ រត់ការដំឡើងមួយ នៅពេលចាប់ផ្ដើម ។\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " aptitude នេះមិនមាន Super Cow Powers ទេ ។\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 #, fuzzy #| msgid "replaces" msgid "trace" @@ -5787,13 +5808,13 @@ msgstr "ជំនួស" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 #, fuzzy #| msgid "no" msgid "info" @@ -5801,13 +5822,13 @@ msgstr "ទេ" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 #, fuzzy #| msgid "Err " msgid "error" @@ -5815,102 +5836,102 @@ msgstr "Err " #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 #, fuzzy msgid "fatal" msgstr "បិទ" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " "\"warn\", \"error\", \"fatal\", or \"off\")." msgstr "" -#: src/main.cc:487 +#: src/main.cc:488 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "Invalid logger name \"%s\"." msgstr "ប្រតិបត្តិការ %s មិនត្រឹមត្រូវ" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "បានរំពឹងតម្លៃលេខ នៅបន្ទាប់ពី -q=\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "បានរំពឹងតម្លៃលេខ នៅបន្ទាប់ពី -q=, ប៉ុន្តែបែរជាជួប %s ទៅវិញ\n" -#: src/main.cc:802 +#: src/main.cc:794 #, fuzzy, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o ទាមទារអាគុយម៉ង់មួយ ដែលមានទម្រង់ជា កូនសោ=តម្លៃ, តែបែរជាទទួលបាន %s ទៅវិញ" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "ចម្លែកមែនទែន ៖ បានទទួលកូដជម្រើសដែលមិនស្គាល់\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "" -#: src/main.cc:1039 +#: src/main.cc:1023 #, fuzzy #| msgid "Package" msgid "first-package" msgstr "កញ្ចប់" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "" -#: src/main.cc:1043 +#: src/main.cc:1027 #, fuzzy #| msgid "All Packages" msgid "all-packages" msgstr "កញ្ចប់ទាំងអស់" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -5918,7 +5939,7 @@ msgid "" "versions\"." msgstr "" -#: src/main.cc:1089 +#: src/main.cc:1073 #, fuzzy #| msgid "Only one of -u and -i may be specified\n" msgid "" @@ -5926,7 +5947,7 @@ msgid "" "specified\n" msgstr "អាចបញ្ជាក់តែមួយប៉ុណ្ណោះក្នុងចំណោម -u និង -i\n" -#: src/main.cc:1098 +#: src/main.cc:1082 #, fuzzy #| msgid "" #| "-u and -i may not be specified in command-line mode (eg, with 'install')" @@ -5935,23 +5956,23 @@ msgid "" "(eg, with 'install')" msgstr "មិនគួរបញ្ជាក់ -u និង -i នៅក្នុងរបៀបបន្ទាត់ពាក្យបញ្ជាឡើយ (ឧ. ជាមួយ 'install')" -#: src/main.cc:1115 +#: src/main.cc:1099 #, fuzzy #| msgid "-u and -i may not be specified with a command" msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "មិនគួរបញ្ជាក់ -u និង -i ជាមួយពាក្យបញ្ជាឡើយ" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "មិនស្គាល់ពាក្យបញ្ជា \"%s\"\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "ករណីលើកលែងដែលមិនបានចាប់ ៖ %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, fuzzy, c-format msgid "" "Backtrace:\n" @@ -5960,7 +5981,8 @@ msgstr "" "ដាន ៖\n" "%s" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "ស្វែងរក ៖ " @@ -6834,23 +6856,27 @@ msgstr "ជំនួស" msgid "obsoletes" msgstr "លែងប្រើ" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (ផ្តល់ដោយ %F)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." msgstr "បើអ្នកជ្រើសកញ្ចប់មួយ សេចក្ដីពន្យល់នៃស្ថានភាពបច្ចុប្បន្នរបស់វា នឹងលេចឡើងត្រង់នេះ ។" -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -6858,16 +6884,16 @@ msgstr "" "%B%s%b ត្រូវបានដំឡើងដោយស្វ័យប្រវត្តិ ។ វានឹងត្រូវបានយកចេញ ព្រោះកញ្ចប់ទាំងអស់ដែលអាស្រ័យតាមវា ត្រូវ" "បានយកចេញបាត់ហើយ ៖" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "%B%s%b នឹងត្រូវបានយកចេញដោយស្វ័យប្រវត្តិ ព្រោះមានកំហុសភាពអាស្រ័យ ៖" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "%B%s%b នឹងត្រូវបានដំឡើងដោយស្វ័យប្រវត្តិ ដើម្បីបំពេញតាមភាពអាស្រ័យ ៖" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -6875,78 +6901,78 @@ msgstr "" "%B%s%b មិនអាចត្រូវបានធ្វើឲ្យប្រសើរឡើយ នៅពេលនេះ ប៉ុន្តែបើវាអាច វានឹងនៅត្រឹមកំណែ %B%s%b " "ប៉ុណ្ណោះ ។" -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" msgstr "" "%B%s%b នឹងមិនអាចត្រូវបានធ្វើឲ្យប្រសើរទៅជាកំណែ %B%s%b ឡើយ ដើម្បីកុំឲ្យខូចភាពអាស្រ័យខាងក្រោម ៖" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "បច្ចុប្បន្ន %B%s%b ត្រូវបានដំឡើងហើយ ។" -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "បច្ចុប្បន្ន %B%s%b មិនត្រូវបានដំឡើងឡើយ ។" -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "ភាពអាស្រ័យមួយចំនួនរបស់ %B%s%b មិនត្រូវបានបំពេញគ្រប់គ្រាន់ឡើយ ៖" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "%B%s%b នឹងត្រូវបានបន្ទាប ។" -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b នឹងមិនត្រូវបានធ្វើឲ្យប្រសើរទៅជាកំណែ %B%s%b ឡើយ ។" -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." msgstr "" "%B%s%b អាចនឹងត្រូវបានធ្វើឲ្យប្រសើរទៅជាកំណែ %B%s%b ប៉ុន្តែវាត្រូវបានទុកនៅត្រឹមកំណែ %B%s%b ។" -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b នឹងត្រូវបានដំឡើងឡើងវិញ ។" -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b នឹងត្រូវបានដំឡើង ។" -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b នឹងត្រូវបានយកចេញ ។" -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b នឹងត្រូវបានធ្វើឲ្យប្រសើរពីកំណែ %B%s%b ទៅកំណែ %B%s%b ។" -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 #, fuzzy msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "បច្ចុប្បន្ន %s មិនត្រូវបានដំឡើងឡើយ ដូច្នេះវានឹងមិនត្រូវបានដំឡើងម្ដងទៀតឡើយ ។\n" -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "កញ្ចប់ខាងក្រោមអាស្រ័យតាម %B%s%b ហើយនឹងត្រូវបានខូច ដោយសារតែការយកវាចេញ ៖" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "កញ្ចប់ខាងក្រោមអាស្រ័យតាម %B%s%b ហើយនឹងត្រូវបានខូច ៖" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" msgstr "" "កញ្ចប់ខាងក្រោមនេះបានប៉ះទង្គិចជាមួយ %B%s%b ហើយនឹងត្រូវបានខូច ដោយសារតែការដំឡើងរបស់វា ៖" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -6955,37 +6981,37 @@ msgstr "" "កញ្ចប់ខាងក្រោមអាស្រ័យតាមកំណែ %B%s%b មិនមែនកំណែ %B%s%b ដែលបានដំឡើងពេលនេះឡើយ ឬ ប៉ះទង្គិច" "ជាមួយកំណែដែលបានដំឡើងបច្ចុប្បន្ន ៖" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." msgstr "កញ្ចប់ខាងក្រោមប៉ះទង្គិចជាមួយ %B%s%b ឬ អាស្រ័យតាមកំណែដែលនឹងមិនត្រូវបានដំឡើង ។" -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "កញ្ចប់ខាងក្រោមប៉ះទង្គិចជាមួយ %B%s%b ៖៖" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" msgstr "កញ្ចប់ខាងក្រោមអាស្រ័យតាមកំណែ %B%s%b មិនមែនកញ្ចប់ %B%s%b ដែលបានដំឡើងពេលនេះឡើយ ៖" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." msgstr "កញ្ចប់ខាងក្រោមអាស្រ័យតាមកំណែ %B%s%b ដែលនឹងមិនត្រូវបានដំឡើង ៖" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "ធ្វើឲ្យប្រសើរ" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "បន្ទាប" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -6994,13 +7020,13 @@ msgstr "" "កញ្ចប់ខាងក្រោមអាស្រ័យតាមកំណែ %B%s%b ដែលបានដំឡើងបច្ចុប្បន្ន (%B%s%b) ឬ ប៉ះទង្គិចជាមួយកំណែ ដែល" "វានឹងត្រូវបាន%s ទៅ (%B%s%b) ហើយវានឹងត្រូវបានខូច បើវាត្រូវបាន%s ។" -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." msgstr "កញ្ចប់ខាងក្រោមប៉ះទង្គិចជាមួយកំណែ %B%s%b of %B%s%b ហើយនឹងត្រូវបានខូច បើវាត្រូវបាន%s ។" -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7034,47 +7060,47 @@ msgstr "អនុវត្ត" msgid "Close" msgstr "បិទ" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s ប៉ះទង្គិចជាមួយ %s [ផ្ដល់ដោយ %s %s]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "កំពុងយក %s ចេញ" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "កំពុងដំឡើង %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%BRemove%b កញ្ចប់ដូចតទៅនេះ ៖%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%BInstall%b កញ្ចប់ដូចតទៅនេះ ៖ %n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%BKeep%b កញ្ចប់ដូចតទៅនេះ នៅត្រឹមកំណែបច្ចុប្បន្នដដែល ៖%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%BUpgrade%b កញ្ចប់ដូចតទៅនេះ ៖ %n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%BDowngrade%b កញ្ចប់ដូចតទៅនេះ ៖ %n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "មិនបាច់ដោះស្រាយភាពអាស្រ័យដូចតទៅនេះ ៖ %n" @@ -7172,10 +7198,6 @@ msgstr "E ៖" msgid "W:" msgstr "W ៖" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "ស្វែងរក ៖" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7541,7 +7563,9 @@ msgid "Error while dumping resolver state" msgstr "មានកំហុស ខណៈពេលបោះចោលស្ថានភាពរបស់កម្មវិធីដោះស្រាយ" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "ឯកសារដែលស្ថានភាពកម្មវិធីដោះស្រាយ គួរត្រូវបានបោះចោល ៖" #: src/ui.cc:2265 @@ -8048,6 +8072,12 @@ msgstr "ទាញយកកំណត់ហេតុផ្លាស msgid "You can only view changelogs of official Debian packages." msgstr "អ្នកអាចមើលតែកំណត់ហេតុការផ្លាស់ប្ដូរ របស់កញ្ចប់ដេបៀនផ្លូវការប៉ុណ្ណោះ ។" +#~ msgid "Press Return to continue" +#~ msgstr "ចុចគ្រាប់ចុច បញ្ចូល ដើម្បីបន្ត ។" + +#~ msgid "Search for:" +#~ msgstr "ស្វែងរក ៖" + #, fuzzy #~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." @@ -8175,11 +8205,6 @@ msgstr "អ្នកអាចមើលតែកំណត់ហេត #~ msgid "gtk-yes" #~ msgstr "បាទ" -#, fuzzy -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "ប្រតិបត្តិការ %s មិនត្រឹមត្រូវ" - #~ msgid "but it is not installable" #~ msgstr "ប៉ុន្តែមិនមានវាឡើយ" @@ -8345,10 +8370,6 @@ msgstr "អ្នកអាចមើលតែកំណត់ហេត #~ " lead to a conflict with the given package if installed\n" #~ msgstr " -V បង្ហាញកំណែនៃកញ្ចប់ ដែលនឹងត្រូវដំឡើង ។\n" -#, fuzzy -#~ msgid " indicators.\n" -#~ msgstr " -h អត្ថបទជំនួយនេះ\n" - #~ msgid "Downloading " #~ msgstr "កំពុងទាញយក " @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2008-09-01 16:03+0200\n" "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n" "Language-Team: Kurdish <ubuntu-l10n-kur@lists.ubuntu.com>\n" @@ -19,39 +19,35 @@ msgstr "" "X-Generator: Lokalize 0.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " msgstr "" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " +msgstr "%BStandard:%b " + +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "Rast" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "Şaş" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " -msgstr "" - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "%BStandard:%b " - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "%BNirx:%b " -#: src/apt_config_treeitems.cc:279 +#: src/apt_config_treeitems.cc:280 #, c-format -msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "" @@ -518,8 +514,8 @@ msgstr "" msgid "[%d(%d)/...] Resolving dependencies" msgstr "" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "" @@ -785,7 +781,7 @@ msgid "" msgstr "" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "Dev jê berde.\n" @@ -1122,7 +1118,7 @@ msgstr "" msgid "No packages to show -- enter the package names on the line after 'i'.\n" msgstr "" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "" @@ -1131,10 +1127,6 @@ msgstr "" msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1416,7 +1408,7 @@ msgstr "" #: src/cmdline/cmdline_resolver.cc:222 #, c-format msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" @@ -1664,7 +1656,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created." msgstr "" #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "" @@ -1700,7 +1692,7 @@ msgid "Invalid response; please enter one of the following commands:" msgstr "" #: src/cmdline/cmdline_resolver.cc:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +msgid "No solution found within the allotted time. Try harder? [Y/n] " msgstr "" #: src/cmdline/cmdline_resolver.cc:1080 @@ -1901,7 +1893,7 @@ msgstr "Pakêt: " msgid "State" msgstr "Rewş" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "" @@ -2009,27 +2001,31 @@ msgstr "Dikevê şuna" msgid "Obsoletes" msgstr "Nepêwîst dike" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Rave: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "Malper:" -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "" @@ -2342,6 +2338,11 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "" +#: src/cmdline_parse.cc:22 +#, c-format +msgid "Invalid command-line option '%s'" +msgstr "" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "" @@ -2359,7 +2360,7 @@ msgstr "[ÇEWTÎ]" msgid "UNSATISFIED" msgstr "" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "" @@ -2367,7 +2368,7 @@ msgstr "" msgid "Tags" msgstr "Etîket" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "Etîketên Bikarhêner" @@ -2749,16 +2750,21 @@ msgstr "" msgid "Unable to open %s to log actions" msgstr "" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -2766,81 +2772,81 @@ msgid "" "\n" msgstr "" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[BILINDKIRIN] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[NIZMKIRIN] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "RAKE" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "SAZ BIKE" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "JI NÛ VE SAZKIRIN" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "ŞIKESTÎ" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -2860,79 +2866,79 @@ msgstr "" msgid "Filtering packages" msgstr "Pakêtên şikestî tune." -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "" -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "" -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, c-format msgid "Unknown term type: \"%s\"." msgstr "" #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, c-format msgid "" "The ?%s term must be used in a \"wide\" context (a top-level context, or a " "context enclosed by ?%s)." msgstr "" -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, c-format msgid "Badly formed expression: expected '|', got '%c'" msgstr "" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "" @@ -3813,22 +3819,22 @@ msgstr "" msgid "%s: Unable to accept a connection: %s" msgstr "" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4486,7 +4492,7 @@ msgstr "" msgid "Virtual package" msgstr "Pakêt" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "" @@ -4656,163 +4662,169 @@ msgstr "%s dikeve şuna %s" msgid "%s obsoletes %s" msgstr "%s %s'ê nepêwîst dike" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s dikeve şuna %s" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "Ev paketan rake:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "Ev paketan saz bike:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 #, fuzzy #| msgid "Remove the following packages:" msgid "Keep the following packages:" msgstr "Ev paketan rake:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "Ev paketan bilind bike:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "Ev paketan nizim bike:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 #, fuzzy #| msgid "Remove the following packages:" msgid "Leave the following dependencies unresolved:" msgstr "Ev paketan rake:" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, fuzzy, c-format #| msgid "Remove %F [%s (%s)]" msgid "Remove %s [<big>%s</big> (%s)]" msgstr "%F [%s (%s)] rake" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "Install %s [<big>%s</big> (%s)]" msgstr "%F [%s (%s)] saz bike" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "Cancel the installation of %s" msgstr "Sazkirina %F betal bike" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Cancel the removal of %s" msgstr "Rakirina %F betal bike" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, fuzzy, c-format #| msgid " Apt version: %s\n" msgid "Keep %s at version <big>%s</big> (%s)" msgstr "Guhertoya Apt: %s\n" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, fuzzy, c-format #| msgid "Upgrade %F [%s (%s) -> %s (%s)]" msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "%F bilind bike [%s (%s) -> %s (%s)] " -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, fuzzy, c-format #| msgid "Downgrade %F [%s (%s) -> %s (%s)]" msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "%F nizim bike [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>Remove</b> %s" msgstr "Rakirin(%s)" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>remove</b> %s" msgstr "Rakirin(%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid " Apt version: %s\n" msgid "<b>Keep</b> %s at version %s" msgstr "Guhertoya Apt: %s\n" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid " Apt version: %s\n" msgid "<b>keep</b> %s at version %s" msgstr "Guhertoya Apt: %s\n" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>Cancel</b> the installation of %s" msgstr "Sazkirina %F betal bike" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>cancel</b> the installation of %s" msgstr "Sazkirina %F betal bike" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>Install</b> %s %s" msgstr "%F [%s (%s)] saz bike" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>install</b> %s %s" msgstr "%F [%s (%s)] saz bike" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid "Downgrade %F [%s (%s) -> %s (%s)]" msgid "<b>Downgrade</b> %s to version %s" msgstr "%F nizim bike [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid "Downgrade %F [%s (%s) -> %s (%s)]" msgid "<b>downgrade</b> %s to version %s" msgstr "%F nizim bike [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>Upgrade</b> %s to version %s" msgstr "%s guherto" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>upgrade</b> %s to version %s" msgstr "%s guherto" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format #| msgid "%d install" #| msgid_plural "%d installs" @@ -4821,7 +4833,7 @@ msgid_plural "%s installs" msgstr[0] "%d sazkirin" msgstr[1] "%d sazkirin" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, fuzzy, c-format #| msgid "%d removal" #| msgid_plural "%d removals" @@ -4830,7 +4842,7 @@ msgid_plural "%s removes" msgstr[0] "%d rakirin" msgstr[1] "%d rakirin" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, fuzzy, c-format #| msgid "%d keep" #| msgid_plural "%d keeps" @@ -4839,7 +4851,7 @@ msgid_plural "%s keeps" msgstr[0] "%d hêlan" msgstr[1] "%d hêlan" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, fuzzy, c-format #| msgid "%d upgrade" #| msgid_plural "%d upgrades" @@ -4848,7 +4860,7 @@ msgid_plural "%s upgrades" msgstr[0] "%d bilindkirin" msgstr[1] "%d bilindkirin" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, fuzzy, c-format #| msgid "%d downgrade" #| msgid_plural "%d downgrades" @@ -4857,7 +4869,7 @@ msgid_plural "%s downgrades" msgstr[0] "%d nizmkirin" msgstr[1] "%d nizmkirin" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, fuzzy, c-format #| msgid "Recommendations" msgid "%s unresolved recommendation" @@ -4865,35 +4877,35 @@ msgid_plural "%s unresolved recommendations" msgstr[0] "Tawsiye" msgstr[1] "Tawsiye" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 #, fuzzy #| msgid "No resolution found." msgid "No solutions yet." msgstr "Çareserî nehat dîtin." -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 #, fuzzy #| msgid "No resolution found." msgid "No dependency solution was found." msgstr "Çareserî nehat dîtin." -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 #, fuzzy #| msgid "No resolution found." msgid "No solutions." msgstr "Çareserî nehat dîtin." -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, fuzzy, c-format #| msgid "No resolution found." msgid "%u solutions." msgstr "Çareserî nehat dîtin." -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Versions of %s" msgid "Solution %s of %s." @@ -5191,12 +5203,12 @@ msgstr "" #: src/main.cc:179 #, c-format -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5325,40 +5337,45 @@ msgstr "" #: src/main.cc:213 #, c-format -msgid " clean - Erase downloaded package files.\n" +msgid " versions - Displays the versions of specified packages.\n" msgstr "" #: src/main.cc:214 #, c-format -msgid " autoclean - Erase old downloaded package files.\n" +msgid " clean - Erase downloaded package files.\n" msgstr "" #: src/main.cc:215 #, c-format -msgid " changelog - View a package's changelog.\n" +msgid " autoclean - Erase old downloaded package files.\n" msgstr "" #: src/main.cc:216 #, c-format -msgid " download - Download the .deb file for a package.\n" +msgid " changelog - View a package's changelog.\n" msgstr "" #: src/main.cc:217 #, c-format +msgid " download - Download the .deb file for a package.\n" +msgstr "" + +#: src/main.cc:218 +#, c-format msgid "" " reinstall - Download and (possibly) reinstall a currently installed " "package.\n" msgstr "" -#: src/main.cc:218 +#: src/main.cc:219 #, c-format msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" -#: src/main.cc:220 +#: src/main.cc:221 #, c-format msgid "" " why-not - Show the manually installed packages that lead to a " @@ -5367,161 +5384,161 @@ msgid "" " lead to a conflict with the given package if installed.\n" msgstr "" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr "" -#: src/main.cc:225 +#: src/main.cc:226 #, c-format msgid " -h This help text.\n" msgstr "" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" -#: src/main.cc:231 +#: src/main.cc:232 #, c-format msgid " --qt Use the Qt GUI.\n" msgstr "" -#: src/main.cc:232 +#: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr "" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr "" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr "" -#: src/main.cc:236 +#: src/main.cc:237 #, c-format -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr "" -#: src/main.cc:237 +#: src/main.cc:238 #, c-format msgid "" " -y Assume that the answer to simple yes/no questions is 'yes'.\n" msgstr "" -#: src/main.cc:238 +#: src/main.cc:239 #, c-format msgid "" " -F format Specify a format for displaying search results; see the " "manual.\n" msgstr "" -#: src/main.cc:239 +#: src/main.cc:240 #, c-format msgid "" " -O order Specify how search results should be sorted; see the " "manual.\n" msgstr "" -#: src/main.cc:240 +#: src/main.cc:241 #, c-format msgid "" " -w width Specify the display width for formatting search results.\n" msgstr "" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr "" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr "" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr "" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr "" -#: src/main.cc:245 +#: src/main.cc:246 #, c-format msgid "" " -v Display extra information. (may be supplied multiple " "times).\n" msgstr "" -#: src/main.cc:246 +#: src/main.cc:247 #, c-format msgid "" " -t [release] Set the release from which packages should be installed.\n" msgstr "" -#: src/main.cc:247 +#: src/main.cc:248 #, c-format msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" -#: src/main.cc:249 +#: src/main.cc:250 #, c-format msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr "" -#: src/main.cc:250 +#: src/main.cc:251 #, c-format msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr "" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr "" -#: src/main.cc:254 src/main.cc:256 +#: src/main.cc:255 src/main.cc:257 #, c-format -msgid " (terminal interface only)" +msgid " (terminal interface only)\n" msgstr "" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr "" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 #, fuzzy #| msgid "true" msgid "trace" @@ -5529,13 +5546,13 @@ msgstr "rast" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 #, fuzzy #| msgid "no" msgid "info" @@ -5543,19 +5560,19 @@ msgstr "na" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 msgid "error" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 #, fuzzy #| msgid "false" msgid "fatal" @@ -5563,94 +5580,94 @@ msgstr "şaş" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " "\"warn\", \"error\", \"fatal\", or \"off\")." msgstr "" -#: src/main.cc:487 +#: src/main.cc:488 #, c-format msgid "Invalid logger name \"%s\"." msgstr "" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "" -#: src/main.cc:802 +#: src/main.cc:794 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "" -#: src/main.cc:1039 +#: src/main.cc:1023 #, fuzzy #| msgid "Package" msgid "first-package" msgstr "Pakêt" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "" -#: src/main.cc:1043 +#: src/main.cc:1027 #, fuzzy #| msgid "All Packages" msgid "all-packages" msgstr "Hemû Pakêt" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -5658,40 +5675,41 @@ msgid "" "versions\"." msgstr "" -#: src/main.cc:1089 +#: src/main.cc:1073 msgid "" "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be " "specified\n" msgstr "" -#: src/main.cc:1098 +#: src/main.cc:1082 msgid "" "-u, -i, and --clean-on-startup may not be specified in command-line mode " "(eg, with 'install')" msgstr "" -#: src/main.cc:1115 +#: src/main.cc:1099 msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" "%s\n" msgstr "" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "Lê bigere:" @@ -6546,161 +6564,165 @@ msgstr "" msgid "obsoletes" msgstr "" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr "" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." msgstr "" -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" msgstr "" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." msgstr "" -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" msgstr "" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "" -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "" -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "" -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "" -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." msgstr "" -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "" -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "" -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "" -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "" -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "" -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" msgstr "" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " "installed version:" msgstr "" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." msgstr "" -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" msgstr "" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." msgstr "" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "bilindkirî" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "nizimkirî" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " "be broken if it is %s." msgstr "" -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." msgstr "" -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -6734,47 +6756,47 @@ msgstr "Bisepîne" msgid "Close" msgstr "Girtin" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "%s tê rakirin" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "%s %s (%s) tên sazkirin" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "" @@ -6870,10 +6892,6 @@ msgstr "" msgid "W:" msgstr "" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "Lê bigere:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7203,7 +7221,7 @@ msgid "Error while dumping resolver state" msgstr "" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "" #: src/ui.cc:2265 @@ -7700,6 +7718,9 @@ msgstr "Tê daxistin " msgid "You can only view changelogs of official Debian packages." msgstr "" +#~ msgid "Search for:" +#~ msgstr "Lê bigere:" + #, fuzzy #~| msgid "Section: " #~ msgid "Safe actions" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude_lt\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2008-08-25 12:12+0300\n" "Last-Translator: Darius Žitkevičius <skystis@gmail.com>\n" "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n" @@ -18,42 +18,36 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" "%100<10 || n%100>=20) ? 1 : 2);\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" -msgstr "" -"%BNustatymas:%b %s\n" -"%BNumatytas:%b %s\n" -"%BReikšmė:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " +msgstr "%BParinktys:%b " + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " +msgstr "%BNumatyta:%b " -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "Taip" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "Ne" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " -msgstr "%BParinktys:%b " - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "%BNumatyta:%b " - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "%BReikšmė:%b " -#: src/apt_config_treeitems.cc:279 -#, c-format -msgid "Editing \"%ls\"" +#: src/apt_config_treeitems.cc:280 +#, fuzzy, c-format +#| msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "Redaguojant \"%ls\"" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "%BPasirinkimas:%b " @@ -623,8 +617,8 @@ msgstr "Esminė resolver klaida" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] Sprendžiamos priklausomybės" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "Vidinė klaida: netikėtas tuščias sprendimas." @@ -920,7 +914,7 @@ msgstr "" "Nepavyko saugiai išspręsti priklausomybių, pabandykite su --full-resolver.\n" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "Atšaukti.\n" @@ -1285,7 +1279,7 @@ msgstr "Po išpakavimo atsilaisvins %sB.\n" msgid "No packages to show -- enter the package names on the line after 'i'.\n" msgstr "Nėra rodomų paketų -- įveskite paketų vardus eilutėje po „i“.\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "Norėdami tęsti spauskite ENTER." @@ -1295,10 +1289,6 @@ msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "" "Nerastas joks paketas -- įveskite paketų pavadinimus eilutėje po „c“.\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "Norėdami tęsti spauskite ENTER." - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1607,7 +1597,7 @@ msgstr "Sprendimų būsena sėkmingai įrašyta!" #| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: " #| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: %F" @@ -1877,7 +1867,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created." msgstr "Norima išspręsti priklausomybes, bet nesukurtas joks resolver." #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "Sprendžiamos priklausomybės..." @@ -1914,7 +1904,9 @@ msgid "Invalid response; please enter one of the following commands:" msgstr "Blogas atsakymas; įveskite vieną iš išvardintų komandų:" #: src/cmdline/cmdline_resolver.cc:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +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:1080 @@ -2121,7 +2113,7 @@ msgstr "Paketas: " msgid "State" msgstr "Būsena" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "Pateikė" @@ -2229,27 +2221,31 @@ msgstr "Pakeičia" msgid "Obsoletes" msgstr "Nurašo" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Pateikia" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Aprašas: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "Svetainė: " -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "Nepavyko surasti paketą %s" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "Nepavyko interpretuoti derinio %s" @@ -2574,6 +2570,12 @@ msgstr "%s: ši komanda reikalauja bent vieno argumento (paketo užklausai)." msgid "Unknown version selection, something is very wrong." msgstr "" +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "Klaidingas veiksmas %s" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "Standartinėje įvestyje netikėta bylos galo žymė" @@ -2594,7 +2596,7 @@ msgstr "[KLAIDA]" msgid "UNSATISFIED" msgstr "NETINKAMAS" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "NEEGZISTUOJA" @@ -2602,7 +2604,7 @@ msgstr "NEEGZISTUOJA" msgid "Tags" msgstr "Žymės" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "Vatotojo Žymės" @@ -3007,16 +3009,21 @@ msgstr "Nepavyko surasti paketą %s" msgid "Unable to open %s to log actions" msgstr "Negaliu atidaryti %s žurnalui" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "Klaida generuojant lokalų laiką (%s)" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "žurnalo ataskaita" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -3028,81 +3035,81 @@ msgstr "" "dėl dpkg klaidos. Šie veiksmai negali būti užbaigti.\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "Diegiamų paketų skaičius %li, šalinamų paketų skaičius %li.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "Bus sunaudota %sB disko vietos\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "Bus atlaisvinta %sB disko vietos\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[ATNAUJINTI] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[PASENDINTI] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "PAŠALINTI" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "ĮDIEGTI" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "ĮDIEGTI IŠ NAUJO" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "SULAIKYTI" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "SUGADINTA" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "PAŠALINTI, NEBENAUDOJAMAS" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "PAŠALINTI, PRIKLAUSOMYBĖS" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "ĮDIEGTI, PRIKLAUSOMYBĖS" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "SULAIKYTI, PRIKLAUSOMYBĖS" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "NESUKONFIGŪRUOTAS" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -3125,39 +3132,39 @@ msgstr "" msgid "Filtering packages" msgstr "Gaunu paketus" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "Nežinomas veiksmo tipas: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "Neuždarytas reiškinys po %s" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "Nežinomas prioritetas: %s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "Netikėta derinio šablono pabaiga (tikėtasi '%c')." -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "Tikėtasi '%c', gauta '%c'." -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "Nežinomas priklausomybės tipas: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, fuzzy, c-format #| msgid "Unknown matcher type: \"%s\"." msgid "Unknown term type: \"%s\"." @@ -3165,41 +3172,41 @@ msgstr "Nežinomas derinio tipas:„%s“." #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, c-format msgid "" "The ?%s term must be used in a \"wide\" context (a top-level context, or a " "context enclosed by ?%s)." msgstr "" -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "Neatitikęs „(“" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "Pateikia: negali būti sugadintas" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "Nežinomas derinio tipas: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "Negalima ieškoti \"\"" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "Netikėtas tuščias reiškinys" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, fuzzy, c-format #| msgid "Badly formed expression" msgid "Badly formed expression: expected '|', got '%c'" msgstr "Blogai suformuotas reiškinys" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "Netikėtas „)“" @@ -4146,22 +4153,22 @@ msgstr "" msgid "%s: Unable to accept a connection: %s" msgstr "Iš šablono \"%s\": %s nepavyko sukurti laikino aplanko" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4890,7 +4897,7 @@ msgstr "" msgid "Virtual package" msgstr "Paketas" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "Neįdiegtas" @@ -5064,163 +5071,169 @@ msgstr "%s pakeičia %s" msgid "%s obsoletes %s" msgstr "%s nurašo %s" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s pakeičia %s" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "Pašalinti šiuos paketus:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "Įdiegti šiuos paketus:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 #, fuzzy #| msgid "Remove the following packages:" msgid "Keep the following packages:" msgstr "Pašalinti šiuos paketus:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "Atnaujinti šiuos paketus:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "Pasendinti šiuos paketus:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 #, fuzzy #| msgid "Leave the following dependencies unresolved:%n" msgid "Leave the following dependencies unresolved:" msgstr "Palikti šias priklausomybes neišspręstas:%n" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, fuzzy, c-format #| msgid "Remove %F [%s (%s)]" msgid "Remove %s [<big>%s</big> (%s)]" msgstr "Pašalint %F [%s (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "Install %s [<big>%s</big> (%s)]" msgstr "Įdiegti %F [%s (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "Cancel the installation of %s" msgstr "Nutraukti %F diegimą" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Cancel the removal of %s" msgstr "Atšaukti %F pašalinimą" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "Keep %s at version <big>%s</big> (%s)" msgstr "Palikti %F versiją %s (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, fuzzy, c-format #| msgid "Upgrade %F [%s (%s) -> %s (%s)]" msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Atnaujini %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, fuzzy, c-format #| msgid "Downgrade %F [%s (%s) -> %s (%s)]" msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Pasendinti %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>Remove</b> %s" msgstr "Šalinti(%s)" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>remove</b> %s" msgstr "Šalinti(%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>Keep</b> %s at version %s" msgstr "Palikti %F versiją %s (%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>keep</b> %s at version %s" msgstr "Palikti %F versiją %s (%s)" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>Cancel</b> the installation of %s" msgstr "Nutraukti %F diegimą" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>cancel</b> the installation of %s" msgstr "Nutraukti %F diegimą" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>Install</b> %s %s" msgstr "Įdiegti %F [%s (%s)]" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>install</b> %s %s" msgstr "Įdiegti %F [%s (%s)]" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "<b>Downgrade</b> %s to version %s" msgstr " cwidget versija: %s\n" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "<b>downgrade</b> %s to version %s" msgstr " cwidget versija: %s\n" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>Upgrade</b> %s to version %s" msgstr "%s versijos" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>upgrade</b> %s to version %s" msgstr "%s versijos" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format #| msgid "%d install" #| msgid_plural "%d installs" @@ -5230,7 +5243,7 @@ msgstr[0] "%d diegiamas" msgstr[1] "%d diegiami" msgstr[2] "%d diegiamų" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, fuzzy, c-format #| msgid "%d removal" #| msgid_plural "%d removals" @@ -5240,7 +5253,7 @@ msgstr[0] "%d šalinamas" msgstr[1] "%d šalinami" msgstr[2] "%d šalinamų" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, fuzzy, c-format #| msgid "%d keep" #| msgid_plural "%d keeps" @@ -5250,7 +5263,7 @@ msgstr[0] "%d paliekamas" msgstr[1] "%d paliekami" msgstr[2] "%d paliekamų" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, fuzzy, c-format #| msgid "%d upgrade" #| msgid_plural "%d upgrades" @@ -5260,7 +5273,7 @@ msgstr[0] "%d atnaujinamas" msgstr[1] "%d atnaujinami" msgstr[2] "%d atnaujinamų" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, fuzzy, c-format #| msgid "%d downgrade" #| msgid_plural "%d downgrades" @@ -5270,7 +5283,7 @@ msgstr[0] "%d pasendintas" msgstr[1] "%d pasendinti" msgstr[2] "%d pasendintų" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, fuzzy, c-format #| msgid "Audit ^Recommendations" msgid "%s unresolved recommendation" @@ -5279,35 +5292,35 @@ msgstr[0] "Patikrinti ^rekomendacijas" msgstr[1] "Patikrinti ^rekomendacijas" msgstr[2] "Patikrinti ^rekomendacijas" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 #, fuzzy #| msgid "No more solutions." msgid "No solutions yet." msgstr "Sprendimų nebėra." -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 #, fuzzy #| msgid "Dependency handling" msgid "No dependency solution was found." msgstr "Priklausomybių tvarkymas" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 #, fuzzy #| msgid "No more solutions." msgid "No solutions." msgstr "Sprendimų nebėra." -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, fuzzy, c-format #| msgid "No more solutions." msgid "%u solutions." msgstr "Sprendimų nebėra." -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Could not open file \"%s\"" msgid "Solution %s of %s." @@ -5620,12 +5633,12 @@ msgstr " Ept palaikymas išjungtas.\n" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s kompiliuotas %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5781,29 +5794,35 @@ msgstr " show - Rodyti detalią paketo informaciją\n" #: src/main.cc:213 #, fuzzy, c-format +#| msgid " show - Display detailed information about a package\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - Rodyti detalią paketo informaciją\n" + +#: src/main.cc:214 +#, fuzzy, c-format #| msgid " clean - Erase downloaded package files\n" msgid " clean - Erase downloaded package files.\n" msgstr " clean - Pašalinti gautų paketų bylas\n" -#: src/main.cc:214 +#: src/main.cc:215 #, fuzzy, c-format #| msgid " autoclean - Erase old downloaded package files\n" msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean - Pašalinti senas gautas paketų bylas\n" -#: src/main.cc:215 +#: src/main.cc:216 #, fuzzy, c-format #| msgid " changelog - View a package's changelog\n" msgid " changelog - View a package's changelog.\n" msgstr " changelog - Žiūrėti paketo pakeitimų sąrašą\n" -#: src/main.cc:216 +#: src/main.cc:217 #, fuzzy, c-format #| msgid " download - Download the .deb file for a package\n" msgid " download - Download the .deb file for a package.\n" msgstr " download - Gauti paketo .deb bylą\n" -#: src/main.cc:217 +#: src/main.cc:218 #, fuzzy, c-format #| msgid "" #| " reinstall - Download and (possibly) reinstall a currently installed " @@ -5814,18 +5833,22 @@ msgid "" msgstr "" " reinstall - Gauti ir (galbūt) įdiegti iš naujo šiuo metu įdiegtą paketą\n" -#: src/main.cc:218 -#, c-format +#: src/main.cc:219 +#, fuzzy, c-format +#| msgid "" +#| " why - Show the manually installed packages that require a " +#| "package, or\n" +#| " why one or more packages would require the given package\n" msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " why - Rodyti rankiniu būdu įdiegtus paketus, kuriems reikalingas " "paketas arba\n" " kodėl vienas ar daugiau paketų reikalautu nurodyto paketo\n" -#: src/main.cc:220 +#: src/main.cc:221 #, fuzzy, c-format #| msgid "" #| " why-not - Show the manually installed packages that lead to a " @@ -5845,46 +5868,46 @@ msgstr "" "diegiant\n" " sukelia konfliktą\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " Parinktys:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " -h This help text.\n" msgstr " -h Ši pagalbos informacija\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h Ši pagalbos informacija\n" -#: src/main.cc:232 +#: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr "" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s Simuliuoti veiksmus, tačiau nieko realaus nevykdyti.\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" @@ -5892,13 +5915,13 @@ msgstr "" " -d Tik atsisiųsti reikalingus paketus nieko nediegti ir " "nešalinti.\n" -#: src/main.cc:236 +#: src/main.cc:237 #, fuzzy, c-format #| msgid " -P Always prompt for confirmation or actions\n" -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P Visada klausti veiksmų patvirtinimo\n" -#: src/main.cc:237 +#: src/main.cc:238 #, fuzzy, c-format #| msgid "" #| " -y Assume that the answer to simple yes/no questions is " @@ -5907,7 +5930,7 @@ msgid "" " -y Assume that the answer to simple yes/no questions is 'yes'.\n" msgstr " -y Į klausimus taip/ne automatiškai atsakyti „taip“\n" -#: src/main.cc:238 +#: src/main.cc:239 #, fuzzy, c-format #| msgid "" #| " -F format Specify a format for displaying search results; see the " @@ -5919,7 +5942,7 @@ msgstr "" " -F formatas Nurodyti kokių formatu rodyti paieškos rezultatus žr. " "instrukciją\n" -#: src/main.cc:239 +#: src/main.cc:240 #, fuzzy, c-format #| msgid "" #| " -O order Specify how search results should be sorted; see the " @@ -5931,7 +5954,7 @@ msgstr "" " -O tvarka Nurodyti kaip rūšiuoti paieškos rezultatus; žr. " "instrukcijoje\n" -#: src/main.cc:240 +#: src/main.cc:241 #, fuzzy, c-format #| msgid "" #| " -w width Specify the display width for formatting search results\n" @@ -5939,28 +5962,28 @@ msgid "" " -w width Specify the display width for formatting search results.\n" msgstr " -w plotis Nuodyti ekrano plotį, paieškos rezultatų formavimui\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr " -f Bandyti tvarkyti sugadintus paketus agresyviai.\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr " -V Rodyti kurios paketų versijos bus įdiegtos.\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr " -D Rodyti automatiškai pakeistų paketų priklausomybes.\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr " -Z Rodyti įdiegtų paketų dydžio pasikeitimus.\n" -#: src/main.cc:245 +#: src/main.cc:246 #, fuzzy, c-format #| msgid "" #| " -v Display extra information. (may be supplied multiple " @@ -5972,7 +5995,7 @@ msgstr "" " -v Rodyti papildomą informaciją.( gali būti naudojamas kelis " "kartus)\n" -#: src/main.cc:246 +#: src/main.cc:247 #, fuzzy, c-format #| msgid "" #| " -t [release] Set the release from which packages should be installed\n" @@ -5980,66 +6003,66 @@ msgid "" " -t [release] Set the release from which packages should be installed.\n" msgstr " -t [release] Nustatyti iš kurių paketų diegti.\n" -#: src/main.cc:247 +#: src/main.cc:248 #, fuzzy, c-format #| msgid "" #| " -q In command-line mode, suppress the incremental progress\n" #| " indicators.\n" msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" " -q Komandinėje eilutėje nerodyti progreso indikatoriaus.\n" -#: src/main.cc:249 +#: src/main.cc:250 #, fuzzy, c-format #| msgid " -o key=val Directly set the configuration option named 'key'\n" msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr " -o raktas=reikšmė Tiesiogiai siųsti parametrą „raktas“\n" -#: src/main.cc:250 +#: src/main.cc:251 #, fuzzy, c-format #| msgid "" #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" #| " strong dependencies\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends\tNurodo ar Laikyti (arba nelaikyti) rekomenduojamus " "paketus\n" " kaip reikalingus\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr "" " -S fname Skaityti aptitude išplėstinės būsenos informaciją iš bylos " "fname.\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u Tik paleidus programą gauti naują paketų sąrašą.\n" -#: src/main.cc:254 src/main.cc:256 +#: src/main.cc:255 src/main.cc:257 #, c-format -msgid " (terminal interface only)" +msgid " (terminal interface only)\n" msgstr "" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i Paleidus programą automatiškai vykdyti diegimą.\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " Šis aptitude neturi Superkarvės galių.\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 #, fuzzy #| msgid "true" msgid "trace" @@ -6047,13 +6070,13 @@ msgstr "tesinga" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 #, fuzzy #| msgid "no" msgid "info" @@ -6061,13 +6084,13 @@ msgstr "ne" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 #, fuzzy #| msgid "Err " msgid "error" @@ -6075,7 +6098,7 @@ msgstr "Kld " #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 #, fuzzy #| msgid "false" msgid "fatal" @@ -6083,99 +6106,99 @@ msgstr "klaidinga" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " "\"warn\", \"error\", \"fatal\", or \"off\")." msgstr "" -#: src/main.cc:487 +#: src/main.cc:488 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "Invalid logger name \"%s\"." msgstr "Klaidingas veiksmas %s" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "" "Po -q=\n" " tikėtasi skaičiaus\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "" "Po -q=\n" " tikėtasi skaičiaus, gauta %s\n" -#: src/main.cc:802 +#: src/main.cc:794 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o reikalauja argumentų formate raktas=reikšmė, gavau %s\n" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "Nėra kablelio po žymės pavadinimo „%s“.\n" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "KEISTA: gautas nežinomas parinkčių kodas\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "" -#: src/main.cc:1039 +#: src/main.cc:1023 #, fuzzy #| msgid "Package" msgid "first-package" msgstr "Paketas" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "" -#: src/main.cc:1043 +#: src/main.cc:1027 #, fuzzy #| msgid "All Packages" msgid "all-packages" msgstr "Visi paketai" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -6183,7 +6206,7 @@ msgid "" "versions\"." msgstr "" -#: src/main.cc:1089 +#: src/main.cc:1073 #, fuzzy #| msgid "Only one of -u and -i may be specified\n" msgid "" @@ -6191,7 +6214,7 @@ msgid "" "specified\n" msgstr "Gali būti nurodytas tik vienas iš -u ir -i\n" -#: src/main.cc:1098 +#: src/main.cc:1082 #, fuzzy #| msgid "" #| "-u and -i may not be specified in command-line mode (eg, with 'install')" @@ -6200,23 +6223,23 @@ msgid "" "(eg, with 'install')" msgstr "-u ir -i nenaudojami komandinės eilutės režime (pvz., su „install“)" -#: src/main.cc:1115 +#: src/main.cc:1099 #, fuzzy #| msgid "-u and -i may not be specified with a command" msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "-u ir -i negali būti nurodyti su komanda" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "Nežinoma komanda „%s“\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "Nežinoma išimtis: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" @@ -6225,7 +6248,8 @@ msgstr "" "Pėdsakas:\n" "%s\n" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "Ieškoti: " @@ -7111,23 +7135,27 @@ msgstr "pakeičia" msgid "obsoletes" msgstr "pasendina" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (pateiktas paketo %F)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." msgstr "Pažymėjus paketą, šioje vietoje atsiras jo būsenos aprašymas." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -7135,17 +7163,17 @@ msgstr "" "%B%s%b buvo įdiegtas automatiškai; dabar jis pašalintas, nes paketai, " "kuriems jo reikia pašalinami: " -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "" "%B%s%b bus automatiškai pašalintas, nes trūksta jam reikalingų paketų: " -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "%B%s%b bus automatiškai įdiegtas, nes jis reikalingas paketams: " -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -7153,7 +7181,7 @@ msgstr "" "%B%s%b negali būti atnaujintas dabar, bet jei galėtu, jis vis vien liktu " "versijos %B%s%b." -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -7161,27 +7189,27 @@ msgstr "" "%B%s%b nebus atnaujintas iki versijos %B%s%b, kad nesugriautų šių " "priklausomybių: " -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b šiuo metu įdiegtas." -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b šiuo metu nėra įdiegtas." -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "Kai kurios %B%s%b priklausomybės netenkinamos:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "%B%s%b bus pasendintas." -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b nebus atnaujintas iki uždraustos versijos %B%s%b." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." @@ -7189,42 +7217,42 @@ msgstr "" "%B%s%b negali būti atnaujintas iki versijos %B%s%b, jis paliekamas %B%s%b " "versijos." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b bus įdiegtas iš naujo." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b bus įdiegtas." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b bus pašalintas." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b bus atnaujintas nuo versijos %B%s%b iki versijos %B%s%b." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "%B%s%b yra įdiegtas dalinai; o diegimas bus pabaigtas." -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "Šiems paketams reikia %B%s%b, jį pašalinus paketasi bus sugadinti: " -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "Šiems paketams reikia %B%s%b ir jie yra sugadinti: " -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" msgstr "Šie paketai konfliktuoja su %B%s%b, todėl po įdiegimo būtų sugadinti:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -7233,7 +7261,7 @@ msgstr "" "Šiems paketams reikia %B%s%b versijos, tačiau įdiegta versija yra %B%s%b. " "Arba paketas konfliktuoja su įdiegta versija:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -7241,33 +7269,33 @@ msgstr "" "Šie paketai konfliktuoja su %B%s%b, arba jiems reikia versijos, kurios " "neplanuojama įdiegti." -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "Šie paketai konfliktuoja su %B%s%b: " -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" msgstr "" "Šiems paketams reikia paketo %B%s%b kitos versijos nei yra įdiegta %B%s%b:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." msgstr "" "Šiems paketams reikia paketo versijos %B%s%b, kurios neplanuojama įdiegti." -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "atnaujinta" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "pasendinta" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7276,7 +7304,7 @@ msgstr "" "Šiems paketams reikia šiuo metu įdiegtos versijos %B%s%b (%B%s%b), arba jis " "konfliktuoja su versija %s (%B%s%b), jei tai bus %s paketas bus sugadintas." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7284,7 +7312,7 @@ msgstr "" "Šie paketai konfliktuoja su versija %B%s%b paketo %B%s%b, jei tai bus %s " "paketas bus sugadintas." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7320,47 +7348,47 @@ msgstr "Pritaikyti" msgid "Close" msgstr "Uždaryti" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s konfliktuoja su %s [kurį pateikė %s %s]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "Šalinamas %s" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "Diegiamas %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%BPašalinti%b paketus:%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%BĮdiegti%b paketus:%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%BPalikti%b šiuos paketus palikti dabartinėse versijose:%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%BAtnaujinti%b šiuos paketus:%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%BPasendinti%b šiuos paketus:%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "Palikti šias priklausomybes neišspręstas:%n" @@ -7459,10 +7487,6 @@ msgstr "E:" msgid "W:" msgstr "W:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "Ieškoti: " - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7837,7 +7861,9 @@ msgid "Error while dumping resolver state" msgstr "Klaida iškraunant sprendimų būseną" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "Byla į kurią turėtu būti iškraunama sprendimų būsena:" #: src/ui.cc:2265 @@ -8352,6 +8378,21 @@ msgid "You can only view changelogs of official Debian packages." msgstr "Oficialių Debian paketų pakeitimų sąrašą galima tik skaityti." #~ msgid "" +#~ "%BOption:%b %s\n" +#~ "%BDefault:%b %s\n" +#~ "%BValue:%b %s\n" +#~ msgstr "" +#~ "%BNustatymas:%b %s\n" +#~ "%BNumatytas:%b %s\n" +#~ "%BReikšmė:%b %s\n" + +#~ msgid "Press Return to continue" +#~ msgstr "Norėdami tęsti spauskite ENTER." + +#~ msgid "Search for:" +#~ msgstr "Ieškoti: " + +#~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." #~ msgstr "" #~ "Nepavyksta išspręsti atnaujinimo priklausomybių (resolver neatsako)." @@ -8478,11 +8519,6 @@ msgstr "Oficialių Debian paketų pakeitimų sąrašą galima tik skaityti." #~ msgid "gtk-yes" #~ msgstr "taip" -#, fuzzy -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "Klaidingas veiksmas %s" - #~ msgid "but it is not installable" #~ msgstr "tačiau jis negali būti įdiegtas" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2008-08-22 10:20+0200\n" "Last-Translator: Priti Patil <prithisd@gmail.com>\n" "Language-Team: <janabhaaratii@cdacmumbai.in>\n" @@ -18,41 +18,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +#, fuzzy +msgid "%BOption:%b " +msgstr "पर्याय" + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 #, fuzzy msgid "False" msgstr "बंद करा" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -#, fuzzy -msgid "%BOption:%b " -msgstr "पर्याय" - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "" - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:279 +#: src/apt_config_treeitems.cc:280 #, c-format -msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "" @@ -533,8 +529,8 @@ msgstr "" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...]अवलंबित्वे दूर करीत आहे." -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "अंतर्गत चूकः अनपेक्षित व्यर्थ उत्तर." @@ -816,7 +812,7 @@ msgid "" msgstr "अवलंबित्वे दूर करण्यास असमर्थ" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "वििच्छेद करा \n" @@ -1179,7 +1175,7 @@ msgstr " अनपॅक केल्यावर(गठ्ठ्यातून msgid "No packages to show -- enter the package names on the line after 'i'.\n" msgstr "दाखवण्यासाठी पॅकेजेस नाहीत—- रेषेवर 'i'नंतर पॅकेजची नावे लिहा.\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "पुढे सुरु ठेवण्यासाठी रिटर्न (पुन्हा परत येणे)दाबा." @@ -1188,10 +1184,6 @@ msgstr "पुढे सुरु ठेवण्यासाठी रिटर msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "पॅकाजेस सापडली नाहीत—- - रेषेवर 'c'नंतर पॅकेजेसची नावे लिहा\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "पुढे सुरु ठेवण्यासाठी रिटर्न (पुन्हा परत येणे)दाबा" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1484,7 +1476,7 @@ msgstr "उत्तरे देणारी स्थिती यशस्व #: src/cmdline/cmdline_resolver.cc:222 #, fuzzy, c-format msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F" @@ -1741,7 +1733,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created." msgstr "" #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "अवलंबितं रिझाॅल्व करत आहे" @@ -1777,7 +1769,9 @@ msgid "Invalid response; please enter one of the following commands:" msgstr "अवैध प्रतिसाद ;कृपया पुढीलपैकी एक आज्ञा प्रविष्ट करा ः" #: src/cmdline/cmdline_resolver.cc:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +msgid "No solution found within the allotted time. Try harder? [Y/n] " msgstr "" "नेमून दिलेल्या वेळात कोणतेही उत्तर मिळाले नाही. अधिक कसोशीने प्रयत्न करू का? (हो/ नाही)" @@ -1980,7 +1974,7 @@ msgstr "पॅकेज" msgid "State" msgstr "स्थिती (अवस्था)" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "ने पुरविते" @@ -2088,27 +2082,31 @@ msgstr "च्या जागी बदलत आहे" msgid "Obsoletes" msgstr "कालबाह्य ठरवत आहे" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "पुरवीत आहे" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "वर्णन" -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "" -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "%s पॅकेजची जागा शोधण्यास असमर्थ" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "%sनमुन्यातील लहान परस्परसंबध (पार्स) दाखवण्यास असमर्थ" @@ -2425,6 +2423,12 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "" +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "अवैध क्रिया %s" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "मानक (प्रमाणित) आगतावर अनपेक्षितपणे फाइल चा अंत (शेवट)" @@ -2442,7 +2446,7 @@ msgstr "[ERROR] (चूक)" msgid "UNSATISFIED" msgstr "असमाधानी" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "अनुपलब्ध" @@ -2450,7 +2454,7 @@ msgstr "अनुपलब्ध" msgid "Tags" msgstr "टॅग्ज (खुणेच्या पट्ट्या)" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 #, fuzzy msgid "User Tags" msgstr "टॅग्ज (खुणेच्या पट्ट्या)" @@ -2852,16 +2856,21 @@ msgstr "%s पॅकेजची जागा शोधण्यास असम msgid "Unable to open %s to log actions" msgstr "कृतींची नोंद करण्यासाठी %sउघडण्यात असमर्थ." -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr " स्थानिक वेळ (%s)निर्माण करण्यात त्रुटी " -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "नोंद रिपोर्ट" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -2871,81 +2880,81 @@ msgstr "" "महत्त्वाचे ः(महत्त्वपूृर्ण) ः ही नोंद केवळ नियोजित कृतींचीच सूची करते,dpkgसमस्यांमुळे ज्या कृती " "अयशस्वी ठरतात त्या कदाचित पूर्ण होणार नाहीत.\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "%li पॅकेजेस संस्थापित होतील व %li पॅकेजेस काढून टाकण्यात येतील.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "तबकडीवरील जागेच्या %sB वापरण्यात येईल.\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "तबकडीवरील जागेच्या %sB जागा मोकळी करण्यात येइल.\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, fuzzy, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[UPGRADE][दर्जा वाढवा]%s%s->%\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[DOWNGRADE][ दर्जा कमी करा ]%s %s - > %s \n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "काढून टाका" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "संस्थापित करा" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "पुर्नसंस्थापित करा" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "तसेच धरून ठेवा" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "भंगलेले (तुटलेले)" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "काढून टाका, वापरलेले नाही." -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "काढून टाका, अवलंबित्वे" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "संस्थापित करा, अवलंबित्वे" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "धरुन ठेवा, अवलंबित्वे" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "???????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -2968,80 +2977,80 @@ msgstr "" msgid "Filtering packages" msgstr "पॅकेजेस डाउनलोड करत आहे" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "अज्ञात कृती प्रकार ः %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "%sनंतर रहित न केलेला शब्दशः अक्षरसंच" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "अज्ञात प्राधान्य %s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "" -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, fuzzy, c-format msgid "Expected '%c', got '%c'." msgstr "अपेक्षित, 'किंवा'(',%cमिळाले" -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "अज्ञात अवलंबित्व प्रकार ः %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, fuzzy, c-format msgid "Unknown term type: \"%s\"." msgstr "अज्ञात नमुना प्रकार ः %c" #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, c-format msgid "" "The ?%s term must be used in a \"wide\" context (a top-level context, or a " "context enclosed by ?%s)." msgstr "" -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "न जुळलेले '('" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "पुरवतेः तोडता येत नाही." -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "अज्ञात नमुना प्रकार ः %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "\"\" साठी शोध करु शकत नाही." -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "अनपेक्षित रिक्त अभिव्यक्ती" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, fuzzy, c-format #| msgid "Badly formed expression" msgid "Badly formed expression: expected '|', got '%c'" msgstr "वाईट तऱ्हेने तयार झालेली अभिव्यक्ती" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "अनपेक्षित ')'" @@ -3964,22 +3973,22 @@ msgstr "" msgid "%s: Unable to accept a connection: %s" msgstr "\"%s\":%sनमुन्यातुन तात्पुरती संचयिका निर्माण करण्यास असमर्थ" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4697,7 +4706,7 @@ msgstr "" msgid "Virtual package" msgstr "पॅकेज" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "संस्थापित केले नाही" @@ -4861,156 +4870,162 @@ msgstr "%s %sने बदलले आहे " msgid "%s obsoletes %s" msgstr "%s कालबाह्य %s" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s %sने बदलले आहे " + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "खालील पॅकेजेस काढून टाका." -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "खालील पॅकेजेस संस्थापित करा" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 #, fuzzy #| msgid "Remove the following packages:" msgid "Keep the following packages:" msgstr "खालील पॅकेजेस काढून टाका." -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "खालील पॅकेजेस पुढील आवृत्तीत करा" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "खालील पॅकेजेस डाऊनग्रेड कराः" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 #, fuzzy #| msgid "Leave the following dependencies unresolved:%n" msgid "Leave the following dependencies unresolved:" msgstr "खालील अवलंबीते रिझाॅल्व न करता सोडून द्या %n" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, fuzzy, c-format #| msgid "Remove %F [%s (%s)]" msgid "Remove %s [<big>%s</big> (%s)]" msgstr "%F (%s (%s)) काढून टाका" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, fuzzy, c-format msgid "Install %s [<big>%s</big> (%s)]" msgstr " %F[%s (%s (%s)] संस्थापित करा" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "Cancel the installation of %s" msgstr " %F चे संस्थापित करणे थांबवा " -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Cancel the removal of %s" msgstr " %Fचे काढून टाकणे थांबवा." -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "Keep %s at version <big>%s</big> (%s)" msgstr " %F %s(%s) आवृत्तीत ठेवा" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, fuzzy, c-format #| msgid "Upgrade %F [%s (%s) -> %s (%s)]" msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "पुढील आवृत्तीत %F[%s (%s) ->%s(%s)] करा" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, fuzzy, c-format #| msgid "Downgrade %F [%s (%s) -> %s (%s)]" msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr " डाऊनग्रेड %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format msgid "<b>Remove</b> %s" msgstr "काढून टाका" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format msgid "<b>remove</b> %s" msgstr "काढून टाका" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>Keep</b> %s at version %s" msgstr " %F %s(%s) आवृत्तीत ठेवा" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>keep</b> %s at version %s" msgstr " %F %s(%s) आवृत्तीत ठेवा" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>Cancel</b> the installation of %s" msgstr " %F चे संस्थापित करणे थांबवा " -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>cancel</b> the installation of %s" msgstr " %F चे संस्थापित करणे थांबवा " -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format msgid "<b>Install</b> %s %s" msgstr " %F[%s (%s (%s)] संस्थापित करा" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format msgid "<b>install</b> %s %s" msgstr " %F[%s (%s (%s)] संस्थापित करा" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format msgid "<b>Downgrade</b> %s to version %s" msgstr "libsigc++आवृत्ती : %s\n" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format msgid "<b>downgrade</b> %s to version %s" msgstr "libsigc++आवृत्ती : %s\n" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>Upgrade</b> %s to version %s" msgstr "%sआवृत्त्या" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>upgrade</b> %s to version %s" msgstr "%sआवृत्त्या" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format #| msgid "%d install" #| msgid_plural "%d installs" @@ -5018,7 +5033,7 @@ msgid "%s install" msgid_plural "%s installs" msgstr[0] "%d संस्थपित करा" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, fuzzy, c-format #| msgid "%d removal" #| msgid_plural "%d removals" @@ -5026,7 +5041,7 @@ msgid "%s remove" msgid_plural "%s removes" msgstr[0] "%d काढून टाकणे" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, fuzzy, c-format #| msgid "%d keep" #| msgid_plural "%d keeps" @@ -5034,53 +5049,53 @@ msgid "%s keep" msgid_plural "%s keeps" msgstr[0] "%d ठेवा" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, fuzzy, c-format msgid "%s upgrade" msgid_plural "%s upgrades" msgstr[0] "%d दर्जा वाढवा किंवा %d वाढीव दर्जाची गोष्ट" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, fuzzy, c-format msgid "%s downgrade" msgid_plural "%s downgrades" msgstr[0] "%d दर्जा कमी करा किंवा %d कमी दर्जाची गोष्ट" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, fuzzy, c-format #| msgid "Audit ^Recommendations" msgid "%s unresolved recommendation" msgid_plural "%s unresolved recommendations" msgstr[0] "आॅडिट ^शिफारसी" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 #, fuzzy #| msgid "No more solutions." msgid "No solutions yet." msgstr "आणखी उत्तरे नाहीत" -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 #, fuzzy msgid "No dependency solution was found." msgstr "डिपेंडन्सी हाताळणे" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 #, fuzzy #| msgid "No more solutions." msgid "No solutions." msgstr "आणखी उत्तरे नाहीत" -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, fuzzy, c-format #| msgid "No more solutions." msgid "%u solutions." msgstr "आणखी उत्तरे नाहीत" -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Could not open file \"%s\"" msgid "Solution %s of %s." @@ -5393,12 +5408,12 @@ msgstr "" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s चे संकलन %s %sकडे केले\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5549,30 +5564,36 @@ msgstr "दाखवा - पॅकेजविषयीची तपशील #: src/main.cc:213 #, fuzzy, c-format +#| msgid " show - Display detailed information about a package\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr "दाखवा - पॅकेजविषयीची तपशीलवार (विस्तृत) माहिती प्रदर्शित करा \n" + +#: src/main.cc:214 +#, fuzzy, c-format #| msgid " clean - Erase downloaded package files\n" msgid " clean - Erase downloaded package files.\n" msgstr "" "स्वच्छ करा (साफ करा) - उतरवून घेतलेल्या (डाउललोड केलेल्या) पॅकेज फाइल्स खोडून टाका\n" -#: src/main.cc:214 +#: src/main.cc:215 #, fuzzy, c-format #| msgid " autoclean - Erase old downloaded package files\n" msgid " autoclean - Erase old downloaded package files.\n" msgstr "स्वयंसफाई करा - जुन्या उतरवून घेतलेल्या पॅकेज फाइल्स खोडून टाका\n" -#: src/main.cc:215 +#: src/main.cc:216 #, fuzzy, c-format #| msgid " changelog - View a package's changelog\n" msgid " changelog - View a package's changelog.\n" msgstr "बदलनोंद - पॅकेजमधील बदलनोंदीचे दृश्य दाखवा\n" -#: src/main.cc:216 +#: src/main.cc:217 #, fuzzy, c-format #| msgid " download - Download the .deb file for a package\n" msgid " download - Download the .deb file for a package.\n" msgstr "डाउनलोड करा (उतरवून घ्या) - पॅकेजसाठी .debफाइल उतरवून घ्या \n" -#: src/main.cc:217 +#: src/main.cc:218 #, fuzzy, c-format #| msgid "" #| " reinstall - Download and (possibly) reinstall a currently installed " @@ -5583,15 +5604,15 @@ msgid "" msgstr "" "पुनर्संस्थापित करा - सध्या संस्थापित केलेले पॅकेज उतरवून घ्या व(शक्य तर)पुनर्संस्थापित करा \n" -#: src/main.cc:218 +#: src/main.cc:219 #, fuzzy, c-format msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "-Z\t\t प्रत्येक पॅकेजच्या संस्थापित आकारात झालेला बदल दाखवा \n" -#: src/main.cc:220 +#: src/main.cc:221 #, fuzzy, c-format msgid "" " why-not - Show the manually installed packages that lead to a " @@ -5600,46 +5621,46 @@ msgid "" " lead to a conflict with the given package if installed.\n" msgstr "-Z\t\t प्रत्येक पॅकेजच्या संस्थापित आकारात झालेला बदल दाखवा \n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr "पर्याय ः \n" -#: src/main.cc:225 +#: src/main.cc:226 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " -h This help text.\n" msgstr "-hहे मजकुरासाठी मदत करते \n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " --qt Use the Qt GUI.\n" msgstr "-hहे मजकुरासाठी मदत करते \n" -#: src/main.cc:232 +#: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr "" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr "-s कृतींची नक्कल करते, परंतु प्रत्यक्षात त्या कृती करत नाही.\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" @@ -5647,13 +5668,13 @@ msgstr "" "-d पॅकेजेस फक्त डाउनलोड करते (उतरवून घेते), संस्थापित करीत नाही किंवा काहीही काढून टाकत " "नाही.\n" -#: src/main.cc:236 +#: src/main.cc:237 #, fuzzy, c-format #| msgid " -P Always prompt for confirmation or actions\n" -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr "-p खात्री करून घेण्यासाठी किंवा कृतींसाठी नेहमीच तत्पर \n" -#: src/main.cc:237 +#: src/main.cc:238 #, fuzzy, c-format #| msgid "" #| " -y Assume that the answer to simple yes/no questions is " @@ -5662,7 +5683,7 @@ msgid "" " -y Assume that the answer to simple yes/no questions is 'yes'.\n" msgstr "-y साध्या होय /नाही प्रश्नांसाठी उत्तर होय आहे असे गृहीत धरा \n" -#: src/main.cc:238 +#: src/main.cc:239 #, fuzzy, c-format #| msgid "" #| " -F format Specify a format for displaying search results; see the " @@ -5674,7 +5695,7 @@ msgstr "" "-f विहित नमुना शोध निकाल प्रदर्शित करण्यासाठी विहित नमुना नमूद करा, माहीती पुस्तक " "पहा.\n" -#: src/main.cc:239 +#: src/main.cc:240 #, fuzzy, c-format #| msgid "" #| " -O order Specify how search results should be sorted; see the " @@ -5684,7 +5705,7 @@ msgid "" "manual.\n" msgstr "-O आदेश शोधनिकालांची वर्गवारी कशी करावी ते नमूद करा, माहितीपुस्तक पहा, \n" -#: src/main.cc:240 +#: src/main.cc:241 #, fuzzy, c-format #| msgid "" #| " -w width Specify the display width for formatting search results\n" @@ -5692,28 +5713,28 @@ msgid "" " -w width Specify the display width for formatting search results.\n" msgstr "-w शोधनिकाल नमुन्यात मांडण्यासाठी दृश्यमाध्यमाची रूंदी नमूद करा.\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr "-f भंगलेली पॅकेजेस दुरूस्त करण्याचा जोरदार प्रयत्न करा.\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr " -V पॅकेजेसच्या कोणत्या आवृत्त्या संस्थापित करायच्या आहेत ते दाखवा.\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr "-D स्वयंचलितपणे बदललेल्या पॅकेजेसची परावलंबित्वे दाखवा.\n" -#: src/main.cc:244 +#: src/main.cc:245 #, fuzzy, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr "-Z\t\t प्रत्येक पॅकेजच्या संस्थापित आकारात झालेला बदल दाखवा \n" -#: src/main.cc:245 +#: src/main.cc:246 #, fuzzy, c-format #| msgid "" #| " -v Display extra information. (may be supplied multiple " @@ -5723,7 +5744,7 @@ msgid "" "times).\n" msgstr "-V अतिरिक्त माहिती प्रदर्शित करा. (अनेक वेळा ती पुरवली जाऊ शकते) \n" -#: src/main.cc:246 +#: src/main.cc:247 #, fuzzy, c-format #| msgid "" #| " -t [release] Set the release from which packages should be installed\n" @@ -5733,59 +5754,59 @@ msgstr "" "-t (मुक्त करण्यात येणारी आवृत्ती) ज्यातून पॅकेजेस संस्थापित करायची आहेत, ती आवृत्ती निश्चित " "(स्थापित) करा \n" -#: src/main.cc:247 +#: src/main.cc:248 #, fuzzy, c-format msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "-q आज्ञा-रेखा प्रकारात, वाढीव प्रगती निदर्शक दाबून ठेवा. \n" -#: src/main.cc:249 +#: src/main.cc:250 #, fuzzy, c-format #| msgid " -o key=val Directly set the configuration option named 'key'\n" msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr "-o key=val (कळ =मूल्य) key नावाचा संरचना पर्याय थेट स्थापित करा \n" -#: src/main.cc:250 +#: src/main.cc:251 #, fuzzy, c-format #| msgid "" #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" #| " strong dependencies\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" "--with(out)-recommends\t शिफारशींना जोरदार परावलंबित्वे म्हणून वागवावे की नाही ते " "स्पष्ट करा \n" -#: src/main.cc:252 +#: src/main.cc:253 #, fuzzy, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr "-S fname: fname मधून कल विस्तारित स्थिती माहिती वाचा .\n" -#: src/main.cc:253 +#: src/main.cc:254 #, fuzzy, c-format msgid " -u Download new package lists on startup.\n" msgstr "-u ः संगणक सुरू केल्यावर नवीन पॅकेज सूची डाउनलोड करा (उतरवून घ्या) \n" -#: src/main.cc:254 src/main.cc:256 -#, c-format -msgid " (terminal interface only)" -msgstr "" +#: src/main.cc:255 src/main.cc:257 +#, fuzzy, c-format +msgid " (terminal interface only)\n" +msgstr "-hहे मजकुरासाठी मदत करते \n" -#: src/main.cc:255 +#: src/main.cc:256 #, fuzzy, c-format msgid " -i Perform an install run on startup.\n" msgstr "-i संगणक सुरू केल्यावर संस्थापन प्रोग्राम (आज्ञावली) सुरू करा.\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr "ह्या प्रवृत्तीत सुपर काऊ पॅावर्स (श्रेष्ठ गाय शक्ती) नाहीत.\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 #, fuzzy #| msgid "replaces" msgid "trace" @@ -5793,13 +5814,13 @@ msgstr "पुनः ठेवणे" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 #, fuzzy #| msgid "no" msgid "info" @@ -5807,13 +5828,13 @@ msgstr "नाही" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 #, fuzzy #| msgid "Err " msgid "error" @@ -5821,102 +5842,102 @@ msgstr "Err" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 #, fuzzy msgid "fatal" msgstr "बंद करा" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " "\"warn\", \"error\", \"fatal\", or \"off\")." msgstr "" -#: src/main.cc:487 +#: src/main.cc:488 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "Invalid logger name \"%s\"." msgstr "अवैध क्रिया %s" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "-q नंतर एक क्रमंाक अपेक्षित आहे.\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "-q नंतर एक क्रमंाक अपेक्षित आहे. %sे मिळाले \n" -#: src/main.cc:802 +#: src/main.cc:794 #, fuzzy, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr " कळ=मूल्य स्वरूपाचे विधान -O ला हवे आहे,%s मिळाले." -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "गूढता ः अज्ञात पर्याय संकेत मिळाला.\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "" -#: src/main.cc:1039 +#: src/main.cc:1023 #, fuzzy #| msgid "Package" msgid "first-package" msgstr "पॅकेज" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "" -#: src/main.cc:1043 +#: src/main.cc:1027 #, fuzzy #| msgid "All Packages" msgid "all-packages" msgstr "सर्व पॅकेजेस" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -5924,7 +5945,7 @@ msgid "" "versions\"." msgstr "" -#: src/main.cc:1089 +#: src/main.cc:1073 #, fuzzy #| msgid "Only one of -u and -i may be specified\n" msgid "" @@ -5932,7 +5953,7 @@ msgid "" "specified\n" msgstr "-u व -i पैकी फक्त एकच नमूद करता येईल. \n" -#: src/main.cc:1098 +#: src/main.cc:1082 #, fuzzy #| msgid "" #| "-u and -i may not be specified in command-line mode (eg, with 'install')" @@ -5941,30 +5962,31 @@ msgid "" "(eg, with 'install')" msgstr "आज्ञा-रेखा प्रकारात -u व-i नमूद करणारही नाहीत(उदा.'संस्थापित करा' सह)" -#: src/main.cc:1115 +#: src/main.cc:1099 #, fuzzy #| msgid "-u and -i may not be specified with a command" msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "आज्ञेसोबत -u व -i नमूद केले नसेलही " -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "अज्ञात आज्ञा \"%s\"\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr " न पकडलेला अपवाद ः %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, fuzzy, c-format msgid "" "Backtrace:\n" "%s\n" msgstr "उलट माग काढा%s" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "ह्यासाठी शोधाः" @@ -6847,23 +6869,27 @@ msgstr "पुनः ठेवणे" msgid "obsoletes" msgstr "कालबाह्य" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr "%Fने तजवीज केली" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s%F%F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." msgstr "जर तुम्ही पॅकेज निवडले तर त्याच्या आत्ताच्या परिस्थितीचे स्पष्टीकरण या जागेत दिसेल." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -6871,23 +6897,23 @@ msgstr "" "%B%s%b आपोआप संस्थापित केली, ती काढून टाकली कारणत्याच्या वर अवलंबून असणारी सर्व पॅकेजेस " "काढून टाकण्यात आली." -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "%B%s%b आपोआप काढून टाकली कारण अवलंबित त्रुटी" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "%B%s%b खालील अवलंबित पूर्ण करण्यासाठी आपोआप संस्थापित केली" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." msgstr "" "%B%s%b पुढील आवृत्तीत करु शकत नाही, पण जर केली ,तर ती %B%s%b या आवृत्तीतच करता येईल. " -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -6895,71 +6921,71 @@ msgstr "" "%B%s%b खालील अवलंबित्वांचे खंडन न होऊ देण्यासाठी %B%s%b आवृत्ती %B%s%b मध्ये पुढील " "आवृत्तीत होणार नाही." -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b सध्या संस्थापित केले आहे." -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b चे काही अवलंबित्व पूर्ण झालेले नाही" -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "%B%s%b चे काही अवलंबित्व पूर्ण झालेले नाही." -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "%B%s%b डाउनग्रेड होईल" -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b फाॅरबीडन आवृत्ती मध्ये %B%s%b पुढील आवृत्तीत केले जाणार नाही." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." msgstr "" "%B%s%b मध्ये %B%s%b ला पुढील आवृत्तीत करता येईल, पण ते %B%s%bमध्ये आवृत्तीत झाले आहे." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b पुर्नसंस्थापित होईल." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b संस्थापित होतील होईल." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b काढून टाकले जाईल." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 #, fuzzy msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b आवृत्ती %B%s%b आवृत्ती पासून %B%s%b पुढील आवृत्तीत होईल" -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 #, fuzzy msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "%s सध्या संस्थापित केलेला नाही, म्हणून तो पुनर्संस्थापित होणार नाही. \n" -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr " खालील पॅकेजेस %B%s%b वर अवलंबून आहे. आणि ते काढून टाकल्याने तुटेल. " -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "खालील पॅकेजेस %B%s%b वर अवलंबून आहे आणि ते तुटलेले आहे." -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" msgstr "खालील पॅकेजेस %B%s%b बरोबर मिळत नाही आणि ते त्यात संस्थापित केल्याने तुटतील." -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -6968,39 +6994,39 @@ msgstr "" "खालील पॅकेजेस आत्ताच संस्थापित केलेल्या %B%s%b आवृत्तीपेक्षा %B%s%b वर अवलंबून आहेत.किंवा " "आत्ताच संस्थापित केलेल्या पॅकेज बरोबर मिळत नाही." -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." msgstr "" "खालील पॅकेजेस %B%s%b बरोबर मिळत नाही. किंवा संस्थापित न करणाऱ्या आवृत्तीवर ते अवलंबून आहे." -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "खालील पॅकेजेस %B%s%b बरोबर मिळत नाही." -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" msgstr "" "खालील पॅकेजेस आत्ताच संस्थापित केलेल्या आवृत्ती%B%s%b पेक्षा %B%s%b आवृत्तीवर अवलंबून आहे." -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." msgstr "खालील पॅकेजेस न संस्थापित होणाऱ्या %B%s%bआवृत्तीवर अवलंबून आहे." -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "पुढील आवृत्तीत केले" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "डाऊन ग्रेडेड / अवनत केले गेले." -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7009,14 +7035,14 @@ msgstr "" "खालील पॅकेजेस आत्ताच संरचित केलेल्या %B%s%b (%B%s%b) च्या आवृत्तींवर अवलंबून आहे, किंवा " "%sच्या (%B%s%b) आवृत्तीत किंतू आहे. आणि हे %sअसल्यास तुटेल." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." msgstr "" "खालील पॅकेजेस आवृत्ती %B%s%bच्या %B%s%bबरोबर मिळत नाही आणि ते तुटेल जर ते %s असेल." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7050,47 +7076,47 @@ msgstr "वापरा" msgid "Close" msgstr "बंद करा" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, fuzzy, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s (दिलेल्या %s च्या %s) बरोबर %ेs मिळत नाही " -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr " %s काढून टाकत आहे" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "%s %s(%s)संस्थापित करत आहे." -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr " %B काढून टाका %bखालील पॅकेज%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "खालील पॅकेज%B संस्थापित करा %b %n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%B ठेवा %b खालील पॅकेज त्याच्या आत्ताच्या आवृत्तीः%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%Bपुढील आवृत्तीत %bखालील पॅकेजेस ः %n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr " %Bडाऊनग्रेड %bला खालील पॅकेजेस ः%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "खालील अवलंबीते रिझाॅल्व न करता सोडून द्या %n" @@ -7189,10 +7215,6 @@ msgstr "ईः" msgid "W:" msgstr "डब्लू" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "चा शोध घेत आहे ला शोधत आहे." - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7566,7 +7588,9 @@ msgid "Error while dumping resolver state" msgstr "रिझाॅल्वर स्थिती पाठवत असताना त्रुटी" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "रिझाॅल्वर स्थिती टाकता येईल अशी फाईल." #: src/ui.cc:2265 @@ -8075,6 +8099,12 @@ msgstr "चेंजलाॅग डाऊनलोड होत आहे." msgid "You can only view changelogs of official Debian packages." msgstr "तुम्ही फक्त डेबियन पॅकेजेसचे चेंजलाॅग्ज बघू शकाल." +#~ msgid "Press Return to continue" +#~ msgstr "पुढे सुरु ठेवण्यासाठी रिटर्न (पुन्हा परत येणे)दाबा" + +#~ msgid "Search for:" +#~ msgstr "चा शोध घेत आहे ला शोधत आहे." + #, fuzzy #~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." @@ -8201,11 +8231,6 @@ msgstr "तुम्ही फक्त डेबियन पॅकेजेस #~ msgid "gtk-yes" #~ msgstr "होय" -#, fuzzy -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "अवैध क्रिया %s" - #~ msgid "but it is not installable" #~ msgstr "परंतु ते संस्थापनीय नाही" @@ -8371,10 +8396,6 @@ msgstr "तुम्ही फक्त डेबियन पॅकेजेस #~ " lead to a conflict with the given package if installed\n" #~ msgstr " -V पॅकेजेसच्या कोणत्या आवृत्त्या संस्थापित करायच्या आहेत ते दाखवा.\n" -#, fuzzy -#~ msgid " indicators.\n" -#~ msgstr "-hहे मजकुरासाठी मदत करते \n" - #~ msgid "Downloading " #~ msgstr "डाउनलोडिंग (उतरवून घेत आहे)" @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude_nb\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2008-09-01 15:03+0200\n" "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" @@ -24,42 +24,36 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.2\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" -msgstr "" -"%BValg:%b %s\n" -"%BStandard:%b %s\n" -"%BVerdi:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " +msgstr "%BValg:%b " + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " +msgstr "%BStandard:%b " -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "Sann" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "Usann" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " -msgstr "%BValg:%b " - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "%BStandard:%b " - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "%BVerdi:%b " -#: src/apt_config_treeitems.cc:279 -#, c-format -msgid "Editing \"%ls\"" +#: src/apt_config_treeitems.cc:280 +#, fuzzy, c-format +#| msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "Redigerer «%ls»" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "%BValg:%b " @@ -646,8 +640,8 @@ msgstr "Kritisk feil i oppløser" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] Løser opp avhengigheter" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "Intern feil: uventet null-løsning." @@ -938,7 +932,7 @@ msgstr "" "resolver.\n" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "Avbryt.\n" @@ -1306,7 +1300,7 @@ msgstr "Etter utpakking vil %sB bli frigjort.\n" msgid "No packages to show -- enter the package names on the line after 'i'.\n" msgstr "Ingen pakker å vise -- oppgi pakkenavnene på linja etter «i».\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "Trykk Enter for å fortsette." @@ -1315,10 +1309,6 @@ msgstr "Trykk Enter for å fortsette." msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "Ingen pakker funnet -- oppgi pakkenavnene på linja etter «c».\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "Trykk Enter for å fortsette" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1629,7 +1619,7 @@ msgstr "Løsningsmotorens tilstand vellykket skrevet!" #| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: " #| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pk ver ...: %F%na pk ver ...: %F" @@ -1901,7 +1891,7 @@ msgstr "" "Jeg ønsker å løse avhengighetene, men ingen avhengighetsløser ble opprettet." #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "Løser opp avhengigheter ..." @@ -1938,7 +1928,9 @@ 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:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +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:1080 @@ -2145,7 +2137,7 @@ msgstr "Pakke: " msgid "State" msgstr "Tilstand" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "Skaffes av" @@ -2253,27 +2245,31 @@ msgstr "Erstatter" msgid "Obsoletes" msgstr "Foreldet" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Skaffer" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Beskrivelse: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "Hjemmeside: " -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "Klarte ikke å finne pakka %s" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "Klarte ikke å tolke mønsteret %s" @@ -2593,6 +2589,12 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "" +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "Ugyldig operasjon %s" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "Uventet slutt på data på standard inn" @@ -2610,7 +2612,7 @@ msgstr "[FEIL]" msgid "UNSATISFIED" msgstr "IKKE OPPFYLT" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "UTILGJENGELIG" @@ -2618,7 +2620,7 @@ msgstr "UTILGJENGELIG" msgid "Tags" msgstr "Merker" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "Brukermerker" @@ -3018,16 +3020,21 @@ msgstr "Klarte ikke å finne pakka %s" msgid "Unable to open %s to log actions" msgstr "Klarte ikke å åpne %s for å logge handlinger" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "Feil ved generering av lokal tid (%s)" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "loggrapport" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -3039,81 +3046,81 @@ msgstr "" "på grunn av dpkg-problemer kan være ufullstendige.\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "Vil installere %li pakker, og fjerne %li pakker.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "%sB med diskplass vil bli brukt\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "%sB med diskplass vil bli frigjort\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[OPPGRADER] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[NEDGRADER] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "FJERN" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "INSTALLER" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "INSTALLER PÅ NYTT" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "BEHOLD" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "ØDELAGT" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "FJERN, UBRUKTE" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "FJERN, PAKKEKRAV" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "INSTALLER, PAKKEKRAV" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "BEHOLD, PAKKEKRAV" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "IKKE SATT OPP" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -3136,39 +3143,39 @@ msgstr "" msgid "Filtering packages" msgstr "Laster ned pakker" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "Ukjent handlingstype: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "Streng etter %s er ikke avsluttet" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "Ukjent prioritet %s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "Mønster ender uventet (ventet «%c»)." -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "Ventet «%c», fikk «%c»." -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "Ukjent kravtype: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, fuzzy, c-format #| msgid "Unknown matcher type: \"%s\"." msgid "Unknown term type: \"%s\"." @@ -3176,7 +3183,7 @@ msgstr "Ukjent mønstertype: «%s»." #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, fuzzy, c-format #| msgid "" #| "The ?%s matcher must be used in a \"wide\" context (a top-level context, " @@ -3188,34 +3195,34 @@ msgstr "" "?%s-mønsteret må brukes in «vid» sammenheng (toppnivå eller en sammenheng " "omsluttet av ?%s)." -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "Mangler motsvar til «(»" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "Skaffer: kan ikke ødelegges" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "Ukjent mønstertype: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "Kan ikke søke etter \"\"" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "Uventet tomt uttrykk" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, fuzzy, c-format #| msgid "Badly formed expression" msgid "Badly formed expression: expected '|', got '%c'" msgstr "Dårlig utformet uttrykk" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "Uventet «)»" @@ -4161,22 +4168,22 @@ msgstr "" msgid "%s: Unable to accept a connection: %s" msgstr "Klarte ikke opprette midlertidig mappe fra malen «%s»: %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4910,7 +4917,7 @@ msgstr "" msgid "Virtual package" msgstr "Pakke" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "Ikke installert" @@ -5080,163 +5087,169 @@ msgstr "%s erstatter %s" msgid "%s obsoletes %s" msgstr "%s gjør %s foreldet" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s erstatter %s" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "Fjern disse pakkene:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "Installer disse pakkene:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 #, fuzzy #| msgid "Remove the following packages:" msgid "Keep the following packages:" msgstr "Fjern disse pakkene:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "Oppgrader disse pakkene:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "Nedgrader disse pakkene:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 #, fuzzy #| msgid "Leave the following dependencies unresolved:%n" msgid "Leave the following dependencies unresolved:" msgstr "La følgende avhengigheter være uløste:%n" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, fuzzy, c-format #| msgid "Remove %F [%s (%s)]" msgid "Remove %s [<big>%s</big> (%s)]" msgstr "Fjern %F [%s (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "Install %s [<big>%s</big> (%s)]" msgstr "Installer %F [%s (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "Cancel the installation of %s" msgstr "Avbryt installasjonen av %F" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Cancel the removal of %s" msgstr "Avbryt fjerning av %F" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "Keep %s at version <big>%s</big> (%s)" msgstr "Behold %F i versjon %s(%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, fuzzy, c-format #| msgid "Upgrade %F [%s (%s) -> %s (%s)]" msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Oppgrader %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, fuzzy, c-format #| msgid "Downgrade %F [%s (%s) -> %s (%s)]" msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Nedgrader %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>Remove</b> %s" msgstr "Fjern(%s)" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>remove</b> %s" msgstr "Fjern(%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>Keep</b> %s at version %s" msgstr "Behold %F i versjon %s(%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>keep</b> %s at version %s" msgstr "Behold %F i versjon %s(%s)" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>Cancel</b> the installation of %s" msgstr "Avbryt installasjonen av %F" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>cancel</b> the installation of %s" msgstr "Avbryt installasjonen av %F" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>Install</b> %s %s" msgstr "Installer %F [%s (%s)]" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>install</b> %s %s" msgstr "Installer %F [%s (%s)]" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "<b>Downgrade</b> %s to version %s" msgstr " cwidget-versjon: %s\n" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "<b>downgrade</b> %s to version %s" msgstr " cwidget-versjon: %s\n" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>Upgrade</b> %s to version %s" msgstr "%s-versjoner" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>upgrade</b> %s to version %s" msgstr "%s-versjoner" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format #| msgid "%d install" #| msgid_plural "%d installs" @@ -5245,7 +5258,7 @@ msgid_plural "%s installs" msgstr[0] "%d installert" msgstr[1] "%d installert" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, fuzzy, c-format #| msgid "%d removal" #| msgid_plural "%d removals" @@ -5254,7 +5267,7 @@ msgid_plural "%s removes" msgstr[0] "%d fjernet" msgstr[1] "%d fjernet" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, fuzzy, c-format #| msgid "%d keep" #| msgid_plural "%d keeps" @@ -5263,7 +5276,7 @@ msgid_plural "%s keeps" msgstr[0] "%d beholdt" msgstr[1] "%d beholdt" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, fuzzy, c-format #| msgid "%d upgrade" #| msgid_plural "%d upgrades" @@ -5272,7 +5285,7 @@ msgid_plural "%s upgrades" msgstr[0] "%d oppgradert" msgstr[1] "%d oppgraderte" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, fuzzy, c-format #| msgid "%d downgrade" #| msgid_plural "%d downgrades" @@ -5281,7 +5294,7 @@ msgid_plural "%s downgrades" msgstr[0] "%d nedgradert" msgstr[1] "%d nedgraderte" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, fuzzy, c-format #| msgid "Audit ^Recommendations" msgid "%s unresolved recommendation" @@ -5289,35 +5302,35 @@ msgid_plural "%s unresolved recommendations" msgstr[0] "Revider ^Anbefalinger" msgstr[1] "Revider ^Anbefalinger" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 #, fuzzy #| msgid "No more solutions." msgid "No solutions yet." msgstr "Ingen flere løsninger." -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 #, fuzzy #| msgid "Dependency handling" msgid "No dependency solution was found." msgstr "Håndtering av avhengigheter" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 #, fuzzy #| msgid "No more solutions." msgid "No solutions." msgstr "Ingen flere løsninger." -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, fuzzy, c-format #| msgid "No more solutions." msgid "%u solutions." msgstr "Ingen flere løsninger." -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Could not open file \"%s\"" msgid "Solution %s of %s." @@ -5627,12 +5640,12 @@ msgstr " Ept-støtte deaktivert.\n" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s kompilert på %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5785,29 +5798,35 @@ msgstr " show - Vis detaljert informasjon om en pakke\n" #: src/main.cc:213 #, fuzzy, c-format +#| msgid " show - Display detailed information about a package\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - Vis detaljert informasjon om en pakke\n" + +#: src/main.cc:214 +#, fuzzy, c-format #| msgid " clean - Erase downloaded package files\n" msgid " clean - Erase downloaded package files.\n" msgstr " clean - Slett nedlastede pakkefiler\n" -#: src/main.cc:214 +#: src/main.cc:215 #, fuzzy, c-format #| msgid " autoclean - Erase old downloaded package files\n" msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean - Slett eldre nedlastede pakkefiler\n" -#: src/main.cc:215 +#: src/main.cc:216 #, fuzzy, c-format #| msgid " changelog - View a package's changelog\n" msgid " changelog - View a package's changelog.\n" msgstr " endringslogg - Vis en pakkes endringslogg\n" -#: src/main.cc:216 +#: src/main.cc:217 #, fuzzy, c-format #| msgid " download - Download the .deb file for a package\n" msgid " download - Download the .deb file for a package.\n" msgstr " download - Les ned .deb-fila til en pakke\n" -#: src/main.cc:217 +#: src/main.cc:218 #, fuzzy, c-format #| msgid "" #| " reinstall - Download and (possibly) reinstall a currently installed " @@ -5819,18 +5838,22 @@ msgstr "" " reinstall - Last ned og (kanskje) installer omigjen en pakke som nå er " "installert\n" -#: src/main.cc:218 -#, c-format +#: src/main.cc:219 +#, fuzzy, c-format +#| msgid "" +#| " why - Show the manually installed packages that require a " +#| "package, or\n" +#| " why one or more packages would require the given package\n" msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " why - Vis de manuelt installerte pakkene som krever en pakke, " "eller\n" " hvorfor en eller flere pakker ville krever den gitte pakken\n" -#: src/main.cc:220 +#: src/main.cc:221 #, fuzzy, c-format #| msgid "" #| " why-not - Show the manually installed packages that lead to a " @@ -5850,59 +5873,59 @@ msgstr "" "ville\n" " lede til en konflikt med den gitte pakken hvis installert\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " Valg:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " -h This help text.\n" msgstr " -h Denne hjelpeteksten\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h Denne hjelpeteksten\n" -#: src/main.cc:232 +#: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr "" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s Simuler handlinger, men ikke utfør dem.\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr "" " -d Bare last ned pakker, ikke installer eller slett noe.\n" -#: src/main.cc:236 +#: src/main.cc:237 #, fuzzy, c-format #| msgid " -P Always prompt for confirmation or actions\n" -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P Spør alltid om bekreftelse eller handlinger\n" -#: src/main.cc:237 +#: src/main.cc:238 #, fuzzy, c-format #| msgid "" #| " -y Assume that the answer to simple yes/no questions is " @@ -5911,7 +5934,7 @@ msgid "" " -y Assume that the answer to simple yes/no questions is 'yes'.\n" msgstr " -y Forutsett at svaret på enkle ja/nei-spørsmål er «Ja»\n" -#: src/main.cc:238 +#: src/main.cc:239 #, fuzzy, c-format #| msgid "" #| " -F format Specify a format for displaying search results; see the " @@ -5922,7 +5945,7 @@ msgid "" msgstr "" " -F format Oppgi et format for visning av søkeresultatet; se manualen\n" -#: src/main.cc:239 +#: src/main.cc:240 #, fuzzy, c-format #| msgid "" #| " -O order Specify how search results should be sorted; see the " @@ -5933,7 +5956,7 @@ msgid "" msgstr "" " -O rekkefølge Oppgir hvordan et søkeresultat skal sorteres; se manualen\n" -#: src/main.cc:240 +#: src/main.cc:241 #, fuzzy, c-format #| msgid "" #| " -w width Specify the display width for formatting search results\n" @@ -5942,29 +5965,29 @@ msgid "" msgstr "" " -w bredde Oppgi visningsbredde for formatering av søkeresultatet\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr " -f Prøv hardt å reparere ødelagte pakker.\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr "" " -V Vis hvilke versjoner av pakkene som skal installeres.\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr " -D Vis pakkekrava til automatisk endrede pakker.\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr " -Z\t\t Vis endringene på installert størrelse på hver pakke.\n" -#: src/main.cc:245 +#: src/main.cc:246 #, fuzzy, c-format #| msgid "" #| " -v Display extra information. (may be supplied multiple " @@ -5974,7 +5997,7 @@ msgid "" "times).\n" msgstr " -v Vis ekstra informasjon. (kan tilføyes flere ganger)\n" -#: src/main.cc:246 +#: src/main.cc:247 #, fuzzy, c-format #| msgid "" #| " -t [release] Set the release from which packages should be installed\n" @@ -5982,63 +6005,63 @@ msgid "" " -t [release] Set the release from which packages should be installed.\n" msgstr " -t [slippversjon] Angi hvilken versjon pakker skal installeres fra\n" -#: src/main.cc:247 +#: src/main.cc:248 #, fuzzy, c-format #| msgid "" #| " -q In command-line mode, suppress the incremental progress\n" #| " indicators.\n" msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" " -q Ved bruk av kommandolinja, ikke vis framdriftsindikatorer.\n" -#: src/main.cc:249 +#: src/main.cc:250 #, fuzzy, c-format #| msgid " -o key=val Directly set the configuration option named 'key'\n" msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr " -o nøkkel=verdi Sett direkte oppsettsvalget «nøkkel»\n" -#: src/main.cc:250 +#: src/main.cc:251 #, fuzzy, c-format #| msgid "" #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" #| " strong dependencies\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends\t Oppgi om anbefalte pakker skal håndteres\n" " som strenge avhengigheter\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr " -S fnavn: Les den utvidede statusinfo-fila for aptitude fra fnavn.\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u Last ned ny pakkeliste ved oppstart.\n" -#: src/main.cc:254 src/main.cc:256 -#, c-format -msgid " (terminal interface only)" -msgstr "" +#: src/main.cc:255 src/main.cc:257 +#, fuzzy, c-format +msgid " (terminal interface only)\n" +msgstr " -h Denne hjelpeteksten\n" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i Utfør en installasjonskjøring ved oppstart.\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " Denne aptituden har ikke superku-krefter.\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 #, fuzzy #| msgid "true" msgid "trace" @@ -6046,13 +6069,13 @@ msgstr "sann" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 #, fuzzy #| msgid "no" msgid "info" @@ -6060,13 +6083,13 @@ msgstr "ingen" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 #, fuzzy #| msgid "Err " msgid "error" @@ -6074,7 +6097,7 @@ msgstr "Feil " #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 #, fuzzy #| msgid "false" msgid "fatal" @@ -6082,95 +6105,95 @@ msgstr "usann" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " "\"warn\", \"error\", \"fatal\", or \"off\")." msgstr "" -#: src/main.cc:487 +#: src/main.cc:488 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "Invalid logger name \"%s\"." msgstr "Ugyldig operasjon %s" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "Forventet et tall etter -q=\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "Forventet et tall etter -q=, fikk %s\n" -#: src/main.cc:802 +#: src/main.cc:794 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o krever et argument av formen nøkkel=verdi, fikk %s\n" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "Ikke noe komma etter merkenavn «%s».\n" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "MERKELIG: mottok en ukjent valgkode\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "" -#: src/main.cc:1039 +#: src/main.cc:1023 #, fuzzy #| msgid "Package" msgid "first-package" msgstr "Pakke" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "" -#: src/main.cc:1043 +#: src/main.cc:1027 #, fuzzy #| msgid "All Packages" msgid "all-packages" msgstr "Alle pakkene" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -6178,7 +6201,7 @@ msgid "" "versions\"." msgstr "" -#: src/main.cc:1089 +#: src/main.cc:1073 #, fuzzy #| msgid "Only one of -u and -i may be specified\n" msgid "" @@ -6186,7 +6209,7 @@ msgid "" "specified\n" msgstr "Du kan bare oppgi enten -u eller -i\n" -#: src/main.cc:1098 +#: src/main.cc:1082 #, fuzzy #| msgid "" #| "-u and -i may not be specified in command-line mode (eg, with 'install')" @@ -6195,23 +6218,23 @@ msgid "" "(eg, with 'install')" msgstr "-u og -i kan ikke oppgis i kommandolinjemodus (f.eks., med «install»)" -#: src/main.cc:1115 +#: src/main.cc:1099 #, fuzzy #| msgid "-u and -i may not be specified with a command" msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "-u og -i kan ikke oppgis med en kommando" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "Ukjent kommando «%s»\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "Unntakssignal ble ikke fanget opp: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" @@ -6220,7 +6243,8 @@ msgstr "" "Bakover-spor:\n" "%s\n" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "Søk etter: " @@ -7110,17 +7134,21 @@ msgstr "erstatter" msgid "obsoletes" msgstr "gjør foreldet" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (skaffet av %F)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." @@ -7128,7 +7156,7 @@ msgstr "" "Hvis du velger en pakke, så vil en beskrivelse av statusen dens vises i " "dette feltet." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -7136,18 +7164,18 @@ msgstr "" "%B%s%b ble installert automatisk; den blir slettet fordi alle pakkene som " "hadde avhengigheter til den også slettes:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "%B%s%b vil bli slettet automatisk på grunn av avhengighetsfeil:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" "%B%s%b vil bli installert automatisk for å tilfredsstille følgende " "avhengigheter:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -7155,7 +7183,7 @@ msgstr "" "%B%s%b kan ikke oppgraderes nå, men hadde den kunnet oppgraderes, så hadde " "den fortsatt blitt beholdt i versjon %B%s%b." -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -7163,27 +7191,27 @@ msgstr "" "%B%s%b vil ikke bli oppgradert til versjon %B%s%b for å hindre at følgende " "avhengigheter blir brutt:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "B%s%b er allerede installert." -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b er ikke installert." -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "Noen av %B%s%bs avhengigheter er ikke tilfredsstilt:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "%B%s%b vil bli nedgradert." -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b vil ikke bli oppgradert til den forbudte versjonen %B%s%b." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." @@ -7191,37 +7219,37 @@ msgstr "" "%B%s%b kunne blitt oppgradert til versjon %B%s%b, men blir beholdt som " "versjon %B%s%b." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b vil bli installert på nytt." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b vil bli installert." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b blir slettet." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b vil bli oppgradert fra versjon %B%s%b til versjon %B%s%b." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "%B%s%b er bare delvis installert; dens installasjon vil bli fullført." -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "" "Følgende pakker er avhengige av %B%s%b og vil bli skadet hvis du fjerner den:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "Følgende pakker er avhengige av %B%s%b og er skadet:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" @@ -7229,7 +7257,7 @@ msgstr "" "Følgende pakker er i konflikt med %B%s%b og vil bli skadet hvis den " "installeres:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -7238,7 +7266,7 @@ msgstr "" "Følgende pakker er avhengige av en annen versjon av %B%s%b enn den versjonen " "av %B%s%b som nå er installert, eller er i konflikt med nåværende versjon:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -7246,11 +7274,11 @@ msgstr "" "Følgende pakker er i konflikt med %B%s%b eller er avhengige av en versjon av " "den som ikke vil bli installert." -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "Følgende pakker er i konflikt med %B%s%b:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -7258,7 +7286,7 @@ msgstr "" "Følgende pakker er avhengige av en annen versjon av %B%s%b enn den versjonen " "av %B%s%b som nå er installert:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." @@ -7266,15 +7294,15 @@ msgstr "" "Følgende pakker er avhengige av en versjon av %B%s%b som ikke vil bli " "installert." -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "oppgradert" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "nedgradert" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7284,7 +7312,7 @@ msgstr "" "%b), eller er i konflikt med den versjonen den vil bli %s til (%B%s%b), og " "vil bli skadet hvis den blir %s." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7292,7 +7320,7 @@ msgstr "" "Følgende pakker er konflikt med versjon %B%s%b av %B%s%b og vil bli skadet " "hvis den blir %s." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7328,47 +7356,47 @@ msgstr "Bruk" msgid "Close" msgstr "Lukk" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s er i konflikt med %s [som skaffes av %s %s]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "Fjerner %s" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "Installerer %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%BFjern%b disse pakkene:%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%BInstaller%b disse pakkene:%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%BBehold%b disse pakkene i nåværende versjon:%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%BOppgrader%b disse pakkene:%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%BNedgrader%b disse pakkene:%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "La følgende avhengigheter være uløste:%n" @@ -7467,10 +7495,6 @@ msgstr "E:" msgid "W:" msgstr "W:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "Søk etter:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7845,7 +7869,9 @@ msgid "Error while dumping resolver state" msgstr "Feil under dumping av løsermotorens tilstand" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "Fil som løsermotorens tilstand skal dumpes til:" #: src/ui.cc:2265 @@ -8361,6 +8387,21 @@ msgid "You can only view changelogs of official Debian packages." msgstr "Du kan bare se på endringslogger til offisielle Debian-pakker." #~ msgid "" +#~ "%BOption:%b %s\n" +#~ "%BDefault:%b %s\n" +#~ "%BValue:%b %s\n" +#~ msgstr "" +#~ "%BValg:%b %s\n" +#~ "%BStandard:%b %s\n" +#~ "%BVerdi:%b %s\n" + +#~ msgid "Press Return to continue" +#~ msgstr "Trykk Enter for å fortsette" + +#~ msgid "Search for:" +#~ msgstr "Søk etter:" + +#~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." #~ msgstr "" #~ "Klarte ikke løse opp avhengigheter for oppgraderingen (tidsavbrudd i " @@ -8488,11 +8529,6 @@ msgstr "Du kan bare se på endringslogger til offisielle Debian-pakker." #~ msgid "gtk-yes" #~ msgstr "ja" -#, fuzzy -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "Ugyldig operasjon %s" - #~ msgid "but it is not installable" #~ msgstr "men lar seg ikke installere" @@ -8689,10 +8725,6 @@ msgstr "Du kan bare se på endringslogger til offisielle Debian-pakker." #~ msgstr "" #~ " -V Vis hvilke versjoner av pakkene som skal installeres.\n" -#, fuzzy -#~ msgid " indicators.\n" -#~ msgstr " -h Denne hjelpeteksten\n" - #~ msgid "There are now %F." #~ msgstr "Det er nå %F." @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude_po_ne\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2007-08-05 17:09+0545\n" "Last-Translator: Nabin Gautam <nabin@mpp.org.np>\n" "Language-Team: Nepali <info@mpp.org.np>\n" @@ -22,41 +22,37 @@ msgstr "" "\n" "X-Generator: KBabel 1.11.4\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +#, fuzzy +msgid "%BOption:%b " +msgstr "विकल्पहरू" + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 #, fuzzy msgid "False" msgstr "बन्द गर्नुहोस्" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -#, fuzzy -msgid "%BOption:%b " -msgstr "विकल्पहरू" - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "" - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:279 +#: src/apt_config_treeitems.cc:280 #, c-format -msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "" @@ -537,8 +533,8 @@ msgstr "समाधानकर्तामा घातक त्रुटि" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] निर्भरता हल गरिदैछ" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "आन्तरिक त्रुटि: अनपेक्षित शून्य समाधान ।" @@ -828,7 +824,7 @@ msgid "" msgstr "निर्भरताहरू हल गर्न असक्षम भयो ।" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "परित्याग गर्नुहोस् ।\n" @@ -1194,7 +1190,7 @@ msgstr "प्याक गरेपछि %sB खाली हुनेछन msgid "No packages to show -- enter the package names on the line after 'i'.\n" msgstr "देखाउन कुनै प्याकेजहरू छैन -- 'i' पछि रेखामा प्याकेज नाम प्रविष्ट गर्नुहोस् ।\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "निरन्तरता दिन 'फर्कनुहोस्' थिच्नुहोस् ।" @@ -1203,10 +1199,6 @@ msgstr "निरन्तरता दिन 'फर्कनुहोस्' msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "कुनै प्याकेजहरू फेला परेन -- 'c' पछि रेखामा प्याकेज नाम प्रविष्ट गर्नुहोस् ।\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "निरन्तरता दिन 'फर्कनुहोस्' थिच्नुहोस् " - #: src/cmdline/cmdline_prompt.cc:806 #, fuzzy, c-format #| msgid "" @@ -1511,7 +1503,7 @@ msgstr "हलकर्ता स्थिति सफलतापूर्व #| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F" #| "%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F" @@ -1777,7 +1769,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created." msgstr "" #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "निर्भरताहरू पुन समाधान गर्दैछ..." @@ -1813,7 +1805,9 @@ msgid "Invalid response; please enter one of the following commands:" msgstr "अवैध प्रतिक्रिया; कृपया निम्न आदेशहरू मध्य एउटा प्रविष्टि गर्नुहोस्:" #: src/cmdline/cmdline_resolver.cc:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +msgid "No solution found within the allotted time. Try harder? [Y/n] " msgstr "बाँडिएको समय भित्र कुनै समाधान फेला परेन । अझ कठिन प्रयास गर्नुहुन्छ ?[Y/n]" #: src/cmdline/cmdline_resolver.cc:1080 @@ -2017,7 +2011,7 @@ msgstr "प्याकेज:" msgid "State" msgstr "राज्य" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "द्वारा उपलब्ध" @@ -2125,27 +2119,31 @@ msgstr "बदल्दछ" msgid "Obsoletes" msgstr "अप्रचलित गर्दछ" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "प्रदान गर्दछ" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "वर्णन:" -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "" -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "प्याकेज %s स्थानिय गर्न असक्षम भयो " -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "बान्की %s पद वर्णन गर्न असक्षम भयो" @@ -2474,6 +2472,12 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "" +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "अवैध सञ्चालन %s" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "मानक आगतमा अनपेक्षित फाइलको समाप्ती" @@ -2491,7 +2495,7 @@ msgstr "[ERROR]" msgid "UNSATISFIED" msgstr "UNSATISFIED" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "UNAVAILABLE" @@ -2499,7 +2503,7 @@ msgstr "UNAVAILABLE" msgid "Tags" msgstr "ट्यागहरू" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 #, fuzzy #| msgid "Tags" msgid "User Tags" @@ -2899,16 +2903,21 @@ msgstr "प्याकेज %s स्थानिय गर्न असक् msgid "Unable to open %s to log actions" msgstr "कार्यहरू लग गर्न %s खोल्न असक्षम भयो" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "स्थानिय समय (%s) सिर्जना गर्दा त्रुटि" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "लग प्रतिवेदन" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -2919,81 +2928,81 @@ msgstr "" " असफल भएको कार्यहरू पूरा हुन सकदैन ।\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "%li प्याकेजहरू स्थापना गर्नेछ, र %li प्याकेजहरू हटाउँनेछ ।\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "डिस्क खाली ठाउँको %sB प्रयोग हुनेछ\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "डिस्कको %sB खाली स्थान खाली हुनेछ\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[UPGRADE] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[DOWNGRADE] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "हटाउनुहोस्" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "स्थापना गर्नुहोस्" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "पुन:स्थापना गर्नुहोस्" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "समाउनुहोस्" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "भाँचिएको" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "हटाउनुहोस्, प्रयोग भएको छैन" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "निर्भरता, हटाउनुहोस्" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "निर्भरता, स्थापना गर्नुहोस् " -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "निर्भरता, समाउनुहोस्" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -3016,40 +3025,40 @@ msgstr "" msgid "Filtering packages" msgstr "प्याकेजहरू डाउनलोड गर्दै" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "अज्ञात कार्य प्रकार: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "%s पछि वास्तविक स्ट्रिङ टर्मिनेट भएन" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "अज्ञात प्राथमिकता %s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "" -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, fuzzy, c-format #| msgid "Expected ',' or '(', got '%c'" msgid "Expected '%c', got '%c'." msgstr "अपेक्षित ',' वा '(', ले '%c' प्राप्त गर्यो" -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "अज्ञात निर्भरता प्रकार: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, fuzzy, c-format #| msgid "Unknown pattern type: %c" msgid "Unknown term type: \"%s\"." @@ -3057,41 +3066,41 @@ msgstr "अज्ञात बान्की प्रकार: %c" #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, c-format msgid "" "The ?%s term must be used in a \"wide\" context (a top-level context, or a " "context enclosed by ?%s)." msgstr "" -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "मेल खाएन '('" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "उपलब्ध गराउँदछ: भाँच्न सक्दैन " -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "अज्ञात बान्की प्रकार: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "\"\" खोजी गर्न सक्दैन" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "अनपेक्षित खाली अभिव्यक्ति" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, fuzzy, c-format #| msgid "Badly formed expression" msgid "Badly formed expression: expected '|', got '%c'" msgstr "खराब ढाँचाबद्ध अभिव्यक्ति" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "अनपेक्षित ')'" @@ -4030,22 +4039,22 @@ msgstr "" msgid "%s: Unable to accept a connection: %s" msgstr "\"%s\" टेम्प्लेटबाट अस्थायी डाइरेक्ट्री सिर्जना गर्न असफल भयो: %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4765,7 +4774,7 @@ msgstr "" msgid "Virtual package" msgstr "प्याकेज " -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "स्थापना गरिएको छैन" @@ -4935,161 +4944,167 @@ msgstr "%s बदल्नुहोस् %s" msgid "%s obsoletes %s" msgstr "%s अप्रचलितहरु %s" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s बदल्नुहोस् %s" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "निम्न प्याकेजहरू हटाउनुहोस्:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "निम्न प्याकेजहरू स्थापना गर्नुहोस्" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 #, fuzzy #| msgid "Remove the following packages:" msgid "Keep the following packages:" msgstr "निम्न प्याकेजहरू हटाउनुहोस्:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "निम्न प्याकेजहरू उन्नत गर्नुहोस:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "निम्न प्याकेजहरू अवनति गर्नुहोस्:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 #, fuzzy #| msgid "Leave the following dependencies unresolved:%n" msgid "Leave the following dependencies unresolved:" msgstr "निम्न निर्भरताहरू विचाररहितमा छाड्नुहोस्:%n" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, fuzzy, c-format #| msgid "Remove %F [%s (%s)]" msgid "Remove %s [<big>%s</big> (%s)]" msgstr "हटाउनुहोस् %F [%s (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "Install %s [<big>%s</big> (%s)]" msgstr "स्थापना गर्नुहोस् %F [%s (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "Cancel the installation of %s" msgstr "%F को स्थापना रद्द गर्नुहोस्" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Cancel the removal of %s" msgstr " %Fको हटाउने रद्द गर्नुहोस्" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "Keep %s at version <big>%s</big> (%s)" msgstr "राख्नुहोस् %F at version %s (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, fuzzy, c-format #| msgid "Upgrade %F [%s (%s) -> %s (%s)]" msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "उन्नति %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, fuzzy, c-format #| msgid "Downgrade %F [%s (%s) -> %s (%s)]" msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "अवनति %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format msgid "<b>Remove</b> %s" msgstr "हटाउनुहोस्" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format msgid "<b>remove</b> %s" msgstr "हटाउनुहोस्" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>Keep</b> %s at version %s" msgstr "राख्नुहोस् %F at version %s (%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>keep</b> %s at version %s" msgstr "राख्नुहोस् %F at version %s (%s)" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>Cancel</b> the installation of %s" msgstr "%F को स्थापना रद्द गर्नुहोस्" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>cancel</b> the installation of %s" msgstr "%F को स्थापना रद्द गर्नुहोस्" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>Install</b> %s %s" msgstr "स्थापना गर्नुहोस् %F [%s (%s)]" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>install</b> %s %s" msgstr "स्थापना गर्नुहोस् %F [%s (%s)]" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid "libsigc++ version: %s\n" msgid "<b>Downgrade</b> %s to version %s" msgstr "libsigc++ version: %s\n" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid "libsigc++ version: %s\n" msgid "<b>downgrade</b> %s to version %s" msgstr "libsigc++ version: %s\n" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>Upgrade</b> %s to version %s" msgstr "%s संस्करणहरू" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>upgrade</b> %s to version %s" msgstr "%s संस्करणहरू" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format #| msgid "%d install" #| msgid_plural "%d installs" @@ -5098,7 +5113,7 @@ msgid_plural "%s installs" msgstr[0] "%d स्थापना गर्नुहोस्" msgstr[1] "%d स्थापना गर्छ" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, fuzzy, c-format #| msgid "%d removal" #| msgid_plural "%d removals" @@ -5107,7 +5122,7 @@ msgid_plural "%s removes" msgstr[0] "%d हटाइएको" msgstr[1] "%d हटाउने कामहरू" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, fuzzy, c-format #| msgid "%d keep" #| msgid_plural "%d keeps" @@ -5116,7 +5131,7 @@ msgid_plural "%s keeps" msgstr[0] "%d राख्नुहोस्" msgstr[1] "%d राख्छ" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, fuzzy, c-format #| msgid "%d upgrade" #| msgid_plural "%d upgrades" @@ -5125,7 +5140,7 @@ msgid_plural "%s upgrades" msgstr[0] "%d स्तरवृद्धि गर्नुहोस्" msgstr[1] "%d स्तरवृद्धि गर्छ" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, fuzzy, c-format #| msgid "%d downgrade" #| msgid_plural "%d downgrades" @@ -5134,7 +5149,7 @@ msgid_plural "%s downgrades" msgstr[0] "%d स्तरकम गर्नुहोस्" msgstr[1] "%d स्तरकम गर्छ" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, fuzzy, c-format #| msgid "Audit ^Recommendations" msgid "%s unresolved recommendation" @@ -5142,35 +5157,35 @@ msgid_plural "%s unresolved recommendations" msgstr[0] "सिफारिशहरू लेखा जाँच्नुहोस्" msgstr[1] "सिफारिशहरू लेखा जाँच्नुहोस्" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 #, fuzzy #| msgid "No more solutions." msgid "No solutions yet." msgstr "बढि समाधानहरू छैन ।" -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 #, fuzzy #| msgid "^Dependency handling" msgid "No dependency solution was found." msgstr "^निर्भरता ह्यान्डलिङ्" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 #, fuzzy #| msgid "No more solutions." msgid "No solutions." msgstr "बढि समाधानहरू छैन ।" -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, fuzzy, c-format #| msgid "No more solutions." msgid "%u solutions." msgstr "बढि समाधानहरू छैन ।" -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Could not open file \"%s\"" msgid "Solution %s of %s." @@ -5488,12 +5503,12 @@ msgstr "" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s, %s %s मा कम्पाइल भयो\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5656,29 +5671,35 @@ msgstr "देखाउनुहोस् - एउटा प्या #: src/main.cc:213 #, fuzzy, c-format +#| msgid " show - Display detailed information about a package\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr "देखाउनुहोस् - एउटा प्याकेजको बारेमा विस्तृत जानकारी प्रदर्शन गर्नुहोस्\n" + +#: src/main.cc:214 +#, fuzzy, c-format #| msgid " clean - Erase downloaded package files\n" msgid " clean - Erase downloaded package files.\n" msgstr " सफा गर्नुहोस् - डाउनलोड गरिएको प्याकेज फाइलहरू मेट्नुहोस्\n" -#: src/main.cc:214 +#: src/main.cc:215 #, fuzzy, c-format #| msgid " autoclean - Erase old downloaded package files\n" msgid " autoclean - Erase old downloaded package files.\n" msgstr "स्वत सफा गर्नुहोस् - पुरानो डाउनलोड गरिएका प्याकेज फाइलहरू मेट्नुहोस्\n" -#: src/main.cc:215 +#: src/main.cc:216 #, fuzzy, c-format #| msgid " changelog - View a package's changelog\n" msgid " changelog - View a package's changelog.\n" msgstr " लग परिवर्तन गर्नुहोस् - प्याकेजको लग परिवर्तन हेर्नुहोस्\n" -#: src/main.cc:216 +#: src/main.cc:217 #, fuzzy, c-format #| msgid " download - Download the .deb file for a package\n" msgid " download - Download the .deb file for a package.\n" msgstr "डाउनलोड गर्नुहोस् - एउटा प्याकेजको लागि deb फाइल डाउनलोड गर्नुहोस्\n" -#: src/main.cc:217 +#: src/main.cc:218 #, fuzzy, c-format #| msgid "" #| " reinstall - Download and (possibly) reinstall a currently installed " @@ -5690,15 +5711,15 @@ msgstr "" "पुन:स्थापना गर्नुहोस् - हालै स्थापना गरिएको एउटा प्याकेज डाउनलोड र (सम्भवत:) पुन:" "स्थापना गर्नुहोस्\n" -#: src/main.cc:218 +#: src/main.cc:219 #, c-format msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" -#: src/main.cc:220 +#: src/main.cc:221 #, c-format msgid "" " why-not - Show the manually installed packages that lead to a " @@ -5707,46 +5728,46 @@ msgid "" " lead to a conflict with the given package if installed.\n" msgstr "" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " विकल्पहरू:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " -h This help text.\n" msgstr " -h यो मद्दत पाठ\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h यो मद्दत पाठ\n" -#: src/main.cc:232 +#: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr "" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s कार्यहरू नक्कल गर्नुहोस्, तर तिनीहरुले साँच्चैकै सम्पादन गर्दैन ।\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" @@ -5754,13 +5775,13 @@ msgstr "" " -d प्याकेजहरू मात्र डाउनलोड गर्नुहोस्, केही पनि स्थापना गर्ने वा हटाउने " "कार्य नगर्नुहोस् ।\n" -#: src/main.cc:236 +#: src/main.cc:237 #, fuzzy, c-format #| msgid " -P Always prompt for confirmation or actions\n" -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P यकिन वा कार्यहरुको लागि सधै प्रोम्प्ट गर्नुहोस्\n" -#: src/main.cc:237 +#: src/main.cc:238 #, fuzzy, c-format #| msgid "" #| " -y Assume that the answer to simple yes/no questions is " @@ -5769,7 +5790,7 @@ msgid "" " -y Assume that the answer to simple yes/no questions is 'yes'.\n" msgstr " -y मान्नुहोस् कि साधारण हो/होइन प्रश्नको उत्तर 'हो' हो\n" -#: src/main.cc:238 +#: src/main.cc:239 #, fuzzy, c-format #| msgid "" #| " -F format Specify a format for displaying search results; see the " @@ -5781,7 +5802,7 @@ msgstr "" " -F ढाँचा खोजी नतिजाहरू प्रदर्शन गर्नको लागि एउटा ढाँचा निर्दिष्ट गर्नुहोस्; " "म्यानुल हेर्नुहोस्\n" -#: src/main.cc:239 +#: src/main.cc:240 #, fuzzy, c-format #| msgid "" #| " -O order Specify how search results should be sorted; see the " @@ -5792,7 +5813,7 @@ msgid "" msgstr "" " -O आदेश कसरी खोजी नतिजाहरू क्रमबद्ध गर्ने निर्दिष्ट गर्नुहोस्, म्यानुल हेर्नुहोस्\n" -#: src/main.cc:240 +#: src/main.cc:241 #, fuzzy, c-format #| msgid "" #| " -w width Specify the display width for formatting search results\n" @@ -5801,28 +5822,28 @@ msgid "" msgstr "" " -w चौडा खोजी नतिजाहरू ढाँचाका लागि प्रदर्शन चौडाई निर्दिष्ट गर्नुहोस्\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr " -f आक्रमक ढंगले बिग्रेका प्याकेजहरू निश्चित गर्ने प्रयास गर्नुहोस् ।\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr " -V प्याकेजहरुको कुन संस्करणहरू स्थापना गर्ने देखाउनुहोस् ।\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr " -D स्वत: परिवर्तन भएका प्याकेजहरुको निर्भरता देखाउनुहोस् ।\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr " -Z\t\t प्रत्येक प्याकेजको स्थापित साइजमा परिवर्तन देखाउनुहोस् ।\n" -#: src/main.cc:245 +#: src/main.cc:246 #, fuzzy, c-format #| msgid "" #| " -v Display extra information. (may be supplied multiple " @@ -5832,7 +5853,7 @@ msgid "" "times).\n" msgstr " -v अन्य सूचना प्रदर्शन गर्नुहोस् । (बहुँविद समयमा आपूर्ति हुन सक्छ)\n" -#: src/main.cc:246 +#: src/main.cc:247 #, fuzzy, c-format #| msgid "" #| " -t [release] Set the release from which packages should be installed\n" @@ -5840,62 +5861,62 @@ msgid "" " -t [release] Set the release from which packages should be installed.\n" msgstr " -t [release] स्थापना हुन लागेको प्याकेजहरू बाट विमोचन सेट गर्नुहोस्\n" -#: src/main.cc:247 +#: src/main.cc:248 #, fuzzy, c-format #| msgid "" #| " -q In command-line mode, suppress the incremental progress " #| "indicators.\n" msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr " -q आदेश-रेखा मोडमा, बढोत्तरीत प्रगति सूचकहरू रोक्नुहोस् ।\n" -#: src/main.cc:249 +#: src/main.cc:250 #, fuzzy, c-format #| msgid " -o key=val Directly set the configuration option named 'key'\n" msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr " -o key=val 'कुञ्जी' नामकरण गरिएको कनफिगरेसन विकल्प सिधै सेट गर्नुहोस्\n" -#: src/main.cc:250 +#: src/main.cc:251 #, fuzzy, c-format #| msgid "" #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" #| " strong dependencies\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --बिना -सिफारिस\t बलियो निर्भरता को रुपमा सिफारिसहरू\n" " पेश गर्ने नगर्ने निर्दिष्ट गर्नुहोस्\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr "-s fname : fname बाट झुकाव विस्तारित वस्तुस्थिति सूचना पढ्नुहोस् ।\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u सुरुवातमा नयाँ प्याकेज सूचिहरू डाउनलोड गर्नुहोस् ।\n" -#: src/main.cc:254 src/main.cc:256 +#: src/main.cc:255 src/main.cc:257 #, c-format -msgid " (terminal interface only)" +msgid " (terminal interface only)\n" msgstr "" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i सुरुवातमा एउटा स्थापना सञ्चालन सम्पादन गर्नुहोस् ।\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " यो झुकाब संग सुपर काऊ शक्ति छैन ।\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 #, fuzzy #| msgid "replaces" msgid "trace" @@ -5903,13 +5924,13 @@ msgstr "बदल्छ" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 #, fuzzy #| msgid "no" msgid "info" @@ -5917,13 +5938,13 @@ msgstr "होइन" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 #, fuzzy #| msgid "Err " msgid "error" @@ -5931,103 +5952,103 @@ msgstr "Err " #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 #, fuzzy msgid "fatal" msgstr "बन्द गर्नुहोस्" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " "\"warn\", \"error\", \"fatal\", or \"off\")." msgstr "" -#: src/main.cc:487 +#: src/main.cc:488 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "Invalid logger name \"%s\"." msgstr "अवैध सञ्चालन %s" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "-q= पछि अपेक्षित एउटा नम्बर\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "-q= पछि अपेक्षित एउटा नम्बर, %s प्राप्त गर्यो\n" -#: src/main.cc:802 +#: src/main.cc:794 #, fuzzy, c-format #| msgid "-o requires an argument of the form key=value, got %s" msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o लाई कुञ्जी=मानको रुपमा एउटा तर्कको आवश्यकता छ, %s प्राप्त गर्यो" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "WEIRDNESS: अज्ञात विकल्प कोड प्राप्त भयो\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "" -#: src/main.cc:1039 +#: src/main.cc:1023 #, fuzzy #| msgid "Package" msgid "first-package" msgstr "प्याकेज " -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "" -#: src/main.cc:1043 +#: src/main.cc:1027 #, fuzzy #| msgid "All Packages" msgid "all-packages" msgstr "सबै प्याकेजहरू" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -6035,7 +6056,7 @@ msgid "" "versions\"." msgstr "" -#: src/main.cc:1089 +#: src/main.cc:1073 #, fuzzy #| msgid "Only one of -u and -i may be specified\n" msgid "" @@ -6043,7 +6064,7 @@ msgid "" "specified\n" msgstr "-u र -i को एउटा मात्रै निर्दिष्ट हुनेछ\n" -#: src/main.cc:1098 +#: src/main.cc:1082 #, fuzzy #| msgid "" #| "-u and -i may not be specified in command-line mode (eg, with 'install')" @@ -6052,23 +6073,23 @@ msgid "" "(eg, with 'install')" msgstr "आदेश-रेखा मोडमा -u र -i निर्दिष्ट हुने छैन (जस्तै, 'install' संगै)" -#: src/main.cc:1115 +#: src/main.cc:1099 #, fuzzy #| msgid "-u and -i may not be specified with a command" msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "-u र -i आदेश संग निर्दिष्ट हुने छैन" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "अज्ञात आदेश \"%s\"\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "छोडिएको अपवाद: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, fuzzy, c-format #| msgid "" #| "Backtrace:\n" @@ -6080,7 +6101,8 @@ msgstr "" "ब्याकट्रयास:\n" "%s" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "को लागि खोजी गर्नुहोस्:" @@ -6967,17 +6989,21 @@ msgstr "बदल्छ" msgid "obsoletes" msgstr "अप्रचलितहरू" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (%F द्धारा प्रदान)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." @@ -6985,97 +7011,97 @@ msgstr "" "यदि तपाईँले प्याकेज चयन गर्नु भयो भने, यसको चालु अवास्थाको एउटा व्याख्या यो खाली ठाउँमा " "देखिने छ ।" -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" msgstr "" "%B%s%b स्वत: स्थापना भयो;यो हट्यो किन भने यसमा आधारित सबै प्याकेजहरू हटिरहेका छन्:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "निर्भरता त्रुटिहरुको कारणले %B%s%b स्वत: हट्नेछ:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "निम्न निर्भरताहरू सन्तुष्ट पार्न %B%s%b स्वत: स्थापना हुनेछ:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." msgstr "%B%s%b अहिले स्तरवृद्दि हुन सक्दैन, तर यदि भयो भने, यो %B%s%b संस्करणमानै रहनेछ ।" -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" msgstr "" "संस्करण %B%s%b मा, %B%s%b उन्नत हुनेछैन, निम्न निर्भरताहरू बिग्रन त्याग गर्न सकिन्छ :" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b हालमा स्थापना छ ।" -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b हालमा स्थापना छैन ।" -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "%B%s%b का केहि निर्भरताहरू सन्तुष्ट छैन:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "%B%s%b अवनति हुनेछ ।" -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "बिर्सने संस्करण %B%s%b मा %B%s%b उन्नत हुदैन ।" -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." msgstr "%B%s%b संस्करण %B%s%b उन्नत गर्न सकिदैन , तर यो %B%s%b संस्करणमा रहि रहेको छ ।" -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b पुन स्थापना हुनेछ ।" -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b स्थापना हुनेछ ।" -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b हट्ने छ ।" -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b संस्करण %B%s%b देखी संस्करण %B%s%b उन्नत हुनेछ ।" -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "%B%s%b आंशीक मात्र स्थापना भएको छ; यसको स्थापना पुरा हुनेछ ।" -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "निम्न प्याकेजहरू %B%s%b मा आधारित छ र त्यसको हटाउने द्धारा बिग्रिन् सक्छ:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "निम्न प्याकेजहरू %B%s%b मा आधारित छ र बिग्रएको छ:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" msgstr "निम्न प्याकेजहरू %B%s%b संग द्धन्द गर्दछ र यसको स्थापना द्धारा बिग्रन सक्छ:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -7084,17 +7110,17 @@ msgstr "" "निम्न प्याकेजहरू संस्करण %B%s%b मा आधारित छ हालमा स्थापना गरिएको संस्करण %B%s%b भन्दा " "अर्को, वा हालमा स्थापना गरिएको संस्करण संग द्धन्द हुन्छ:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." msgstr "निम्न प्याकेजहरू %B%s%b संग द्धन्द गर्दछ, वा स्थापना नगर्ने संस्करणकमा आधारित हुन्छ ।" -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "निम्न प्याकेजहरू %B%s%b संग द्धन्द गर्दछ:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -7102,21 +7128,21 @@ msgstr "" "निम्न प्याकेजहरू %B%s%b संस्करणमा आधारित छ भर्खरै स्थापना गरिएको संस्करण %B%s%b भन्दा " "भिन्न:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." msgstr "निम्न प्याकेजहरू %B%s%b संस्करणमा आधारित छ जसलाई स्थापना गर्न गइएको छैन ।" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "उन्नत गरिएको" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "अवनति गरिएको" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7125,13 +7151,13 @@ msgstr "" "निम्न प्याकेजहरू हाल मात्र स्थापना गरिएको संस्करण %B%s%b (%B%s%b) मा आधारित छ, वा " "संस्करण संग द्धन्द छ यो %s हुन सक्छ (%B%s%b), र यदि %s हो भने बिग्रन्छ ।" -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." msgstr "निम्न प्याकेजहरू संस्करण %B%s%b of %B%s%b संग द्धन्द गर्दछ, यो हो भने %s बिग्रन्छ ।" -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7166,47 +7192,47 @@ msgstr "लागू गर्नुहोस्" msgid "Close" msgstr "बन्द गर्नुहोस्" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s संग द्धन्द %s [%s %s द्धारा प्रदान गरिएको]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "%s हटाउदै" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr " %s %s (%s) स्थापना हुदै" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%BRemove%b निम्न प्याकेजहरू:%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%BInstall%b निम्न प्याकेजहरू:%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%BKeep%b निम्न प्याकेजहरुलाई हालको संस्करणमा :%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%B अवनति %b निम्न प्याकेजहरू:%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%B अवनति %b निम्न प्याकेजहरू:%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "निम्न निर्भरताहरू विचाररहितमा छाड्नुहोस्:%n" @@ -7304,10 +7330,6 @@ msgstr "E:" msgid "W:" msgstr "W:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "का लागि खोज्नुहोस्:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7689,7 +7711,9 @@ msgid "Error while dumping resolver state" msgstr "पुन समाधान गर्ने स्थिति डम्प गर्दा त्रुटि" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "स्पष्टकर्ता स्थिति फ्याक्नु पर्ने फाइल:" #: src/ui.cc:2265 @@ -8198,6 +8222,12 @@ msgstr "परिवर्तनलग डाउनलोड गर्दै" msgid "You can only view changelogs of official Debian packages." msgstr "तपाईँले आधिकारिक डेविएन प्याकेजहरुको परिवर्तनलग मात्र हर्न सक्नुहुन्छ ।" +#~ msgid "Press Return to continue" +#~ msgstr "निरन्तरता दिन 'फर्कनुहोस्' थिच्नुहोस् " + +#~ msgid "Search for:" +#~ msgstr "का लागि खोज्नुहोस्:" + #, fuzzy #~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." @@ -8326,11 +8356,6 @@ msgstr "तपाईँले आधिकारिक डेविएन प् #~ msgid "gtk-yes" #~ msgstr "हो" -#, fuzzy -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "अवैध सञ्चालन %s" - #~ msgid "but it is not installable" #~ msgstr "तर यो स्थापना योग्य छैन" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2008-09-05 23:04+0200\n" "Last-Translator: Frans Pop <elendil@planet.nl>\n" "Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n" @@ -17,42 +17,36 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: KBabel 1.11.4\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" -msgstr "" -"%BOptie:%b %s\n" -"%BDefault:%b %s\n" -"%BWaarde:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " +msgstr "%BOptie:%b " + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " +msgstr "%BDefault:%b " -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "Waar" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "Onwaar" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " -msgstr "%BOptie:%b " - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "%BDefault:%b " - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "%BWaarde:%b " -#: src/apt_config_treeitems.cc:279 -#, c-format -msgid "Editing \"%ls\"" +#: src/apt_config_treeitems.cc:280 +#, fuzzy, c-format +#| msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "Bezig met wijzigen van \"%ls\"" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "%BKeuze:%b " @@ -562,8 +556,8 @@ msgstr "Fatale fout in de oplosser" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] Bezig met het oplossen van afhankelijkheden" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "Interne fout: onverwachte null-oplossing." @@ -860,7 +854,7 @@ msgstr "" "Kan afhankelijkheden niet oplossen; u kunt met --full-resolver proberen.\n" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "Breek af.\n" @@ -1239,7 +1233,7 @@ msgstr "" "Er zijn geen te tonen pakketten -- geef de pakketnamen in op de regel achter " "'i'.\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "Druk op return om verder te gaan." @@ -1250,10 +1244,6 @@ msgstr "" "Er zijn geen pakketten gevonden -- geef de pakketnamen in op de regel achter " "'c'.\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "Druk op Return om verder te gaan" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1569,7 +1559,7 @@ msgstr "Status van oplosser met succes weggeschreven!" #| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: " #| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: %F" @@ -1841,7 +1831,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created." msgstr "" #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "Bezig met het oplossen van afhankelijkheden..." @@ -1879,7 +1869,9 @@ 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:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +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:1080 @@ -2087,7 +2079,7 @@ msgstr "Pakket: " msgid "State" msgstr "Staat" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "Voorzien door" @@ -2195,27 +2187,31 @@ msgstr "Vervangt" msgid "Obsoletes" msgstr "Veroudert" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Voorziet in" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Beschrijving: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "Homepage: " -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "Kan pakket %s niet localiseren" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "Kan patroon %s niet ontleden" @@ -2535,6 +2531,12 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "" +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "Ongeldige operatie %s" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "Onverwacht bestandseinde in standaardinvoer" @@ -2552,7 +2554,7 @@ msgstr "[FOUT]" msgid "UNSATISFIED" msgstr "NIET VOLDAAN" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "NIET AANWEZIG" @@ -2560,7 +2562,7 @@ msgstr "NIET AANWEZIG" msgid "Tags" msgstr "Labels" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "Gebruikerslabels" @@ -2970,16 +2972,21 @@ msgstr "Kan pakket %s niet localiseren" msgid "Unable to open %s to log actions" msgstr "Kan %s niet openen om acties bij te houden" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "Fout bij het genereren van de lokale tijd (%s)" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "logboek rapport" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -2991,81 +2998,81 @@ msgstr "" "dpkg-problemen zijn misschien niet afgerond.\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "Zal %li pakketten installeren en %li pakketten verwijderen.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "%sB schijfruimte zal worden gebruikt\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "%sB schijfruimte zal worden verwijderd\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[OPWAARDEREN] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[DEGRADEREN] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "VERWIJDER" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "INSTALLEER" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "HERINSTALLEER" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "BEHOUD" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "DEFECT" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "VERWIJDER, NIET GEBRUIKT" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "VERWIJDER, AFHANKELIJKHEDEN" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "INSTALLEER, AFHANKELIJKHEDEN" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "BEHOUD, AFHANKELIJKHEDEN" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "NIET GECONFIGUREERD" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -3088,39 +3095,39 @@ msgstr "" msgid "Filtering packages" msgstr "Ophalen pakketten" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "Onbekend actietype: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "Niet-afgesloten letterlijke string na %s" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "Onbekende prioriteit %s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "Onverwacht einde van vergelijkingspatroon (verwachtte '%c')." -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "Verwachtte '%c', kreeg '%c'" -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "Onbekend afhankelijkheidstype: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, fuzzy, c-format #| msgid "Unknown matcher type: \"%s\"." msgid "Unknown term type: \"%s\"." @@ -3128,7 +3135,7 @@ msgstr "Onbekend type vergelijker: \"%s\"." #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, fuzzy, c-format #| msgid "" #| "The ?%s matcher must be used in a \"wide\" context (a top-level context, " @@ -3140,34 +3147,34 @@ msgstr "" "De vergelijker ?%s moet worden gebruikt in een \"brede\" context (een " "context ofwel op het hoogste niveau ofwel ingesloten door ?%s)." -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "Ongebalanceerd '('" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "Voorzien: kan niet defect raken" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "Onbekend patroontype: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "Kan niet zoeken naar \"\"" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "Onverwachte lege expressie" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, fuzzy, c-format #| msgid "Badly formed expression" msgid "Badly formed expression: expected '|', got '%c'" msgstr "Slecht gevormde expressie" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "Onverwacht ')'" @@ -4115,22 +4122,22 @@ msgstr "" msgid "%s: Unable to accept a connection: %s" msgstr "kan tijdelijke map niet aanmaken van sjabloon \"%s\": %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4864,7 +4871,7 @@ msgstr "" msgid "Virtual package" msgstr "Pakket" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "Niet-geïnstalleerd" @@ -5034,163 +5041,169 @@ msgstr "%s vervangt %s" msgid "%s obsoletes %s" msgstr "%s veroudert %s" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s vervangt %s" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "Verwijder de volgende pakketten:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "Installeer de volgende pakketten:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 #, fuzzy #| msgid "Remove the following packages:" msgid "Keep the following packages:" msgstr "Verwijder de volgende pakketten:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "Waardeer volgende pakketten op:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr " Degradeer de volgende pakketten:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 #, fuzzy #| msgid "Leave the following dependencies unresolved:%n" msgid "Leave the following dependencies unresolved:" msgstr "Laat de volgende afhankelijkheden onopgelost:%n" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, fuzzy, c-format #| msgid "Remove %F [%s (%s)]" msgid "Remove %s [<big>%s</big> (%s)]" msgstr "Verwijder %F [%s (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "Install %s [<big>%s</big> (%s)]" msgstr "Installeer %F [%s (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "Cancel the installation of %s" msgstr "Breek de installatie van %F af" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Cancel the removal of %s" msgstr "Annuleer de verwijdering van %F" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "Keep %s at version <big>%s</big> (%s)" msgstr "Behoud %F op versie %s (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, fuzzy, c-format #| msgid "Upgrade %F [%s (%s) -> %s (%s)]" msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Opwaarderen van %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, fuzzy, c-format #| msgid "Downgrade %F [%s (%s) -> %s (%s)]" msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Degradeer %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>Remove</b> %s" msgstr "Verwijder(%s)" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>remove</b> %s" msgstr "Verwijder(%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>Keep</b> %s at version %s" msgstr "Behoud %F op versie %s (%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>keep</b> %s at version %s" msgstr "Behoud %F op versie %s (%s)" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>Cancel</b> the installation of %s" msgstr "Breek de installatie van %F af" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>cancel</b> the installation of %s" msgstr "Breek de installatie van %F af" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>Install</b> %s %s" msgstr "Installeer %F [%s (%s)]" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>install</b> %s %s" msgstr "Installeer %F [%s (%s)]" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "<b>Downgrade</b> %s to version %s" msgstr " cwidget-versie: %s\n" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "<b>downgrade</b> %s to version %s" msgstr " cwidget-versie: %s\n" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>Upgrade</b> %s to version %s" msgstr "%s versies" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>upgrade</b> %s to version %s" msgstr "%s versies" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format #| msgid "%d install" #| msgid_plural "%d installs" @@ -5199,7 +5212,7 @@ msgid_plural "%s installs" msgstr[0] "%d installatie" msgstr[1] "%d installaties" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, fuzzy, c-format #| msgid "%d removal" #| msgid_plural "%d removals" @@ -5208,7 +5221,7 @@ msgid_plural "%s removes" msgstr[0] "%d te verwijderen" msgstr[1] "%d te verwijderen" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, fuzzy, c-format #| msgid "%d keep" #| msgid_plural "%d keeps" @@ -5217,7 +5230,7 @@ msgid_plural "%s keeps" msgstr[0] "%d behouden" msgstr[1] "%d behouden" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, fuzzy, c-format #| msgid "%d upgrade" #| msgid_plural "%d upgrades" @@ -5226,7 +5239,7 @@ msgid_plural "%s upgrades" msgstr[0] "%d op te waarderen" msgstr[1] "%d op te waarderen" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, fuzzy, c-format #| msgid "%d downgrade" #| msgid_plural "%d downgrades" @@ -5235,7 +5248,7 @@ msgid_plural "%s downgrades" msgstr[0] "%d degradatie" msgstr[1] "%d degradaties" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, fuzzy, c-format #| msgid "Audit ^Recommendations" msgid "%s unresolved recommendation" @@ -5243,35 +5256,35 @@ msgid_plural "%s unresolved recommendations" msgstr[0] "Onderzoek ^Aanbevelingen" msgstr[1] "Onderzoek ^Aanbevelingen" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 #, fuzzy #| msgid "No more solutions." msgid "No solutions yet." msgstr "Geen oplossingen meer." -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 #, fuzzy #| msgid "Dependency handling" msgid "No dependency solution was found." msgstr "Afhankelijkheidsafhandeling" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 #, fuzzy #| msgid "No more solutions." msgid "No solutions." msgstr "Geen oplossingen meer." -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, fuzzy, c-format #| msgid "No more solutions." msgid "%u solutions." msgstr "Geen oplossingen meer." -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Could not open file \"%s\"" msgid "Solution %s of %s." @@ -5582,12 +5595,12 @@ msgstr " Ondersteuning van 'ept' niet actief.\n" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s gecompileerd in %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5740,29 +5753,35 @@ msgstr " show - Gedetailleerde informatie tonen van een pakket\n" #: src/main.cc:213 #, fuzzy, c-format +#| msgid " show - Display detailed information about a package\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - Gedetailleerde informatie tonen van een pakket\n" + +#: src/main.cc:214 +#, fuzzy, c-format #| msgid " clean - Erase downloaded package files\n" msgid " clean - Erase downloaded package files.\n" msgstr " clean - Opgehaalde pakketbestanden wissen\n" -#: src/main.cc:214 +#: src/main.cc:215 #, fuzzy, c-format #| msgid " autoclean - Erase old downloaded package files\n" msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean - Oude opgehaalde pakketbestanden wissen\n" -#: src/main.cc:215 +#: src/main.cc:216 #, fuzzy, c-format #| msgid " changelog - View a package's changelog\n" msgid " changelog - View a package's changelog.\n" msgstr " changelog - Bekijk de changelog van een pakket\n" -#: src/main.cc:216 +#: src/main.cc:217 #, fuzzy, c-format #| msgid " download - Download the .deb file for a package\n" msgid " download - Download the .deb file for a package.\n" msgstr " download - Het .deb-bestand van een pakket ophalen\n" -#: src/main.cc:217 +#: src/main.cc:218 #, fuzzy, c-format #| msgid "" #| " reinstall - Download and (possibly) reinstall a currently installed " @@ -5774,19 +5793,23 @@ msgstr "" " reinstall - Download en herinstalleer (mogelijk) een momenteel " "geïnstalleerd pakket\n" -#: src/main.cc:218 -#, c-format +#: src/main.cc:219 +#, fuzzy, c-format +#| msgid "" +#| " why - Show the manually installed packages that require a " +#| "package, or\n" +#| " why one or more packages would require the given package\n" msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " why - Toon de handmatig geïnstalleerde pakketten die een pakket\n" " vereisen, of waarom één of meer pakketten het opgegeven " "pakket\n" " nodig zouden hebben\n" -#: src/main.cc:220 +#: src/main.cc:221 #, fuzzy, c-format #| msgid "" #| " why-not - Show the manually installed packages that lead to a " @@ -5805,59 +5828,59 @@ msgstr "" " pakketten zouden leiden tot een conflict met het opgegeven\n" " pakket indien geïnstalleerd\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " Opties:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " -h This help text.\n" msgstr " -h Deze helptekst\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h Deze helptekst\n" -#: src/main.cc:232 +#: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr "" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s Acties simuleren, maar ze niet werkelijk uitvoeren\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr "" " -d Enkel pakketten ophalen, niets installeren of verwijderen.\n" -#: src/main.cc:236 +#: src/main.cc:237 #, fuzzy, c-format #| msgid " -P Always prompt for confirmation or actions\n" -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr "-P Steeds naar bevestiging of actie vragen\n" -#: src/main.cc:237 +#: src/main.cc:238 #, fuzzy, c-format #| msgid "" #| " -y Assume that the answer to simple yes/no questions is " @@ -5868,7 +5891,7 @@ msgstr "" " -y Veronderstel dat het antwoord op eenvoudige ja/nee-vragen " "'ja' is\n" -#: src/main.cc:238 +#: src/main.cc:239 #, fuzzy, c-format #| msgid "" #| " -F format Specify a format for displaying search results; see the " @@ -5880,7 +5903,7 @@ msgstr "" " -F indeling Een indeling aangeven voor de zoekresultaten; zie " "handleiding\n" -#: src/main.cc:239 +#: src/main.cc:240 #, fuzzy, c-format #| msgid "" #| " -O order Specify how search results should be sorted; see the " @@ -5892,7 +5915,7 @@ msgstr "" " -O ordening Geef aan hoe zoekresultaten moeten gesorteerd worden; zie " "handleiding\n" -#: src/main.cc:240 +#: src/main.cc:241 #, fuzzy, c-format #| msgid "" #| " -w width Specify the display width for formatting search results\n" @@ -5901,18 +5924,18 @@ msgid "" msgstr "" " -w breedte Geeft de breedte aan voor weergave van zoekresultaten\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr "" " -f Probeert reparaties van defecte pakketten te forceren\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr " -V Toont welke versies van pakketten geïnstalleerd zijn\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" @@ -5920,13 +5943,13 @@ msgstr "" " -D Toont de afhankelijkheden van automatisch gewijzigde " "pakketten\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr "" " -Z Toont de wijziging in installatiegrootte van elk pakket\n" -#: src/main.cc:245 +#: src/main.cc:246 #, fuzzy, c-format #| msgid "" #| " -v Display extra information. (may be supplied multiple " @@ -5938,7 +5961,7 @@ msgstr "" " -v Toont extra informatie. (kan meerdere keren worden " "meegegeven)\n" -#: src/main.cc:246 +#: src/main.cc:247 #, fuzzy, c-format #| msgid "" #| " -t [release] Set the release from which packages should be installed\n" @@ -5948,67 +5971,67 @@ msgstr "" " -t [release] Zet de release waarvan pakketten moeten geïnstalleerd " "worden\n" -#: src/main.cc:247 +#: src/main.cc:248 #, fuzzy, c-format #| msgid "" #| " -q In command-line mode, suppress the incremental progress\n" #| " indicators.\n" msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" " -q In commandoregelmodus: onderdruk de incrementele " "voortgangs-\n" " indicatoren.\n" -#: src/main.cc:249 +#: src/main.cc:250 #, fuzzy, c-format #| msgid " -o key=val Directly set the configuration option named 'key'\n" msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr "" " -o sleutel=val Zet de configuratie-optie genaamd 'sleutel' rechtstreeks\n" -#: src/main.cc:250 +#: src/main.cc:251 #, fuzzy, c-format #| msgid "" #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" #| " strong dependencies\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends\tspecifieert of recommends al dan niet als sterke\n" " afhankelijkheden worden behandeld\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr "" " -S fnaam Lees de uitgebreide statusinfo van aptitude uit fnaam.\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u Haal bij het opstarten nieuwe pakketlijsten op.\n" -#: src/main.cc:254 src/main.cc:256 +#: src/main.cc:255 src/main.cc:257 #, c-format -msgid " (terminal interface only)" +msgid " (terminal interface only)\n" msgstr "" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i Voer bij het opstarten een installatieslag uit.\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " Deze aptitude heeft geen Super Koe-krachten.\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 #, fuzzy #| msgid "true" msgid "trace" @@ -6016,13 +6039,13 @@ msgstr "waar" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 #, fuzzy #| msgid "no" msgid "info" @@ -6030,13 +6053,13 @@ msgstr "nee" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 #, fuzzy #| msgid "Err " msgid "error" @@ -6044,7 +6067,7 @@ msgstr "Fout " #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 #, fuzzy #| msgid "false" msgid "fatal" @@ -6052,95 +6075,95 @@ msgstr "onwaar" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " "\"warn\", \"error\", \"fatal\", or \"off\")." msgstr "" -#: src/main.cc:487 +#: src/main.cc:488 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "Invalid logger name \"%s\"." msgstr "Ongeldige operatie %s" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "Verwachtte een getal na -q=\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "Verwachtte een getal na -q=, got %s\n" -#: src/main.cc:802 +#: src/main.cc:794 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o vereist een argument in de vorm sleutel=waarde, kreeg %s\n" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "Ontbrekende komma na labelnaam \"%s\".\n" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "BIZAR: onbekende optiecode meegekregen\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "" -#: src/main.cc:1039 +#: src/main.cc:1023 #, fuzzy #| msgid "Package" msgid "first-package" msgstr "Pakket" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "" -#: src/main.cc:1043 +#: src/main.cc:1027 #, fuzzy #| msgid "All Packages" msgid "all-packages" msgstr "Alle Pakketten" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -6148,7 +6171,7 @@ msgid "" "versions\"." msgstr "" -#: src/main.cc:1089 +#: src/main.cc:1073 #, fuzzy #| msgid "Only one of -u and -i may be specified\n" msgid "" @@ -6156,7 +6179,7 @@ msgid "" "specified\n" msgstr "Er mag slechts één van -u of -i meegegeven worden.\n" -#: src/main.cc:1098 +#: src/main.cc:1082 #, fuzzy #| msgid "" #| "-u and -i may not be specified in command-line mode (eg, with 'install')" @@ -6167,23 +6190,23 @@ msgstr "" "-u en -i mogen niet meegegeven worden in commandoregelmodus (zoals bij " "'install')" -#: src/main.cc:1115 +#: src/main.cc:1099 #, fuzzy #| msgid "-u and -i may not be specified with a command" msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "-u en -i mogen niet meegegeven worden met een commando" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "Onbekend commando \"%s\"\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "Niet opgevangen uitzondering: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" @@ -6192,7 +6215,8 @@ msgstr "" "Backtrace:\n" "%s\n" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "Zoek naar: " @@ -7083,17 +7107,21 @@ msgstr "vervangt" msgid "obsoletes" msgstr "veroudert" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr "(voorzien door %F)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." @@ -7101,7 +7129,7 @@ msgstr "" "Als u een pakket selecteert, dan zal een uitleg over haar huidige staat " "verschijnen op deze plaats." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -7109,18 +7137,18 @@ msgstr "" "%B%s%b was automatisch geïnstalleerd; het wordt verwijderd omdat alle " "pakketten die ervan afhangen worden verwijderd:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "%B%s%b zal automatisch verwijderd worden door afhankelijkheidsfouten:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" "%B%s%b zal automatisch geïnstalleerd worden om te voldoen aan volgende " "afhankelijkheden:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -7128,7 +7156,7 @@ msgstr "" "%B%s%b kan nu niet worden opgewaardeerd, maar als het kon, zou het nog op " "versie %B%s%b gehouden worden." -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -7136,27 +7164,27 @@ msgstr "" "%B%s%b zal niet opgewaardeerd worden naar versie %B%s%b, om het breken van " "volgende afhankelijkheden te vermijden:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b is op dit moment geïnstalleerd." -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b is op dit moment niet geïnstalleerd." -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "Enkele afhankelijkheden van %B%s%b zijn niet nagekomen:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "%B%s%b zal worden gedegradeerd." -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b zal niet worden opgewaardeerd naar de verboden versie %B%s%b." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." @@ -7164,40 +7192,40 @@ msgstr "" "%B%s%b kan opgewaardeerd worden naar versie %B%s%b, maar wordt behouden op " "versie %B%s%b." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b zal worden geherinstalleerd." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b zal worden geïnstalleerd." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b zal worden verwijderd." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b zal worden opgewaardeerd van versie %B%s%b naar versie %B%s%b." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "" "%B%s%b is slechts gedeeltelijk geïnstalleerd; de installatie zal worden " "voltooid." -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "" "De volgende pakketten hangen af van %B%s%b en zullen defect raken door de " "verwijdering:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "De volgende pakketten hangen af van %B%s%b en zijn defect:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" @@ -7205,7 +7233,7 @@ msgstr "" "De volgende pakketten conflicteren met %B%s%b en zullen defect raken bij " "haar installatie:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -7215,7 +7243,7 @@ msgstr "" "de huidig geïnstalleerde versie van %B%s%b, of conflicteren met de huidig " "geïnstalleerde versie:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -7223,11 +7251,11 @@ msgstr "" "De volgende pakketten conflicteren met %B%s%b, of hangen af van een versie " "van haar die niet wordt geïnstalleerd:" -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "De volgende pakketten conflicteren met %B%s%b:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -7235,7 +7263,7 @@ msgstr "" "De volgende pakketten hangen af van een versie van %B%s%b verschillend van " "de huidig geïnstalleerde versie van %B%s%b:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." @@ -7243,15 +7271,15 @@ msgstr "" "De volgende pakketten hangen af van een versie van %B%s%b die niet wordt " "geïnstalleerd:" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "opgewaardeerd" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "gedegradeerd" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7261,7 +7289,7 @@ msgstr "" "%b (%B%s%b), of conflicteren met de versie die het zal zijn %s naar (%B%s" "%b), en zullen defect raken als het %s is." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7269,7 +7297,7 @@ msgstr "" "De volgende pakketten conflicteren met versie %B%s%b van %B%s%b, en zullen " "defect raken als het %s is:" -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7305,47 +7333,47 @@ msgstr "Toepassen" msgid "Close" msgstr "Sluiten" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s conflicteert met %s [voorzien door %s %s]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "Verwijderen van %s" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "Installeren %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%BVerwijder%b de volgende pakketten:%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%BInstalleer%b de volgende pakketten:%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%BBehoud%b de volgende pakketten op hun huidige versie:%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%BOpwaarderen%b van volgende pakketten:%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr " %BDegradeer%b de volgende pakketten:%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "Laat de volgende afhankelijkheden onopgelost:%n" @@ -7444,10 +7472,6 @@ msgstr "E:" msgid "W:" msgstr "W:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "Zoek naar:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7785,8 +7809,8 @@ msgid "" "Obsolete downloaded package files have been deleted, freeing %sB of disk " "space." msgstr "" -"Verouderde opgehaalde pakketbestanden zijn verwijderd, %sB schijfruimte " -"is vrijgemaakt." +"Verouderde opgehaalde pakketbestanden zijn verwijderd, %sB schijfruimte is " +"vrijgemaakt." #: src/ui.cc:1830 #, fuzzy @@ -7830,7 +7854,9 @@ msgid "Error while dumping resolver state" msgstr "Fout bij het archiveren van de status van de oplosser" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "Bestand waarin de status van de oplosser moet worden gearchiveerd:" #: src/ui.cc:2265 @@ -8352,6 +8378,21 @@ msgid "You can only view changelogs of official Debian packages." msgstr "U kunt alleen changelogs van officiële Debian-pakketten bekijken." #~ msgid "" +#~ "%BOption:%b %s\n" +#~ "%BDefault:%b %s\n" +#~ "%BValue:%b %s\n" +#~ msgstr "" +#~ "%BOptie:%b %s\n" +#~ "%BDefault:%b %s\n" +#~ "%BWaarde:%b %s\n" + +#~ msgid "Press Return to continue" +#~ msgstr "Druk op Return om verder te gaan" + +#~ msgid "Search for:" +#~ msgstr "Zoek naar:" + +#~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." #~ msgstr "" #~ "Kan afhankelijkheden voor de opwaardering niet oplossen: time-out in " @@ -8479,11 +8520,6 @@ msgstr "U kunt alleen changelogs van officiële Debian-pakketten bekijken." #~ msgid "gtk-yes" #~ msgstr "ja" -#, fuzzy -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "Ongeldige operatie %s" - #~ msgid "but it is not installable" #~ msgstr "maar het is niet installeerbaar" @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude_nn\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+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" @@ -23,41 +23,37 @@ msgstr "" "X-Generator: KBabel 1.10\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +#, fuzzy +msgid "%BOption:%b " +msgstr "Val" + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 #, fuzzy msgid "False" msgstr "Lukk" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -#, fuzzy -msgid "%BOption:%b " -msgstr "Val" - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "" - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:279 +#: src/apt_config_treeitems.cc:280 #, c-format -msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "" @@ -534,8 +530,8 @@ msgstr "" msgid "[%d(%d)/...] Resolving dependencies" msgstr "Klarer ikkje løysa pakkekrav." -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "Intern feil: uventa nulløysing." @@ -823,7 +819,7 @@ msgid "" msgstr "Klarer ikkje løysa pakkekrav." #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "Avbryt.\n" @@ -1183,7 +1179,7 @@ msgstr "Etter utpakking vil %sB bli frigjort.\n" msgid "No packages to show -- enter the package names on the line after 'i'.\n" msgstr "Ingen pakkar å vise -- oppgje pakkenamna på linja etter «i».\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "Trykk Enter for å halda fram." @@ -1192,10 +1188,6 @@ msgstr "Trykk Enter for å halda fram." msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "Fann ingen pakkar -- oppgje pakkenamna på linja etter «c».\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "Trykk Enter for å halda fram" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1494,7 +1486,7 @@ msgstr "" #: src/cmdline/cmdline_resolver.cc:222 #, fuzzy, c-format msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "y: %Fn: %Fq: %F,: %F.: %F<HANDLING> pakke... : %F%n%F%F%F%F%F%F%F%F" @@ -1744,7 +1736,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created." msgstr "" #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 #, fuzzy msgid "Resolving dependencies..." @@ -1782,7 +1774,9 @@ 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:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +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:1080 @@ -1983,7 +1977,7 @@ msgstr "Pakke: " msgid "State" msgstr "Tilstand" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "Skaffa av" @@ -2091,27 +2085,31 @@ msgstr "Byter ut" msgid "Obsoletes" msgstr "Foreldar" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Skaffar" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Skildring: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "" -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, fuzzy, c-format msgid "Unable to locate package %s" msgstr "Klarer ikkje opna %s" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, fuzzy, c-format msgid "Unable to parse pattern %s" msgstr "Klarer ikkje opna %s" @@ -2432,6 +2430,12 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "" +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "Ugyldig operasjon %s" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "" @@ -2449,7 +2453,7 @@ msgstr "[FEIL]" msgid "UNSATISFIED" msgstr "IKKJE TILFREDSSTILT" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "IKKJE TILGJENGELEG" @@ -2458,7 +2462,7 @@ msgstr "IKKJE TILGJENGELEG" msgid "Tags" msgstr "Merke" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 #, fuzzy msgid "User Tags" msgstr "Merke" @@ -2852,16 +2856,21 @@ msgstr "Klarer ikkje opna %s" msgid "Unable to open %s to log actions" msgstr "Ikkje i stand til å opna %s for å logga handlingar" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, fuzzy, c-format msgid "Error generating local time (%s)" msgstr "Feil ved skriving av løysingstilstand til %s" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "loggrapport" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -2873,81 +2882,81 @@ msgstr "" "på grunn av dpkg-problem kan vera ufullstendige.\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "Vil installera %li pakkar, og fjerna %li pakkar.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "%sB med diskplass vil bli brukt\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, fuzzy, c-format msgid "%sB of disk space will be freed\n" msgstr "%sB med diskplass vil bli brukt\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[UPGRADER] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[NEDGRADER] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "FJERN" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "INSTALLER" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "INSTALLER PÅ NY" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "HALD TILBAKE" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "ØYDELAGT" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "FJERN, UBRUKTE" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "FJERN, PAKKEKRAV" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "INSTALLER, PAKKEKRAV" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "HALD, PAKKEKRAV" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -2970,81 +2979,81 @@ msgstr "" msgid "Filtering packages" msgstr "Lastar ned pakkar" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "Ukjent handlingstype: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "Ukjent prioritet %s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "" -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, fuzzy, c-format msgid "Expected '%c', got '%c'." msgstr "Klarer ikkje opna %s" -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "Ukjend kravtype: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, fuzzy, c-format msgid "Unknown term type: \"%s\"." msgstr "Ukjent mønstertype: %c" #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, c-format msgid "" "The ?%s term must be used in a \"wide\" context (a top-level context, or a " "context enclosed by ?%s)." msgstr "" -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "Passa ikkje «(»" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "Ukjent mønstertype: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 #, fuzzy msgid "Can't search for \"\"" msgstr "Søk etter: " -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "Uventa tomt uttrykk" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, fuzzy, c-format #| msgid "Badly formed expression" msgid "Badly formed expression: expected '|', got '%c'" msgstr "Dårleg utforma uttrykk" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "Uventa «)»" @@ -3955,22 +3964,22 @@ msgstr "" msgid "%s: Unable to accept a connection: %s" msgstr "Klarer ikkje opna %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4677,7 +4686,7 @@ msgstr "" msgid "Virtual package" msgstr "Pakke" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "Ikkje installert" @@ -4844,226 +4853,231 @@ msgstr "erstattar" msgid "%s obsoletes %s" msgstr "forelda" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +msgid "%s enhances %s" +msgstr "erstattar" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 #, fuzzy msgid "Remove the following packages:" msgstr "%BFjern%b desse pakkane: %n" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 #, fuzzy msgid "Install the following packages:" msgstr "%BInstaller%b desse pakkane: %n" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 #, fuzzy msgid "Keep the following packages:" msgstr "%BFjern%b desse pakkane: %n" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 #, fuzzy msgid "Upgrade the following packages:" msgstr "%BOppgrader%b desse pakkane: %n" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 #, fuzzy msgid "Downgrade the following packages:" msgstr "%BNedgrader%b desse pakkane: %n" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 #, fuzzy msgid "Leave the following dependencies unresolved:" msgstr "%BFjern%b desse pakkane: %n" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, fuzzy, c-format msgid "Remove %s [<big>%s</big> (%s)]" msgstr "^Fjern" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, fuzzy, c-format #| msgid "%s versions" msgid "Install %s [<big>%s</big> (%s)]" msgstr "%s-versjonar" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, fuzzy, c-format msgid "Cancel the installation of %s" msgstr "hald fram med installasjonen" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, fuzzy, c-format msgid "Cancel the removal of %s" msgstr "hald fram med installasjonen" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, fuzzy, c-format msgid "Keep %s at version <big>%s</big> (%s)" msgstr "" "\n" "Curses-versjon: %s\n" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, fuzzy, c-format msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Lasta ned %sB på %s (%sB/s)." -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, fuzzy, c-format msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Lasta ned %sB på %s (%sB/s)." -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format msgid "<b>Remove</b> %s" msgstr "^Fjern" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format msgid "<b>remove</b> %s" msgstr "^Fjern" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format msgid "<b>Keep</b> %s at version %s" msgstr "" "\n" "Curses-versjon: %s\n" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format msgid "<b>keep</b> %s at version %s" msgstr "" "\n" "Curses-versjon: %s\n" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format msgid "<b>Cancel</b> the installation of %s" msgstr "hald fram med installasjonen" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format msgid "<b>cancel</b> the installation of %s" msgstr "hald fram med installasjonen" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>Install</b> %s %s" msgstr "%s-versjonar" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>install</b> %s %s" msgstr "%s-versjonar" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format msgid "<b>Downgrade</b> %s to version %s" msgstr "«libsigc++»-versjon: %s\n" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format msgid "<b>downgrade</b> %s to version %s" msgstr "«libsigc++»-versjon: %s\n" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>Upgrade</b> %s to version %s" msgstr "%s-versjonar" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>upgrade</b> %s to version %s" msgstr "%s-versjonar" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format msgid "%s install" msgid_plural "%s installs" msgstr[0] "%d installeringar" msgstr[1] "%d installeringar" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, fuzzy, c-format msgid "%s remove" msgid_plural "%s removes" msgstr[0] "%d fjerningar" msgstr[1] "%d fjerningar" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, fuzzy, c-format msgid "%s keep" msgid_plural "%s keeps" msgstr[0] "%d haldt tilbake" msgstr[1] "%d haldt tilbake" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, fuzzy, c-format msgid "%s upgrade" msgid_plural "%s upgrades" msgstr[0] "%d oppgraderingar" msgstr[1] "%d oppgraderingar" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, fuzzy, c-format msgid "%s downgrade" msgid_plural "%s downgrades" msgstr[0] "%d nedgraderingar" msgstr[1] "%d nedgraderingar" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, fuzzy, c-format msgid "%s unresolved recommendation" msgid_plural "%s unresolved recommendations" msgstr[0] "Tilrådingar" msgstr[1] "Tilrådingar" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 #, fuzzy #| msgid "No more solutions." msgid "No solutions yet." msgstr "Ingen fleire løysingar." -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 #, fuzzy msgid "No dependency solution was found." msgstr "^Handsaming av pakkekrav" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 #, fuzzy #| msgid "No more solutions." msgid "No solutions." msgstr "Ingen fleire løysingar." -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, fuzzy, c-format #| msgid "No more solutions." msgid "%u solutions." msgstr "Ingen fleire løysingar." -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Could not open file \"%s\"" msgid "Solution %s of %s." @@ -5383,12 +5397,12 @@ msgstr "" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s kompilert på %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5541,44 +5555,50 @@ msgstr " show - Vis detaljert informasjon om ei pakke\n" #: src/main.cc:213 #, fuzzy, c-format +#| msgid " show - Display detailed information about a package\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - Vis detaljert informasjon om ei pakke\n" + +#: src/main.cc:214 +#, fuzzy, c-format #| msgid " clean - Erase downloaded package files\n" msgid " clean - Erase downloaded package files.\n" msgstr " clean - Slett nedlasta pakkefiler\n" -#: src/main.cc:214 +#: src/main.cc:215 #, fuzzy, c-format #| msgid " autoclean - Erase old downloaded package files\n" msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean - Slett gamle nedlasta pakkefiler\n" -#: src/main.cc:215 +#: src/main.cc:216 #, fuzzy, c-format #| msgid " changelog - View a package's changelog\n" msgid " changelog - View a package's changelog.\n" msgstr " changelog - Vis endringsloggen til ein pakke\n" -#: src/main.cc:216 +#: src/main.cc:217 #, fuzzy, c-format #| msgid " download - Download the .deb file for a package\n" msgid " download - Download the .deb file for a package.\n" msgstr " download - Last ned .deb-fila for ein pakke\n" -#: src/main.cc:217 +#: src/main.cc:218 #, c-format msgid "" " reinstall - Download and (possibly) reinstall a currently installed " "package.\n" msgstr "" -#: src/main.cc:218 +#: src/main.cc:219 #, fuzzy, c-format msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr " -Z\t\t Vis endringane på installert storleik på kvar pakke.\n" -#: src/main.cc:220 +#: src/main.cc:221 #, fuzzy, c-format msgid "" " why-not - Show the manually installed packages that lead to a " @@ -5587,59 +5607,59 @@ msgid "" " lead to a conflict with the given package if installed.\n" msgstr " -Z\t\t Vis endringane på installert storleik på kvar pakke.\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " Val:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " -h This help text.\n" msgstr " -h Denne hjelpeteksten\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h Denne hjelpeteksten\n" -#: src/main.cc:232 +#: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr "" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s Simuler handlingar, men ikkje utfør dei.\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr "" " -d Berre lasta ned pakkar, ikkje installer eller fjern noko.\n" -#: src/main.cc:236 +#: src/main.cc:237 #, fuzzy, c-format #| msgid " -P Always prompt for confirmation or actions\n" -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P Spør alltid om stadfesting eller handlingar\n" -#: src/main.cc:237 +#: src/main.cc:238 #, fuzzy, c-format #| msgid "" #| " -y Assume that the answer to simple yes/no questions is " @@ -5648,7 +5668,7 @@ msgid "" " -y Assume that the answer to simple yes/no questions is 'yes'.\n" msgstr " -y Forutset at svaret på enkle ja/nei-spørsmål er «Ja»\n" -#: src/main.cc:238 +#: src/main.cc:239 #, fuzzy, c-format #| msgid "" #| " -F format Specify a format for displaying search results; see the " @@ -5659,7 +5679,7 @@ msgid "" msgstr "" " -F format Oppgje eit format for vising av søkjeresultat; sjå manualen\n" -#: src/main.cc:239 +#: src/main.cc:240 #, fuzzy, c-format #| msgid "" #| " -O order Specify how search results should be sorted; see the " @@ -5671,7 +5691,7 @@ msgstr "" " -O rekkjefølgje Oppgjev korleis eit søkjeresultat skal sorterast; sjå " "manualen\n" -#: src/main.cc:240 +#: src/main.cc:241 #, fuzzy, c-format #| msgid "" #| " -w width Specify the display width for formatting search results\n" @@ -5680,29 +5700,29 @@ msgid "" msgstr "" " -w breidde Oppgje visingsbreidde for formatering av søkjeresultat\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr " -f Prøv hardt å reparere øydelagde pakkar.\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr "" " -V Vis kva for versjonar av pakkar som skal installerast.\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr " -D Vis pakkekrava til automatisk endra pakkar.\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr " -Z\t\t Vis endringane på installert storleik på kvar pakke.\n" -#: src/main.cc:245 +#: src/main.cc:246 #, fuzzy, c-format #| msgid "" #| " -v Display extra information. (may be supplied multiple " @@ -5713,7 +5733,7 @@ msgid "" msgstr "" " -v Vis ekstra informasjon. (kan tilføyast fleire gongar)\n" -#: src/main.cc:246 +#: src/main.cc:247 #, fuzzy, c-format #| msgid "" #| " -t [release] Set the release from which packages should be installed\n" @@ -5722,59 +5742,59 @@ msgid "" msgstr "" " -t [sleppversjon] Set sleppversjonen som pakkar skal installerast frå\n" -#: src/main.cc:247 +#: src/main.cc:248 #, c-format msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" -#: src/main.cc:249 +#: src/main.cc:250 #, fuzzy, c-format #| msgid " -o key=val Directly set the configuration option named 'key'\n" msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr " -o nøkkel=verdi Set direkte oppsettsvalet som heiter «nøkkel»\n" -#: src/main.cc:250 +#: src/main.cc:251 #, fuzzy, c-format #| msgid "" #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" #| " strong dependencies\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends\tOppgje om tilrådde og/eller føreslåtte pakkar skal\n" " handterast som strenge pakkekrav\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr " -S fnamn: Les den utvida statusinfo-fila for aptitude frå fnamn.\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u Last ned ny pakkeliste ved oppstart.\n" -#: src/main.cc:254 src/main.cc:256 -#, c-format -msgid " (terminal interface only)" -msgstr "" +#: src/main.cc:255 src/main.cc:257 +#, fuzzy, c-format +msgid " (terminal interface only)\n" +msgstr " -h Denne hjelpeteksten\n" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i Utfør ei installasjonskøyring ved oppstart.\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " Denne aptituden har ikkje Super Cow Powers.\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 #, fuzzy #| msgid "replaces" msgid "trace" @@ -5782,13 +5802,13 @@ msgstr "erstattar" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 #, fuzzy #| msgid "no" msgid "info" @@ -5796,13 +5816,13 @@ msgstr "ingen" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 #, fuzzy #| msgid "Err " msgid "error" @@ -5810,102 +5830,102 @@ msgstr "Feil " #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 #, fuzzy msgid "fatal" msgstr "Lukk" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " "\"warn\", \"error\", \"fatal\", or \"off\")." msgstr "" -#: src/main.cc:487 +#: src/main.cc:488 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "Invalid logger name \"%s\"." msgstr "Ugyldig operasjon %s" -#: src/main.cc:769 +#: src/main.cc:761 #, fuzzy, c-format msgid "Expected a number after -q=\n" msgstr "Klarer ikkje opna %s" -#: src/main.cc:778 +#: src/main.cc:770 #, fuzzy, c-format msgid "Expected a number after -q=, got %s\n" msgstr "Klarer ikkje opna %s" -#: src/main.cc:802 +#: src/main.cc:794 #, fuzzy, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o krev eit argument på forma nøkkel=verdi, fekk %s" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "MERKJELEG: mottok ein ukjent valkode\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "" -#: src/main.cc:1039 +#: src/main.cc:1023 #, fuzzy #| msgid "Package" msgid "first-package" msgstr "Pakke" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "" -#: src/main.cc:1043 +#: src/main.cc:1027 #, fuzzy #| msgid "All Packages" msgid "all-packages" msgstr "Alle pakkar" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -5913,7 +5933,7 @@ msgid "" "versions\"." msgstr "" -#: src/main.cc:1089 +#: src/main.cc:1073 #, fuzzy #| msgid "Only one of -u and -i may be specified\n" msgid "" @@ -5921,7 +5941,7 @@ msgid "" "specified\n" msgstr "Berre ein av -u og -i kan oppgjevast\n" -#: src/main.cc:1098 +#: src/main.cc:1082 #, fuzzy #| msgid "" #| "-u and -i may not be specified in command-line mode (eg, with 'install')" @@ -5931,30 +5951,31 @@ msgid "" msgstr "" "-u og -i kan ikkje oppgjevast i kommandolinjemodus (dvs, med «install»)" -#: src/main.cc:1115 +#: src/main.cc:1099 #, fuzzy #| msgid "-u and -i may not be specified with a command" msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "-u og -i kan ikkje oppgjevast med ein kommando" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "Ukjent kommando «%s»\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" "%s\n" msgstr "" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "Søk etter: " @@ -6844,24 +6865,28 @@ msgstr "erstattar" msgid "obsoletes" msgstr "forelda" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (skaffa til vege av %F)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." msgstr "" "Viss du vel ein pakke vil ei forklaring på tilstanden til pakka koma her." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -6869,17 +6894,17 @@ msgstr "" "%B%s%b blei installert automatisk; han blir fjerna fordi alle pakkane som " "krev denne pakken er/blir fjerna:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "%B%s%b vil bli fjerna automatisk på grunn av feil med pakkekrava:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" "%B%s%b vil bli installert automatisk for å tilfredsstilla desse pakkekrava:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -6887,7 +6912,7 @@ msgstr "" "%B%s%b kan ikkje oppgraderast no, men viss han hadde kunna det, så ville han " "framleis blitt halden på versjon %B%s%b." -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -6895,64 +6920,64 @@ msgstr "" "%B%s%b vil ikkje bli oppgradert til versjon %B%s%b for å unngå å øydeleggja " "desse pakkekrava:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b er installert." -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b er ikkje installert." -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "Nokre av pakkekrava til %B%s%b er ikkje tilfredsstilt:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "%B%s%b vil bli nedgradert." -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b vil ikkje bli oppgradert til den forbodne versjonen %B%s%b." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." msgstr "" "%B%s%b kan oppgraderast til versjon %B%s%b, men blir haldt på versjon %B%s%b." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b vil bli installert på ny." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b vil bli installert." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b vil bli fjerna." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b vil bli oppgradert frå versjon %B%s%b til versjon %B%s%b." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 #, fuzzy msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "%s er ikkje installert no, så han blir ikkje re-installert.\n" -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "Desse pakkane krev %B%s%b og vil bli øydelagde viss han vert fjerna:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "Desse pakkane krev %B%s%b og er øydelagde:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" @@ -6960,7 +6985,7 @@ msgstr "" "Desse pakkane er i konflikt med %B%s%b og vil bli øydelagde viss han bli " "installert:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -6969,7 +6994,7 @@ msgstr "" "Desse pakkane krev ein anna versjon av %B%s%b enn den versjonen som er " "installert, eller er i konflikt med den installerte versjonen:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -6977,11 +7002,11 @@ msgstr "" "Desse pakkane er i konflikt med %B%s%b, eller krev ein versjon som ikkje " "kjem til å bli installert." -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "Desse pakkane er i konflikt med %B%s%b:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -6989,22 +7014,22 @@ msgstr "" "Desse pakkane krev ein anna versjon av %B%s%b enn den versjonen som er " "installert av %B%s%b:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." msgstr "" "Desse pakkane krev ein versjon av %B%s%b som ikkje kjem til å bli installert." -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "oppgradert" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "nedgradert" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7014,7 +7039,7 @@ msgstr "" "dei er i konlikt med den versjonen han vil bli %s til (%B%s%b), og vil bli " "øydelagde viss han blir %s." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7022,7 +7047,7 @@ msgstr "" "Desse pakkane er i konflikt med versjon %B%s%b av %B%s%b, og vil bli " "øydelagde viss han blir %s." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7058,47 +7083,47 @@ msgstr "Bruk" msgid "Close" msgstr "Lukk" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, fuzzy, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "konflikt med" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, fuzzy, c-format msgid "Removing %s" msgstr "Set opp %s på ny\n" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%BFjern%b desse pakkane: %n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%BInstaller%b desse pakkane: %n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%BHald%b desse pakkane på noverande versjon: %n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%BOppgrader%b desse pakkane: %n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%BNedgrader%b desse pakkane: %n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, fuzzy, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "%BFjern%b desse pakkane: %n" @@ -7201,10 +7226,6 @@ msgstr "E:" msgid "W:" msgstr "W:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "Søk etter:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7578,7 +7599,9 @@ msgid "Error while dumping resolver state" msgstr "Feil ved lagring av løysingstilstanden" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "Fila der løysingstilstanden skal lagrast:" #: src/ui.cc:2265 @@ -8107,6 +8130,12 @@ msgstr "Lastar ned endringslogg" msgid "You can only view changelogs of official Debian packages." msgstr "Du kan berre lesa endringsloggar for offisielle debianpakkar." +#~ msgid "Press Return to continue" +#~ msgstr "Trykk Enter for å halda fram" + +#~ msgid "Search for:" +#~ msgstr "Søk etter:" + #, fuzzy #~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." @@ -8227,11 +8256,6 @@ msgstr "Du kan berre lesa endringsloggar for offisielle debianpakkar." #~ msgid "gtk-yes" #~ msgstr "ja" -#, fuzzy -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "Ugyldig operasjon %s" - #~ msgid "but it is not installable" #~ msgstr "men lèt seg ikkje installera" @@ -8382,10 +8406,6 @@ msgstr "Du kan berre lesa endringsloggar for offisielle debianpakkar." #~ msgstr "" #~ " -V Vis kva for versjonar av pakkar som skal installerast.\n" -#, fuzzy -#~ msgid " indicators.\n" -#~ msgstr " -h Denne hjelpeteksten\n" - #~ msgid "Downloading " #~ msgstr "Lastar ned " @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude 0.4.11\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2012-01-24 16:10+0100\n" "Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n" "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n" @@ -25,42 +25,36 @@ msgstr "" "%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Lokalize 1.2\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" -msgstr "" -"%BOpcja:%b %s\n" -"%BDomyślnie:%b %s\n" -"%BWartość:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " +msgstr "%BOpcja:%b " + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " +msgstr "%BDomyślnie:%b " -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "Prawda" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "Fałsz" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " -msgstr "%BOpcja:%b " - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "%BDomyślnie:%b " - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "%BWartość:%b " -#: src/apt_config_treeitems.cc:279 -#, c-format -msgid "Editing \"%ls\"" +#: src/apt_config_treeitems.cc:280 +#, fuzzy, c-format +#| msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "Edycja \"%ls\"" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "%BWybór:%b " @@ -653,8 +647,8 @@ msgstr "Błąd krytyczny rozwiązywania problemów z zależnościami" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] Uzupełnianie zależności" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "Błąd wewnętrzny: niespodziewane puste rozwiązanie." @@ -949,7 +943,7 @@ msgstr "" "uruchomić z opcją --full-resolver\n" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "Przerwane.\n" @@ -1306,7 +1300,7 @@ msgstr "" "Brak pakietów do wyświetlenia -- po poleceniu \"i\" należy podać nazwy " "pakietów.\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "Wciśnij return." @@ -1315,10 +1309,6 @@ msgstr "Wciśnij return." msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "Brak pakietów -- po poleceniu \"c\" należy podać nazwy pakietów.\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "Wciśnij return" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1633,9 +1623,12 @@ msgid "Resolver state successfully written!" msgstr "Zapisano stan rozwiązywania problemów z zależnościami." #: src/cmdline/cmdline_resolver.cc:222 -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +#| "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "t: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (nr|wersja) ...: %F%na (nr|" @@ -1908,7 +1901,7 @@ msgstr "" "zostało właściwie przygotowane." #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "Uzupełnianie niespełnionych zależności..." @@ -1946,7 +1939,9 @@ msgstr "Nieprawidłowa odpowiedź. Proszę podać jedno z następujących polece # Nie należy tłumaczyć Y na T! Patrz #495551. #: src/cmdline/cmdline_resolver.cc:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +msgid "No solution found within the allotted time. Try harder? [Y/n] " msgstr "" "Nie znaleziono rozwiązań przed upływem limitu czasu. Próbować dalej? [Y/n]" @@ -2152,7 +2147,7 @@ msgstr "Pakiet: " msgid "State" msgstr "Stan" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "Udostępniany przez" @@ -2260,27 +2255,31 @@ msgstr "Zastępuje" msgid "Obsoletes" msgstr "Dezaktualizuje" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Udostępnia" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Opis: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "Strona internetowa: " -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "Nie można znaleźć pakietu %s" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "Nie można przetworzyć wzorca %s" @@ -2599,6 +2598,12 @@ msgstr "%s: należy podać przynajmniej jeden argument (pakiet do wyszukania).\n msgid "Unknown version selection, something is very wrong." msgstr "Nieznany wybór wersji, jest jakiś poważny problem." +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "Błędna operacja '%s'" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "Niespodziewany koniec pliku na standardowym wejściu" @@ -2615,7 +2620,7 @@ msgstr "[BŁĄD] %s" msgid "UNSATISFIED" msgstr "NIESPEŁNIONE" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "NIEDOSTĘPNY" @@ -2623,7 +2628,7 @@ msgstr "NIEDOSTĘPNY" msgid "Tags" msgstr "Znaczniki" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "Znaczniki użytkownika" @@ -3039,16 +3044,21 @@ msgstr "Nie można stworzyć skróconego magazynu podręcznego: %s" msgid "Unable to open %s to log actions" msgstr "Nie można otworzyć pliku dziennika: %s" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "Błąd przy ustalaniu lokalnego czasu (%s)" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "dziennik operacji" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -3059,81 +3069,81 @@ msgstr "" "wystąpiły błędy dpkg mogą nie być zakończone pomyślnie.\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "Zostanie zainstalowanych %li pakietów, usuniętych %li pakietów.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "Zostanie zajęte na dysku: %sB\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "Zostanie zwolnione na dysku: %sB\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[UAKTUALNIONY] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[COFNIĘTY] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "USUNIĘTY" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "INSTALOWANY" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "REINSTALOWANY" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "ZATRZYMANY" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "ZALEŻNOŚCI" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "USUNIĘTY, NIE UŻYWANY" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "USUNIĘTY, ZALEŻNOŚCI" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "INSTALOWANY, ZALEŻNOŚCI" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "ZATRZYMANY, ZALEŻNOŚCI" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "NIESKONFIGUROWANY" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -3154,46 +3164,46 @@ msgstr "Uzyskiwanie dostępu do indeksu" msgid "Filtering packages" msgstr "Filtrowanie pakietów" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "Nieznana akcja: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "Niezakończony poprawnie tekst po %s" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "Nieznany priorytet: %s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "Wzorzec dopasowania nieoczekiwanie zakończony (oczekiwano \"%c\")." -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "Oczekiwano \"%c\", a napotkano \"%c\"" -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "Nieznany typ zależności: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, c-format msgid "Unknown term type: \"%s\"." msgstr "Nieznany typ terminu: \"%s\"." #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, c-format msgid "" "The ?%s term must be used in a \"wide\" context (a top-level context, or a " @@ -3202,33 +3212,33 @@ msgstr "" "Termin ?%s musi być użyty w \"szerszym\" kontekście (na najwyższym poziomie " "lub objętym przez ?%s)." -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "Niesparowany nawias \"(\"" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "Udostępnia: nie może być niespełnione" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "Nieznany typ wzorca: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "Nie można szukać \"\"" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "Niespodziewane puste wyrażenie" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, c-format msgid "Badly formed expression: expected '|', got '%c'" msgstr "Niepoprawne wyrażenie: oczekiwano \"|\", otrzymano \"%c\"" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "Niespodziewany nawias \")\"" @@ -4098,22 +4108,22 @@ msgstr "Błąd wewnętrzny: tymczasowa nazwa gniazda \"%s\" jest za długa!" msgid "%s: Unable to accept a connection: %s" msgstr "%s: Nie udało się przyjąć połączenia: %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "[%s] uruchamianie procesu dpkg...\n" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "[%s] zakończono proces dpkg.\n" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "[%s] proces dpkg zakończył się błędem.\n" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4757,7 +4767,7 @@ msgstr "" msgid "Virtual package" msgstr "Pakiet wirtualny" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "niezainstalowany" @@ -4951,140 +4961,146 @@ msgstr "%s zastępuje %s" msgid "%s obsoletes %s" msgstr "%s dezaktualizuje %s" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s zastępuje %s" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "Usunięcie następujących pakietów:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "Instalacja następujących pakietów:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 msgid "Keep the following packages:" msgstr "Zatrzymanie następujących pakietów:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "Aktualizacja następujących pakietów:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "Cofnięcie następujących pakietów do wcześniejszych wersji:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 msgid "Leave the following dependencies unresolved:" msgstr "Pozostawienie następujących problemów z zależnościami:" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, c-format msgid "Remove %s [<big>%s</big> (%s)]" msgstr "Usunięcie %s [<big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, c-format msgid "Install %s [<big>%s</big> (%s)]" msgstr "Instalacja %s [<big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, c-format msgid "Cancel the installation of %s" msgstr "Odwołanie instalacji %s" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, c-format msgid "Cancel the removal of %s" msgstr "Odwołanie usunięcia %s" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, c-format msgid "Keep %s at version <big>%s</big> (%s)" msgstr "Zatrzymanie %s w wersji <big>%s</big> (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, c-format msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Aktualizacja %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, c-format msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Cofnięcie %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, c-format msgid "<b>Remove</b> %s" msgstr "<b>Usunięcie</b> %s" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, c-format msgid "<b>remove</b> %s" msgstr "<b>usunięcie</b> %s" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, c-format msgid "<b>Keep</b> %s at version %s" msgstr "<b>Zatrzymanie</b> %s w wersji %s" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, c-format msgid "<b>keep</b> %s at version %s" msgstr "<b>zatrzymanie</b> %s w wersji %s" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, c-format msgid "<b>Cancel</b> the installation of %s" msgstr "<b>Odwołanie</b> instalacji %s" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, c-format msgid "<b>cancel</b> the installation of %s" msgstr "<b>odwołanie</b> instalacji %s" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, c-format msgid "<b>Install</b> %s %s" msgstr "<b>Instalacja</b> %s %s" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, c-format msgid "<b>install</b> %s %s" msgstr "<b>instalacja</b> %s %s" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>Downgrade</b> %s to version %s" msgstr "<b>Cofnięcie</b> %s do wersji %s" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>downgrade</b> %s to version %s" msgstr "<b>cofnięcie</b> %s do wersji %s" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>Upgrade</b> %s to version %s" msgstr "<b>Aktualizacja</b> %s do wersji %s" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>upgrade</b> %s to version %s" msgstr "<b>aktualizacja</b> %s do wersji %s" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "Pozostawione problemy z zależnościami: %s" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "pozostawione problemy z zależnościami: %s" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, c-format msgid "%s install" msgid_plural "%s installs" @@ -5092,7 +5108,7 @@ msgstr[0] "%s instalacja" msgstr[1] "%s instalacje" msgstr[2] "%s instalacji" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, c-format msgid "%s remove" msgid_plural "%s removes" @@ -5100,7 +5116,7 @@ msgstr[0] "%s usunięcie" msgstr[1] "%s usunięcia" msgstr[2] "%s usunięć" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, c-format msgid "%s keep" msgid_plural "%s keeps" @@ -5108,7 +5124,7 @@ msgstr[0] "%s zatrzymanie" msgstr[1] "%s zatrzymania" msgstr[2] "%s zatrzymań" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, c-format msgid "%s upgrade" msgid_plural "%s upgrades" @@ -5116,7 +5132,7 @@ msgstr[0] "%s aktualizacja" msgstr[1] "%s aktualizacje" msgstr[2] "%s aktualizacji" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, c-format msgid "%s downgrade" msgid_plural "%s downgrades" @@ -5124,7 +5140,7 @@ msgstr[0] "%s cofnięcie" msgstr[1] "%s cofnięcia" msgstr[2] "%s cofnięć" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, c-format msgid "%s unresolved recommendation" msgid_plural "%s unresolved recommendations" @@ -5132,28 +5148,28 @@ msgstr[0] "%s nierozwiązana zależność \"poleca\"" msgstr[1] "%s nierozwiązane zależności \"poleca\"" msgstr[2] "%s nierozwiązanych zależności \"poleca\"" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 msgid "No solutions yet." msgstr "Nie ma jeszcze rozwiązań." -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 msgid "No dependency solution was found." msgstr "Nie znaleziono rozwiązania problemów z zależnościami." -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 msgid "No solutions." msgstr "Nie ma rozwiązań." -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "Aby obejrzeć rozwiązanie, wybierz je z listy po prawej stronie." -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, c-format msgid "%u solutions." msgstr "%u rozwiązań." -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, c-format msgid "Solution %s of %s." msgstr "Rozwiązanie %s z %s" @@ -5455,13 +5471,15 @@ msgid " Gtk+ support disabled.\n" msgstr " Obsługa Gtk+ wyłączona.\n" #: src/main.cc:179 -#, c-format -msgid " Compiled with Qt 4.6.2 %s\n" +#, fuzzy, c-format +#| msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr " Skompilowany z Qt 4.6.2 %s\n" #: src/main.cc:180 -#, c-format -msgid " Running on Qt 4.6.2 %s\n" +#, fuzzy, c-format +#| msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr " Uruchamianie korzystając z Qt 4.6.2 %s\n" #: src/main.cc:182 @@ -5595,26 +5613,32 @@ msgid " show - Display detailed information about a package.\n" msgstr " show - Wyświetlanie szczegółowych informacji o pakiecie.\n" #: src/main.cc:213 +#, fuzzy, c-format +#| msgid " show - Display detailed information about a package.\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - Wyświetlanie szczegółowych informacji o pakiecie.\n" + +#: src/main.cc:214 #, c-format msgid " clean - Erase downloaded package files.\n" msgstr " clean - Usunięcie pobranych plików pakietów.\n" -#: src/main.cc:214 +#: src/main.cc:215 #, c-format msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean - Usunięcie starych plików pakietów.\n" -#: src/main.cc:215 +#: src/main.cc:216 #, c-format msgid " changelog - View a package's changelog.\n" msgstr " changelog - Wyświetlanie dziennika zmian pakietu.\n" -#: src/main.cc:216 +#: src/main.cc:217 #, c-format msgid " download - Download the .deb file for a package.\n" msgstr " download - Pobranie pliku .deb pakietu.\n" -#: src/main.cc:217 +#: src/main.cc:218 #, c-format msgid "" " reinstall - Download and (possibly) reinstall a currently installed " @@ -5622,19 +5646,23 @@ msgid "" msgstr "" " reinstall - Pobranie i ponowna instalacja już zainstalowanego pakietu.\n" -#: src/main.cc:218 -#, c-format +#: src/main.cc:219 +#, fuzzy, c-format +#| msgid "" +#| " why - Show the manually installed packages that require a " +#| "package, or\n" +#| " why one or more packages would require the given package\n" msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " why - Wyświetlenie pakietów ręcznie zainstalowanych, które " "wymagają\n" " danego pakietu, lub dlaczego pakiet lub pakiety mogą go " "wymagać.\n" -#: src/main.cc:220 +#: src/main.cc:221 #, c-format msgid "" " why-not - Show the manually installed packages that lead to a " @@ -5648,17 +5676,17 @@ msgstr "" "pakiety\n" " mogą prowadzić do konfliktu z danym pakietem po instalacji.\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " Opcje:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, c-format msgid " -h This help text.\n" msgstr " -h Ten tekst pomocy.\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" @@ -5666,17 +5694,17 @@ msgstr "" " --gui Używa interfejsu GTK, nawet jeśli go wyłączono w " "konfiguracji.\n" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr " --no-gui Nie używa interfejsu GTK, nawet jeśli jest dostępny.\n" -#: src/main.cc:231 +#: src/main.cc:232 #, c-format msgid " --qt Use the Qt GUI.\n" msgstr " --qt Używa interfejsu Qt.\n" -#: src/main.cc:232 +#: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" @@ -5684,31 +5712,32 @@ msgstr "" " --no-qt Nie używa interfejsu Qt, nawet jeśli go włączono w " "konfiguracji.\n" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s Symulacja akcji bez ich wykonania.\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr "" " -d Pobranie pakietów bez instalacji lub usuwania czegokolwiek.\n" -#: src/main.cc:236 -#, c-format -msgid " -P Always prompt for confirmation or actions.\n" +#: src/main.cc:237 +#, fuzzy, c-format +#| msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P Pytanie o potwierdzenie wykonywanych akcji.\n" -#: src/main.cc:237 +#: src/main.cc:238 #, c-format msgid "" " -y Assume that the answer to simple yes/no questions is 'yes'.\n" msgstr "" " -y Przyjęcie odpowiedzi \"tak\" na pytania typu tak/nie.\n" -#: src/main.cc:238 +#: src/main.cc:239 #, c-format msgid "" " -F format Specify a format for displaying search results; see the " @@ -5716,7 +5745,7 @@ msgid "" msgstr "" " -F format Format wyświetlania wyników wyszukiwania; patrz podręcznik.\n" -#: src/main.cc:239 +#: src/main.cc:240 #, c-format msgid "" " -O order Specify how search results should be sorted; see the " @@ -5724,36 +5753,36 @@ msgid "" msgstr "" " -O order Sposób sortowania wyników wyszukiwania; patrz podręcznik.\n" -#: src/main.cc:240 +#: src/main.cc:241 #, c-format msgid "" " -w width Specify the display width for formatting search results.\n" msgstr " -w width Szerokość wyświetlania wyników wyszukiwania.\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr "" " -f Agresywne próby naprawienia niespełnionych zależności.\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr " -V Wyświetlanie wersji pakietów do instalacji.\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr "" " -D Wyświetlanie zależności automatycznie zmienianych pakietów.\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr " -Z Wyświetlanie zmian rozmiarów pakietów.\n" -#: src/main.cc:245 +#: src/main.cc:246 #, c-format msgid "" " -v Display extra information. (may be supplied multiple " @@ -5762,7 +5791,7 @@ msgstr "" " -v Wyświetlanie dodatkowych informacji (można podać " "wielokrotnie).\n" -#: src/main.cc:246 +#: src/main.cc:247 #, c-format msgid "" " -t [release] Set the release from which packages should be installed.\n" @@ -5770,52 +5799,59 @@ msgstr "" " -t [wydanie] Ustalenie wydania z którego mają pochodzić instalowane " "pakiety.\n" -#: src/main.cc:247 -#, c-format +#: src/main.cc:248 +#, fuzzy, c-format +#| msgid "" +#| " -q In command-line mode, suppress the incremental progress.\n" +#| " indicators.\n" msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" " -q Wyłączenie wskaźników postępu przy uruchomieniu w trybie\n" " wiersza poleceń.\n" -#: src/main.cc:249 +#: src/main.cc:250 #, c-format msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr " -o nazwa=wartość Bezpośrednie ustawienie wartości podanej opcji.\n" -#: src/main.cc:250 -#, c-format +#: src/main.cc:251 +#, fuzzy, c-format +#| msgid "" +#| " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +#| " strong dependencies.\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends\tCzy traktować rekomendacje (sugestie) jak\n" " silne zależności.\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr "" " -S nazwa-pliku Odczyt rozszerzonych informacji o stanie z pliku nazwa-" "pliku.\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u: : Uaktualnienie listy pakietów przy starcie.\n" -#: src/main.cc:254 src/main.cc:256 -#, c-format -msgid " (terminal interface only)" +#: src/main.cc:255 src/main.cc:257 +#, fuzzy, c-format +#| msgid " (terminal interface only)" +msgid " (terminal interface only)\n" msgstr " (tylko interfejs terminalowy)" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i Przeprowadzenie instalacji przy starcie.\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " Ten aptitude nie posiada Mocy Super Krowy.\n" @@ -5823,49 +5859,49 @@ msgstr " Ten aptitude nie posiada Mocy Super Krowy.\n" # Tłumaczenie tego typu opcji chyba nie jest dobrym pomysłem? #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 msgid "trace" msgstr "trace" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "debug" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 msgid "info" msgstr "info" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "warn" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 msgid "error" msgstr "error" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 msgid "fatal" msgstr "fatal" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "off" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " @@ -5874,48 +5910,48 @@ msgstr "" "Nieprawidłowa nazwa poziomu dziennika \"%s\" (oczekiwano \"trace\", \"debug" "\", \"info\", \"warn\", \"error\", \"fatal\" lub \"off\")." -#: src/main.cc:487 +#: src/main.cc:488 #, c-format msgid "Invalid logger name \"%s\"." msgstr "Błędna nazwa loggera \"%s\"." -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "Brak liczby po -q=\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "Po -q= oczekiwano liczby, napotkano %s\n" -#: src/main.cc:802 +#: src/main.cc:794 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o wymaga podania argumentu postaci nazwa=wartość, otrzymano %s\n" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "Brak kropki po nazwie znacznika \"%s\".\n" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "DZIWNE: otrzymano nieznany kod opcji\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "--show-package-names|never" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "--show-package-names|auto" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "--show-package-names|always" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " @@ -5924,29 +5960,29 @@ msgstr "" "Nieprawidłowy tryb wyświetlania nazw pakietów \"%s\" (oczekiwano \"never\", " "\"auto\" lub \"always\")." -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "no-summary" -#: src/main.cc:1039 +#: src/main.cc:1023 msgid "first-package" msgstr "first-package" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "first-package-and-type" -#: src/main.cc:1043 +#: src/main.cc:1027 msgid "all-packages" msgstr "all-packages" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "all-packages-with-dep-versions" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -5957,7 +5993,7 @@ msgstr "" "\"first-package\", \"first-package-and-type\", \"all-packages\" lub \"all-" "packages-with-dep-versions\"." -#: src/main.cc:1089 +#: src/main.cc:1073 msgid "" "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be " "specified\n" @@ -5965,7 +6001,7 @@ msgstr "" "Można podać tylko jedną z opcji: --auto-clean-on-startup, --clean-on-" "startup, -i lub -u\n" -#: src/main.cc:1098 +#: src/main.cc:1082 msgid "" "-u, -i, and --clean-on-startup may not be specified in command-line mode " "(eg, with 'install')" @@ -5973,21 +6009,21 @@ msgstr "" "-u, -i, ani --clean-on-startup nie można podać dla trybu wiersza poleceń " "(np. z \"install\")" -#: src/main.cc:1115 +#: src/main.cc:1099 msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "-u, -i, ani --clean-on-startup nie można podać razem z poleceniem" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "Nieznane polecenie: \"%s\"\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "Nieobsłużony wyjątek: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" @@ -5996,7 +6032,8 @@ msgstr "" "Ślad stosu:\n" "%s\n" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "Wyszukiwany tekst: " @@ -6867,24 +6904,28 @@ msgstr "zastępuje" msgid "obsoletes" msgstr "dezaktualizuje" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (udostępniany przez %F)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." msgstr "" "Po wybraniu pakietu zostanie tu wyświetlony opis jego bieżącego stanu. " -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -6892,20 +6933,20 @@ msgstr "" "Pakiet %B%s%b był zainstalowany automatycznie; zostanie usunięty, ponieważ " "usuwane są wszystkie wymagające go pakiety:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "" "Pakiet %B%s%b zostanie automatycznie usunięty z powodu niespełnionych " "zależności:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" "Pakiet %B%s%b zostanie automatycznie zainstalowany w celu spełnienia " "następujących zależności:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -6913,7 +6954,7 @@ msgstr "" "Pakiet %B%s%b nie może teraz zostać zaktualizowany. Nawet gdyby mógł, " "zostałby zatrzymany na wersji %B%s%b." -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -6921,28 +6962,28 @@ msgstr "" "Pakiet %B%s%b nie zostanie zaktualizowany do wersji %B%s%b, aby zapobiec " "niespełnieniu następujących zależności:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "Pakiet %B%s%b jest zainstalowany." -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "Pakiet %B%s%b nie jest zainstalowany." -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "Niektóre zależności pakietu %B%s%b nie są spełnione:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "Pakiet %B%s%b zostanie cofnięty." -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "" "Pakiet %B%s%b nie zostanie zaktualizowany do zabronionej wersji %B%s%b." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." @@ -6950,41 +6991,41 @@ msgstr "" "Pakiet %B%s%b może być zaktualizowany do wersji %B%s%b, jest jednak " "zatrzymany na wersji %B%s%b." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "Pakiet %B%s%b zostanie ponownie zainstalowany." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "Pakiet %B%s%b zostanie zainstalowany." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "Pakiet %B%s%b zostanie usunięty." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "" "Pakiet %B%s%b zostanie zaktualizowany z wersji %B%s%b do wersji %B%s%b." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "" "%B%s%b jest częściowo zainstalowany, jego instalacja zostanie dokończona." -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "" "Następujące pakiety wymagają pakietu %B%s%b i po jego usunięciu będą miały " "niespełnione zależności:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "" "Następujące pakiety wymagają pakietu %B%s%b i mają niespełnione zależności:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" @@ -6992,7 +7033,7 @@ msgstr "" "Następujące pakiety są w konflikcie z pakietem %B%s%b i po jego instalacji " "będą miały niespełnione zależności:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -7001,7 +7042,7 @@ msgstr "" "Następujące pakiety wymagają wersji pakietu %B%s%b innej niż obecnie " "zainstalowana wersja %B%s%b lub są w konflikcie z obecną wersją:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -7009,11 +7050,11 @@ msgstr "" "Następujące pakiety są w konflikcie z pakietem %B%s%b lub wymagają takiej " "jego wersji, która nie jest planowana do instalacji." -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "Następujące pakiety są w konflikcie z pakietem %B%s%b:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -7021,7 +7062,7 @@ msgstr "" "Następujące pakiety wymagają wersji pakietu %B%s%b różnej od obecnie " "zainstalowanej wersji %B%s%b:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." @@ -7029,15 +7070,15 @@ msgstr "" "Następujące pakiety wymagają wersji pakietu %B%s%b, która nie jest planowana " "do instalacji." -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "zaktualizowany" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "cofnięty" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7047,7 +7088,7 @@ msgstr "" "(%B%s%b) lub są w konflikcie z wersją do której ma być %s (%B%s%b), będą " "więc miały niespełnione zależności jeśli zostanie %s." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7055,7 +7096,7 @@ msgstr "" "Następujące pakiety są w konflikcie z pakietem %B%2$s%b w wersji %B%1$s%b, i " "będą miały niespełnione zależności jeśli zostanie %3$s." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7091,47 +7132,47 @@ msgstr "Zastosuj" msgid "Close" msgstr "Zamknij" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s jest w konflikcie z %s [udostępniany przez %s %s]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "Usuwanie %s" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "Instalowanie %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "Pozostawienie %ls bez rozwiązania." -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%BUsunięcie%b następujących pakietów:%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%BInstalacja%b następujących pakietów:%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%BZatrzymanie%b bieżących wersji następujących pakietów:%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%BAktualizacja%b następujących pakietów:%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%BCofnięcie%b następujących pakietów do wcześniejszych wersji:%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "Pozostawienie następujących problemów z zależnościami:%n" @@ -7232,10 +7273,6 @@ msgstr "E:" msgid "W:" msgstr "W:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "Wyszukiwany tekst:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7602,7 +7639,9 @@ msgid "Error while dumping resolver state" msgstr "Błąd w czasie zapisu stanu procedury rozwiązywania zależności" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "Plik do zapisu stanu procedury rozwiązywania zależności:" #: src/ui.cc:2265 @@ -8115,6 +8154,21 @@ msgstr "" "Debiana." #~ msgid "" +#~ "%BOption:%b %s\n" +#~ "%BDefault:%b %s\n" +#~ "%BValue:%b %s\n" +#~ msgstr "" +#~ "%BOpcja:%b %s\n" +#~ "%BDomyślnie:%b %s\n" +#~ "%BWartość:%b %s\n" + +#~ msgid "Press Return to continue" +#~ msgstr "Wciśnij return" + +#~ msgid "Search for:" +#~ msgstr "Wyszukiwany tekst:" + +#~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." #~ msgstr "" #~ "Nie można rozwiązać problemów z zależnościami dla aktualizacji " @@ -8242,11 +8296,6 @@ msgstr "" #~ msgid "gtk-yes" #~ msgstr "tak" -#, fuzzy -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "Błędna operacja '%s'" - #~ msgid "but it is not installable" #~ msgstr "którego nie można zainstalować" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2010-04-12 23:22+0100\n" "Last-Translator: Miguel Figueiredo <elmig@debianPT.org>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" @@ -16,42 +16,36 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" -msgstr "" -"%BOpção:%b %s\n" -"%BPredefinição:%b %s\n" -"%BValor:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " +msgstr "%BOpção:%b " + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " +msgstr "%BPredefinição:%b " -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "Verdadeiro" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "Falso" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " -msgstr "%BOpção:%b " - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "%BPredefinição:%b " - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "%BValor:%b " -#: src/apt_config_treeitems.cc:279 -#, c-format -msgid "Editing \"%ls\"" +#: src/apt_config_treeitems.cc:280 +#, fuzzy, c-format +#| msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "A editar \"%ls\"" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "%BEscolha:%b " @@ -654,8 +648,8 @@ msgstr "Erro fatal no resolvedor" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] A resolver as dependências" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "Erro interno: solução nula não esperada." @@ -951,7 +945,7 @@ msgstr "" "--full-resolver.\n" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "Abortar.\n" @@ -1318,7 +1312,7 @@ msgstr "" "Não existem pacotes para mostrar -- introduza os nomes dos pacotes na linha " "a seguir a 'i'.\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "Carregue em Return (Enter) para continuar." @@ -1329,10 +1323,6 @@ msgstr "" "Não foram encontrados pacotes -- introduza os nomes dos pacotes na linha a " "seguir a 'c'.\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "Carregue em Return (Enter) para continuar" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1646,7 +1636,7 @@ msgstr "Estado do resolvedor escrito com sucesso!" #| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: " #| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: %F" @@ -1924,7 +1914,7 @@ msgstr "" "dependências." #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "A resolver as dependências..." @@ -1962,7 +1952,9 @@ 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:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +msgid "No solution found within the allotted time. Try harder? [Y/n] " msgstr "" "Não foi encontrada nenhuma solução dentro do tempo alocado. Tentar melhor? " "[Y/n]" @@ -2167,7 +2159,7 @@ msgstr "Pacote: " msgid "State" msgstr "Estado" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "Disponibilizado por" @@ -2275,27 +2267,31 @@ msgstr "Substitui" msgid "Obsoletes" msgstr "Obsoleta" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Disponibiliza" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Descrição: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "Página de Internet: " -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "Não foi possível localizar o pacote %s" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "Não foi possível processar o padrão %s" @@ -2617,6 +2613,11 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "Escolha de versão desconhecida, algo está muito errado." +#: src/cmdline_parse.cc:22 +#, c-format +msgid "Invalid command-line option '%s'" +msgstr "Opção inválida da linha de comandos, '%s'" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "Fim-de-ficheiro inesperado na entrada standard" @@ -2633,7 +2634,7 @@ msgstr "" msgid "UNSATISFIED" msgstr "(NÃO SATISFEITAS)" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "INDISPONÍVEL" @@ -2641,7 +2642,7 @@ msgstr "INDISPONÍVEL" msgid "Tags" msgstr "Tags" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "Tags do Utilizador" @@ -3064,16 +3065,21 @@ msgstr "Não foi possível criar cache truncada: %s." msgid "Unable to open %s to log actions" msgstr "Não é possível abrir %s para gravar o log das acções" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "Erro ao gerar o tempo local (%s)" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "relatório de log" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -3084,81 +3090,81 @@ msgstr "" "falham devido a problemas do dpkg podem não estar completas.\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "Serão instalados %li pacotes e removidos %li pacotes.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "%sB de espaço em disco será usado\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "serão libertados %sB de espaço em disco\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[ACTUALIZAR] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[DOWNGRADE] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "REMOVER" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "INSTALAR" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "REINSTALAR" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "MANTER" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "DANIFICADO" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "REMOVER, NÃO UTILIZADO" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "REMOVER, DEPENDÊNCIAS" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "INSTALAR, DEPENDÊNCIAS" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "MANTER, DEPENDÊNCIAS" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "NÃO CONFIGURADO" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -3181,46 +3187,46 @@ msgstr "" msgid "Filtering packages" msgstr "A transferir pacotes" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "Tipo de acção desconhecida: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "String literal não terminada após %s" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "Prioridade desconhecida %s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "O padrão a coincidir termina inesperadamente (esperado '%c')." -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "Esperado '%c', obtido '%c'." -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "Tipo de dependência desconhecida: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, c-format msgid "Unknown term type: \"%s\"." msgstr "Tipo de terminal desconhecido: \"%s\"." #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, c-format msgid "" "The ?%s term must be used in a \"wide\" context (a top-level context, or a " @@ -3229,33 +3235,33 @@ msgstr "" "O termo ?%s tem de ser utilizado num contexto \"lato\" (um contexto de nível " "de topo, ou um contexto fechado por ?%s)." -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "'(' sem par" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "Disponibiliza: não pode ser estragado" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "Tipo de padrão desconhecido: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "Não pode procurar por \"\"" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "Expressão vazia não esperada" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, c-format msgid "Badly formed expression: expected '|', got '%c'" msgstr "Expressão mal formada: esperado '|', obtido '%c'" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "')' inesperado" @@ -4157,22 +4163,22 @@ msgstr "" msgid "%s: Unable to accept a connection: %s" msgstr "i%s: Não foi possível aceitar uma ligação: %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "[%s] a iniciar o processo dpkg...\n" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "[%s] processo dpkg terminado.\n" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "[%s] o processo dpkg falhou.\n" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4816,7 +4822,7 @@ msgstr "" msgid "Virtual package" msgstr "Pacote virtual" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "Não Instalado" @@ -4997,203 +5003,209 @@ msgstr "%s substitui %s" msgid "%s obsoletes %s" msgstr "%s torna obsoleto %s" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s substitui %s" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "Remover os seguintes pacotes:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "Instalar Os seguintes pacotes:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 msgid "Keep the following packages:" msgstr "Manter os seguintes pacotes:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "Actualizar os seguintes pacotes:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "Downgrade aos seguintes pacotes:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 msgid "Leave the following dependencies unresolved:" msgstr "Deixar as seguintes dependências por resolver:" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, c-format msgid "Remove %s [<big>%s</big> (%s)]" msgstr "Remover %s [<big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, c-format msgid "Install %s [<big>%s</big> (%s)]" msgstr "Instalar %s [<big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, c-format msgid "Cancel the installation of %s" msgstr "Cancelar a instalação de %s" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, c-format msgid "Cancel the removal of %s" msgstr "Cancelar a remoção de %s" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, c-format msgid "Keep %s at version <big>%s</big> (%s)" msgstr "Manter %s na versão <big>%s</big> (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, c-format msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Actualizar %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, c-format msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Downgrade de %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, c-format msgid "<b>Remove</b> %s" msgstr "<b>Remover</b> %s" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, c-format msgid "<b>remove</b> %s" msgstr "<b>remover</b> %s" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, c-format msgid "<b>Keep</b> %s at version %s" msgstr "<b>Manter</b> %s na versão %s" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, c-format msgid "<b>keep</b> %s at version %s" msgstr "<b>manter</b> %s na versão %s" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, c-format msgid "<b>Cancel</b> the installation of %s" msgstr "<b>Cancelar</b> a instalação de %s" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, c-format msgid "<b>cancel</b> the installation of %s" msgstr "<b>cancelar</b> a instalação de %s" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, c-format msgid "<b>Install</b> %s %s" msgstr "<b>Instalar</b> %s %s" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, c-format msgid "<b>install</b> %s %s" msgstr "<b>instalar</b> %s %s" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>Downgrade</b> %s to version %s" msgstr "<b>Downgrade</b> %s para a versão %s" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>downgrade</b> %s to version %s" msgstr "<b>downgrade</b> %s para a versão %s" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>Upgrade</b> %s to version %s" msgstr "<b>Actualizar</b> %s para a versão %s" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>upgrade</b> %s to version %s" msgstr "<b>actualizar</b> %s para a versão %s" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "Deixar %s por resolver" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "deixar %s por resolver" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, c-format msgid "%s install" msgid_plural "%s installs" msgstr[0] "%s instalação" msgstr[1] "%s instalações" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, c-format msgid "%s remove" msgid_plural "%s removes" msgstr[0] "%s remoção" msgstr[1] "%s remoções" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, c-format msgid "%s keep" msgid_plural "%s keeps" msgstr[0] "%s mantido" msgstr[1] "%s mantidos" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, c-format msgid "%s upgrade" msgid_plural "%s upgrades" msgstr[0] "%s actualização" msgstr[1] "%s actualizações" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, c-format msgid "%s downgrade" msgid_plural "%s downgrades" msgstr[0] "%s downgrade" msgstr[1] "%s downgrades" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, c-format msgid "%s unresolved recommendation" msgid_plural "%s unresolved recommendations" msgstr[0] "%s recomendação não resolvida" msgstr[1] "%s recomendações não resolvidas" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 msgid "No solutions yet." msgstr "Ainda sem soluções." -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 msgid "No dependency solution was found." msgstr "Não foi encontrada solução de dependências." -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 msgid "No solutions." msgstr "Sem soluções." -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "Para ver uma solução, escolha-a na lista à direita." -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, c-format msgid "%u solutions." msgstr "%u soluções." -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Solution %s of %s (tier %s)." msgid "Solution %s of %s." @@ -5510,12 +5522,12 @@ msgstr " Suporte para Ept desactivado.\n" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s compilado em %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5671,29 +5683,35 @@ msgstr " show - Mostrar informação detalhada acerca de um pacote\n" #: src/main.cc:213 #, fuzzy, c-format +#| msgid " show - Display detailed information about a package\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - Mostrar informação detalhada acerca de um pacote\n" + +#: src/main.cc:214 +#, fuzzy, c-format #| msgid " clean - Erase downloaded package files\n" msgid " clean - Erase downloaded package files.\n" msgstr " clean - Apagar ficheiros de pacotes já transferidos\n" -#: src/main.cc:214 +#: src/main.cc:215 #, fuzzy, c-format #| msgid " autoclean - Erase old downloaded package files\n" msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean - Apagar ficheiros antigos de pacotes transferidos\n" -#: src/main.cc:215 +#: src/main.cc:216 #, fuzzy, c-format #| msgid " changelog - View a package's changelog\n" msgid " changelog - View a package's changelog.\n" msgstr " changelog - Ver o registo de alterações de um pacote\n" -#: src/main.cc:216 +#: src/main.cc:217 #, fuzzy, c-format #| msgid " download - Download the .deb file for a package\n" msgid " download - Download the .deb file for a package.\n" msgstr " download - Transferir o ficheiro .deb para um pacote\n" -#: src/main.cc:217 +#: src/main.cc:218 #, fuzzy, c-format #| msgid "" #| " reinstall - Download and (possibly) reinstall a currently installed " @@ -5705,19 +5723,23 @@ msgstr "" " reinstall - Transferir e (possivelmente) reinstalar um pacote " "actualmente instalado\n" -#: src/main.cc:218 -#, c-format +#: src/main.cc:219 +#, fuzzy, c-format +#| msgid "" +#| " why - Show the manually installed packages that require a " +#| "package, or\n" +#| " why one or more packages would require the given package\n" msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " why - Mostrar os pacotes instalados manualmente que necessitem " "dum\n" " pacote, ou porque um ou mais pacotes necessitariam dum dado " "pacote\n" -#: src/main.cc:220 +#: src/main.cc:221 #, fuzzy, c-format #| msgid "" #| " why-not - Show the manually installed packages that lead to a " @@ -5734,36 +5756,36 @@ msgstr "" " why-not - Mostrar os pacotes instalados manualmente que levam a um\n" " conflito com o dito pacote, se instalado\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " Opções:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " -h This help text.\n" msgstr " -h Este texto de ajuda\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" " --gui\t\t Utilizar o GUI GTK mesmo que desabilitado na configuração.\n" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr " --no-gui \tNão utilizar o GUI GTK mesmo que disponível.\n" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h Este texto de ajuda\n" -#: src/main.cc:232 +#: src/main.cc:233 #, fuzzy, c-format #| msgid "" #| " --gui Use the GTK GUI even if disabled in the configuration.\n" @@ -5772,25 +5794,25 @@ msgid "" msgstr "" " --gui\t\t Utilizar o GUI GTK mesmo que desabilitado na configuração.\n" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s Simular acções, sem as executar.\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr "" " -d Transferir apenas os pacotes, não instalar ou remover nada.\n" -#: src/main.cc:236 +#: src/main.cc:237 #, fuzzy, c-format #| msgid " -P Always prompt for confirmation or actions\n" -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P Pedir sempre por confirmação ou acções\n" -#: src/main.cc:237 +#: src/main.cc:238 #, fuzzy, c-format #| msgid "" #| " -y Assume that the answer to simple yes/no questions is " @@ -5801,7 +5823,7 @@ msgstr "" " -y Assumir que a resposta é 'sim' para perguntas simples de sim/" "não\n" -#: src/main.cc:238 +#: src/main.cc:239 #, fuzzy, c-format #| msgid "" #| " -F format Specify a format for displaying search results; see the " @@ -5813,7 +5835,7 @@ msgstr "" " -F formato Especificar um formato para exibição dos resultados da " "pesquisa; ver o manual\n" -#: src/main.cc:239 +#: src/main.cc:240 #, fuzzy, c-format #| msgid "" #| " -O order Specify how search results should be sorted; see the " @@ -5825,7 +5847,7 @@ msgstr "" " -O ordem Especifica como os resultados das pesquisas devem ser " "ordenados; ver o manual\n" -#: src/main.cc:240 +#: src/main.cc:241 #, fuzzy, c-format #| msgid "" #| " -w width Specify the display width for formatting search results\n" @@ -5835,19 +5857,19 @@ msgstr "" " -w largura Especifica a largura de exibição para formatar os " "resultados de pesquisa\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr "" " -f Tentar agressivamente corrigir os pacotes com problemas.\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr "" " -V Exibir quais as versões de pacotes que irão ser instalados.\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" @@ -5855,13 +5877,13 @@ msgstr "" " -D Exibir as dependências dos pacotes modificados " "automaticamente.\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr "" " -Z Mostrar a alteração no tamanho instalado de cada pacote.\n" -#: src/main.cc:245 +#: src/main.cc:246 #, fuzzy, c-format #| msgid "" #| " -v Display extra information. (may be supplied multiple " @@ -5872,7 +5894,7 @@ msgid "" msgstr "" " -v Exibir informação extra. (pode ser fornecido várias vezes)\n" -#: src/main.cc:246 +#: src/main.cc:247 #, fuzzy, c-format #| msgid "" #| " -t [release] Set the release from which packages should be installed\n" @@ -5881,108 +5903,108 @@ msgid "" msgstr "" " -t [release] Define de que distribuição os pacotes devem ser instalados\n" -#: src/main.cc:247 +#: src/main.cc:248 #, fuzzy, c-format #| msgid "" #| " -q In command-line mode, suppress the incremental progress\n" #| " indicators.\n" msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" " -q No modo de linha de comandos, suprimir os " "indicadores incrementais de progresso.\n" -#: src/main.cc:249 +#: src/main.cc:250 #, fuzzy, c-format #| msgid " -o key=val Directly set the configuration option named 'key'\n" msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr "" " -o key=val Define directamente a opção de configuração chamada 'key'\n" -#: src/main.cc:250 +#: src/main.cc:251 #, fuzzy, c-format #| msgid "" #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" #| " strong dependencies\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends\tEspecifica se as recomendações devem ser \n" " tratadas como dependências fortes\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr "" " -S fname Lê a informação de estado estendido do aptitude do fname.\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u Transferir novas listas de pacotes no arranque.\n" -#: src/main.cc:254 src/main.cc:256 -#, c-format -msgid " (terminal interface only)" -msgstr "" +#: src/main.cc:255 src/main.cc:257 +#, fuzzy, c-format +msgid " (terminal interface only)\n" +msgstr " -h Este texto de ajuda\n" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i Executa uma execução de instalação no arranque.\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " Este aptitude não tem Poderes de Super Vaca.\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 msgid "trace" msgstr "trace" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "debug" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 msgid "info" msgstr "info" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "warn" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 msgid "error" msgstr "erro" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 msgid "fatal" msgstr "fatal" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "off" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " @@ -5991,77 +6013,77 @@ msgstr "" "Nome de nível de log desconhecido \"%s\" (esperado \"trace\", \"debug\", " "\"info\", \"warn\", \"error\", \"fatal\", ou \"off\")." -#: src/main.cc:487 +#: src/main.cc:488 #, c-format msgid "Invalid logger name \"%s\"." msgstr "Nome de logger inválido \"%s\"." -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "Esperava um número após -q=\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "Esperava um número após -q=, foi obtido %s\n" -#: src/main.cc:802 +#: src/main.cc:794 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o necessita de um argumento na forma chave=valor, foi obtido %s\n" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "Nenhuma vírgula a seguir o nome do 'tag' \"%s\".\n" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "ESTRANHO: recebida uma opção de código desconhecida\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "no-summary" -#: src/main.cc:1039 +#: src/main.cc:1023 msgid "first-package" msgstr "first-package" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "first-package-and-type" -#: src/main.cc:1043 +#: src/main.cc:1027 msgid "all-packages" msgstr "all-packages" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "all-packages-with-dep-versions" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -6072,7 +6094,7 @@ msgstr "" "\"first-package\", \"first-package-and-type\", \"all-packages\", ou \"all-" "packages-with-dep-versions\"." -#: src/main.cc:1089 +#: src/main.cc:1073 #, fuzzy #| msgid "Only one of -u and -i may be specified\n" msgid "" @@ -6080,7 +6102,7 @@ msgid "" "specified\n" msgstr "Apenas uma das opções -u e -i pode ser especificada\n" -#: src/main.cc:1098 +#: src/main.cc:1082 #, fuzzy #| msgid "" #| "-u and -i may not be specified in command-line mode (eg, with 'install')" @@ -6091,23 +6113,23 @@ msgstr "" "-u e -i não podem ser especificadas em modo de linha de comando (eg. com " "'install')" -#: src/main.cc:1115 +#: src/main.cc:1099 #, fuzzy #| msgid "-u and -i may not be specified with a command" msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "-u e -i não podem ser especificadas com um comando" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "Comando desconhecido \"%s\"\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "Excepção não tratada: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" @@ -6116,7 +6138,8 @@ msgstr "" "Backtrace:\n" "%s\n" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "Procurar por: " @@ -7012,17 +7035,21 @@ msgstr "substitui" msgid "obsoletes" msgstr "obsoletos" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (disponibilizado por %F)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." @@ -7030,7 +7057,7 @@ msgstr "" "Se seleccionar um pacote, uma explicação de seu estado actual aparecerá " "neste espaço." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -7038,18 +7065,18 @@ msgstr "" "%B%s%b foi instalado automaticamente; está agora a ser removido dado que " "todos os pacotes que dependiam dele estão também a ser removidos:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "%B%s%b será removido automaticamente devido a erros de dependências:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" "%B%s%b será instalado automaticamente para satisfazer as seguintes " "dependências:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -7057,7 +7084,7 @@ msgstr "" "%B%s%b não pode ser actualizado neste momento, mas se pudesse, ainda assim " "seria mantido na versão %B%s%b." -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -7065,27 +7092,27 @@ msgstr "" "%B%s%b não será actualizado para a versão %B%s%b para evitar quebrar as " "seguintes dependências :" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b está actualmente instalado." -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b não está actualmente instalado." -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "Algumas dependências de %B%s%b não estão satisfeitas:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "será feito downgrade a %B%s%b." -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b não será actualizado para a versão %B%s%b que está proibida." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." @@ -7093,39 +7120,39 @@ msgstr "" "%B%s%b poderia ser actualizado para a versão %B%s%b, mas será mantido na " "versão %B%s%b." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b será reinstalado." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b será instalado." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b será removido." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b será actualizado da versão %B%s%b para a versão %B%s%b." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "" "%B%s%b está apenas parcialmente instalado; a sua instalação será completada." -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "" "Os pacotes seguintes dependem de %B%s%b e ficarão com problemas com a sua " "remoção:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "Os pacotes seguintes dependem de %B%s%b e estão com problemas:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" @@ -7133,7 +7160,7 @@ msgstr "" "Os pacotes seguintes entram em conflito com %B%s%b e ficarão com problemas " "pela sua instalação:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -7143,7 +7170,7 @@ msgstr "" "%s%b actualmente instalada, ou entram em conflito com a versão actualmente " "instalada:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -7151,11 +7178,11 @@ msgstr "" "Os pacotes seguintes entram em conflito com %B%s%b, ou dependem de uma " "versão desse pacote que não irá ser instalada." -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "Os pacotes seguintes estão em conflito com %B%s%b:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -7163,7 +7190,7 @@ msgstr "" "Os seguintes pacotes dependem de uma versão de %B%s%b em vez da versão de %B" "%s%b que está actualmente instalada:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." @@ -7171,15 +7198,15 @@ msgstr "" "Os seguintes pacotes dependem de uma versão de %B%s%b que não vai ser " "instalada." -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "actualizados" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "feito downgrade" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7189,7 +7216,7 @@ msgstr "" "instalada, ou entram em conflito com a versão que será %s para (%B%s%b), e " "ficará com problemas se for %s." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7197,7 +7224,7 @@ msgstr "" "Os seguintes pacotes estão em conflito com a versão %B%s%b de %B%s%b, e " "ficarão com problemas se for %s." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7233,47 +7260,47 @@ msgstr "Aplicar" msgid "Close" msgstr "Fechar" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s em conflito com %s [disponibilizado por %s %s]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "A remover %s" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "A instalar %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "Deixar %ls por resolver." -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%BRemover%b os seguintes pacotes:%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%BInstalar%b Os seguintes pacotes:%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%BManter%b os seguintes pacotes na sua versão actual:%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%BActualizar%b os seguintes pacotes:%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%BDowngrade%b dos seguintes pacotes:%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "Deixar as seguintes dependências por resolver:%n" @@ -7372,10 +7399,6 @@ msgstr "E:" msgid "W:" msgstr "W:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "Procurar por:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7757,7 +7780,9 @@ msgid "Error while dumping resolver state" msgstr "Erro enquanto fazia o dump do estado do resolvedor" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "Ficheiro para o qual deve ser feito o dump do estado do resolvedor:" #: src/ui.cc:2265 @@ -8278,6 +8303,21 @@ msgstr "A transferir os changelogs" msgid "You can only view changelogs of official Debian packages." msgstr "Só pode ver 'changelogs' de pacotes oficiais Debian." +#~ msgid "" +#~ "%BOption:%b %s\n" +#~ "%BDefault:%b %s\n" +#~ "%BValue:%b %s\n" +#~ msgstr "" +#~ "%BOpção:%b %s\n" +#~ "%BPredefinição:%b %s\n" +#~ "%BValor:%b %s\n" + +#~ msgid "Press Return to continue" +#~ msgstr "Carregue em Return (Enter) para continuar" + +#~ msgid "Search for:" +#~ msgstr "Procurar por:" + #~ msgid "but it is not installable" #~ msgstr "mas não é instalável" @@ -8293,10 +8333,6 @@ msgstr "Só pode ver 'changelogs' de pacotes oficiais Debian." #~ msgid "E: The %s command takes no arguments\n" #~ msgstr "E: O comando %s não leva argumentos\n" -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "Opção inválida da linha de comandos, '%s'" - #~| msgid "Section" #~ msgid "Safe actions" #~ msgstr "Acções seguras" @@ -8666,10 +8702,6 @@ msgstr "Só pode ver 'changelogs' de pacotes oficiais Debian." #~ " -V Exibir quais as versões de pacotes que irão ser " #~ "instalados.\n" -#, fuzzy -#~ msgid " indicators.\n" -#~ msgstr " -h Este texto de ajuda\n" - #~ msgid "There are now %F." #~ msgstr "Agora existem %F." diff --git a/po/pt_BR.po b/po/pt_BR.po index 77c5bc39..f2dc5e63 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: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2008-06-15 18:07-0300\n" "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n" "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian." @@ -15,42 +15,36 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" -msgstr "" -"%BOpção:%b %s\n" -"%BPadrão:%b %s\n" -"%BValor:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " +msgstr "%BOpção:%b " + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " +msgstr "%BPadrão:%b " -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "Verdadeiro" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "Falso" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " -msgstr "%BOpção:%b " - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "%BPadrão:%b " - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "%BValor:%b " -#: src/apt_config_treeitems.cc:279 -#, c-format -msgid "Editing \"%ls\"" +#: src/apt_config_treeitems.cc:280 +#, fuzzy, c-format +#| msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "Editando \"%ls\"" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "%BEscolha:%b " @@ -655,8 +649,8 @@ msgstr "Erro fatal no resolvedor" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] Resolvendo dependências" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "Erro interno: solução nula inesperada." @@ -955,7 +949,7 @@ msgstr "" "resolver.\n" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "Abortar.\n" @@ -1325,7 +1319,7 @@ msgstr "" "Nenhum pacote para mostrar -- informe os nomes dos pacotes na linha após " "'i'.\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "Pressione Enter para continuar." @@ -1335,10 +1329,6 @@ msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "" "Nenhum pacote encontrado -- informe os nomes dos pacotes na linha após 'c'.\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "Pressione Enter para continuar" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1652,7 +1642,7 @@ msgstr "Estado do resolvedor escrito com sucesso!" #| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: " #| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "s: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr versão pacote ...: %F%na versão " @@ -1928,7 +1918,7 @@ msgstr "" "criado." #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "Resolvendo dependências..." @@ -1966,7 +1956,9 @@ 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:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +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]" @@ -2177,7 +2169,7 @@ msgstr "Pacote: " msgid "State" msgstr "Estado" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "Fornecido por" @@ -2285,27 +2277,31 @@ msgstr "Substitui" msgid "Obsoletes" msgstr "Torna obsoleto" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Fornece" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Descrição: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "Página web: " -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "Impossível localizar pacote %s" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "Impossível interpretar padrão %s" @@ -2625,6 +2621,12 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "" +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "Operação %s inválida" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "Fim de arquivo inesperado na entrada padrão" @@ -2642,7 +2644,7 @@ msgstr "[ERRO]" msgid "UNSATISFIED" msgstr "NÃO SATISFEITAS" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "NÃO DISPONÍVEIS" @@ -2650,7 +2652,7 @@ msgstr "NÃO DISPONÍVEIS" msgid "Tags" msgstr "Tags" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "Tags de Usuário" @@ -3061,16 +3063,21 @@ msgstr "Impossível localizar pacote %s" msgid "Unable to open %s to log actions" msgstr "Impossível abrir %s para registrar ações" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "Erro gerando hora local (%s)" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "relatório de log" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -3080,81 +3087,81 @@ msgstr "" "IMPORTANTE: este log lista somente ações pretendidas; ações que falham\n" "devido a problemas do dpkg podem não estar completas.\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "Serão instalados %li pacotes e removidos %li pacotes.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "%sB de espaço em disco serão usados\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "%sB de espaço em disco serão liberados\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[ATUALIZAÇÃO] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[REVERTER] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "REMOVER" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "INSTALAR" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "REINSTALAR" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "RETER" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "QUEBRADO" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "REMOVER, NÃO USADOS" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "REMOVER, DEPENDÊNCIAS" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "INSTALAR, DEPENDÊNCIAS" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "RETER, DEPENDÊNCIAS" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "NÃO CONFIGURADO" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -3177,39 +3184,39 @@ msgstr "" msgid "Filtering packages" msgstr "Baixando pacotes" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "Tipo de ação desconhecida: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "String literal não terminada depois de %s" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "Prioridade %s desconhecida" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "Padrão de combinação termina inesperadamente (esperado '%c')." -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "Esperado '%c', obtido '%c'." -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "Tipo de dependência desconhecida: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, fuzzy, c-format #| msgid "Unknown matcher type: \"%s\"." msgid "Unknown term type: \"%s\"." @@ -3217,7 +3224,7 @@ msgstr "Tipo de combinação desconhecido: \"%s\"." #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, fuzzy, c-format #| msgid "" #| "The ?%s matcher must be used in a \"wide\" context (a top-level context, " @@ -3229,34 +3236,34 @@ msgstr "" "O combinador ?%s deve ser usado em um contexto \"amplo\" (um contexto de " "nível mais alto, ou um contexto envolto por ?%s)." -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "'(' sem par" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "Fornece: não pode estar quebrado" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "Tipo de padrão desconhecido: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "Não foi possível pesquisar \"\"" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "Expressão vazia não esperada" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, fuzzy, c-format #| msgid "Badly formed expression" msgid "Badly formed expression: expected '|', got '%c'" msgstr "Expressão mal formada" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "')' inesperado" @@ -4204,22 +4211,22 @@ msgstr "" msgid "%s: Unable to accept a connection: %s" msgstr "Impossível criar diretório temporário a partir de modelo \"%s\": %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4952,7 +4959,7 @@ msgstr "" msgid "Virtual package" msgstr "Pacote" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "Não Instalado" @@ -5122,163 +5129,169 @@ msgstr "%s substitui %s" msgid "%s obsoletes %s" msgstr "%s obsoleta %s" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s substitui %s" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "Remover os pacotes a seguir:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "Instalar os pacotes a seguir:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 #, fuzzy #| msgid "Remove the following packages:" msgid "Keep the following packages:" msgstr "Remover os pacotes a seguir:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "Atualizar os pacotes a seguir:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "Reverter a versão dos pacotes a seguir:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 #, fuzzy #| msgid "Leave the following dependencies unresolved:%n" msgid "Leave the following dependencies unresolved:" msgstr "Manter as seguintes dependências não resolvidas:%n" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, fuzzy, c-format #| msgid "Remove %F [%s (%s)]" msgid "Remove %s [<big>%s</big> (%s)]" msgstr "Remover %F [%s (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "Install %s [<big>%s</big> (%s)]" msgstr "Instalar %F [%s (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "Cancel the installation of %s" msgstr "Cancelar a instalação de %F" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Cancel the removal of %s" msgstr "Cancelar a remoção de %F" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "Keep %s at version <big>%s</big> (%s)" msgstr "Manter %F na versão %s (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, fuzzy, c-format #| msgid "Upgrade %F [%s (%s) -> %s (%s)]" msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Atualizar %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, fuzzy, c-format #| msgid "Downgrade %F [%s (%s) -> %s (%s)]" msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Reverter %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>Remove</b> %s" msgstr "Remover(%s)" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>remove</b> %s" msgstr "Remover(%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>Keep</b> %s at version %s" msgstr "Manter %F na versão %s (%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>keep</b> %s at version %s" msgstr "Manter %F na versão %s (%s)" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>Cancel</b> the installation of %s" msgstr "Cancelar a instalação de %F" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>cancel</b> the installation of %s" msgstr "Cancelar a instalação de %F" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>Install</b> %s %s" msgstr "Instalar %F [%s (%s)]" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>install</b> %s %s" msgstr "Instalar %F [%s (%s)]" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "<b>Downgrade</b> %s to version %s" msgstr " versão cwidget: %s\n" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "<b>downgrade</b> %s to version %s" msgstr " versão cwidget: %s\n" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>Upgrade</b> %s to version %s" msgstr "%s versões" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>upgrade</b> %s to version %s" msgstr "%s versões" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format #| msgid "%d install" #| msgid_plural "%d installs" @@ -5287,7 +5300,7 @@ msgid_plural "%s installs" msgstr[0] "%d instalação" msgstr[1] "%d instalações" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, fuzzy, c-format #| msgid "%d removal" #| msgid_plural "%d removals" @@ -5296,7 +5309,7 @@ msgid_plural "%s removes" msgstr[0] "%d remoção" msgstr[1] "%d remoções" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, fuzzy, c-format #| msgid "%d keep" #| msgid_plural "%d keeps" @@ -5305,7 +5318,7 @@ msgid_plural "%s keeps" msgstr[0] "%d mantido" msgstr[1] "%d mantidos" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, fuzzy, c-format #| msgid "%d upgrade" #| msgid_plural "%d upgrades" @@ -5314,7 +5327,7 @@ msgid_plural "%s upgrades" msgstr[0] "%d atualização" msgstr[1] "%d atualizações" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, fuzzy, c-format #| msgid "%d downgrade" #| msgid_plural "%d downgrades" @@ -5323,7 +5336,7 @@ msgid_plural "%s downgrades" msgstr[0] "%d reversão" msgstr[1] "%d reversões" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, fuzzy, c-format #| msgid "Audit ^Recommendations" msgid "%s unresolved recommendation" @@ -5331,35 +5344,35 @@ msgid_plural "%s unresolved recommendations" msgstr[0] "Auditar ^recomendações" msgstr[1] "Auditar ^recomendações" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 #, fuzzy #| msgid "No more solutions." msgid "No solutions yet." msgstr "Sem mais soluções." -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 #, fuzzy #| msgid "Dependency handling" msgid "No dependency solution was found." msgstr "Gerenciamento de dependências" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 #, fuzzy #| msgid "No more solutions." msgid "No solutions." msgstr "Sem mais soluções." -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, fuzzy, c-format #| msgid "No more solutions." msgid "%u solutions." msgstr "Sem mais soluções." -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Could not open file \"%s\"" msgid "Solution %s of %s." @@ -5675,12 +5688,12 @@ msgstr " Suporte a ept desabilitado.\n" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s compilado em %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5835,29 +5848,35 @@ msgstr " show - Exibe informações detalhadas sobre um pacote\n" #: src/main.cc:213 #, fuzzy, c-format +#| msgid " show - Display detailed information about a package\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - Exibe informações detalhadas sobre um pacote\n" + +#: src/main.cc:214 +#, fuzzy, c-format #| msgid " clean - Erase downloaded package files\n" msgid " clean - Erase downloaded package files.\n" msgstr " clean - Apaga arquivos de pacotes baixados\n" -#: src/main.cc:214 +#: src/main.cc:215 #, fuzzy, c-format #| msgid " autoclean - Erase old downloaded package files\n" msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean - Apaga arquivos antigos de pacotes baixados\n" -#: src/main.cc:215 +#: src/main.cc:216 #, fuzzy, c-format #| msgid " changelog - View a package's changelog\n" msgid " changelog - View a package's changelog.\n" msgstr " changelog - Visualiza o log de mudanças de um pacote\n" -#: src/main.cc:216 +#: src/main.cc:217 #, fuzzy, c-format #| msgid " download - Download the .deb file for a package\n" msgid " download - Download the .deb file for a package.\n" msgstr " download - Baixa do arquivo .deb de um pacote\n" -#: src/main.cc:217 +#: src/main.cc:218 #, fuzzy, c-format #| msgid "" #| " reinstall - Download and (possibly) reinstall a currently installed " @@ -5868,18 +5887,22 @@ msgid "" msgstr "" " reinstall - Baixa e (possivelmente) reinstala um pacote já instalado\n" -#: src/main.cc:218 -#, c-format +#: src/main.cc:219 +#, fuzzy, c-format +#| msgid "" +#| " why - Show the manually installed packages that require a " +#| "package, or\n" +#| " why one or more packages would require the given package\n" msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " why - Mostra os pacotes manualmente instalados que requerem um\n" " pacote, ou mostra por que um ou mais pacotes precisariam\n" " do pacote dado\n" -#: src/main.cc:220 +#: src/main.cc:221 #, fuzzy, c-format #| msgid "" #| " why-not - Show the manually installed packages that lead to a " @@ -5898,58 +5921,58 @@ msgstr "" " pacotes levariam a um conflito com o pacote dado, se\n" " instalado\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " Opções:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " -h This help text.\n" msgstr " -h Este texto de ajuda\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h Este texto de ajuda\n" -#: src/main.cc:232 +#: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr "" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s Simular ações, mas não executá-las de verdade.\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr " -d Somente baixa pacotes, não instala ou remove nada.\n" -#: src/main.cc:236 +#: src/main.cc:237 #, fuzzy, c-format #| msgid " -P Always prompt for confirmation or actions\n" -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P Sempre pedir por confirmação ou ações\n" -#: src/main.cc:237 +#: src/main.cc:238 #, fuzzy, c-format #| msgid "" #| " -y Assume that the answer to simple yes/no questions is " @@ -5960,7 +5983,7 @@ msgstr "" " -y Assume que a resposta para perguntas simples sim/não é " "'sim'\n" -#: src/main.cc:238 +#: src/main.cc:239 #, fuzzy, c-format #| msgid "" #| " -F format Specify a format for displaying search results; see the " @@ -5972,7 +5995,7 @@ msgstr "" " -F formato Especifica um formato para exibição dos resultados da\n" " pesquisa; veja o manual\n" -#: src/main.cc:239 +#: src/main.cc:240 #, fuzzy, c-format #| msgid "" #| " -O order Specify how search results should be sorted; see the " @@ -5985,7 +6008,7 @@ msgstr "" "ordenados;\n" " veja o manual\n" -#: src/main.cc:240 +#: src/main.cc:241 #, fuzzy, c-format #| msgid "" #| " -w width Specify the display width for formatting search results\n" @@ -5995,17 +6018,17 @@ msgstr "" " -w largura Especifica a largura de exibição para formatar resultados\n" " de busca\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr " -f Tenta agressivamente corrigir pacotes quebrados.\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr " -V Mostra quais versões de pacotes serão instaladas.\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" @@ -6013,13 +6036,13 @@ msgstr "" " -D Mostra as dependências dos pacotes modificados " "automaticamente.\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr "" " -Z Mostra a mudança no tamanho instalado de cada pacote.\n" -#: src/main.cc:245 +#: src/main.cc:246 #, fuzzy, c-format #| msgid "" #| " -v Display extra information. (may be supplied multiple " @@ -6031,7 +6054,7 @@ msgstr "" " -v Exibe informação extra. (pode ser fornecido múltiplas " "vezes)\n" -#: src/main.cc:246 +#: src/main.cc:247 #, fuzzy, c-format #| msgid "" #| " -t [release] Set the release from which packages should be installed\n" @@ -6040,66 +6063,66 @@ msgid "" msgstr "" " -t [release] Define de qual distribuição os pacotes devem ser instalados\n" -#: src/main.cc:247 +#: src/main.cc:248 #, fuzzy, c-format #| msgid "" #| " -q In command-line mode, suppress the incremental progress\n" #| " indicators.\n" msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" " -q Em modo linha de comando, suprime os indicadores de\n" " progresso incremental.\n" -#: src/main.cc:249 +#: src/main.cc:250 #, fuzzy, c-format #| msgid " -o key=val Directly set the configuration option named 'key'\n" msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr "" " -o chave=val Definir diretamente a opção de configuração chamada 'chave'\n" -#: src/main.cc:250 +#: src/main.cc:251 #, fuzzy, c-format #| msgid "" #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" #| " strong dependencies\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends\tEspecifica se as recomendações devem ou não ser\n" " tratadas como dependências fortes\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr "" " -S arquivo Lê a informação de estado estendida do aptitude do arquivo.\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u Baixa novas lista de pacotes ao iniciar.\n" -#: src/main.cc:254 src/main.cc:256 -#, c-format -msgid " (terminal interface only)" -msgstr "" +#: src/main.cc:255 src/main.cc:257 +#, fuzzy, c-format +msgid " (terminal interface only)\n" +msgstr " -h Este texto de ajuda\n" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i Executa uma ação de instalação ao iniciar.\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " Este aptitude não contém Poderes de Super Vaca.\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 #, fuzzy #| msgid "true" msgid "trace" @@ -6107,13 +6130,13 @@ msgstr "verdadeiro" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 #, fuzzy #| msgid "no" msgid "info" @@ -6121,13 +6144,13 @@ msgstr "não" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 #, fuzzy #| msgid "Err " msgid "error" @@ -6135,7 +6158,7 @@ msgstr "Err " #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 #, fuzzy #| msgid "false" msgid "fatal" @@ -6143,95 +6166,95 @@ msgstr "falso" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " "\"warn\", \"error\", \"fatal\", or \"off\")." msgstr "" -#: src/main.cc:487 +#: src/main.cc:488 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "Invalid logger name \"%s\"." msgstr "Operação %s inválida" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "Esperado um número após -q=\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "Esperado um número após -q=, obtido %s\n" -#: src/main.cc:802 +#: src/main.cc:794 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o requer um argumento na forma chave=valor, obtido %s\n" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "Sem vírgula após o nome da tag \"%s\".\n" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "ESTRANHEZA: recebida opção de código desconhecida\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "" -#: src/main.cc:1039 +#: src/main.cc:1023 #, fuzzy #| msgid "Package" msgid "first-package" msgstr "Pacote" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "" -#: src/main.cc:1043 +#: src/main.cc:1027 #, fuzzy #| msgid "All Packages" msgid "all-packages" msgstr "Todos os pacotes" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -6239,7 +6262,7 @@ msgid "" "versions\"." msgstr "" -#: src/main.cc:1089 +#: src/main.cc:1073 #, fuzzy #| msgid "Only one of -u and -i may be specified\n" msgid "" @@ -6247,7 +6270,7 @@ msgid "" "specified\n" msgstr "Somente uma das opções -u e -i pode ser especificada\n" -#: src/main.cc:1098 +#: src/main.cc:1082 #, fuzzy #| msgid "" #| "-u and -i may not be specified in command-line mode (eg, with 'install')" @@ -6258,23 +6281,23 @@ msgstr "" "-u e -i não podem ser especificadas em modo de linha de comando (por " "exemplo, com 'install')" -#: src/main.cc:1115 +#: src/main.cc:1099 #, fuzzy #| msgid "-u and -i may not be specified with a command" msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "-u e -i não podem ser especificados com um comando" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "Comando desconhecido \"%s\"\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "Exceção não capturada: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" @@ -6283,7 +6306,8 @@ msgstr "" "Backtrace:\n" "%s\n" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "Pesquisar por: " @@ -7175,17 +7199,21 @@ msgstr "substitui" msgid "obsoletes" msgstr "obsoleta" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (fornecido por %F)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." @@ -7193,7 +7221,7 @@ msgstr "" "Se você selecionar um pacote, uma explicação de seu estado atual aparecerá " "neste espaço." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -7201,18 +7229,18 @@ msgstr "" "%B%s%b foi automaticamente instalado; ele está sendo removido porque todos " "os pacotes que dependiam dele estão sendo removidos:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "%B%s%b será automaticamente removido devido a erros de dependências:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" "%B%s%b será automaticamente instalado para satisfazer as dependências a " "seguir:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -7220,7 +7248,7 @@ msgstr "" "%B%s%b não pode ser atualizado agora, mas se pudesse, ainda assim seria " "retido na versão %B%s%b." -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -7228,27 +7256,27 @@ msgstr "" "%B%s%b não será atualizado para a versão %B%s%b para evitar quebrar as " "seguintes dependências:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b está atualmente instalado." -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b não está atualmente instalado." -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "Algumas dependências de %B%s%b não estão satisfeitas:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "%B%s%b será revertido." -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b não será atualizado para a versão proibida %B%s%b." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." @@ -7256,38 +7284,38 @@ msgstr "" "%B%s%b poderia ser atualizado para a versão %B%s%b, mas está sendo retido na " "versão %B%s%b." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b será reinstalado." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b será instalado." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b será removido." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b será atualizado da versão %B%s%b para a versão %B%s%b." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "" "%B%s%b é o único parcialmente instalado; sua instalação será completada." -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "" "Os pacotes a seguir dependem de %B%s%b e serão quebrados com sua remoção:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "Os pacotes a seguir dependem de %B%s%b e estão quebrados:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" @@ -7295,7 +7323,7 @@ msgstr "" "Os pacotes a seguir conflitam com %B%s%b e serão quebrados devido a sua " "instalação:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -7305,7 +7333,7 @@ msgstr "" "atualmente instalada de %B%s%b, ou conflitam com a versão atualmente " "instalada:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -7313,11 +7341,11 @@ msgstr "" "Os pacotes a seguir conflitam com %B%s%b ou dependem de uma versão que não " "será instalada." -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "Os pacotes a seguir conflitam com %B%s%b:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -7325,22 +7353,22 @@ msgstr "" "Os pacotes a seguir dependem de uma versão de %B%s%b diferente da versão " "instalada atualmente de %B%s%b:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." msgstr "" "Os pacotes a seguir dependem de uma versão de %B%s%b que não será instalada." -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "atualizado" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "revertido" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7350,7 +7378,7 @@ msgstr "" "%b) ou conflitam com a versão que será %s para (%B%s%b) e ficará quebrada " "caso a mesma seja %s." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7358,7 +7386,7 @@ msgstr "" "Os pacotes a seguir conflitam com a versão %B%s%b de %B%s%b e serão " "quebrados caso a mesma seja %s." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7394,47 +7422,47 @@ msgstr "Aplicar" msgid "Close" msgstr "Fechar" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s conflita com %s [fornecido por %s %s]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "Removendo %s" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "Instalando %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%BRemover%b os pacotes a seguir:%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%BInstalar%b os pacotes a seguir:%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%BManter%b os pacotes a seguir em suas versões atuais:%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%BAtualizar%b os pacotes a seguir:%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%BReverter%b os pacotes a seguir:%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "Manter as seguintes dependências não resolvidas:%n" @@ -7533,10 +7561,6 @@ msgstr "E:" msgid "W:" msgstr "A:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "Pesquisar por:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7915,7 +7939,9 @@ msgid "Error while dumping resolver state" msgstr "Erro descarregando o estado do resolvedor" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "Arquivo no qual o estado do resolvedor deverá ser descarregado:" #: src/ui.cc:2265 @@ -8436,6 +8462,21 @@ msgid "You can only view changelogs of official Debian packages." msgstr "Você só pode visualizar logs de mudanças de pacotes Debian oficiais." #~ msgid "" +#~ "%BOption:%b %s\n" +#~ "%BDefault:%b %s\n" +#~ "%BValue:%b %s\n" +#~ msgstr "" +#~ "%BOpção:%b %s\n" +#~ "%BPadrão:%b %s\n" +#~ "%BValor:%b %s\n" + +#~ msgid "Press Return to continue" +#~ msgstr "Pressione Enter para continuar" + +#~ msgid "Search for:" +#~ msgstr "Pesquisar por:" + +#~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." #~ msgstr "" #~ "Impossível resolver dependências para a atualização (o resolvedor " @@ -8563,11 +8604,6 @@ msgstr "Você só pode visualizar logs de mudanças de pacotes Debian oficiais." #~ msgid "gtk-yes" #~ msgstr "sim" -#, fuzzy -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "Operação %s inválida" - #~ msgid "but it is not installable" #~ msgstr "mas não é instalável." @@ -8762,10 +8798,6 @@ msgstr "Você só pode visualizar logs de mudanças de pacotes Debian oficiais." #~ " lead to a conflict with the given package if installed\n" #~ msgstr " -V Exibir quais versões de pacotes serão instaladas.\n" -#, fuzzy -#~ msgid " indicators.\n" -#~ msgstr " -h Este texto de ajuda\n" - #~ msgid "Downloading " #~ msgstr "Fazendo download de " @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2008-10-17 15:42+0200\n" "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n" "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n" @@ -19,42 +19,36 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2;\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" -msgstr "" -"%BOpțiune:%b %s\n" -"%BImplicit:%b %s\n" -"%BValoare:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " +msgstr "%BOpțiune:%b " + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " +msgstr "%BImplicit:%b " -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "Adevărat" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "Fals" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " -msgstr "%BOpțiune:%b " - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "%BImplicit:%b " - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "%BValoare:%b " -#: src/apt_config_treeitems.cc:279 -#, c-format -msgid "Editing \"%ls\"" +#: src/apt_config_treeitems.cc:280 +#, fuzzy, c-format +#| msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "Se editează „%ls”" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "%BAlegere:%b " @@ -659,8 +653,8 @@ msgstr "Eroare fatală în rezolvator" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] Se rezolvă dependențele" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "Eroare internă: soluție nulă neașteptată" @@ -960,7 +954,7 @@ msgstr "" "Nu se pot rezolva dependențele, încercați să rulați cu --full-resolver.\n" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "Abandonează.\n" @@ -1335,7 +1329,7 @@ msgstr "" "Nici un pachet de arătat -- introduceți numele pachetului pe o linie după " "'i'.\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "Apăsați Enter pentru a continua." @@ -1345,10 +1339,6 @@ msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "" "Nici un pachet găsit -- introduceți numele pachetului pe o linie după 'c'.\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "Apăsați Enter pentru a continua" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1666,7 +1656,7 @@ msgstr "Scrierea starii rezolvatorului a reușit!" #| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: " #| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pac ver ...: %F%na pac ver ...: %F" @@ -1942,7 +1932,7 @@ msgstr "" "de dependențe." #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "Se rezolvă dependențele..." @@ -1980,7 +1970,9 @@ msgid "Invalid response; please enter one of the following commands:" msgstr "Răspuns nevalid; vă rog introduceți una din următoarele comenzi:" #: src/cmdline/cmdline_resolver.cc:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +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]" @@ -2190,7 +2182,7 @@ msgstr "Pachet: " msgid "State" msgstr "Stare" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "Furnizat de" @@ -2298,27 +2290,31 @@ msgstr "Înlocuiește" msgid "Obsoletes" msgstr "Învechește" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Furnizează" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Descriere: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "Pagina de internet: " -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "Nu s-a putut localiza pachetul %s" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "Nu se poate analiza modelul %s" @@ -2644,6 +2640,12 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "" +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "Operațiune necorespunzătoare %s" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "Sfârșit de fișier neașteptat la intrarea standard" @@ -2661,7 +2663,7 @@ msgstr "[EROARE]" msgid "UNSATISFIED" msgstr "NESATISFĂCUT" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "INDISPONIBIL" @@ -2669,7 +2671,7 @@ msgstr "INDISPONIBIL" msgid "Tags" msgstr "Etichete" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "Etichete de utilizator" @@ -3080,16 +3082,21 @@ msgstr "Nu s-a putut localiza pachetul %s" msgid "Unable to open %s to log actions" msgstr "Nu s-a putut deschide %s pentru înregistrarea acțiunilor" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "Eroare în timpul generării orei locale (%s)" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "raport de jurnal" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -3101,81 +3108,81 @@ msgstr "" "eșuează din pricina unor probleme dpkg ar putea să nu fie complete.\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "Se vor instala %li pachete, și se vor șterge %li pachete.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "%sB din spațiul de pe disc va fi folosit\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "%sB din spațiu pe disc va fi eliberat\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[ÎNNOIRE] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[RETROGRADARE] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "ȘTERGERE" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "INSTALARE" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "REINSTALARE" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "PĂSTRARE" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "DETERIORARE" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "ȘTEGERE, NEFOLOSIT" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "ȘTERGERE, DEPENDENȚE" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "INSTALARE, DEPENDENȚE" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "PĂSTRARE, DEPENDENȚE" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "NECONFIGURAT" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "?????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -3198,39 +3205,39 @@ msgstr "" msgid "Filtering packages" msgstr "Se descarcă pachetele" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "Tip de acțiune necunoscut: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "Șir literal neterminat după %s" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "Prioritate necunoscută: %s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "Modelul de căutare se termină în mod neașteptat (se aștepta „%c”)." -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "Se aștepta „%c”, s-a primit „%c”." -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "Tip de dependență necunoscut: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, fuzzy, c-format #| msgid "Unknown matcher type: \"%s\"." msgid "Unknown term type: \"%s\"." @@ -3238,7 +3245,7 @@ msgstr "Tip de model necunoscut: \"%s\"." #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, fuzzy, c-format #| msgid "" #| "The ?%s matcher must be used in a \"wide\" context (a top-level context, " @@ -3250,34 +3257,34 @@ msgstr "" "Modelul ?%s trebuie folosit într-un cotext „larg” (un context de nivel " "superior sau un context încadrat de ?%s)." -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "„(” fără pereche" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "Furnizează: nu poate fi deteriorat" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "Tip de model necunoscut: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "Nu se poate căuta \"\"" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "Expresie goală neașteptată" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, fuzzy, c-format #| msgid "Badly formed expression" msgid "Badly formed expression: expected '|', got '%c'" msgstr "Expresie formată greșit" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "Caracter neașteptat „)”" @@ -4232,22 +4239,22 @@ msgstr "" msgid "%s: Unable to accept a connection: %s" msgstr "Nu se poate crea directorul temporar din șablonul „%s”: %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4984,7 +4991,7 @@ msgstr "" msgid "Virtual package" msgstr "Pachet" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "Neinstalat" @@ -5158,163 +5165,169 @@ msgstr "%s îl înlocuiește pe %s" msgid "%s obsoletes %s" msgstr "%s îl învechește pe %s" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s îl înlocuiește pe %s" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "Se șterg următoarele pachete:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "Se instalează următoarele pachete:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 #, fuzzy #| msgid "Remove the following packages:" msgid "Keep the following packages:" msgstr "Se șterg următoarele pachete:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "Se înnoiesc următoarele pachete:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "Se retrogradează următoarele pachetele:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 #, fuzzy #| msgid "Leave the following dependencies unresolved:%n" msgid "Leave the following dependencies unresolved:" msgstr "Se lasă următoarele dependențe nesatisfăcute: %n" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, fuzzy, c-format #| msgid "Remove %F [%s (%s)]" msgid "Remove %s [<big>%s</big> (%s)]" msgstr "Se șterge %F [%s (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "Install %s [<big>%s</big> (%s)]" msgstr "Se instalează %F [%s (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "Cancel the installation of %s" msgstr "Se anulează instalarea lui %F" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Cancel the removal of %s" msgstr "Se anulează ștergerea lui %F" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "Keep %s at version <big>%s</big> (%s)" msgstr "Se păstrează %F la versiunea %s (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, fuzzy, c-format #| msgid "Upgrade %F [%s (%s) -> %s (%s)]" msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Se înnoiește %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, fuzzy, c-format #| msgid "Downgrade %F [%s (%s) -> %s (%s)]" msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Se retrogradează %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>Remove</b> %s" msgstr "Ștergere(%s)" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>remove</b> %s" msgstr "Ștergere(%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>Keep</b> %s at version %s" msgstr "Se păstrează %F la versiunea %s (%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>keep</b> %s at version %s" msgstr "Se păstrează %F la versiunea %s (%s)" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>Cancel</b> the installation of %s" msgstr "Se anulează instalarea lui %F" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>cancel</b> the installation of %s" msgstr "Se anulează instalarea lui %F" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>Install</b> %s %s" msgstr "Se instalează %F [%s (%s)]" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>install</b> %s %s" msgstr "Se instalează %F [%s (%s)]" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "<b>Downgrade</b> %s to version %s" msgstr " cwidget, versiunea: %s\n" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "<b>downgrade</b> %s to version %s" msgstr " cwidget, versiunea: %s\n" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>Upgrade</b> %s to version %s" msgstr "%s versiuni" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>upgrade</b> %s to version %s" msgstr "%s versiuni" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format #| msgid "%d install" #| msgid_plural "%d installs" @@ -5324,7 +5337,7 @@ msgstr[0] "%d instalare" msgstr[1] "%d instalări" msgstr[2] "%d de instalări" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, fuzzy, c-format #| msgid "%d removal" #| msgid_plural "%d removals" @@ -5334,7 +5347,7 @@ msgstr[0] "%d ștergere" msgstr[1] "%d ștergeri" msgstr[2] "%d de ștergeri" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, fuzzy, c-format #| msgid "%d keep" #| msgid_plural "%d keeps" @@ -5344,7 +5357,7 @@ msgstr[0] "%d păstrare" msgstr[1] "%d păstrări" msgstr[2] "%d de păstrări" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, fuzzy, c-format #| msgid "%d upgrade" #| msgid_plural "%d upgrades" @@ -5354,7 +5367,7 @@ msgstr[0] "%d înnoire" msgstr[1] "%d înnoiri" msgstr[2] "%d de înnoiri" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, fuzzy, c-format #| msgid "%d downgrade" #| msgid_plural "%d downgrades" @@ -5364,7 +5377,7 @@ msgstr[0] "%d retrogradare" msgstr[1] "%d retrogradări" msgstr[2] "%d de retrogradări" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, fuzzy, c-format #| msgid "Audit ^Recommendations" msgid "%s unresolved recommendation" @@ -5373,35 +5386,35 @@ msgstr[0] "^Revizuiește recomandările" msgstr[1] "^Revizuiește recomandările" msgstr[2] "^Revizuiește recomandările" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 #, fuzzy #| msgid "No more solutions." msgid "No solutions yet." msgstr "Nu mai sunt soluții." -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 #, fuzzy #| msgid "Dependency handling" msgid "No dependency solution was found." msgstr "Manevrarea dependențelor" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 #, fuzzy #| msgid "No more solutions." msgid "No solutions." msgstr "Nu mai sunt soluții." -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, fuzzy, c-format #| msgid "No more solutions." msgid "%u solutions." msgstr "Nu mai sunt soluții." -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Could not open file \"%s\"" msgid "Solution %s of %s." @@ -5718,12 +5731,12 @@ msgstr " Suportul pentru ept este dezactivat.\n" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s compilat la %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5876,29 +5889,35 @@ msgstr " show - Afișează informații detaliate despre un pachet\n" #: src/main.cc:213 #, fuzzy, c-format +#| msgid " show - Display detailed information about a package\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - Afișează informații detaliate despre un pachet\n" + +#: src/main.cc:214 +#, fuzzy, c-format #| msgid " clean - Erase downloaded package files\n" msgid " clean - Erase downloaded package files.\n" msgstr " clean - Șterge fișierele pachetelor descărcate\n" -#: src/main.cc:214 +#: src/main.cc:215 #, fuzzy, c-format #| msgid " autoclean - Erase old downloaded package files\n" msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean - Șterge vechile fișiere ale pachetelor descărcate\n" -#: src/main.cc:215 +#: src/main.cc:216 #, fuzzy, c-format #| msgid " changelog - View a package's changelog\n" msgid " changelog - View a package's changelog.\n" msgstr " changelog - Afișează jurnalul de modificări al unui pachet\n" -#: src/main.cc:216 +#: src/main.cc:217 #, fuzzy, c-format #| msgid " download - Download the .deb file for a package\n" msgid " download - Download the .deb file for a package.\n" msgstr " download - Descarcă fișierul .deb pentru un pachet\n" -#: src/main.cc:217 +#: src/main.cc:218 #, fuzzy, c-format #| msgid "" #| " reinstall - Download and (possibly) reinstall a currently installed " @@ -5910,17 +5929,21 @@ msgstr "" " reinstall - Descarcă și reinstalează (pe cât posibil) un pachet instalat " "curent\n" -#: src/main.cc:218 -#, c-format +#: src/main.cc:219 +#, fuzzy, c-format +#| msgid "" +#| " why - Show the manually installed packages that require a " +#| "package, or\n" +#| " why one or more packages would require the given package\n" msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " why - Arată pachetele instalate manual care „cer” un pachet, sau\n" " de ce unul sau mai multe pachete ar „cere” pachetul dat\n" -#: src/main.cc:220 +#: src/main.cc:221 #, fuzzy, c-format #| msgid "" #| " why-not - Show the manually installed packages that lead to a " @@ -5938,59 +5961,59 @@ msgstr "" " cu pachetul dat, sau de ce unul sau mai multe pachete ar\n" " duce la un conflict cu pachetul dat dacă este instalat\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " Opțiuni:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " -h This help text.\n" msgstr " -h Acest text de ajutor\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h Acest text de ajutor\n" -#: src/main.cc:232 +#: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr "" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s Simulează acțiunea, dar n-o executa în realitate.\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr "" " -d Doar descarcă pachetele, nu instala sau șterge nimic.\n" -#: src/main.cc:236 +#: src/main.cc:237 #, fuzzy, c-format #| msgid " -P Always prompt for confirmation or actions\n" -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P Întodeauna cere confirmare pentru acțiuni\n" -#: src/main.cc:237 +#: src/main.cc:238 #, fuzzy, c-format #| msgid "" #| " -y Assume that the answer to simple yes/no questions is " @@ -6001,7 +6024,7 @@ msgstr "" " -y Presupune că răspunsul la întrebările simple da/nu este " "'da'\n" -#: src/main.cc:238 +#: src/main.cc:239 #, fuzzy, c-format #| msgid "" #| " -F format Specify a format for displaying search results; see the " @@ -6013,7 +6036,7 @@ msgstr "" " -F format Specifică un format pentru afișarea rezultatelor căutării; " "vezi manualul\n" -#: src/main.cc:239 +#: src/main.cc:240 #, fuzzy, c-format #| msgid "" #| " -O order Specify how search results should be sorted; see the " @@ -6025,7 +6048,7 @@ msgstr "" " -O ordine Specifică modul în care rezultatele căutării să fie sortate; " "vezi manual\n" -#: src/main.cc:240 +#: src/main.cc:241 #, fuzzy, c-format #| msgid "" #| " -w width Specify the display width for formatting search results\n" @@ -6035,29 +6058,29 @@ msgstr "" " -w lățime Specifică lățimea afișării pentru formatarea rezultatului de " "căutare\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr "" " -f Încerc în mod agresiv să repar pachetele deteriorate.\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr " -V Arată ce versiuni de pachete sunt instalate.\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr " -D Arată dependențele pachetelor schimbate automat.\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr " -Z\t\tArată modificarea în dimensiune a fiecărui pachet instalat.\n" -#: src/main.cc:245 +#: src/main.cc:246 #, fuzzy, c-format #| msgid "" #| " -v Display extra information. (may be supplied multiple " @@ -6069,7 +6092,7 @@ msgstr "" " -v Afișează informații suplimentare (poate fi folosită de mai " "multe ori)\n" -#: src/main.cc:246 +#: src/main.cc:247 #, fuzzy, c-format #| msgid "" #| " -t [release] Set the release from which packages should be installed\n" @@ -6078,68 +6101,68 @@ msgid "" msgstr "" " -t [producție] Impune producția din care pachetele ar trebui instalate\n" -#: src/main.cc:247 +#: src/main.cc:248 #, fuzzy, c-format #| msgid "" #| " -q In command-line mode, suppress the incremental progress\n" #| " indicators.\n" msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" " -q În modul linie de comandă, inhibă indicatoarele de progres\n" " incrementale.\n" -#: src/main.cc:249 +#: src/main.cc:250 #, fuzzy, c-format #| msgid " -o key=val Directly set the configuration option named 'key'\n" msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr "" " -o key=val Ajustează direct opțiunea de configurare numită 'key'\n" -#: src/main.cc:250 +#: src/main.cc:251 #, fuzzy, c-format #| msgid "" #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" #| " strong dependencies\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends\t Specifică dacă recomandările să fie tratate ca " "dependențe\n" " puternice sau nu\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr "" " -S fnume Citește informațiile de stare extinsă aptitude din fișierul " "fnume.\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u Descarcă listele cu pachetele noi la pornire.\n" -#: src/main.cc:254 src/main.cc:256 -#, c-format -msgid " (terminal interface only)" -msgstr "" +#: src/main.cc:255 src/main.cc:257 +#, fuzzy, c-format +msgid " (terminal interface only)\n" +msgstr " -h Acest text de ajutor\n" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i Execută comanda de instalare la pornire\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " Acest aptitude nu are puterile unei Super Vaci.\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 #, fuzzy #| msgid "true" msgid "trace" @@ -6147,13 +6170,13 @@ msgstr "adevărat" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 #, fuzzy #| msgid "no" msgid "info" @@ -6161,13 +6184,13 @@ msgstr "nu" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 #, fuzzy #| msgid "Err " msgid "error" @@ -6175,7 +6198,7 @@ msgstr "Er " #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 #, fuzzy #| msgid "false" msgid "fatal" @@ -6183,95 +6206,95 @@ msgstr "fals" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " "\"warn\", \"error\", \"fatal\", or \"off\")." msgstr "" -#: src/main.cc:487 +#: src/main.cc:488 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "Invalid logger name \"%s\"." msgstr "Operațiune necorespunzătoare %s" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "Se așteaptă un număr după -q=\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "Așteptat un număr după -q=, primit %s\n" -#: src/main.cc:802 +#: src/main.cc:794 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o necesită un argument de forma cheie=valoare, s-a primit %s\n" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "Nici o virgulă după numele de etichetă „%s”.\n" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "CIUDĂȚENIE: primit cod opțiune necunoscut\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "" -#: src/main.cc:1039 +#: src/main.cc:1023 #, fuzzy #| msgid "Package" msgid "first-package" msgstr "Pachet" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "" -#: src/main.cc:1043 +#: src/main.cc:1027 #, fuzzy #| msgid "All Packages" msgid "all-packages" msgstr "Toate pachetele" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -6279,7 +6302,7 @@ msgid "" "versions\"." msgstr "" -#: src/main.cc:1089 +#: src/main.cc:1073 #, fuzzy #| msgid "Only one of -u and -i may be specified\n" msgid "" @@ -6287,7 +6310,7 @@ msgid "" "specified\n" msgstr "Doar unul din -u și -i poate fi specificat\n" -#: src/main.cc:1098 +#: src/main.cc:1082 #, fuzzy #| msgid "" #| "-u and -i may not be specified in command-line mode (eg, with 'install')" @@ -6297,23 +6320,23 @@ msgid "" msgstr "" "-u și -i nu pot fi folosiți în modul „linie de comandă” (ex., cu „install”)" -#: src/main.cc:1115 +#: src/main.cc:1099 #, fuzzy #| msgid "-u and -i may not be specified with a command" msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "-u și -i nu pot fi folosiți cu o comandă" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "Comandă necunoscută „%s”\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "Excepție nedetectată: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" @@ -6322,7 +6345,8 @@ msgstr "" "Stiva de apeluri:\n" "%s\n" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "Căutare pentru: " @@ -7213,17 +7237,21 @@ msgstr "înlocuiește" msgid "obsoletes" msgstr "învechit" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (furnizat de %F)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." @@ -7231,7 +7259,7 @@ msgstr "" "Dacă alegeți un pachet, o explicație a stării curente va apărea în acest " "spațiu." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -7239,17 +7267,17 @@ msgstr "" "%B%s%b a fost instalat automat; este pe cale de a fi șters deoarece toate " "pachetele ce depind de el sunt șterse:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "%B%s%b va fi automat șters datorită erorilor de dependențe:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" "%B%s%b va fi automat instalat pentru a satisface următoarele dependențe:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -7257,7 +7285,7 @@ msgstr "" "%B%s%b nu poate fi înnoit acum, dar dacă ar putea fi, va fi ținut încă la " "versiunea %B%s%b." -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -7265,27 +7293,27 @@ msgstr "" "%B%s%b nu va fi înnoit la versiunea %B%s%b, pentru a nu deteriora " "următoarele dependențe:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b este instalat în momentul de față." -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b nu este instalat în momentul de față." -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "Unele dependențe ale lui %B%s%b nu sunt satisfăcute:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "%B%s%b va fi retrogradat." -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b nu va fi înnoit la versiunea interzisă %B%s%b." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." @@ -7293,37 +7321,37 @@ msgstr "" "%B%s%b ar putea fi înnoit la versiunea %B%s%b, dar va fi ținut la versiunea " "%B%s%b." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b va fi reinstalat." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b va fi instalat." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b va fi șters." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b va fi înnoit de la versiunea %B%s%b la versiunea %B%s%b." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "%B%s%b este doar parțial instalat; se va termina instarea lui." -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "" "Următoarele pachete depind de %B%s%b și vor fi deteriorate prin ștergerea sa:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "Următoarele pachete depind de %B%s%b și sunt deteriorate:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" @@ -7331,7 +7359,7 @@ msgstr "" "Următoarele pachete sunt în conflict cu %B%s%b și se vor deteriora datorită " "instalării sale:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -7341,7 +7369,7 @@ msgstr "" "lui %B%s%b instalată în momentul de față, sau este în conflict cu versiunea " "curentă:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -7349,11 +7377,11 @@ msgstr "" "Următoarele pachete sunt în conflict cu %B%s%b, sau depind de o versiune ce " "nu se va instala." -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "Următoarele pachete sunt în conflict cu %B%s%b:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -7361,7 +7389,7 @@ msgstr "" "Următoarele pachete depind de o versiune a lui %B%s%b alta decât versiunea " "curentă a lui %B%s%b:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." @@ -7369,15 +7397,15 @@ msgstr "" "Următoarele pachete depind de o versiune a lui %B%s%b care nu va fi " "instalată:" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "înnoit" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "retrogradat" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7387,7 +7415,7 @@ msgstr "" "%b), sau sunt în conflict cu versiunea ce va fi %s la (%B%s%b), și vor fi " "deteriorate dacă este %s." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7395,7 +7423,7 @@ msgstr "" "Următoarele pachete sunt în conflict cu versiunea %B%s%b a lui %B%s%b și se " "vor deteriora dacă este %s." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7431,47 +7459,47 @@ msgstr "Aplică" msgid "Close" msgstr "Închide" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s este în conflict cu %s [furnizat de %s %s]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "Se șterge %s" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "Se instalează %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%BȘterge%b următoarele pachete: %n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%BInstalează%b următoarele pachete: %n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%BȚine%b următoarele pachete la versiunea lor curentă: %n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%BÎnoiește%b următoarele pachete: %n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%BRetrogradează%b următoarele pachetele: %n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "Se lasă următoarele dependențe nesatisfăcute: %n" @@ -7570,10 +7598,6 @@ msgstr "E:" msgid "W:" msgstr "A:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "Căutare pentru:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7966,7 +7990,9 @@ msgid "Error while dumping resolver state" msgstr "Eroare în timpul scrierii stării rezolvatorului" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "Fișierul în care ar trebui scrisă starea rezolvatorului:" #: src/ui.cc:2265 @@ -8484,6 +8510,21 @@ msgstr "" "Puteți să vedeți doar jurnalele de modificări ale pachetelor Debian oficiale." #~ msgid "" +#~ "%BOption:%b %s\n" +#~ "%BDefault:%b %s\n" +#~ "%BValue:%b %s\n" +#~ msgstr "" +#~ "%BOpțiune:%b %s\n" +#~ "%BImplicit:%b %s\n" +#~ "%BValoare:%b %s\n" + +#~ msgid "Press Return to continue" +#~ msgstr "Apăsați Enter pentru a continua" + +#~ msgid "Search for:" +#~ msgstr "Căutare pentru:" + +#~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." #~ msgstr "" #~ "Nu se pot rezolva dependențele pentru înnoire (rezolvatorul nu a terminat " @@ -8611,11 +8652,6 @@ msgstr "" #~ msgid "gtk-yes" #~ msgstr "da" -#, fuzzy -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "Operațiune necorespunzătoare %s" - #~ msgid "but it is not installable" #~ msgstr "dar nu este instalabil" @@ -8811,10 +8847,6 @@ msgstr "" #~ " lead to a conflict with the given package if installed\n" #~ msgstr " -V Arată ce versiuni de pachete sunt instalate.\n" -#, fuzzy -#~ msgid " indicators.\n" -#~ msgstr " -h Acest text de ajutor\n" - #~ msgid "There are now %F." #~ msgstr "Acum sunt %F." @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude 0.6.1.3-3\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2009-12-06 08:52+0300\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" @@ -25,42 +25,36 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: KBabel 1.11.4\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" -msgstr "" -"%BПараметр:%b %s\n" -"%BПо умолчанию:%b %s\n" -"%BЗначение:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " +msgstr "%BПараметр:%b " + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " +msgstr "%BПо умолчанию:%b " -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "True" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "False" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " -msgstr "%BПараметр:%b " - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "%BПо умолчанию:%b " - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "%BЗначение:%b " -#: src/apt_config_treeitems.cc:279 -#, c-format -msgid "Editing \"%ls\"" +#: src/apt_config_treeitems.cc:280 +#, fuzzy, c-format +#| msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "Редактируется \"%ls\"" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "%BВыбор:%b " @@ -647,8 +641,8 @@ msgstr "Неустранимая ошибка в решателе" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] Разрешение зависимостей" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "Внутренняя ошибка: неожиданно нет решения." @@ -945,7 +939,7 @@ msgstr "" "параметром --full-resolver.\n" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "Прервать.\n" @@ -1312,7 +1306,7 @@ msgstr "После распаковки освободится %s байт.\n" msgid "No packages to show -- enter the package names on the line after 'i'.\n" msgstr "Нет пакетов для показа -- введите имена пакетов в строке после 'i'.\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "Нажмите Ввод для продолжения." @@ -1321,10 +1315,6 @@ msgstr "Нажмите Ввод для продолжения." msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "Пакеты не найдены -- введите имена пакетов в строке после 'c'.\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "Нажмите Ввод для продолжения" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1636,7 +1626,7 @@ msgstr "Состояние решателя успешно сохранено!" #| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: " #| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: %F" @@ -1910,7 +1900,7 @@ msgstr "" "создан." #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "Разрешение зависимостей..." @@ -1948,7 +1938,9 @@ msgid "Invalid response; please enter one of the following commands:" msgstr "Неверный ответ; можно вводить одну из следующих команд:" #: src/cmdline/cmdline_resolver.cc:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +msgid "No solution found within the allotted time. Try harder? [Y/n] " msgstr "" "За отведённое время решения не было найдено. Попытаться тщательнее? [Y/n]" @@ -2151,7 +2143,7 @@ msgstr "Пакет: " msgid "State" msgstr "Состояние" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "Предоставляется" @@ -2259,27 +2251,31 @@ msgstr "Заменяют" msgid "Obsoletes" msgstr "Устаревшие" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Предоставляют" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Описание: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "Сайт: " -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "Не удалось найти пакет %s" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "Не удалось проанализировать шаблон %s" @@ -2600,6 +2596,12 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "Выбранная версия неизвестна, в чём-то большая ошибка." +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "Неверная операция %s" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "Неожиданный конец файла в стандартном входном потоке" @@ -2616,7 +2618,7 @@ msgstr "" msgid "UNSATISFIED" msgstr "НЕУДОВЛЕТВОРИТЕЛЬНЫЙ" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "НЕДОСТУПНЫЙ" @@ -2624,7 +2626,7 @@ msgstr "НЕДОСТУПНЫЙ" msgid "Tags" msgstr "Метки" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "Пользов. метки" @@ -3036,16 +3038,21 @@ msgstr "Не удалось создать усечённый кэш: %s." msgid "Unable to open %s to log actions" msgstr "Не удалось открыть %s для протоколирования действий" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "Ошибка генерирования местного времени (%s)" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "журнал отчёта" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -3057,81 +3064,81 @@ msgstr "" "незавершёнными\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "Будет установлено %li пакетов, и %li пакетов будет удалено.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "%sB дискового пространства будет использовано\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "%sB дискового пространства будет освобождено\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[ОБНОВЛЕНИЕ] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[ЗАМЕНА НА СТАРЫЕ] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "УДАЛИТЬ" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "УСТАНОВИТЬ" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "ПЕРЕУСТАНОВИТЬ" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "ФИКСИРОВАТЬ" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "НЕРАБОТОСПОСОБНЫ" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "УДАЛИТЬ, НЕ ИСПОЛЬЗОВАТЬ" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "УДАЛИТЬ, ЗАВИСИМОСТИ" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "УСТАНОВИТЬ, ЗАВИСИМОСТИ" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "ФИКСИРОВАТЬ, ЗАВИСИМОСТИ" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "НЕ НАСТРОЕНО" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -3154,46 +3161,46 @@ msgstr "" msgid "Filtering packages" msgstr "Скачиваются пакеты" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "Неизвестный тип действия: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "Незавершённая текстовая строка после %s" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "Неизвестный приоритет %s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "Шаблон совпадений завершился неожиданно (ожидалось '%c')." -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "Ожидался '%c', получен '%c'." -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "Неизвестный тип зависимости: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, c-format msgid "Unknown term type: \"%s\"." msgstr "Неизвестный тип элемента: \"%s\"." #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, c-format msgid "" "The ?%s term must be used in a \"wide\" context (a top-level context, or a " @@ -3202,33 +3209,33 @@ msgstr "" "Элемент ?%s должен использоваться в \"расширенном\" контексте (контекст " "верхнего уровня или контекст, указанный в ?%s)." -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "Несовпадающая '('" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "Предоставляет: не может быть неработоспособным" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "Неизвестный тип шаблона: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "Не найдена \"\"" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "Неожиданное пустое выражение" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, c-format msgid "Badly formed expression: expected '|', got '%c'" msgstr "Неправильно оформленное выражение: ожидалось '|', получено '%c'" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "Неожиданное ')'" @@ -4118,22 +4125,22 @@ msgstr "Внутренняя ошибка: имя временного соке msgid "%s: Unable to accept a connection: %s" msgstr "%s: Не удалось принять подключение: %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "[%s] запускается процесс dpkg...\n" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "[%s] процесс dpkg завершён.\n" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "[%s] процесс dpkg завершился неудачно.\n" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "[%s] процесс dpkg завершён; остались ещё пакеты для обработки.\n" @@ -4773,7 +4780,7 @@ msgstr "" msgid "Virtual package" msgstr "Виртуальный пакет" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "Не установлен" @@ -4948,140 +4955,146 @@ msgstr "%s замещает %s" msgid "%s obsoletes %s" msgstr "%s делает устаревшим %s" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s замещает %s" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "Удалить следующие пакеты:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "Установить следующие пакеты:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 msgid "Keep the following packages:" msgstr "Сохранить следующие пакеты:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "Обновить следующие пакеты:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "Установить более старые версии следующих пакетов:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 msgid "Leave the following dependencies unresolved:" msgstr "Оставить следующие зависимости неразрешёнными:" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, c-format msgid "Remove %s [<big>%s</big> (%s)]" msgstr "Удалить %s [<big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, c-format msgid "Install %s [<big>%s</big> (%s)]" msgstr "Установить %s [<big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, c-format msgid "Cancel the installation of %s" msgstr "Отменить установку %s" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, c-format msgid "Cancel the removal of %s" msgstr "Отменить удаление %s" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, c-format msgid "Keep %s at version <big>%s</big> (%s)" msgstr "Сохранить %s версии <big>%s</big> (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, c-format msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Обновить %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, c-format msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Вернуть старую версию %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, c-format msgid "<b>Remove</b> %s" msgstr "<b>Удалить</b> %s" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, c-format msgid "<b>remove</b> %s" msgstr "<b>удалить</b> %s" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, c-format msgid "<b>Keep</b> %s at version %s" msgstr "<b>Сохранить</b> %s версии %s" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, c-format msgid "<b>keep</b> %s at version %s" msgstr "<b>сохранить</b> %s версии %s" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, c-format msgid "<b>Cancel</b> the installation of %s" msgstr "<b>Отменить</b> установку %s" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, c-format msgid "<b>cancel</b> the installation of %s" msgstr "<b>отменить</b> установку %s" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, c-format msgid "<b>Install</b> %s %s" msgstr "<b>Установить</b> %s %s" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, c-format msgid "<b>install</b> %s %s" msgstr "<b>установить</b> %s %s" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>Downgrade</b> %s to version %s" msgstr "<b>Установить старую версию</b> %s (%s)" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>downgrade</b> %s to version %s" msgstr "<b>установить старую версию</b> %s (%s)" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>Upgrade</b> %s to version %s" msgstr "<b>Обновить</b> %s до версии %s" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>upgrade</b> %s to version %s" msgstr "<b>обновить</b> %s до версии %s" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "Оставить %s нерешённом" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "оставить %s нерешённом" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, c-format msgid "%s install" msgid_plural "%s installs" @@ -5089,7 +5102,7 @@ msgstr[0] "%s установлен" msgstr[1] "%s установлено" msgstr[2] "%s установлено" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, c-format msgid "%s remove" msgid_plural "%s removes" @@ -5097,7 +5110,7 @@ msgstr[0] "%s удалён" msgstr[1] "%s удалено" msgstr[2] "%s удалено" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, c-format msgid "%s keep" msgid_plural "%s keeps" @@ -5105,7 +5118,7 @@ msgstr[0] "%s сохранён" msgstr[1] "%s сохранено" msgstr[2] "%s сохранено" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, c-format msgid "%s upgrade" msgid_plural "%s upgrades" @@ -5113,7 +5126,7 @@ msgstr[0] "%s обновлён" msgstr[1] "%s обновлено" msgstr[2] "%s обновлено" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, c-format msgid "%s downgrade" msgid_plural "%s downgrades" @@ -5121,7 +5134,7 @@ msgstr[0] "%s заменён на более старый" msgstr[1] "%s заменено на более старые" msgstr[2] "%s заменено на более старые" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, c-format msgid "%s unresolved recommendation" msgid_plural "%s unresolved recommendations" @@ -5129,28 +5142,28 @@ msgstr[0] "%s нерешённая рекомендация" msgstr[1] "%s нерешённых рекомендаций" msgstr[2] "%s нерешённых рекомендаций" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 msgid "No solutions yet." msgstr "Пока решений нет." -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 msgid "No dependency solution was found." msgstr "Решение зависимости не найдено." -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 msgid "No solutions." msgstr "Решений нет." -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "Чтобы посмотреть решение, выберите его из списка справа." -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, c-format msgid "%u solutions." msgstr "%u решений." -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Solution %s of %s (tier %s)." msgid "Solution %s of %s." @@ -5453,12 +5466,12 @@ msgstr " Поддержка Gtk+ выключена.\n" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s скомпилировано в %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5592,26 +5605,32 @@ msgid " show - Display detailed information about a package.\n" msgstr " show - Показать подробную информацию о пакете.\n" #: src/main.cc:213 +#, fuzzy, c-format +#| msgid " show - Display detailed information about a package.\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - Показать подробную информацию о пакете.\n" + +#: src/main.cc:214 #, c-format msgid " clean - Erase downloaded package files.\n" msgstr " clean - Удалить скачанные файлы пакетов.\n" -#: src/main.cc:214 +#: src/main.cc:215 #, c-format msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean - Удалить старые скачанные файлы пакетов.\n" -#: src/main.cc:215 +#: src/main.cc:216 #, c-format msgid " changelog - View a package's changelog.\n" msgstr " changelog - Посмотреть список изменений пакета.\n" -#: src/main.cc:216 +#: src/main.cc:217 #, c-format msgid " download - Download the .deb file for a package.\n" msgstr " download - Скачать файл .deb для пакета.\n" -#: src/main.cc:217 +#: src/main.cc:218 #, c-format msgid "" " reinstall - Download and (possibly) reinstall a currently installed " @@ -5620,18 +5639,22 @@ msgstr "" " reinstall - Скачать и (возможно) переустановить уже установленный " "пакет.\n" -#: src/main.cc:218 -#, c-format +#: src/main.cc:219 +#, fuzzy, c-format +#| msgid "" +#| " why - Show the manually installed packages that require a " +#| "package, or\n" +#| " why one or more packages would require the given package\n" msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " why - Показать вручную установленные пакеты, которым нужен пакет,\n" " или почему одному или более пакетам потребовался бы\n" " заданный пакет\n" -#: src/main.cc:220 +#: src/main.cc:221 #, c-format msgid "" " why-not - Show the manually installed packages that lead to a " @@ -5644,35 +5667,35 @@ msgstr "" " пакетов привели бы к конфликту с заданным пакетом,\n" " если бы он был установлен.\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " Параметры:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, c-format msgid " -h This help text.\n" msgstr " -h Эта справка.\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" " --gui Использовать ГИП GTK, даже если он выключен в настройках.\n" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr " --no-gui Не использовать ГИП GTK, даже если это возможно.\n" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text.\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h Эта справка.\n" -#: src/main.cc:232 +#: src/main.cc:233 #, fuzzy, c-format #| msgid "" #| " --gui Use the GTK GUI even if disabled in the configuration.\n" @@ -5681,13 +5704,13 @@ msgid "" msgstr "" " --gui Использовать ГИП GTK, даже если он выключен в настройках.\n" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr "" " -s Имитировать действия, но не выполнять их на самом деле.\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" @@ -5695,18 +5718,19 @@ msgstr "" " -d Только скачать пакеты, ничего не устанавливать и не " "удалять.\n" -#: src/main.cc:236 -#, c-format -msgid " -P Always prompt for confirmation or actions.\n" +#: src/main.cc:237 +#, fuzzy, c-format +#| msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P Всегда спрашивать подтверждение или действия.\n" -#: src/main.cc:237 +#: src/main.cc:238 #, c-format msgid "" " -y Assume that the answer to simple yes/no questions is 'yes'.\n" msgstr " -y Предполагать ответ 'да' на простой вопрос да/нет.\n" -#: src/main.cc:238 +#: src/main.cc:239 #, c-format msgid "" " -F format Specify a format for displaying search results; see the " @@ -5715,7 +5739,7 @@ msgstr "" " -F format Задать формат отображения результатов поиска; смотрите " "руководство.\n" -#: src/main.cc:239 +#: src/main.cc:240 #, c-format msgid "" " -O order Specify how search results should be sorted; see the " @@ -5724,36 +5748,36 @@ msgstr "" " -O order Задать формат сортировки результатов поиска; смотрите " "руководство.\n" -#: src/main.cc:240 +#: src/main.cc:241 #, c-format msgid "" " -w width Specify the display width for formatting search results.\n" msgstr " -w width Задать ширину вывода результатов поиска.\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr " -f Принудительно исправлять неработоспособные пакеты.\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr " -V Показывать версию устанавливаемых пакетов.\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr "" " -D Показывать зависимости автоматически изменяемых пакетов.\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr "" " -Z Показывать изменение размера установки каждого пакета.\n" -#: src/main.cc:245 +#: src/main.cc:246 #, c-format msgid "" " -v Display extra information. (may be supplied multiple " @@ -5762,109 +5786,116 @@ msgstr "" " -v Отображать дополнительную информацию. (может указываться " "несколько раз).\n" -#: src/main.cc:246 +#: src/main.cc:247 #, c-format msgid "" " -t [release] Set the release from which packages should be installed.\n" msgstr "" " -t [release] Задать выпуск, из которого должны быть установлены пакеты.\n" -#: src/main.cc:247 -#, c-format +#: src/main.cc:248 +#, fuzzy, c-format +#| msgid "" +#| " -q In command-line mode, suppress the incremental progress.\n" +#| " indicators.\n" msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" " -q Не выводить индикаторы хода работы в режиме командной " "строки.\n" -#: src/main.cc:249 +#: src/main.cc:250 #, c-format msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr "" " -o key=val Вручную установить значение параметра настройки с именем " "'key'.\n" -#: src/main.cc:250 -#, c-format +#: src/main.cc:251 +#, fuzzy, c-format +#| msgid "" +#| " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +#| " strong dependencies.\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends\tУказать, будут ли рекомендуемые пакеты\n" " трактоваться как строгие зависимости.\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr "" " -S fname Читать информацию о расширенном статусе aptitude из fname.\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u Скачать список новых пакетов при запуске.\n" -#: src/main.cc:254 src/main.cc:256 -#, c-format -msgid " (terminal interface only)" +#: src/main.cc:255 src/main.cc:257 +#, fuzzy, c-format +#| msgid " (terminal interface only)" +msgid " (terminal interface only)\n" msgstr " (только в текстовом интерфейсе)" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i Запустить установку при запуске.\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " Эта версия aptitude не имеет коровьей СУПЕРСИЛЫ.\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 msgid "trace" msgstr "trace" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "debug" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 msgid "info" msgstr "info" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "warn" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 msgid "error" msgstr "error" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 msgid "fatal" msgstr "fatal" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "off" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " @@ -5873,77 +5904,77 @@ msgstr "" "Неизвестное имя уровня протоколирования \"%s\" (допустимы \"trace\", \"debug" "\", \"info\", \"warn\", \"error\", \"fatal\", или \"off\")." -#: src/main.cc:487 +#: src/main.cc:488 #, c-format msgid "Invalid logger name \"%s\"." msgstr "Неверное имя команды ведения протокола \"%s\"." -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "Ожидается число после -q=\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "Ожидается число после -q=, получен %s\n" -#: src/main.cc:802 +#: src/main.cc:794 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o требуется параметр в виде ключ=значение, получен %s\n" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "Не указана запятая после имени метки \"%s\".\n" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "СТРАННОСТЬ: получен неизвестный код параметра\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "no-summary" -#: src/main.cc:1039 +#: src/main.cc:1023 msgid "first-package" msgstr "first-package" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "first-package-and-type" -#: src/main.cc:1043 +#: src/main.cc:1027 msgid "all-packages" msgstr "all-packages" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "all-packages-with-dep-versions" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -5954,7 +5985,7 @@ msgstr "" "package\", \"first-package-and-type\", \"all-packages\", или \"all-packages-" "with-dep-versions\"." -#: src/main.cc:1089 +#: src/main.cc:1073 msgid "" "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be " "specified\n" @@ -5962,7 +5993,7 @@ msgstr "" "Можно указать только одно из: --auto-clean-on-startup, --clean-on-startup, -" "i и -u\n" -#: src/main.cc:1098 +#: src/main.cc:1082 msgid "" "-u, -i, and --clean-on-startup may not be specified in command-line mode " "(eg, with 'install')" @@ -5970,21 +6001,21 @@ msgstr "" "-u, -i и --clean-on-startup не могут быть заданы в режиме командной строки " "(например, с install)" -#: src/main.cc:1115 +#: src/main.cc:1099 msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "-u, -i и --clean-on-startup не могут быть заданы с командой" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "Неизвестная команда \"%s\"\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "Необработанное исключение: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" @@ -5993,7 +6024,8 @@ msgstr "" "Трассировка:\n" "%s\n" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "Поиск: " @@ -6886,23 +6918,27 @@ msgstr "замещает" msgid "obsoletes" msgstr "делает устаревшим" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (предоставлено %F)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." msgstr "При выборе пакета его текущее состояние появится здесь." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -6910,18 +6946,18 @@ msgstr "" "%B%s%b было установлено автоматически; пакеты удаляются, потому что все " "пакеты, которые от них зависели тоже удаляются:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "%B%s%b будут автоматически удалены из-за ошибок в зависимостях:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" "%B%s%b будут автоматически установлены для удовлетворения следующих " "зависимостей:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -6929,7 +6965,7 @@ msgstr "" "%B%s%b не могут быть обновлены в данный момент, но если это было бы " "возможно, то они всё равно остались бы версии %B%s%b." -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -6937,27 +6973,27 @@ msgstr "" "%B%s%b не будет обновлён до версии %B%s%b, чтобы избежать порчи следующих " "зависимостей:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b уже установлен." -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b ещё не установлен." -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "Некоторые зависимости от %B%s%b не удовлетворены:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "%B%s%b будет заменён на более старую версию." -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b не будет обновлён на запрещённую версию %B%s%b." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." @@ -6965,42 +7001,42 @@ msgstr "" "%B%s%b может быть обновлён до версии %B%s%b, но зафиксирован на версии %B%s" "%b." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b будет переустановлен." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b будет установлен." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b будет удалён." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b будет обновлён с версии %B%s%b до версии %B%s%b." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "%B%s%b не до конца установлен; его установка будет завершена." -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "Следующие пакеты зависят от %B%s%b и будут испорчены удалением:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "Следующие пакеты зависят от %B%s%b и испорчены:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" msgstr "Следующие пакеты конфликтуют с %B%s%b и будут испорчены установкой:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -7009,7 +7045,7 @@ msgstr "" "Следующие пакеты зависят от версии %B%s%b, которая отличается от текущей " "версии %B%s%b, или конфликтует с текущей версией:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -7017,11 +7053,11 @@ msgstr "" "Следующие пакеты конфликтуют с %B%s%b, или зависят от версии, которая не " "устанавливается." -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "Следующие пакеты конфликтуют с %B%s%b:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -7029,21 +7065,21 @@ msgstr "" "Следующие пакеты зависят от версии %B%s%b которая отличается от текущей " "версии %B%s%b:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." msgstr "Следующие пакеты зависят от версии %B%s%b, которая не устанавливается." -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "обновлено" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "заменено на более старые" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7052,7 +7088,7 @@ msgstr "" "Следующие пакеты зависят от текущей версии %B%s%b (%B%s%b), или конфликтуют " "с версией %s в (%B%s%b), и будут испорчены если %s." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7060,7 +7096,7 @@ msgstr "" "Следующие пакеты конфликтуют с версией %B%s%b of %B%s%b, и будут испорчены " "если %s." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7096,47 +7132,47 @@ msgstr "Применить" msgid "Close" msgstr "Закрыть" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s конфликтует с %s [предоставлен %s %s]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "Удаляется %s" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "Устанавливается %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "Оставить %ls нерешённым." -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%BУдалить%b следующие пакеты:%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%BУстановить%b следующие пакеты:%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%BСохранить%b для следующих пакетов их текущие версии:%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%BОбновить%b следующие пакеты:%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%BУстановить более старую версию%b для следующих пакетов:%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "Оставить следующие зависимости неразрешёнными:%n" @@ -7235,10 +7271,6 @@ msgstr "E:" msgid "W:" msgstr "W:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "Поиск:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7605,7 +7637,9 @@ msgid "Error while dumping resolver state" msgstr "Ошибка во время сброса состояния решателя" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "Файл, в который будет сброшено состояние решателя:" #: src/ui.cc:2265 @@ -8118,6 +8152,21 @@ msgid "You can only view changelogs of official Debian packages." msgstr "Списки изменений можно посмотреть только у официальных пакетов Debian." #~ msgid "" +#~ "%BOption:%b %s\n" +#~ "%BDefault:%b %s\n" +#~ "%BValue:%b %s\n" +#~ msgstr "" +#~ "%BПараметр:%b %s\n" +#~ "%BПо умолчанию:%b %s\n" +#~ "%BЗначение:%b %s\n" + +#~ msgid "Press Return to continue" +#~ msgstr "Нажмите Ввод для продолжения" + +#~ msgid "Search for:" +#~ msgstr "Поиск:" + +#~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." #~ msgstr "" #~ "Не удалось разрешить зависимости для обновления (вышло время решателя)." @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2009-12-03 11:31+0100\n" "Last-Translator: Ivan Masár <helix84@centrum.sk>\n" "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n" @@ -18,42 +18,36 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" -msgstr "" -"%BVoľba:%b %s\n" -"%BŠtandardne:%b %s\n" -"%BHodnota:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " +msgstr "%BVoľba:%b " + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " +msgstr "%BŠtandardne:%b " -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "Áno" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "Nie" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " -msgstr "%BVoľba:%b " - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "%BŠtandardne:%b " - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "%BHodnota:%b " -#: src/apt_config_treeitems.cc:279 -#, c-format -msgid "Editing \"%ls\"" +#: src/apt_config_treeitems.cc:280 +#, fuzzy, c-format +#| msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "Upravuje sa „%ls“" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "%BVoľba:%b " @@ -630,8 +624,8 @@ msgstr "Závažná chyba pri riešení závislostí" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] Riešenie závislostí" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "Interná chyba: neočakávané prázdne riešenie." @@ -927,7 +921,7 @@ msgstr "" "resolver.\n" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "Prerušené.\n" @@ -1290,7 +1284,7 @@ msgstr "Po rozbalení sa uvoľní %sB.\n" msgid "No packages to show -- enter the package names on the line after 'i'.\n" msgstr "Nie je čo zobraziť -- zadajte názvy balíkov na riadok za „i“.\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "Pokračovanie stlačením klávesu Enter." @@ -1299,10 +1293,6 @@ msgstr "Pokračovanie stlačením klávesu Enter." msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "Nenašli sa žiadne balíky -- zadajte názvy balíkov na riadok za „c“.\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "Pokračovanie stlačením klávesu Enter" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1616,7 +1606,7 @@ msgstr "Stav riešenia úspešne uložený!" #| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: " #| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: %F" @@ -1885,7 +1875,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created." msgstr "Chcem vyriešiť konflikty, ale riešenie konfliktov nebolo vytvorené." #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "Riešenie závislostí..." @@ -1922,7 +1912,9 @@ 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:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +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]" @@ -2125,7 +2117,7 @@ msgstr "Balík: " msgid "State" msgstr "Stav" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "Poskytovaný" @@ -2233,27 +2225,31 @@ msgstr "Nahrádza" msgid "Obsoletes" msgstr "Zastaráva" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Poskytuje" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Popis: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "Domovská stránka:" -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "Nedá sa nájsť balík %s" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "Nedá sa spracovať vzor %s" @@ -2574,6 +2570,11 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "Neznámy výber verzie, niečo sa veľmi pokazilo." +#: src/cmdline_parse.cc:22 +#, c-format +msgid "Invalid command-line option '%s'" +msgstr "Nesprávna voľba príkazového riadka „%s“" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "Neočakávaný koniec súboru na štandardnom vstupe" @@ -2590,7 +2591,7 @@ msgstr "" msgid "UNSATISFIED" msgstr "NESPLNENÝ" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "NEDOSTUPNÝ" @@ -2598,7 +2599,7 @@ msgstr "NEDOSTUPNÝ" msgid "Tags" msgstr "Značky" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "Používateľské značky" @@ -3005,16 +3006,21 @@ msgstr "Nedá sa vytvoriť orezaná vyrovnávacia pamäť: %s." msgid "Unable to open %s to log actions" msgstr "Nedá sa otvoriť %s na záznam operácií" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "Chyba pri generovaní lokálneho času (%s)" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "záznam hlásení" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -3026,81 +3032,81 @@ msgstr "" "kvôli problémom v dpkg, sa nemusia dokončiť.\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "Nainštaluje sa %li balíkov a odstráni sa %li balíkov.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "Na disku sa použije %sB\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "Na disku sa uvoľní %sB\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[AKTUALIZÁCIA] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[DEGRADÁCIA] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "ODSTRÁNENIE" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "INŠTALÁCIA" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "REINŠTALÁCIA" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "PONECHANIE" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "POŠKODENIE" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "ODSTRÁNENIE, NEPOUŽÍVANÝ" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "ODSTRÁNENIE, ZÁVISLOSTI" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "INŠTALÁCIA, ZÁVISLOSTI" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "PONECHANIE, ZÁVISLOSTI" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "NENAKONFIGUROVANÝ" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -3123,46 +3129,46 @@ msgstr "" msgid "Filtering packages" msgstr "Sťahujú sa balíky" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "Neznáma operácia: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "Neukončený znakový reťazec po %s" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "Neznáma priorita: %s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "Vyhľadávací vzor neočakávane končí (očakávalo sa „%c“)." -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "Očakávala sa „%c“, zadané „%c“" -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "Neznámy typ závislosti: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, c-format msgid "Unknown term type: \"%s\"." msgstr "Neznámy typ vzoru: „%s“." #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, c-format msgid "" "The ?%s term must be used in a \"wide\" context (a top-level context, or a " @@ -3171,33 +3177,33 @@ msgstr "" "Vyhľadávanie ?%s sa musí použiť v kontexte „wide“ (kontext najvyššej úrovne " "alebo kontext uzavretý v ?%s)." -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "„(“ bez náprotivku" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "Poskytuje: nemôže byť poškodený" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "Neznámy vzor: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "Nie je možné hľadať „“" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "Neočakávaný prázdny výraz" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, c-format msgid "Badly formed expression: expected '|', got '%c'" msgstr "Chybne utvorený výraz: očakávalo sa „|“, dostali sme „%c“" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "Neočakávaná „)“" @@ -4096,22 +4102,22 @@ msgstr "Vnútorná chyba: dočasný názov socketu „%s“ je príliš dlhý!" msgid "%s: Unable to accept a connection: %s" msgstr "%s: Nebolo možné prijať spojenie: %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "[%s] proces dpkg sa spúšťa...\n" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "[%s] proces dpkg skončil.\n" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "[%s] proces dpkg zlyhal.\n" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "[%s] proces dpkg skončil; ešte zostali balíky na spracovanie.\n" @@ -4751,7 +4757,7 @@ msgstr "" msgid "Virtual package" msgstr "Virtuálny balík" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "Nenainštalovaný" @@ -4937,140 +4943,146 @@ msgstr "%s nahrádza %s" msgid "%s obsoletes %s" msgstr "%s zastaráva %s" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s nahrádza %s" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "Odstrániť nasledujúce balíky:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "Nainštalovať nasledujúce balíky:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 msgid "Keep the following packages:" msgstr "Ponechať nasledujúce balíky:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "Aktualizovať nasledujúce balíky:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "Znížiť verzie nasledujúcich balíkov:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 msgid "Leave the following dependencies unresolved:" msgstr "Ponechať nasledujúce závislosti nevyriešené:" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, c-format msgid "Remove %s [<big>%s</big> (%s)]" msgstr "Odstrániť %s [<big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, c-format msgid "Install %s [<big>%s</big> (%s)]" msgstr "Nainštalovať %s [<big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, c-format msgid "Cancel the installation of %s" msgstr "Zrušiť inštaláciu %s" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, c-format msgid "Cancel the removal of %s" msgstr "Zrušiť odstránenie %s" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, c-format msgid "Keep %s at version <big>%s</big> (%s)" msgstr "Ponechať %s vo verzii <big>%s</big> (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, c-format msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Aktualizovať %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, c-format msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Degradovať %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, c-format msgid "<b>Remove</b> %s" msgstr "<b>Odstrániť</b> %s" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, c-format msgid "<b>remove</b> %s" msgstr "<b>Odstrániť</b> %s" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, c-format msgid "<b>Keep</b> %s at version %s" msgstr "<b>Ponechať</b> %s vo verzii %s" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, c-format msgid "<b>keep</b> %s at version %s" msgstr "<b>Ponechať</b> %s vo verzii %s" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, c-format msgid "<b>Cancel</b> the installation of %s" msgstr "</b>Zrušiť</b> inštaláciu %s" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, c-format msgid "<b>cancel</b> the installation of %s" msgstr "</b>Zrušiť</b> inštaláciu %s" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, c-format msgid "<b>Install</b> %s %s" msgstr "<b>Nainštalovať</b> %s %s" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, c-format msgid "<b>install</b> %s %s" msgstr "<b>Nainštalovať</b> %s %s" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>Downgrade</b> %s to version %s" msgstr "<b>Degradovať</b> %s na verziu %s" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>downgrade</b> %s to version %s" msgstr "<b>Degradovať</b> %s na verziu %s" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>Upgrade</b> %s to version %s" msgstr "<b>Aktualizovať</b> %s na verziu %s" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>upgrade</b> %s to version %s" msgstr "<b>Aktualizovať</b> na %s verziu %s" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "Ponechať %s nevyriešené" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "ponechať %s nevyriešené" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, c-format msgid "%s install" msgid_plural "%s installs" @@ -5078,7 +5090,7 @@ msgstr[0] "%s inštalácia" msgstr[1] "%s inštalácie" msgstr[2] "%s inštalácií" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, c-format msgid "%s remove" msgid_plural "%s removes" @@ -5086,7 +5098,7 @@ msgstr[0] "%s odstránenie" msgstr[1] "%s odstránenia" msgstr[2] "%s odstránení" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, c-format msgid "%s keep" msgid_plural "%s keeps" @@ -5094,7 +5106,7 @@ msgstr[0] "%s ponechanie" msgstr[1] "%s ponechania" msgstr[2] "%s ponechaní" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, c-format msgid "%s upgrade" msgid_plural "%s upgrades" @@ -5102,7 +5114,7 @@ msgstr[0] "%s aktualizácia" msgstr[1] "%s aktualizácie" msgstr[2] "%s aktualizácií" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, c-format msgid "%s downgrade" msgid_plural "%s downgrades" @@ -5110,7 +5122,7 @@ msgstr[0] "%s degradovaný" msgstr[1] "%s degradované" msgstr[2] "%s degradovaných" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, c-format msgid "%s unresolved recommendation" msgid_plural "%s unresolved recommendations" @@ -5118,28 +5130,28 @@ msgstr[0] "%s nevyriešené odporúčanie" msgstr[1] "%s nevyriešené odporúčania" msgstr[2] "%s nevyriešených odporúčaní" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 msgid "No solutions yet." msgstr "Zatiaľ žiadne riešenia." -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 msgid "No dependency solution was found." msgstr "Nebolo nájdené žiadne riešenie závislostí." -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 msgid "No solutions." msgstr "Žiadne riešenia." -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "Ak chcete zobraziť riešenie, vyberte ho zo zoznamu vpravo." -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, c-format msgid "%u solutions." msgstr "%u riešení." -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Solution %s of %s (tier %s)." msgid "Solution %s of %s." @@ -5439,12 +5451,12 @@ msgstr " Podpora Gtk+ vypnutá.\n" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s skompilovaný %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5578,26 +5590,32 @@ msgid " show - Display detailed information about a package.\n" msgstr " show - Zobrazí podrobné informácie o balíku.\n" #: src/main.cc:213 +#, fuzzy, c-format +#| msgid " show - Display detailed information about a package.\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - Zobrazí podrobné informácie o balíku.\n" + +#: src/main.cc:214 #, c-format msgid " clean - Erase downloaded package files.\n" msgstr " clean - Odstráni stiahnuté .deb súbory balíkov.\n" -#: src/main.cc:214 +#: src/main.cc:215 #, c-format msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean - Odstráni staré stiahnuté .deb súbory balíkov.\n" -#: src/main.cc:215 +#: src/main.cc:216 #, c-format msgid " changelog - View a package's changelog.\n" msgstr " changelog - Zobrazí záznam zmien balíka.\n" -#: src/main.cc:216 +#: src/main.cc:217 #, c-format msgid " download - Download the .deb file for a package.\n" msgstr " download - Stiahne .deb súbor balíka.\n" -#: src/main.cc:217 +#: src/main.cc:218 #, c-format msgid "" " reinstall - Download and (possibly) reinstall a currently installed " @@ -5606,18 +5624,22 @@ msgstr "" " reinstall - Stiahne a (pravdepodobne) preinštaluje aktuálne " "nainštalovaný balík.\n" -#: src/main.cc:218 -#, c-format +#: src/main.cc:219 +#, fuzzy, c-format +#| msgid "" +#| " why - Show the manually installed packages that require a " +#| "package, or\n" +#| " why one or more packages would require the given package\n" msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " why - Zobrazí ručne nainštalované balíky, ktoré vyžadujú balík " "alebo\n" " prečo by jeden alebo viac balíkov vyžadovalo daný balík\n" -#: src/main.cc:220 +#: src/main.cc:221 #, c-format msgid "" " why-not - Show the manually installed packages that lead to a " @@ -5630,17 +5652,17 @@ msgstr "" "ku\n" " konfliktu s daným balíkom, keby bol nainštalovaný.\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " Voľby:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, c-format msgid " -h This help text.\n" msgstr " -h Tento pomocník.\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" @@ -5648,19 +5670,19 @@ msgstr "" " --gui Použiť grafické rozhranie GTK aj ak je vypnuté v " "konfigurácii.\n" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" " --no-gui Nepoužívať grafické rozhranie GTK ani ak je dostupné.\n" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text.\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h Tento pomocník.\n" -#: src/main.cc:232 +#: src/main.cc:233 #, fuzzy, c-format #| msgid "" #| " --gui Use the GTK GUI even if disabled in the configuration.\n" @@ -5670,31 +5692,32 @@ msgstr "" " --gui Použiť grafické rozhranie GTK aj ak je vypnuté v " "konfigurácii.\n" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s Iba simuluje, nič v skutočnosti nevykonáva.\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr "" " -d Stiahne balíky, ale nič neinštaluje ani neodstraňuje.\n" -#: src/main.cc:236 -#, c-format -msgid " -P Always prompt for confirmation or actions.\n" +#: src/main.cc:237 +#, fuzzy, c-format +#| msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P Vždy vyžadovať potvrdenie alebo operácie.\n" -#: src/main.cc:237 +#: src/main.cc:238 #, c-format msgid "" " -y Assume that the answer to simple yes/no questions is 'yes'.\n" msgstr "" " -y Na jednoduché áno/nie otázky odpovie automaticky „áno“.\n" -#: src/main.cc:238 +#: src/main.cc:239 #, c-format msgid "" " -F format Specify a format for displaying search results; see the " @@ -5703,7 +5726,7 @@ msgstr "" " -F formát Udáva formát na zobrazenie výsledkov hľadania; pozri " "manuál.\n" -#: src/main.cc:239 +#: src/main.cc:240 #, c-format msgid "" " -O order Specify how search results should be sorted; see the " @@ -5711,34 +5734,34 @@ msgid "" msgstr "" " -O radenie Udáva spôsob zoradenia výsledkov hľadania; pozri manuál.\n" -#: src/main.cc:240 +#: src/main.cc:241 #, c-format msgid "" " -w width Specify the display width for formatting search results.\n" msgstr " -w šírka Udáva šírku zobrazenia výsledkov hľadania.\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr " -f Agresívne sa pokúsi opraviť poškodené balíky.\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr " -V Zobrazí verziu balíkov, ktoré sa majú inštalovať.\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr " -D Zobrazí závislosti automaticky zmenených balíkov.\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr " -Z\t\t Zobrazí zmenu v nainštalovanej veľkosti každého balíka.\n" -#: src/main.cc:245 +#: src/main.cc:246 #, c-format msgid "" " -v Display extra information. (may be supplied multiple " @@ -5746,7 +5769,7 @@ msgid "" msgstr "" " -v Zobrazí dodatočné informácie. (Môžete zadať niekoľkokrát.)\n" -#: src/main.cc:246 +#: src/main.cc:247 #, c-format msgid "" " -t [release] Set the release from which packages should be installed.\n" @@ -5754,99 +5777,106 @@ msgstr "" " -t [verzia] Vyberie verziu vydania, z ktorého sa majú inštalovať " "balíky.\n" -#: src/main.cc:247 -#, c-format +#: src/main.cc:248 +#, fuzzy, c-format +#| msgid "" +#| " -q In command-line mode, suppress the incremental progress.\n" +#| " indicators.\n" msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" " -q V príkazovom riadku, potláča indikátory inkrementálneho\n" " postupu.\n" -#: src/main.cc:249 +#: src/main.cc:250 #, c-format msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr " -o kľúč=hodn Nastaví konfiguračnú voľbu nazvanú „kľúč“.\n" -#: src/main.cc:250 -#, c-format +#: src/main.cc:251 +#, fuzzy, c-format +#| msgid "" +#| " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +#| " strong dependencies.\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends\tNastaví, či sa majú odporúčané závislosti\n" " brať ako silné závislosti\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr " -S fname Načíta rozšírené stavové informácie zo súboru fname.\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u Pri štarte stiahne nové zoznamy balíkov.\n" -#: src/main.cc:254 src/main.cc:256 -#, c-format -msgid " (terminal interface only)" +#: src/main.cc:255 src/main.cc:257 +#, fuzzy, c-format +#| msgid " (terminal interface only)" +msgid " (terminal interface only)\n" msgstr " (iba terminálové rozhranie)" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i Pri štarte spustí inštaláciu.\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " Toto aptitude nemá schopnosti posvätnej kravy.\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 msgid "trace" msgstr "trasovanie" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "ladenie" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 msgid "info" msgstr "info" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "upozornenie" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 msgid "error" msgstr "chyba" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 msgid "fatal" msgstr "kritická" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "vypnuté" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " @@ -5855,77 +5885,77 @@ msgstr "" "Neznáma úroveň protokolovania „%s“ (očakávané „trasovanie“, „ladenie“, " "„info“, „upozornenie“, „chyba“, „kritická“ alebo „vypnuté“)." -#: src/main.cc:487 +#: src/main.cc:488 #, c-format msgid "Invalid logger name \"%s\"." msgstr "Neplatný názov protokolu „%s“." -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "Po -q= sa očakáva číslo\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "Po -q= sa očakáva číslo, zadané bolo %s\n" -#: src/main.cc:802 +#: src/main.cc:794 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o vyžaduje argument v tvare kľúč=hodnota, zadané bolo %s\n" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "Chýba čiarka po názve značky „%s“.\n" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "ZVLÁŠTNE: prijatý kód neznámej voľby\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "bez-zhrnutia" -#: src/main.cc:1039 +#: src/main.cc:1023 msgid "first-package" msgstr "prvý-balík" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "prvý-balík-a-typ" -#: src/main.cc:1043 +#: src/main.cc:1027 msgid "all-packages" msgstr "všetky-balíky" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "všetky-balíky-so-závis-verziami" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -5936,7 +5966,7 @@ msgstr "" "package“, „first-package-and-type“, „all-packages“ alebo „all-packages-with-" "dep-versions“." -#: src/main.cc:1089 +#: src/main.cc:1073 msgid "" "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be " "specified\n" @@ -5944,7 +5974,7 @@ msgstr "" "Môžete zadať iba jednu z volieb --auto-clean-on-startup, --clean-on-startup, " "-i a -u\n" -#: src/main.cc:1098 +#: src/main.cc:1082 msgid "" "-u, -i, and --clean-on-startup may not be specified in command-line mode " "(eg, with 'install')" @@ -5952,21 +5982,21 @@ msgstr "" "-u, -i a --clean-on-startup nemôžu byť použité v režime príkazového riadka " "(napr. s „install“)" -#: src/main.cc:1115 +#: src/main.cc:1099 msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "-u, -i a --clean-on-startup nemôžu byť použité spoločne s príkazom" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "Neznámy príkaz „%s“\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "Neodchytená výnimka: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" @@ -5975,7 +6005,8 @@ msgstr "" "Výpis:\n" "%s\n" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "Hľadať: " @@ -6860,23 +6891,27 @@ msgstr "nahrádza" msgid "obsoletes" msgstr "zastaráva" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (poskytovaný %F)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." msgstr "Ak si zvolíte balík, objaví sa tu popis jeho aktuálneho stavu." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -6884,17 +6919,17 @@ msgstr "" "%B%s%b bol inštalovaný automaticky; teraz sa odstráni, pretože všetky " "balíky, ktoré na ňom záviseli, sa budú odstraňovať:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "%B%s%b sa automaticky odstráni kvôli chybám v závislostiach:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" "%B%s%b sa automaticky nainštaluje kvôli splneniu nasledujúcich závislostí:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -6902,7 +6937,7 @@ msgstr "" "%B%s%b sa nemôže aktualizovať, a aj keby mohol, bol by ponechaný vo verzii %B" "%s%b." -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -6910,27 +6945,27 @@ msgstr "" "%B%s%b sa nebude aktualizovať na verziu %B%s%b, aby neporušil nasledujúce " "závislosti:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b je nainštalovaný." -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b nie je nainštalovaný." -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "Niektoré závislosti %B%s%b nie sú splnené:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "%B%s%b bude degradovaný." -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b sa nebude aktualizovať na zakázanú verziu %B%s%b." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." @@ -6938,43 +6973,43 @@ msgstr "" "%B%s%b by sa mohol aktualizovať na verziu %B%s%b, ale je ponechaný vo verzii " "%B%s%b." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b sa preinštaluje." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b sa nainštaluje." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b sa odstráni." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b sa aktualizuje z verzie %B%s%b na verziu %B%s%b." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "%B%s%b je iba čiastočne nainštalovaný; jeho inštalácia sa dokončí." -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "Nasledujúce balíky závisia na %B%s%b a jeho odstránením sa porušia:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "Nasledujúce balíky závisia na %B%s%b a sú porušené:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" msgstr "" "Nasledujúce balíky sú v konflikte s %B%s%b a jeho inštaláciou sa porušia:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -6983,7 +7018,7 @@ msgstr "" "Nasledujúce balíky závisia na balíku %B%s%b v inej verzii, než je aktuálne " "inštalovaná %B%s%b, alebo sú s ňou v konflikte:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -6991,11 +7026,11 @@ msgstr "" "Nasledujúce balíky sú v konflikte s %B%s%b, alebo závisia na jeho verzii, " "ktorá sa nebude inštalovať." -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "Nasledujúce balíky sú v konflikte s %B%s%b:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -7003,7 +7038,7 @@ msgstr "" "Nasledujúce balíky závisia na balíku %B%s%b v inej verzii, než je aktuálne " "inštalovaná %B%s%b:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." @@ -7011,15 +7046,15 @@ msgstr "" "Nasledujúce balíky závisia na verzii balíku %B%s%b, ktorá sa nebude " "inštalovať." -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "aktualizovaný" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "degradovaný" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7029,7 +7064,7 @@ msgstr "" "%s%b), alebo sú v konflikte s verziou, na ktorú bude balík %s (%B%s%b). Ak " "bude balík %s, tieto balíky sa porušia." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7037,7 +7072,7 @@ msgstr "" "Nasledujúce balíky sú v konflikte s verziou %B%s%b balíku %B%s%b. Ak bude " "balík %s, tieto balíky sa porušia." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7073,47 +7108,47 @@ msgstr "Použiť" msgid "Close" msgstr "Zavrieť" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s koliduje s %s [Je poskytovaný %s %s]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "Odstraňuje sa %s" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "Inštaluje sa %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "Ponechať %ls nevyriešené." -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%BOdstrániť%b nasledujúce balíky:%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%BNainštalovať%b nasledujúce balíky:%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%BPonechať%b nasledujúce balíky v ich aktuálnych verziách:%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%BAktualizovať%b nasledujúce balíky:%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%BDegradovať%b nasledujúce balíky:%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "Nasledujúce závislosti ostávajú nevyriešené:%n" @@ -7212,10 +7247,6 @@ msgstr "E:" msgid "W:" msgstr "W:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "Hľadať:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7578,7 +7609,9 @@ msgid "Error while dumping resolver state" msgstr "Nastala chyba pri ukladaní stavu riešenia" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "Súbor, do ktorého má byť stav riešenia uložený:" #: src/ui.cc:2265 @@ -8094,6 +8127,21 @@ msgid "You can only view changelogs of official Debian packages." msgstr "Môžete prehliadať zoznamy zmien iba oficiálnych Debian balíkov." #~ msgid "" +#~ "%BOption:%b %s\n" +#~ "%BDefault:%b %s\n" +#~ "%BValue:%b %s\n" +#~ msgstr "" +#~ "%BVoľba:%b %s\n" +#~ "%BŠtandardne:%b %s\n" +#~ "%BHodnota:%b %s\n" + +#~ msgid "Press Return to continue" +#~ msgstr "Pokračovanie stlačením klávesu Enter" + +#~ msgid "Search for:" +#~ msgstr "Hľadať:" + +#~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." #~ msgstr "" #~ "Nie je možné vyriešiť závislosti aktualizácie (čas vyhradený pre riešenie " @@ -8211,9 +8259,6 @@ msgstr "Môžete prehliadať zoznamy zmien iba oficiálnych Debian balíkov." #~ msgid "gtk-no" #~ msgstr "gtk-no" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "Nesprávna voľba príkazového riadka „%s“" - #~ msgid "" #~ "The package %s has no candidate version and will not be upgraded; unable " #~ "to show its changelog." @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2009-02-03 15:46+0100\n" "Last-Translator: Martin Bagge <brother@bsnet.se>\n" "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n" @@ -19,42 +19,36 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1\n" "X-Generator: KBabel 1.11.4\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" -msgstr "" -"%BAlternativ:%b %s\n" -"%BStandard:%b %s\n" -"%BVärde:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " +msgstr "%BAlternativ:%b " + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " +msgstr "%BStandard:%b " -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "Sant" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "Falskt" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " -msgstr "%BAlternativ:%b " - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "%BStandard:%b " - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "%BVärde:%b " -#: src/apt_config_treeitems.cc:279 -#, c-format -msgid "Editing \"%ls\"" +#: src/apt_config_treeitems.cc:280 +#, fuzzy, c-format +#| msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "Redigerar \"%ls\"" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "%BVal:%b " @@ -646,8 +640,8 @@ msgstr "Ödesdigert fel i problemlösaren" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] Löser bereoenden" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "Internt fel: oväntad noll-lösning." @@ -945,7 +939,7 @@ msgstr "" "resolver.\n" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "Avbryt.\n" @@ -1314,7 +1308,7 @@ msgstr "Efter uppackning kommer %sB diskplats att frigöras.\n" msgid "No packages to show -- enter the package names on the line after 'i'.\n" msgstr "Inga paket att visa -- ange paketnamnen på raden efter \"i\".\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "Tryck på Return för att fortsätta." @@ -1323,10 +1317,6 @@ msgstr "Tryck på Return för att fortsätta." msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "Inga paket hittades -- ange paketnamnen på raden efter \"c\".\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "Tryck på Retur för att fortsätta" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1638,7 +1628,7 @@ msgstr "Skrivning av lösningtillstånd lyckades!" #| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: " #| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: %F" @@ -1908,7 +1898,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created." msgstr "Jag vill lösa beroendekonflikter men det finns ingen beroendelösare." #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "Löser beroenden..." @@ -1945,7 +1935,9 @@ msgid "Invalid response; please enter one of the following commands:" msgstr "Ogiltigt svar; ange ett av följande kommandon:" #: src/cmdline/cmdline_resolver.cc:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +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? [Y/n]" @@ -2152,7 +2144,7 @@ msgstr "Paket: " msgid "State" msgstr "Tillstånd" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "Tillhandahålls av" @@ -2260,27 +2252,31 @@ msgstr "Ersätter" msgid "Obsoletes" msgstr "Föråldrar" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Tillhandahåller" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Beskrivning: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "Webbplats:" -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "Kunde inte hitta paketet %s" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "Kunde inte tolka mönstret %s" @@ -2604,6 +2600,12 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "" +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "Ogiltig åtgärd %s" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "Oväntat filslut från standard in" @@ -2621,7 +2623,7 @@ msgstr "[FEL]" msgid "UNSATISFIED" msgstr "OTILLFREDSSTÄLLT" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "OTILLGÄNGLIGT" @@ -2629,7 +2631,7 @@ msgstr "OTILLGÄNGLIGT" msgid "Tags" msgstr "Taggar" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "Användaretiketter" @@ -3028,16 +3030,21 @@ msgstr "Kunde inte hitta paketet %s" msgid "Unable to open %s to log actions" msgstr "Kunde inte öppna %s för att logga åtgärder" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "Fel vid generering av lokal tid (%s)" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "loggrapport" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -3048,81 +3055,81 @@ msgstr "" "misslyckas på grund av problem med dpkg kommer inte vara komplett.\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "Kommer att installeras %li paket och ta bort %li paket.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "%sB diskplats kommer att användas\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "%sB diskplats kommer att frigöras\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[UPPGRADERING] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[NEDGRADERING] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "TA BORT" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "INSTALLERA" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "OMINSTALLERA" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "HÅLLS TILLBAKA" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "TRASIGA" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "TA BORT, INTE ANVÄND" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "TA BORT, BEROENDEN" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "INSTALLERA, BEROENDEN" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "HÅLLS KVAR, BEROENDEN" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "ATT STÄLLA IN" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -3145,39 +3152,39 @@ msgstr "" msgid "Filtering packages" msgstr "Hämtar paket" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "Okänd åtgärdstyp: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "Ej avslutande bokstavlig sträng efter %s" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "Okänd prioritet %s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "Sökmönster slutar oväntat (förväntade '%c')." -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "Förväntade \"%c\" men fick \"%c\"." -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "Okänd beroendetyp: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, fuzzy, c-format #| msgid "Unknown matcher type: \"%s\"." msgid "Unknown term type: \"%s\"." @@ -3185,7 +3192,7 @@ msgstr "Okänd mönstertyp: %s." #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, fuzzy, c-format #| msgid "" #| "The ?%s matcher must be used in a \"wide\" context (a top-level context, " @@ -3197,34 +3204,34 @@ msgstr "" "Sökfunktionen ?%s måste användas \"brett\" (i huvudgruppen eller omgärdad " "av ?%s)." -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "Omatchat \"(\"" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "Tillhandahåller: kan inte vara trasigt" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "Okänd mönstertyp: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "Kan inte söka efter \"\"" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "Oväntat tomt uttryck" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, fuzzy, c-format #| msgid "Badly formed expression" msgid "Badly formed expression: expected '|', got '%c'" msgstr "Felaktigt formulerat uttryck" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "Oväntat \")\"" @@ -4171,22 +4178,22 @@ msgstr "" msgid "%s: Unable to accept a connection: %s" msgstr "Kunde inte skapa temporärkatalog från mallen \"%s\": %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4920,7 +4927,7 @@ msgstr "" msgid "Virtual package" msgstr "Paket" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "Inte installerat" @@ -5090,163 +5097,169 @@ msgstr "%s ersätter %s" msgid "%s obsoletes %s" msgstr "%s föråldrar %s" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s ersätter %s" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "Ta bort följande paket:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "Installera följande paket:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 #, fuzzy #| msgid "Remove the following packages:" msgid "Keep the following packages:" msgstr "Ta bort följande paket:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "Uppgradera följande paket:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "Nedgradera följande paket:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 #, fuzzy #| msgid "Leave the following dependencies unresolved:%n" msgid "Leave the following dependencies unresolved:" msgstr "Lämna följande beroenden olösta:%n" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, fuzzy, c-format #| msgid "Remove %F [%s (%s)]" msgid "Remove %s [<big>%s</big> (%s)]" msgstr "Ta bort %F [%s (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "Install %s [<big>%s</big> (%s)]" msgstr "Installera %F [%s (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "Cancel the installation of %s" msgstr "Avbryt installationen av %F" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Cancel the removal of %s" msgstr "Avbryt borttagningen av %F" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "Keep %s at version <big>%s</big> (%s)" msgstr "Håll kvar %F vid version %s (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, fuzzy, c-format #| msgid "Upgrade %F [%s (%s) -> %s (%s)]" msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Uppgradera %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, fuzzy, c-format #| msgid "Downgrade %F [%s (%s) -> %s (%s)]" msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Nedgradera %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>Remove</b> %s" msgstr "Ta bort (%s)" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>remove</b> %s" msgstr "Ta bort (%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>Keep</b> %s at version %s" msgstr "Håll kvar %F vid version %s (%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>keep</b> %s at version %s" msgstr "Håll kvar %F vid version %s (%s)" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>Cancel</b> the installation of %s" msgstr "Avbryt installationen av %F" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>cancel</b> the installation of %s" msgstr "Avbryt installationen av %F" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>Install</b> %s %s" msgstr "Installera %F [%s (%s)]" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>install</b> %s %s" msgstr "Installera %F [%s (%s)]" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "<b>Downgrade</b> %s to version %s" msgstr " cwidget-version: %s\n" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "<b>downgrade</b> %s to version %s" msgstr " cwidget-version: %s\n" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>Upgrade</b> %s to version %s" msgstr "%s versioner" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>upgrade</b> %s to version %s" msgstr "%s versioner" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format #| msgid "%d install" #| msgid_plural "%d installs" @@ -5255,7 +5268,7 @@ msgid_plural "%s installs" msgstr[0] "%d att installera" msgstr[1] "%d att installera" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, fuzzy, c-format #| msgid "%d removal" #| msgid_plural "%d removals" @@ -5264,7 +5277,7 @@ msgid_plural "%s removes" msgstr[0] "%d att ta bort" msgstr[1] "%d att ta bort" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, fuzzy, c-format #| msgid "%d keep" #| msgid_plural "%d keeps" @@ -5273,7 +5286,7 @@ msgid_plural "%s keeps" msgstr[0] "%d att behålla" msgstr[1] "%d att behålla" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, fuzzy, c-format #| msgid "%d upgrade" #| msgid_plural "%d upgrades" @@ -5282,7 +5295,7 @@ msgid_plural "%s upgrades" msgstr[0] "%d att uppgradera" msgstr[1] "%d att uppgradera" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, fuzzy, c-format #| msgid "%d downgrade" #| msgid_plural "%d downgrades" @@ -5291,7 +5304,7 @@ msgid_plural "%s downgrades" msgstr[0] "%d att nedgradera" msgstr[1] "%d att nedgradera" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, fuzzy, c-format #| msgid "Audit ^Recommendations" msgid "%s unresolved recommendation" @@ -5299,35 +5312,35 @@ msgid_plural "%s unresolved recommendations" msgstr[0] "Granska ^rekommendationer" msgstr[1] "Granska ^rekommendationer" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 #, fuzzy #| msgid "No more solutions." msgid "No solutions yet." msgstr "Inga fler lösningar." -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 #, fuzzy #| msgid "Dependency handling" msgid "No dependency solution was found." msgstr "Beroendehantering" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 #, fuzzy #| msgid "No more solutions." msgid "No solutions." msgstr "Inga fler lösningar." -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, fuzzy, c-format #| msgid "No more solutions." msgid "%u solutions." msgstr "Inga fler lösningar." -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Could not open file \"%s\"" msgid "Solution %s of %s." @@ -5636,12 +5649,12 @@ msgstr " Stöd för Ept avaktiverat.\n" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s byggd den %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5794,29 +5807,35 @@ msgstr " show - Visa detaljerad information om ett paket\n" #: src/main.cc:213 #, fuzzy, c-format +#| msgid " show - Display detailed information about a package\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - Visa detaljerad information om ett paket\n" + +#: src/main.cc:214 +#, fuzzy, c-format #| msgid " clean - Erase downloaded package files\n" msgid " clean - Erase downloaded package files.\n" msgstr " clean - Radera hämtade paketfiler\n" -#: src/main.cc:214 +#: src/main.cc:215 #, fuzzy, c-format #| msgid " autoclean - Erase old downloaded package files\n" msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean - Radera gamla hämtade paketfiler\n" -#: src/main.cc:215 +#: src/main.cc:216 #, fuzzy, c-format #| msgid " changelog - View a package's changelog\n" msgid " changelog - View a package's changelog.\n" msgstr " changelog - Visa ändringsloggen för ett paket\n" -#: src/main.cc:216 +#: src/main.cc:217 #, fuzzy, c-format #| msgid " download - Download the .deb file for a package\n" msgid " download - Download the .deb file for a package.\n" msgstr " download - Hämta .deb-filen för ett paket\n" -#: src/main.cc:217 +#: src/main.cc:218 #, fuzzy, c-format #| msgid "" #| " reinstall - Download and (possibly) reinstall a currently installed " @@ -5828,12 +5847,16 @@ msgstr "" " reinstall - Hämta och (eventuellt) installera om ett för närvarande " "installerat paket\n" -#: src/main.cc:218 -#, c-format +#: src/main.cc:219 +#, fuzzy, c-format +#| msgid "" +#| " why - Show the manually installed packages that require a " +#| "package, or\n" +#| " why one or more packages would require the given package\n" msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " varför - Visa de manuellt installerade paketen som kräver ett " "paket eller\n" @@ -5841,7 +5864,7 @@ msgstr "" "aktuella paketet\n" # if I ever meet the person who choose this layout... /Martin -#: src/main.cc:220 +#: src/main.cc:221 #, fuzzy, c-format #| msgid "" #| " why-not - Show the manually installed packages that lead to a " @@ -5861,46 +5884,46 @@ msgstr "" "kan\n" " skapa en konflikt med det givna paketet om det installeras.\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " Flaggor:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " -h This help text.\n" msgstr " -h Denna hjälptext\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h Denna hjälptext\n" -#: src/main.cc:232 +#: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr "" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s Simulera åtgärder utan att faktiskt genomföra dem.\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" @@ -5908,13 +5931,13 @@ msgstr "" " -d Hämta endast paket, installera inte eller ta bort " "någonting.\n" -#: src/main.cc:236 +#: src/main.cc:237 #, fuzzy, c-format #| msgid " -P Always prompt for confirmation or actions\n" -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P Fråga alltid efter bekräftelse eller åtgärder\n" -#: src/main.cc:237 +#: src/main.cc:238 #, fuzzy, c-format #| msgid "" #| " -y Assume that the answer to simple yes/no questions is " @@ -5923,7 +5946,7 @@ msgid "" " -y Assume that the answer to simple yes/no questions is 'yes'.\n" msgstr " -y Anta att svaret på enkla ja/nej-frågor är \"ja\"\n" -#: src/main.cc:238 +#: src/main.cc:239 #, fuzzy, c-format #| msgid "" #| " -F format Specify a format for displaying search results; see the " @@ -5934,7 +5957,7 @@ msgid "" msgstr "" " -F format Ange ett format för visning av sökresultat; se manualen\n" -#: src/main.cc:239 +#: src/main.cc:240 #, fuzzy, c-format #| msgid "" #| " -O order Specify how search results should be sorted; see the " @@ -5944,7 +5967,7 @@ msgid "" "manual.\n" msgstr " -O sortering Ange hur sökresultat ska sorteras; se manualen\n" -#: src/main.cc:240 +#: src/main.cc:241 #, fuzzy, c-format #| msgid "" #| " -w width Specify the display width for formatting search results\n" @@ -5952,28 +5975,28 @@ msgid "" " -w width Specify the display width for formatting search results.\n" msgstr " -w bredd Ange visningsbredd för att formatera sökresultat\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr " -f Försök aggressivt att rätta till trasiga paket.\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr " -V Visa vilka versioner av paketen som ska installeras.\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr " -D Visa beroenden för automatiskt ändrade paket.\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr " -Z\t\t Visa ändring av installationsstorlek för varje paket.\n" -#: src/main.cc:245 +#: src/main.cc:246 #, fuzzy, c-format #| msgid "" #| " -v Display extra information. (may be supplied multiple " @@ -5983,7 +6006,7 @@ msgid "" "times).\n" msgstr " -v Visa extra information. (kan anges flera gånger)\n" -#: src/main.cc:246 +#: src/main.cc:247 #, fuzzy, c-format #| msgid "" #| " -t [release] Set the release from which packages should be installed\n" @@ -5991,19 +6014,19 @@ msgid "" " -t [release] Set the release from which packages should be installed.\n" msgstr " -t [utgåva] Ange utgåvan för vilken paketen ska installeras\n" -#: src/main.cc:247 +#: src/main.cc:248 #, fuzzy, c-format #| msgid "" #| " -q In command-line mode, suppress the incremental progress\n" #| " indicators.\n" msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" " -q I kommandoradsläge, tysta ner den inkrementella " "förloppsindikatorn.\n" -#: src/main.cc:249 +#: src/main.cc:250 #, fuzzy, c-format #| msgid " -o key=val Directly set the configuration option named 'key'\n" msgid " -o key=val Directly set the configuration option named 'key'.\n" @@ -6011,46 +6034,46 @@ msgstr "" " -o nyckel=värde Ställ direkt in en konfigurationsinställning med namnet " "\"nyckel\"\n" -#: src/main.cc:250 +#: src/main.cc:251 #, fuzzy, c-format #| msgid "" #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" #| " strong dependencies\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends\tFastställ huruvida rekommendationer ska behandlas\n" " som starka beroenden\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr " -S filnamn: Läs aptitudes utökade statusinformation från filnamn.\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u Hämta nya paketlistor vid uppstart.\n" -#: src/main.cc:254 src/main.cc:256 -#, c-format -msgid " (terminal interface only)" -msgstr "" +#: src/main.cc:255 src/main.cc:257 +#, fuzzy, c-format +msgid " (terminal interface only)\n" +msgstr " -h Denna hjälptext\n" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i Genomför en installationskörning vid uppstart.\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " Denna aptitude har inte Super-Ko-Krafter.\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 #, fuzzy #| msgid "true" msgid "trace" @@ -6058,13 +6081,13 @@ msgstr "Sant" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 #, fuzzy #| msgid "no" msgid "info" @@ -6072,13 +6095,13 @@ msgstr "nej" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 #, fuzzy #| msgid "Err " msgid "error" @@ -6086,7 +6109,7 @@ msgstr "Fel" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 #, fuzzy #| msgid "false" msgid "fatal" @@ -6094,95 +6117,95 @@ msgstr "Falskt" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " "\"warn\", \"error\", \"fatal\", or \"off\")." msgstr "" -#: src/main.cc:487 +#: src/main.cc:488 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "Invalid logger name \"%s\"." msgstr "Ogiltig åtgärd %s" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "Förväntade ett nummer efter -q=\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "Förväntade ett nummer efter -q=, fick %s\n" -#: src/main.cc:802 +#: src/main.cc:794 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o kräver ett argument i formatet nyckel=värde, fick %s\n" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "Saknade komma efter etikettnamnet \"%s\".\n" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "SKUMT: okänd flaggkod mottagen\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "" -#: src/main.cc:1039 +#: src/main.cc:1023 #, fuzzy #| msgid "Package" msgid "first-package" msgstr "Paket" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "" -#: src/main.cc:1043 +#: src/main.cc:1027 #, fuzzy #| msgid "All Packages" msgid "all-packages" msgstr "Alla paket" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -6190,7 +6213,7 @@ msgid "" "versions\"." msgstr "" -#: src/main.cc:1089 +#: src/main.cc:1073 #, fuzzy #| msgid "Only one of -u and -i may be specified\n" msgid "" @@ -6198,7 +6221,7 @@ msgid "" "specified\n" msgstr "Endast en av -u och -i får anges\n" -#: src/main.cc:1098 +#: src/main.cc:1082 #, fuzzy #| msgid "" #| "-u and -i may not be specified in command-line mode (eg, with 'install')" @@ -6208,23 +6231,23 @@ msgid "" msgstr "" "-u och -i får inte anges i kommandoradsläget (exempelvis, med \"install\")" -#: src/main.cc:1115 +#: src/main.cc:1099 #, fuzzy #| msgid "-u and -i may not be specified with a command" msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "-u och -i får inte anges med ett kommando" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "Okänt kommando \"%s\"\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "Ofångat undantag: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" @@ -6233,7 +6256,8 @@ msgstr "" "Bakåtspårning:\n" "%s\n" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "Sök efter: " @@ -7121,23 +7145,27 @@ msgstr "ersätter" msgid "obsoletes" msgstr "föråldrar" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (tillhandahålls av %F)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." msgstr "Om du väljer ett paket kommer dess tillstånd visas på denna plats." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -7145,19 +7173,19 @@ msgstr "" "%B%s%b blev automatiskt installerat och kommer att tas bort för att alla de " "paket som är beroende av det kommer att tas bort:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "" "%B%s%b kommer att bli automatiskt borttaget på grund av beroendeproblem:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" "%B%s%b kommer att automatiskt installeras för att tillfredsställa följande " "beroenden:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -7165,7 +7193,7 @@ msgstr "" "%B%s%b kan inte uppgraderas nu men även om det kunde det, så skulle det " "hållas kvar på version %B%s%b." -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -7173,28 +7201,28 @@ msgstr "" "%B%s%b kommer inte att uppgraderas till version %B%s%b för att undvika att " "bryta följande beroenden:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b är för närvarande installerat." -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b är för närvarande inte installerat." -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "Vissa beroenden för %B%s%b är inte tillfredsställda:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "%B%s%b kommer att nedgraderas." -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "" "%B%s%b kommer inte att uppgraderas till den förbjudna versionen %B%s%b." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." @@ -7202,40 +7230,40 @@ msgstr "" "%B%s%b kunde uppgraderas till version %B%s%b men det hålls kvar på version %B" "%s%b." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b kommer att installeras om." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b kommer att installeras." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b kommer att tas bort." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b kommer att uppgraderas från version %B%s%b till version %B%s%b." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "" "%B%s%b är endast delvis installerat; dess installation kommer att " "färdigställas." -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "" "Följande paket är beroende av %B%s%b och kommer att bli trasiga genom denna " "borttagning:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "Följande paket är beroende av %B%s%b och är trasiga:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" @@ -7243,7 +7271,7 @@ msgstr "" "Följande paket är i konflikt med %B%s%b och kommer att bli trasiga av " "installationen:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -7253,7 +7281,7 @@ msgstr "" "den nuvarande installerade versionen %B%s%b, eller är i konflikt med den " "nuvarande installerade versionen:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -7261,11 +7289,11 @@ msgstr "" "Följande paket är i konflikt med %B%s%b eller är beroende av en version av " "den som inte kommer att installeras." -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "Följande paket är i konflikt med %B%s%b:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -7273,7 +7301,7 @@ msgstr "" "Följande paket är beroende av en version av %B%s%b som är en annan än den " "nuvarande installerade versionen av %B%s%b:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." @@ -7281,15 +7309,15 @@ msgstr "" "Följande paket är beroende av en version av %B%s%b som inte kommer att bli " "installerad." -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "uppgraderad" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "nedgraderad" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7299,7 +7327,7 @@ msgstr "" "(%B%s%b) eller är i konflikt med versionen den kommer att bli %s till (%B%s" "%b), och kommer att bli trasig om den är %s." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7307,7 +7335,7 @@ msgstr "" "Följande paket är i konflikt med version %B%s%b av %B%s%b och kommer att bli " "trasigt om det är %s." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7343,47 +7371,47 @@ msgstr "Verkställ" msgid "Close" msgstr "Stäng" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s är i konflikt med %s [som tillhandahålls av %s %s]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "Installerar %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%BTa bort%b följande paket:%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%BInstallera%b följande paket:%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%BBehåll%b följande paket vid deras nuvarande version: %n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%BUppgradera%b följande paket:%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%BNedgradera%b följande paket:%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "Lämna följande beroenden olösta:%n" @@ -7482,10 +7510,6 @@ msgstr "F:" msgid "W:" msgstr "V:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "Sök efter:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7862,7 +7886,9 @@ msgid "Error while dumping resolver state" msgstr "Fel vid dumpning av problemlösarens tillstånd" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "Fil i vilken problemlösaren ska dumpa sitt tillstånd:" #: src/ui.cc:2265 @@ -8377,6 +8403,21 @@ msgid "You can only view changelogs of official Debian packages." msgstr "Du kan endast se ändringsloggar från officiella Debianpaket." #~ msgid "" +#~ "%BOption:%b %s\n" +#~ "%BDefault:%b %s\n" +#~ "%BValue:%b %s\n" +#~ msgstr "" +#~ "%BAlternativ:%b %s\n" +#~ "%BStandard:%b %s\n" +#~ "%BVärde:%b %s\n" + +#~ msgid "Press Return to continue" +#~ msgstr "Tryck på Retur för att fortsätta" + +#~ msgid "Search for:" +#~ msgstr "Sök efter:" + +#~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." #~ msgstr "Kunde inte lösa beroenden! Ger upp... (tog för lång tid)" @@ -8502,11 +8543,6 @@ msgstr "Du kan endast se ändringsloggar från officiella Debianpaket." #~ msgid "gtk-yes" #~ msgstr "ja" -#, fuzzy -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "Ogiltig åtgärd %s" - #~ msgid "but it is not installable" #~ msgstr "men det är inte installerbart" @@ -9257,10 +9293,6 @@ msgstr "Du kan endast se ändringsloggar från officiella Debianpaket." #~ " -V Visa vilka versioner av paketen som ska installeras.\n" #, fuzzy -#~ msgid " indicators.\n" -#~ msgstr " -h Denna hjälptext\n" - -#, fuzzy #~ msgid "Downloading " #~ msgstr "Hämtar..." @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2008-05-06 12:52+0700\n" "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n" "Language-Team: Thai <thai-l10n@googlegroups.com>\n" @@ -17,39 +17,35 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" -msgstr "" - -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 -msgid "True" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " msgstr "" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 -msgid "False" +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 +msgid "True" msgstr "" -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 +msgid "False" msgstr "" -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:279 +#: src/apt_config_treeitems.cc:280 #, c-format -msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "" @@ -516,8 +512,8 @@ msgstr "" msgid "[%d(%d)/...] Resolving dependencies" msgstr "" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "" @@ -782,7 +778,7 @@ msgid "" msgstr "" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "" @@ -1123,7 +1119,7 @@ msgstr "" msgid "No packages to show -- enter the package names on the line after 'i'.\n" msgstr "" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "" @@ -1132,10 +1128,6 @@ msgstr "" msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1404,7 +1396,7 @@ msgstr "" #: src/cmdline/cmdline_resolver.cc:222 #, c-format msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" @@ -1650,7 +1642,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created." msgstr "" #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "" @@ -1686,7 +1678,7 @@ msgid "Invalid response; please enter one of the following commands:" msgstr "" #: src/cmdline/cmdline_resolver.cc:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +msgid "No solution found within the allotted time. Try harder? [Y/n] " msgstr "" #: src/cmdline/cmdline_resolver.cc:1080 @@ -1886,7 +1878,7 @@ msgstr "" msgid "State" msgstr "" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "" @@ -1994,27 +1986,31 @@ msgstr "แทนที่" msgid "Obsoletes" msgstr "ใช้แทน" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "" -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "" -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "ไม่พบแพกเกจ %s" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "" @@ -2324,6 +2320,12 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "" +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "ไม่รู้จักคำสั่ง %s" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "" @@ -2340,7 +2342,7 @@ msgstr "" msgid "UNSATISFIED" msgstr "" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "" @@ -2348,7 +2350,7 @@ msgstr "" msgid "Tags" msgstr "" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "" @@ -2731,16 +2733,21 @@ msgstr "ไม่พบแพกเกจ %s" msgid "Unable to open %s to log actions" msgstr "" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -2748,81 +2755,81 @@ msgid "" "\n" msgstr "" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -2842,79 +2849,79 @@ msgstr "" msgid "Filtering packages" msgstr "จะ *ลบ* แพกเกจต่อไปนี้:" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "" -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "" -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, c-format msgid "Unknown term type: \"%s\"." msgstr "" #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, c-format msgid "" "The ?%s term must be used in a \"wide\" context (a top-level context, or a " "context enclosed by ?%s)." msgstr "" -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, c-format msgid "Badly formed expression: expected '|', got '%c'" msgstr "" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "" @@ -3744,22 +3751,22 @@ msgstr "" msgid "%s: Unable to accept a connection: %s" msgstr "ไม่พบแพกเกจ %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4355,7 +4362,7 @@ msgstr "" msgid "Virtual package" msgstr "" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "" @@ -4520,151 +4527,156 @@ msgstr "" msgid "%s obsoletes %s" msgstr "" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, c-format +msgid "%s enhances %s" +msgstr "" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 #, fuzzy #| msgid "The following packages will be REMOVED:" msgid "Keep the following packages:" msgstr "จะ *ลบ* แพกเกจต่อไปนี้:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 msgid "Leave the following dependencies unresolved:" msgstr "" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, fuzzy, c-format #| msgid "Removing %s" msgid "Remove %s [<big>%s</big> (%s)]" msgstr "กำลังถอดถอน %s" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "Install %s [<big>%s</big> (%s)]" msgstr "ไม่รู้จักคำสั่ง %s" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, c-format msgid "Cancel the installation of %s" msgstr "" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, c-format msgid "Cancel the removal of %s" msgstr "" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, fuzzy, c-format #| msgid "Fetched %sB in %s (%sB/s)\n" msgid "Keep %s at version <big>%s</big> (%s)" msgstr "ดาวน์โหลด %sB ใน %s (%sB/s)\n" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, c-format msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, c-format msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Removing %s" msgid "<b>Remove</b> %s" msgstr "กำลังถอดถอน %s" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Removing %s" msgid "<b>remove</b> %s" msgstr "กำลังถอดถอน %s" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Fetched %sB in %s (%sB/s)\n" msgid "<b>Keep</b> %s at version %s" msgstr "ดาวน์โหลด %sB ใน %s (%sB/s)\n" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Fetched %sB in %s (%sB/s)\n" msgid "<b>keep</b> %s at version %s" msgstr "ดาวน์โหลด %sB ใน %s (%sB/s)\n" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, c-format msgid "<b>Cancel</b> the installation of %s" msgstr "" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, c-format msgid "<b>cancel</b> the installation of %s" msgstr "" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "<b>Install</b> %s %s" msgstr "ไม่รู้จักคำสั่ง %s" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "<b>install</b> %s %s" msgstr "ไม่รู้จักคำสั่ง %s" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>Downgrade</b> %s to version %s" msgstr "" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>downgrade</b> %s to version %s" msgstr "" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>Upgrade</b> %s to version %s" msgstr "" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>upgrade</b> %s to version %s" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format #| msgid "%lu reinstalled, " msgid "%s install" @@ -4672,28 +4684,28 @@ msgid_plural "%s installs" msgstr[0] "ติดตั้งซ้ำ %lu, " msgstr[1] "ติดตั้งซ้ำ %lu, " -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, c-format msgid "%s remove" msgid_plural "%s removes" msgstr[0] "" msgstr[1] "" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, c-format msgid "%s keep" msgid_plural "%s keeps" msgstr[0] "" msgstr[1] "" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, c-format msgid "%s upgrade" msgid_plural "%s upgrades" msgstr[0] "" msgstr[1] "" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, fuzzy, c-format #| msgid "%lu downgraded, " msgid "%s downgrade" @@ -4701,35 +4713,35 @@ msgid_plural "%s downgrades" msgstr[0] "ปรับรุ่นลง %lu, " msgstr[1] "ปรับรุ่นลง %lu, " -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, c-format msgid "%s unresolved recommendation" msgid_plural "%s unresolved recommendations" msgstr[0] "" msgstr[1] "" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 msgid "No solutions yet." msgstr "" -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 msgid "No dependency solution was found." msgstr "" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 msgid "No solutions." msgstr "" -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, c-format msgid "%u solutions." msgstr "" -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, c-format msgid "Solution %s of %s." msgstr "" @@ -5022,12 +5034,12 @@ msgstr "" #: src/main.cc:179 #, c-format -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5155,40 +5167,45 @@ msgstr "" #: src/main.cc:213 #, c-format -msgid " clean - Erase downloaded package files.\n" +msgid " versions - Displays the versions of specified packages.\n" msgstr "" #: src/main.cc:214 #, c-format -msgid " autoclean - Erase old downloaded package files.\n" +msgid " clean - Erase downloaded package files.\n" msgstr "" #: src/main.cc:215 #, c-format -msgid " changelog - View a package's changelog.\n" +msgid " autoclean - Erase old downloaded package files.\n" msgstr "" #: src/main.cc:216 #, c-format -msgid " download - Download the .deb file for a package.\n" +msgid " changelog - View a package's changelog.\n" msgstr "" #: src/main.cc:217 #, c-format +msgid " download - Download the .deb file for a package.\n" +msgstr "" + +#: src/main.cc:218 +#, c-format msgid "" " reinstall - Download and (possibly) reinstall a currently installed " "package.\n" msgstr "" -#: src/main.cc:218 +#: src/main.cc:219 #, c-format msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" -#: src/main.cc:220 +#: src/main.cc:221 #, c-format msgid "" " why-not - Show the manually installed packages that lead to a " @@ -5197,185 +5214,185 @@ msgid "" " lead to a conflict with the given package if installed.\n" msgstr "" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr "" -#: src/main.cc:225 +#: src/main.cc:226 #, c-format msgid " -h This help text.\n" msgstr "" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" -#: src/main.cc:231 +#: src/main.cc:232 #, c-format msgid " --qt Use the Qt GUI.\n" msgstr "" -#: src/main.cc:232 +#: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr "" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr "" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr "" -#: src/main.cc:236 +#: src/main.cc:237 #, c-format -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr "" -#: src/main.cc:237 +#: src/main.cc:238 #, c-format msgid "" " -y Assume that the answer to simple yes/no questions is 'yes'.\n" msgstr "" -#: src/main.cc:238 +#: src/main.cc:239 #, c-format msgid "" " -F format Specify a format for displaying search results; see the " "manual.\n" msgstr "" -#: src/main.cc:239 +#: src/main.cc:240 #, c-format msgid "" " -O order Specify how search results should be sorted; see the " "manual.\n" msgstr "" -#: src/main.cc:240 +#: src/main.cc:241 #, c-format msgid "" " -w width Specify the display width for formatting search results.\n" msgstr "" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr "" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr "" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr "" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr "" -#: src/main.cc:245 +#: src/main.cc:246 #, c-format msgid "" " -v Display extra information. (may be supplied multiple " "times).\n" msgstr "" -#: src/main.cc:246 +#: src/main.cc:247 #, c-format msgid "" " -t [release] Set the release from which packages should be installed.\n" msgstr "" -#: src/main.cc:247 +#: src/main.cc:248 #, c-format msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" -#: src/main.cc:249 +#: src/main.cc:250 #, c-format msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr "" -#: src/main.cc:250 +#: src/main.cc:251 #, c-format msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr "" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr "" -#: src/main.cc:254 src/main.cc:256 +#: src/main.cc:255 src/main.cc:257 #, c-format -msgid " (terminal interface only)" +msgid " (terminal interface only)\n" msgstr "" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr "" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 msgid "trace" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 msgid "info" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 #, fuzzy #| msgid "Err " msgid "error" @@ -5383,97 +5400,97 @@ msgstr "ปัญหา " #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 msgid "fatal" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " "\"warn\", \"error\", \"fatal\", or \"off\")." msgstr "" -#: src/main.cc:487 +#: src/main.cc:488 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "Invalid logger name \"%s\"." msgstr "ไม่รู้จักคำสั่ง %s" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "" -#: src/main.cc:802 +#: src/main.cc:794 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "" -#: src/main.cc:1039 +#: src/main.cc:1023 msgid "first-package" msgstr "" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "" -#: src/main.cc:1043 +#: src/main.cc:1027 msgid "all-packages" msgstr "" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -5481,40 +5498,41 @@ msgid "" "versions\"." msgstr "" -#: src/main.cc:1089 +#: src/main.cc:1073 msgid "" "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be " "specified\n" msgstr "" -#: src/main.cc:1098 +#: src/main.cc:1082 msgid "" "-u, -i, and --clean-on-startup may not be specified in command-line mode " "(eg, with 'install')" msgstr "" -#: src/main.cc:1115 +#: src/main.cc:1099 msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" "%s\n" msgstr "" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "" @@ -6342,161 +6360,165 @@ msgstr "" msgid "obsoletes" msgstr "" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr "" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." msgstr "" -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" msgstr "" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." msgstr "" -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" msgstr "" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "" -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "" -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "" -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "" -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." msgstr "" -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "" -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "" -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "" -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "" -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "" -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" msgstr "" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " "installed version:" msgstr "" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." msgstr "" -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" msgstr "" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." msgstr "" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " "be broken if it is %s." msgstr "" -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." msgstr "" -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -6530,47 +6552,47 @@ msgstr "" msgid "Close" msgstr "" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "กำลังถอดถอน %s" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "" @@ -6666,10 +6688,6 @@ msgstr "" msgid "W:" msgstr "" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7000,7 +7018,7 @@ msgid "Error while dumping resolver state" msgstr "" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "" #: src/ui.cc:2265 @@ -7510,10 +7528,5 @@ msgstr "" #~ msgid "Find _Dependency Chains" #~ msgstr "ต้องใช้" -#, fuzzy -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "ไม่รู้จักคำสั่ง %s" - #~ msgid "but it is not installable" #~ msgstr "แต่ไม่สามารถติดตั้งได้" @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+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" @@ -24,41 +24,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +#, fuzzy +msgid "%BOption:%b " +msgstr "Mga Pagpipilian" + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 #, fuzzy msgid "False" msgstr "^Isara" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -#, fuzzy -msgid "%BOption:%b " -msgstr "Mga Pagpipilian" - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "" - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:279 +#: src/apt_config_treeitems.cc:280 #, c-format -msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "" @@ -540,8 +536,8 @@ msgstr "" msgid "[%d(%d)/...] Resolving dependencies" msgstr "Hindi ma-buksan ang %s para sulatan" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "" @@ -834,7 +830,7 @@ msgid "" msgstr "Hindi ma-buksan ang %s para sulatan" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "Hintuin.\n" @@ -1195,7 +1191,7 @@ msgstr "Matapos magbuklat ay %sB ay mapapalaya.\n" msgid "No packages to show -- enter the package names on the line after 'i'.\n" msgstr "Walang paketeng ipapakita - ibigay ang mga pakete pagkatapos ng 'i'.\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "Pindutin ang Enter upang tumuloy." @@ -1205,11 +1201,6 @@ msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "" "Walang nahanap na mga pakete -- ibigay ang mga pakete pagkatapos ng 'c'.\n" -#: src/cmdline/cmdline_prompt.cc:795 -#, fuzzy -msgid "Press Return to continue" -msgstr "Pindutin ang Enter upang tumuloy." - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1507,7 +1498,7 @@ msgstr "" #: src/cmdline/cmdline_resolver.cc:222 #, c-format msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" @@ -1757,7 +1748,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created." msgstr "" #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 #, fuzzy msgid "Resolving dependencies..." @@ -1798,7 +1789,7 @@ msgstr "" "Di tanggap na sagot. Pakibigay ng tanggap na utos o '?' para sa tulong.\n" #: src/cmdline/cmdline_resolver.cc:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +msgid "No solution found within the allotted time. Try harder? [Y/n] " msgstr "" #: src/cmdline/cmdline_resolver.cc:1080 @@ -2001,7 +1992,7 @@ msgstr "Pakete: " msgid "State" msgstr "Katayuan" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "Inihanda ni" @@ -2109,27 +2100,31 @@ msgstr "Palitan" msgid "Obsoletes" msgstr "Obsoletes" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Provides" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Diskripyson: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "" -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, fuzzy, c-format msgid "Unable to locate package %s" msgstr "Hindi ma-buksan ang %s para sulatan" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, fuzzy, c-format msgid "Unable to parse pattern %s" msgstr "Hindi ma-buksan ang %s para sulatan" @@ -2452,6 +2447,12 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "" +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "Hindi tanggap na operasyon %s" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "" @@ -2469,7 +2470,7 @@ msgstr "[ERROR]" msgid "UNSATISFIED" msgstr "HINDI KUNTENTO" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "HINDI AVAILABLE" @@ -2478,7 +2479,7 @@ msgstr "HINDI AVAILABLE" msgid "Tags" msgstr "Tag" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 #, fuzzy msgid "User Tags" msgstr "Tag" @@ -2872,16 +2873,21 @@ msgstr "Hindi ma-buksan ang %s para sulatan" msgid "Unable to open %s to log actions" msgstr "Hindi ma-buksan ang %s para mailista ang mga aksyon" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, fuzzy, c-format msgid "Error generating local time (%s)" msgstr "Error sa pagsulat ng state file" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "log-report" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -2893,81 +2899,81 @@ msgstr "" "dpkg problems ay hindi kumpleto.\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "Ee-install ang %li pakete, at tanggalin %li mga pakete.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "%sB na disk space ang gagamitin\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, fuzzy, c-format msgid "%sB of disk space will be freed\n" msgstr "%sB na disk space ang gagamitin\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[UPGRADE] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[DOWNGRADE] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "TANGGALIN" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "INSTALL" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "REINSTALL" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "PIGILIN" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "SIRA" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "TANGGALIN, HINDI NAGAMIT" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "TANGGALIN, DEPENDENCIES" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "INSTALL, DEPENDENCIES" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "PIGILIN, DEPENDENCIES" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -2990,81 +2996,81 @@ msgstr "" msgid "Filtering packages" msgstr "Kinukuha ang mga pakete" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "Di-kilalang anyo ng aksyon: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "Hindi kilalang prayoridad %s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "" -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, fuzzy, c-format msgid "Expected '%c', got '%c'." msgstr "Hindi ma-buksan ang %s para sulatan" -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "Di-kilalang anyo ng dependency: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, fuzzy, c-format msgid "Unknown term type: \"%s\"." msgstr "Di-kilalang anyo ng pattern: %c" #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, c-format msgid "" "The ?%s term must be used in a \"wide\" context (a top-level context, or a " "context enclosed by ?%s)." msgstr "" -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "Hindi magkatulad '('" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "Di-kilalang anyo ng pattern: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 #, fuzzy msgid "Can't search for \"\"" msgstr "Hanapin ang: " -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "Hindi inaasahang blangko na expression" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, fuzzy, c-format #| msgid "Badly formed expression" msgid "Badly formed expression: expected '|', got '%c'" msgstr "Badly formed expression" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "Hindi inaasahan ')'" @@ -3975,22 +3981,22 @@ msgstr "" msgid "%s: Unable to accept a connection: %s" msgstr "Hindi ma-buksan ang %s para sulatan" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4687,7 +4693,7 @@ msgstr "" msgid "Virtual package" msgstr "Pakete" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 #, fuzzy msgid "Not Installed" msgstr "hindi naka-instol" @@ -4852,166 +4858,171 @@ msgstr "papalitan" msgid "%s obsoletes %s" msgstr "lipas na" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +msgid "%s enhances %s" +msgstr "papalitan" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 #, fuzzy msgid "Remove the following packages:" msgstr "Ang mga sumusunod na pakete ay SIRA:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 #, fuzzy msgid "Install the following packages:" msgstr "Ang mga sumusunod na pakete ay SIRA:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 #, fuzzy msgid "Keep the following packages:" msgstr "Ang mga sumusunod na pakete ay SIRA:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 #, fuzzy msgid "Upgrade the following packages:" msgstr "Ang mga sumusunod na pakete ay SIRA:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 #, fuzzy msgid "Downgrade the following packages:" msgstr "Kinukuha ang mga pakete" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 #, fuzzy msgid "Leave the following dependencies unresolved:" msgstr "Ang mga sumusunod na pakete ay SIRA:" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, fuzzy, c-format msgid "Remove %s [<big>%s</big> (%s)]" msgstr "^Tanggalin" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, fuzzy, c-format msgid "Install %s [<big>%s</big> (%s)]" msgstr "Bersyon" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, fuzzy, c-format msgid "Cancel the installation of %s" msgstr "Pakete na umaasa sa %s" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, fuzzy, c-format msgid "Cancel the removal of %s" msgstr "Pakete na umaasa sa %s" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, fuzzy, c-format msgid "Keep %s at version <big>%s</big> (%s)" msgstr "" "\n" "Salin ng tingayaw: %s\n" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, fuzzy, c-format msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Nakuha %sB ng %s (%sB/s)." -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, fuzzy, c-format msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Nakuha %sB ng %s (%sB/s)." -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format msgid "<b>Remove</b> %s" msgstr "^Tanggalin" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format msgid "<b>remove</b> %s" msgstr "^Tanggalin" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format msgid "<b>Keep</b> %s at version %s" msgstr "" "\n" "Salin ng tingayaw: %s\n" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format msgid "<b>keep</b> %s at version %s" msgstr "" "\n" "Salin ng tingayaw: %s\n" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format msgid "<b>Cancel</b> the installation of %s" msgstr "Pakete na umaasa sa %s" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format msgid "<b>cancel</b> the installation of %s" msgstr "Pakete na umaasa sa %s" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format msgid "<b>Install</b> %s %s" msgstr "Bersyon" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format msgid "<b>install</b> %s %s" msgstr "Bersyon" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format msgid "<b>Downgrade</b> %s to version %s" msgstr "libsigc++ salin: %s\n" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format msgid "<b>downgrade</b> %s to version %s" msgstr "libsigc++ salin: %s\n" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format msgid "<b>Upgrade</b> %s to version %s" msgstr "Bersyon" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format msgid "<b>upgrade</b> %s to version %s" msgstr "Bersyon" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format msgid "%s install" msgid_plural "%s installs" msgstr[0] "Instal" msgstr[1] "Instal" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, fuzzy, c-format msgid "%s remove" msgid_plural "%s removes" msgstr[0] "^Tanggalin" msgstr[1] "^Tanggalin" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, fuzzy, c-format #| msgid "sleep" msgid "%s keep" @@ -5019,51 +5030,51 @@ msgid_plural "%s keeps" msgstr[0] "tulog" msgstr[1] "tulog" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, fuzzy, c-format msgid "%s upgrade" msgid_plural "%s upgrades" msgstr[0] "upgrade" msgstr[1] "upgrade" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, fuzzy, c-format msgid "%s downgrade" msgid_plural "%s downgrades" msgstr[0] "downgrade" msgstr[1] "downgrade" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, fuzzy, c-format msgid "%s unresolved recommendation" msgid_plural "%s unresolved recommendations" msgstr[0] "Rekomendasyon" msgstr[1] "Rekomendasyon" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 msgid "No solutions yet." msgstr "" -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 #, fuzzy msgid "No dependency solution was found." msgstr "^Dependency na pag-tagan" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 #, fuzzy msgid "No solutions." msgstr "^Mabalik ang options" -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, fuzzy, c-format msgid "%u solutions." msgstr "^Mabalik ang options" -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Could not open file \"%s\"" msgid "Solution %s of %s." @@ -5388,12 +5399,12 @@ msgstr "" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s compiled sa %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5547,45 +5558,51 @@ msgstr " show - Pakita ang detalyadong impormasyon tungkol sa pakete\n" #: src/main.cc:213 #, fuzzy, c-format +#| msgid " show - Display detailed information about a package\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - Pakita ang detalyadong impormasyon tungkol sa pakete\n" + +#: src/main.cc:214 +#, fuzzy, c-format #| msgid " clean - Erase downloaded package files\n" msgid " clean - Erase downloaded package files.\n" msgstr " clean - Burahin ang nakuhang pakete files\n" -#: src/main.cc:214 +#: src/main.cc:215 #, fuzzy, c-format #| msgid " autoclean - Erase old downloaded package files\n" msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean - Burahin ang lumang nakuhang pakete files\n" -#: src/main.cc:215 +#: src/main.cc:216 #, fuzzy, c-format #| msgid " changelog - View a package's changelog\n" msgid " changelog - View a package's changelog.\n" msgstr " changelog - Tingnan ang changelog ng pakete\n" -#: src/main.cc:216 +#: src/main.cc:217 #, fuzzy, c-format #| msgid " download - Download the .deb file for a package\n" msgid " download - Download the .deb file for a package.\n" msgstr " download - Kuhain ang .deb file para sa pakete\n" -#: src/main.cc:217 +#: src/main.cc:218 #, c-format msgid "" " reinstall - Download and (possibly) reinstall a currently installed " "package.\n" msgstr "" -#: src/main.cc:218 +#: src/main.cc:219 #, fuzzy, c-format msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " -Z\t\t Ipakita ang pagbabago sa installed na sukat ng bawat pakete.\n" -#: src/main.cc:220 +#: src/main.cc:221 #, fuzzy, c-format msgid "" " why-not - Show the manually installed packages that lead to a " @@ -5595,48 +5612,48 @@ msgid "" msgstr "" " -Z\t\t Ipakita ang pagbabago sa installed na sukat ng bawat pakete.\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " Options:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " -h This help text.\n" msgstr " -h Ang tulong na ito\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h Ang tulong na ito\n" -#: src/main.cc:232 +#: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr "" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr "" " -s Magsagawa ng kunwaring aksyon, pero wag gawin ng toto ang " "pagsagawa sa kanila.\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" @@ -5644,13 +5661,13 @@ msgstr "" " -d Kunin ang pakete lamang, wag i-instal o tanggalin ang kahit " "na ano.\n" -#: src/main.cc:236 +#: src/main.cc:237 #, fuzzy, c-format #| msgid " -P Always prompt for confirmation or actions\n" -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P Laging mag prompt para sa compermasyon o aksyon\n" -#: src/main.cc:237 +#: src/main.cc:238 #, fuzzy, c-format #| msgid "" #| " -y Assume that the answer to simple yes/no questions is " @@ -5661,7 +5678,7 @@ msgstr "" " -y Mag panggap na ang sagot sa simpleng tanong na oo/hindi ay " "'oo\n" -#: src/main.cc:238 +#: src/main.cc:239 #, fuzzy, c-format #| msgid "" #| " -F format Specify a format for displaying search results; see the " @@ -5673,7 +5690,7 @@ msgstr "" " -F format ilagay ang format para i-display ang nahanap na resulta; " "tingnan ang manual\n" -#: src/main.cc:239 +#: src/main.cc:240 #, fuzzy, c-format #| msgid "" #| " -O order Specify how search results should be sorted; see the " @@ -5685,7 +5702,7 @@ msgstr "" " -O order ilagay kung paano ang nahanap na resulta ayon sa pag-uri-" "uri; tingnan ang manual\n" -#: src/main.cc:240 +#: src/main.cc:241 #, fuzzy, c-format #| msgid "" #| " -w width Specify the display width for formatting search results\n" @@ -5695,18 +5712,18 @@ msgstr "" " -w width ilagay ang lapad ng display para sa formatting ng nahanap na " "resulta\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr "" " -f Agresibong sinusubukan na ayusin ang nabasag na mga pakete.\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr " -V Pakita kung anong bersyon ng pakete ang e i-instal.\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" @@ -5714,13 +5731,13 @@ msgstr "" " -D Pakita ang dependencies ng otomatikaling nabagong mga " "pakete.\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr "" " -Z\t\t Ipakita ang pagbabago sa installed na sukat ng bawat pakete.\n" -#: src/main.cc:245 +#: src/main.cc:246 #, fuzzy, c-format #| msgid "" #| " -v Display extra information. (may be supplied multiple " @@ -5732,7 +5749,7 @@ msgstr "" " -v Pakita ang karagdagang impormasyon. (siguro supplied ng " "maraming ulit)\n" -#: src/main.cc:246 +#: src/main.cc:247 #, fuzzy, c-format #| msgid "" #| " -t [release] Set the release from which packages should be installed\n" @@ -5741,14 +5758,14 @@ msgid "" msgstr "" " -t [release] Itakda ang paglaya kung saan ang pakete ay i-installed\n" -#: src/main.cc:247 +#: src/main.cc:248 #, c-format msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" -#: src/main.cc:249 +#: src/main.cc:250 #, fuzzy, c-format #| msgid " -o key=val Directly set the configuration option named 'key'\n" msgid " -o key=val Directly set the configuration option named 'key'.\n" @@ -5756,40 +5773,40 @@ msgstr "" " -o key=val Diretstong ilagay ang pangalan ng configuration option " "'key'\n" -#: src/main.cc:250 +#: src/main.cc:251 #, fuzzy, c-format #| msgid "" #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" #| " strong dependencies\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends\tSpecify kahit na maukol ng rekomenda \n" " matibay na dependencies\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr "" " -S fname Basahin ang aptitude extended status info mula sa fname.\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u Kuhain ang bagong pakete sa simula.\n" -#: src/main.cc:254 src/main.cc:256 -#, c-format -msgid " (terminal interface only)" -msgstr "" +#: src/main.cc:255 src/main.cc:257 +#, fuzzy, c-format +msgid " (terminal interface only)\n" +msgstr " -h Ang tulong na ito\n" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i Magsagawa ng install run sa simula.\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr "" @@ -5798,7 +5815,7 @@ msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 #, fuzzy #| msgid "replaces" msgid "trace" @@ -5806,13 +5823,13 @@ msgstr "papalitan" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 #, fuzzy #| msgid "no" msgid "info" @@ -5820,13 +5837,13 @@ msgstr "hindi" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 #, fuzzy #| msgid "Err " msgid "error" @@ -5834,102 +5851,102 @@ msgstr "Err " #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 #, fuzzy msgid "fatal" msgstr "^Isara" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " "\"warn\", \"error\", \"fatal\", or \"off\")." msgstr "" -#: src/main.cc:487 +#: src/main.cc:488 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "Invalid logger name \"%s\"." msgstr "Hindi tanggap na operasyon %s" -#: src/main.cc:769 +#: src/main.cc:761 #, fuzzy, c-format msgid "Expected a number after -q=\n" msgstr "Hindi ma-buksan ang %s para sulatan" -#: src/main.cc:778 +#: src/main.cc:770 #, fuzzy, c-format msgid "Expected a number after -q=, got %s\n" msgstr "Hindi ma-buksan ang %s para sulatan" -#: src/main.cc:802 +#: src/main.cc:794 #, fuzzy, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o kailangan ng argumento sa hubog na key=value, nakuha %s" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "KAKAIBA: di-kilala na option code natanggap\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "" -#: src/main.cc:1039 +#: src/main.cc:1023 #, fuzzy #| msgid "Package" msgid "first-package" msgstr "Pakete" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "" -#: src/main.cc:1043 +#: src/main.cc:1027 #, fuzzy #| msgid "All Packages" msgid "all-packages" msgstr "Lahat ng pakete" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -5937,7 +5954,7 @@ msgid "" "versions\"." msgstr "" -#: src/main.cc:1089 +#: src/main.cc:1073 #, fuzzy #| msgid "Only one of -u and -i may be specified\n" msgid "" @@ -5945,7 +5962,7 @@ msgid "" "specified\n" msgstr "Tanging isa sa -u at -i ang maaaring specified\n" -#: src/main.cc:1098 +#: src/main.cc:1082 #, fuzzy #| msgid "" #| "-u and -i may not be specified in command-line mode (eg, with 'install')" @@ -5956,30 +5973,31 @@ msgstr "" "-u at -i ay maaring hindi specified sa command-line na pamamaraan (eg, with " "'install')" -#: src/main.cc:1115 +#: src/main.cc:1099 #, fuzzy #| msgid "-u and -i may not be specified with a command" msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "-u at -i hindi siguro na specified na merong command" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "Hindi kilalang command \"%s\"\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" "%s\n" msgstr "" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "Hanapin ang: " @@ -6883,17 +6901,21 @@ msgstr "papalitan" msgid "obsoletes" msgstr "lipas na" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (inihanda ni %F)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." @@ -6901,7 +6923,7 @@ msgstr "" "Kapag pumili ka ng pakete, ang explanation nang kanyang kasalukuyang " "katayuan ay makikita sa lugar na ito." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -6909,19 +6931,19 @@ msgstr "" "%B%s%b ay ma-instal ng otomatik; itoy tinanggal dahil ang lahat ng mga " "pakete na naka-depende dito ay tinatanggal:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "" "%B%s%b ay mag-otomatik na ma-tatanggal sa kadahilanan ng dependency errors:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" "%B%s%b ay ma-otomatik na ma-instal para ma to satisfy the following " "dependencies:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -6929,7 +6951,7 @@ msgstr "" "%B%s%b hindi maaaring i-upgraded ngayon, pero kung sakali, ito ay nasa salin " "%B%s%b." -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -6937,27 +6959,27 @@ msgstr "" "%B%s%b hindi maaring i-upgraded sa salin na %B%s%b, upang maiwasan ang basag " "na mga sumusunod na dependencies:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b ay kasalukuyang naka-instal." -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b ay hindi-kasalukuyang naka-instal." -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "May mga dependecies ng %B%s%b ay hindi kuntento:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "%B%s%b ay ma da-downgraded." -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b ay hindi ma a-upgraded sa bawal na salin %B%s%b." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." @@ -6965,47 +6987,47 @@ msgstr "" "%B%s%b maaring ma-upgraded sa saling %B%s%b, pero itoy inilagay sa saling %B" "%s%b." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%ay ma re-installed." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b ay ma installed." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b ay tatanggalin." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b ay ma-upgraded mula sa salin %B%s%b patungo sa salin %B%s%b." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 #, fuzzy msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "" "%s ay kasalukuyan hindi pa naka-instol, kaya hindi ito iinstolin muli.\n" -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "" "Ang mga sumusunod pakete ay naka depende sa %B%s%b at mababasag sa pag-" "tanggal:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "Ang mga sumusunod pakete ay naka depende sa %B%s%b at mga mababasag:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" msgstr "" "Ang mga sumusunod pakete ay komplikado sa %B%s%b at mababasag sa pag-instal:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -7015,7 +7037,7 @@ msgstr "" "kasalukuyan installed na salin ng %B%s%b, o conflict sa currently installed " "bersyon:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -7023,11 +7045,11 @@ msgstr "" "Ang mga sumusunod na pakete ay conflict sa %B%s%b, o naka-depende sa bersyon " "nito na hindi i-instal." -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "Ang mga sumusunod na pakete ay conflict sa %B%s%b:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -7035,7 +7057,7 @@ msgstr "" "Ang mga sumusunod na pakete ay naka-depende sa versyon ng %B%s%b bukod sa " "kasalukuyan na naka-instal na bersyon ng %B%s%b:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." @@ -7043,15 +7065,15 @@ msgstr "" "Ang mga sumusunod na pakete ay naka-depende sa bersyon ng %B%s%b na hindi i-" "instal." -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "upgrade" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "downgrade" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7061,7 +7083,7 @@ msgstr "" "ng %B%s%b (%B%s%b), o conflict sa bersyon na %s sa (%B%s%b), at itoy " "mababasag kapag %s." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7069,7 +7091,7 @@ msgstr "" "Ang mga sumusunod na pakete ay conflict sa bersyon %B%s%b ng %B%s%b, at itoy " "mababasag kapag na %s." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7109,51 +7131,51 @@ msgstr "" msgid "Close" msgstr "^Isara" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, fuzzy, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "complikado sa" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, fuzzy, c-format msgid "Removing %s" msgstr "Reconfiguring %s\n" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 #, fuzzy msgid "%BRemove%b the following packages:%n" msgstr "Ang mga sumusunod na pakete ay SIRA:" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 #, fuzzy msgid "%BInstall%b the following packages:%n" msgstr "Ang mga sumusunod na pakete ay SIRA:" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 #, fuzzy msgid "%BUpgrade%b the following packages:%n" msgstr "Ang mga sumusunod na pakete ay SIRA:" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 #, fuzzy msgid "%BDowngrade%b the following packages:%n" msgstr "Kinukuha ang mga pakete" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, fuzzy, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "Ang mga sumusunod na pakete ay SIRA:" @@ -7256,10 +7278,6 @@ msgstr "" msgid "W:" msgstr "" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "Maghanap ng:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7641,7 +7659,7 @@ msgid "Error while dumping resolver state" msgstr "" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "" #: src/ui.cc:2265 @@ -8177,6 +8195,13 @@ msgid "You can only view changelogs of official Debian packages." msgstr "Maari lang tignan ang mga changelog ng mga opisyal na paketeng Debian." #, fuzzy +#~ msgid "Press Return to continue" +#~ msgstr "Pindutin ang Enter upang tumuloy." + +#~ msgid "Search for:" +#~ msgstr "Maghanap ng:" + +#, fuzzy #~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." #~ msgstr "Hindi ma-buksan ang %s para sulatan" @@ -8295,11 +8320,6 @@ msgstr "Maari lang tignan ang mga changelog ng mga opisyal na paketeng Debian." #~ msgid "gtk-yes" #~ msgstr "oo" -#, fuzzy -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "Hindi tanggap na operasyon %s" - #~ msgid "but it is not installable" #~ msgstr "ngunit hindi ito maaaring ma-instol." @@ -8427,10 +8447,6 @@ msgstr "Maari lang tignan ang mga changelog ng mga opisyal na paketeng Debian." #~ msgstr "" #~ " -V Pakita kung anong bersyon ng pakete ang e i-instal.\n" -#, fuzzy -#~ msgid " indicators.\n" -#~ msgstr " -h Ang tulong na ito\n" - #~ msgid "Downloading " #~ msgstr "Kinukuha " @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+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" @@ -18,41 +18,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +#, fuzzy +msgid "%BOption:%b " +msgstr "Seçenekler" + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " msgstr "" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 #, fuzzy msgid "False" msgstr "Kapat" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -#, fuzzy -msgid "%BOption:%b " -msgstr "Seçenekler" - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "" - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "" -#: src/apt_config_treeitems.cc:279 +#: src/apt_config_treeitems.cc:280 #, c-format -msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "" @@ -532,8 +528,8 @@ msgstr "" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] Bağımlılıklar çözümleniyor" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "Dahili Hata: beklenmeyen boş çözüm." @@ -815,7 +811,7 @@ msgid "" msgstr "Bağımlılıklar çözülemiytor." #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "İptal.\n" @@ -1181,7 +1177,7 @@ msgstr "" "Gösterilecek paket yok -- 'i'ye bastıktan sonra çıkan satıra paket " "isimlerini girin.\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "Devam etmek için Enter tuşuna basın." @@ -1192,10 +1188,6 @@ msgstr "" "Paket bulunamadı -- 'c'ye bastıktan sonra çıkan satıra paket isimlerini " "girin.\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "Devam etmek için Enter tuşuna basın." - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1493,7 +1485,7 @@ msgstr "Çözümleyici durumu başarıyla yazıldı!" #: src/cmdline/cmdline_resolver.cc:222 #, fuzzy, c-format msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F" @@ -1751,7 +1743,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created." msgstr "" #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "Bağımlılıklar çözüleniyor..." @@ -1787,7 +1779,9 @@ 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:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +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:1080 @@ -1990,7 +1984,7 @@ msgstr "Paket:" msgid "State" msgstr "Durum" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "Sağlayıcı" @@ -2098,27 +2092,31 @@ msgstr "Değiştirilenler" msgid "Obsoletes" msgstr "Eskiyenler" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Sağladığı" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Tanım: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "" -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "%s paketi konumlandırılamıyor" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "%s kalıbı ayrıştırılamıyor" @@ -2433,6 +2431,12 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "" +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "Geçersiz işlem %s" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "Standart girdide beklenmeyen dosya sonu" @@ -2450,7 +2454,7 @@ msgstr "[HATA]" msgid "UNSATISFIED" msgstr " KARŞILANAMAZ" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "MEVCUT DEĞİL" @@ -2458,7 +2462,7 @@ msgstr "MEVCUT DEĞİL" msgid "Tags" msgstr "Etiketler" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 #, fuzzy msgid "User Tags" msgstr "Etiketler" @@ -2851,16 +2855,21 @@ msgstr "%s paketi konumlandırılamıyor" msgid "Unable to open %s to log actions" msgstr "Günlük eylemleri için %s açılamıyor" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "Yerel saat oluşturulurken hata (%s)" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "günlük raporu" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -2870,81 +2879,81 @@ msgstr "" "ÖNEMLİ: Bu günlük sadece denenmiş eylemleri içerir; yani dpkg sorunlarından\n" "dolayı yerine getirilmemiş eylemler.\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "%li paket kurulacak, ve %li paket kaldırılacak.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "%sB disk alanı kullanılacak\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "%sB disk alanı boşaltılacak\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[YÜKSELTME] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[İNDİRGEME] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "KALDIR" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "KUR" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "YENİDEN KUR" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "TUT" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "KIRIK" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "KALDIR, KULLANILMAYAN" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "KALDIR, BAĞIMLILIKLAR" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "KUR, BAĞIMLILIKLAR" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "TUT, BAĞIMLILIKLAR" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -2967,80 +2976,80 @@ msgstr "" msgid "Filtering packages" msgstr "Paketler indiriliyor" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "Bilinmeyen eylem tipi: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "%s'den sonra sonlandırılmamış yalın dizi" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "Bilinmeyen öncelik: %s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "" -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, fuzzy, c-format msgid "Expected '%c', got '%c'." msgstr "',' ya da '(' gerekli, '%c' değil" -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "Bilinmeyen bağımlılık tipi: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, fuzzy, c-format msgid "Unknown term type: \"%s\"." msgstr "Bilinmeyen kalıp tipi: %c" #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, c-format msgid "" "The ?%s term must be used in a \"wide\" context (a top-level context, or a " "context enclosed by ?%s)." msgstr "" -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "Eşleşmeyen '('" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "Sunar: bozuk olamaz" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "Bilinmeyen kalıp tipi: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "\"\" aranamıyor" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "Beklenmeyen boş ifade" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, fuzzy, c-format #| msgid "Badly formed expression" msgid "Badly formed expression: expected '|', got '%c'" msgstr "Kötü biçimli ifade" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "Beklenmeyen ')'" @@ -3973,22 +3982,22 @@ msgstr "" msgid "%s: Unable to accept a connection: %s" msgstr "\"%s\" şablonundan geçici klasör oluşturulamıyor: %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4706,7 +4715,7 @@ msgstr "" msgid "Virtual package" msgstr "Paket" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "Kurulmadı" @@ -4870,159 +4879,165 @@ msgstr "%s %s'in yerini alıyor" msgid "%s obsoletes %s" msgstr "%s %s'i gereksiz kılıyor" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s %s'in yerini alıyor" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "Aşağıdaki paketleri kaldır:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "Aşağıdaki paketleri kur:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 #, fuzzy #| msgid "Remove the following packages:" msgid "Keep the following packages:" msgstr "Aşağıdaki paketleri kaldır:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "Aşağıdaki paketleri yükselt:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "Aşağıdaki paketlerin eski sürümünü kur:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 #, fuzzy #| msgid "Leave the following dependencies unresolved:%n" msgid "Leave the following dependencies unresolved:" msgstr "Aşağıdaki bağımlılıkları çözülmemiş bırak:%n" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, fuzzy, c-format #| msgid "Remove %F [%s (%s)]" msgid "Remove %s [<big>%s</big> (%s)]" msgstr "%F [%s (%s)]'i kaldır" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "Install %s [<big>%s</big> (%s)]" msgstr "%F [%s (%s)]'i kur" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "Cancel the installation of %s" msgstr "%F'in kurulumunu iptal et" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Cancel the removal of %s" msgstr "%F'i kaldırmayı iptal et" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "Keep %s at version <big>%s</big> (%s)" msgstr "%F'in %s (%s) sürümünü tut" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, fuzzy, c-format #| msgid "Upgrade %F [%s (%s) -> %s (%s)]" msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "%F'i yükselt [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, fuzzy, c-format #| msgid "Downgrade %F [%s (%s) -> %s (%s)]" msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Alçalt %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format msgid "<b>Remove</b> %s" msgstr "Kaldır" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format msgid "<b>remove</b> %s" msgstr "Kaldır" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>Keep</b> %s at version %s" msgstr "%F'in %s (%s) sürümünü tut" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>keep</b> %s at version %s" msgstr "%F'in %s (%s) sürümünü tut" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>Cancel</b> the installation of %s" msgstr "%F'in kurulumunu iptal et" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>cancel</b> the installation of %s" msgstr "%F'in kurulumunu iptal et" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>Install</b> %s %s" msgstr "%F [%s (%s)]'i kur" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>install</b> %s %s" msgstr "%F [%s (%s)]'i kur" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format msgid "<b>Downgrade</b> %s to version %s" msgstr "libsigc++ sürümü: %s\n" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format msgid "<b>downgrade</b> %s to version %s" msgstr "libsigc++ sürümü: %s\n" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>Upgrade</b> %s to version %s" msgstr "%s sürümleri" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>upgrade</b> %s to version %s" msgstr "%s sürümleri" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format #| msgid "%d install" #| msgid_plural "%d installs" @@ -5030,7 +5045,7 @@ msgid "%s install" msgid_plural "%s installs" msgstr[0] "%d kurulacak" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, fuzzy, c-format #| msgid "%d removal" #| msgid_plural "%d removals" @@ -5038,7 +5053,7 @@ msgid "%s remove" msgid_plural "%s removes" msgstr[0] "%d kaldırılacak" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, fuzzy, c-format #| msgid "%d keep" #| msgid_plural "%d keeps" @@ -5046,7 +5061,7 @@ msgid "%s keep" msgid_plural "%s keeps" msgstr[0] "%d tutulacak" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, fuzzy, c-format #| msgid "%d upgrade" #| msgid_plural "%d upgrades" @@ -5054,7 +5069,7 @@ msgid "%s upgrade" msgid_plural "%s upgrades" msgstr[0] "%d güncellenecek" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, fuzzy, c-format #| msgid "%d downgrade" #| msgid_plural "%d downgrades" @@ -5062,41 +5077,41 @@ msgid "%s downgrade" msgid_plural "%s downgrades" msgstr[0] "%d eski sürümü kurulacak" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, fuzzy, c-format #| msgid "Audit ^Recommendations" msgid "%s unresolved recommendation" msgid_plural "%s unresolved recommendations" msgstr[0] "^Önerilenleri Denetle" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 #, fuzzy #| msgid "No more solutions." msgid "No solutions yet." msgstr "Başka çözüm yok." -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 #, fuzzy msgid "No dependency solution was found." msgstr "^Bağımlılık işleme" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 #, fuzzy #| msgid "No more solutions." msgid "No solutions." msgstr "Başka çözüm yok." -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, fuzzy, c-format #| msgid "No more solutions." msgid "%u solutions." msgstr "Başka çözüm yok." -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Could not open file \"%s\"" msgid "Solution %s of %s." @@ -5402,12 +5417,12 @@ msgstr "" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s derlendi %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5560,29 +5575,35 @@ msgstr " show - Bir paket hakkında detaylı bilgi göster\n" #: src/main.cc:213 #, fuzzy, c-format +#| msgid " show - Display detailed information about a package\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - Bir paket hakkında detaylı bilgi göster\n" + +#: src/main.cc:214 +#, fuzzy, c-format #| msgid " clean - Erase downloaded package files\n" msgid " clean - Erase downloaded package files.\n" msgstr " clean - İndirilmiş paket dosyalarını sil\n" -#: src/main.cc:214 +#: src/main.cc:215 #, fuzzy, c-format #| msgid " autoclean - Erase old downloaded package files\n" msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean - Eski indirilmiş paket dosyalarını sil\n" -#: src/main.cc:215 +#: src/main.cc:216 #, fuzzy, c-format #| msgid " changelog - View a package's changelog\n" msgid " changelog - View a package's changelog.\n" msgstr " changelog - Paketin değişiklik güncesini göster\n" -#: src/main.cc:216 +#: src/main.cc:217 #, fuzzy, c-format #| msgid " download - Download the .deb file for a package\n" msgid " download - Download the .deb file for a package.\n" msgstr " download - Bir paket için .deb dosyasını indir\n" -#: src/main.cc:217 +#: src/main.cc:218 #, fuzzy, c-format #| msgid "" #| " reinstall - Download and (possibly) reinstall a currently installed " @@ -5592,17 +5613,17 @@ msgid "" "package.\n" msgstr " reinstall - Zaten kurulu olan paketi indir ve yeniden kur\n" -#: src/main.cc:218 +#: src/main.cc:219 #, fuzzy, c-format msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " -Z\t\t Her bir paketin kurulduktan sonraki büyüklük değişikliğini " "göster.\n" -#: src/main.cc:220 +#: src/main.cc:221 #, fuzzy, c-format msgid "" " why-not - Show the manually installed packages that lead to a " @@ -5613,59 +5634,59 @@ msgstr "" " -Z\t\t Her bir paketin kurulduktan sonraki büyüklük değişikliğini " "göster.\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " Seçenekler:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " -h This help text.\n" msgstr " -h Bu yardım metni\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h Bu yardım metni\n" -#: src/main.cc:232 +#: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr "" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s Eylemi simule et, fakat işlemi gerçekleştirme.\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr "" " -d Sadece paketleri indir, hiç bir şey kurma ya da kaldırma\n" -#: src/main.cc:236 +#: src/main.cc:237 #, fuzzy, c-format #| msgid " -P Always prompt for confirmation or actions\n" -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -p Her zaman onay için ya da eylem için sor\n" -#: src/main.cc:237 +#: src/main.cc:238 #, fuzzy, c-format #| msgid "" #| " -y Assume that the answer to simple yes/no questions is " @@ -5676,7 +5697,7 @@ msgstr "" " -y Sadece evet/hayır şeklindeki sorulara onaya gerek kalmadan " "'evet' de\n" -#: src/main.cc:238 +#: src/main.cc:239 #, fuzzy, c-format #| msgid "" #| " -F format Specify a format for displaying search results; see the " @@ -5688,7 +5709,7 @@ msgstr "" " -F format Arama sonuçlarını göstermek için bir biçem belirle; kılavuza " "bakın\n" -#: src/main.cc:239 +#: src/main.cc:240 #, fuzzy, c-format #| msgid "" #| " -O order Specify how search results should be sorted; see the " @@ -5700,7 +5721,7 @@ msgstr "" " -O düzen Arama sonuçlarının nasıl sıralanacağını belirt; kılavuza " "bakın\n" -#: src/main.cc:240 +#: src/main.cc:241 #, fuzzy, c-format #| msgid "" #| " -w width Specify the display width for formatting search results\n" @@ -5708,31 +5729,31 @@ msgid "" " -w width Specify the display width for formatting search results.\n" msgstr " -w genişlik Arama sonuçları için gösterme genişliği belirt\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr " -f Kırık paketleri zorla düzeltmeye çalış.\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr " -V Paketlerin hangi sürümlerinin kurulacağını göster.\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr "" " -D Otomatik olarak değişecek bağımlılık dosyalarını göster.\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr "" " -Z\t\t Her bir paketin kurulduktan sonraki büyüklük değişikliğini " "göster.\n" -#: src/main.cc:245 +#: src/main.cc:246 #, fuzzy, c-format #| msgid "" #| " -v Display extra information. (may be supplied multiple " @@ -5742,7 +5763,7 @@ msgid "" "times).\n" msgstr " -v Ekstra bilgi göster. (birden fazla desteklenebilir)\n" -#: src/main.cc:246 +#: src/main.cc:247 #, fuzzy, c-format #| msgid "" #| " -t [release] Set the release from which packages should be installed\n" @@ -5750,60 +5771,60 @@ msgid "" " -t [release] Set the release from which packages should be installed.\n" msgstr " -t [sürüm] Paketlerin kurulacağı sürümü ayarla\n" -#: src/main.cc:247 +#: src/main.cc:248 #, fuzzy, c-format msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr " -q Komut satırı kipinde, aşama göstergesini gizler.\n" -#: src/main.cc:249 +#: src/main.cc:250 #, fuzzy, c-format #| msgid " -o key=val Directly set the configuration option named 'key'\n" msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr " -o key=değ 'key' yapılandırma seçeneğini doğrudan değiştir\n" -#: src/main.cc:250 +#: src/main.cc:251 #, fuzzy, c-format #| msgid "" #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" #| " strong dependencies\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends\tÖnerilenlerin (recommends) önemli bağımlılık " "olarak\n" " var sayılıp sayılmayacağını belirler.\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr " -S dosyaadi: aptitude gelişmiş durum bilgisini dosyaadi'ndan oku.\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u Başlangıçta yeni paket listelerini indir.\n" -#: src/main.cc:254 src/main.cc:256 -#, c-format -msgid " (terminal interface only)" -msgstr "" +#: src/main.cc:255 src/main.cc:257 +#, fuzzy, c-format +msgid " (terminal interface only)\n" +msgstr " -h Bu yardım metni\n" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i Bir kurulum yap ve başlangıçta çalıştır.\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " Bu yetenek Süper İnek Güçlerine sahip değil.\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 #, fuzzy #| msgid "replaces" msgid "trace" @@ -5811,13 +5832,13 @@ msgstr "yerini alırsa" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 #, fuzzy #| msgid "no" msgid "info" @@ -5825,13 +5846,13 @@ msgstr "hayır" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 #, fuzzy #| msgid "Err " msgid "error" @@ -5839,102 +5860,102 @@ msgstr "Hata" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 #, fuzzy msgid "fatal" msgstr "Kapat" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " "\"warn\", \"error\", \"fatal\", or \"off\")." msgstr "" -#: src/main.cc:487 +#: src/main.cc:488 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "Invalid logger name \"%s\"." msgstr "Geçersiz işlem %s" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "-q='dan sonra sayı belirtilmeli\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "-q='dan sonra sayı belirtilmeli, %s kullanılmış\n" -#: src/main.cc:802 +#: src/main.cc:794 #, fuzzy, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o key=değer şeklinde bir seçenek gerekiyor, %s elde edildi" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "TUHAFLIK: bilinmeyen seçenek kodu alındı\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "" -#: src/main.cc:1039 +#: src/main.cc:1023 #, fuzzy #| msgid "Package" msgid "first-package" msgstr "Paket" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "" -#: src/main.cc:1043 +#: src/main.cc:1027 #, fuzzy #| msgid "All Packages" msgid "all-packages" msgstr "Tüm Paketler" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -5942,7 +5963,7 @@ msgid "" "versions\"." msgstr "" -#: src/main.cc:1089 +#: src/main.cc:1073 #, fuzzy #| msgid "Only one of -u and -i may be specified\n" msgid "" @@ -5950,7 +5971,7 @@ msgid "" "specified\n" msgstr "Yalnızca -u ve -i den biri belirtilmeli\n" -#: src/main.cc:1098 +#: src/main.cc:1082 #, fuzzy #| msgid "" #| "-u and -i may not be specified in command-line mode (eg, with 'install')" @@ -5959,23 +5980,23 @@ msgid "" "(eg, with 'install')" msgstr "-u ve -i komut satırı kipinde belirtilemez (ör. 'install' ile)" -#: src/main.cc:1115 +#: src/main.cc:1099 #, fuzzy #| msgid "-u and -i may not be specified with a command" msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "-u ve -i bir komutla birlikte kullanılamaz" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "Bilinmeyen komut \"%s\"\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "Tutulamayan istisna: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, fuzzy, c-format msgid "" "Backtrace:\n" @@ -5984,7 +6005,8 @@ msgstr "" "Backtrace:\n" "%s" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "Ara: " @@ -6867,17 +6889,21 @@ msgstr "yerini alırsa" msgid "obsoletes" msgstr "eskitirse" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (%F tarafından sağlanan)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." @@ -6885,7 +6911,7 @@ msgstr "" "Bir paket seçerseniz, şu andaki durumu ile ilgili bir açıklama burada " "görünecek." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -6893,18 +6919,18 @@ msgstr "" "%B%s%b paketi otomatik olarak kurulmuştu, şimdi kaldırılacak çünkü bu " "pakete bağımlı olan paketler kaldırılıyor:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "" "Bağımlılık hatalarından dolayı %B%s%b paketi otomatik olarak kaldırılacak:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" "%B%s%b paketi bağımlılıkları karşılamak için otomatik olarak kurulacak:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -6912,7 +6938,7 @@ msgstr "" "%B%s%b şu anda yükseltilemiyor fakat yükseltilebilecek olsaydı bile %B%s%b " "sürümünde tutulacaktı." -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -6920,27 +6946,27 @@ msgstr "" "%B%s%b paketi bazı bağımlılıkları bozmamak için %B%s%b sürümüne " "yükseltilmeyecek:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b şu anda kurulmuş durumda." -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b şu anda kurulu değil." -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "%B%s%b paketinin bazı bağımlılıkları karşılanamadı:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "%B%s%b paketinin eski sürümü kurulacak." -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b paketi, kurulumu engellenen %B%s%b sürümüne yükseltilmeyecek." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." @@ -6948,44 +6974,44 @@ msgstr "" "%B%s%b paketi %B%s%b sürümüne güncellenebilirdi, fakat %B%s%b sürümünde " "kalacak." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b yeniden kurulacak." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b kurulacak." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b kaldırılacak." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b paketi %B%s%b sürümünden %B%s%b sürümüne yükseltilecek." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 #, fuzzy msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "%s şu anda kurulu değil, bu nedenle yeniden yüklenmeyecek.\n" -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "" "Bu paketler %B%s%b paketine bağımlı ve bu paket kaldırılırsa bozulacaklar:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "Bu paketler %B%s%b paketine bağımlıydı ve kırık bağımlılıkları var:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" msgstr "Bu paketler %B%s%b ile çakışıyorlar ve kurulursa bozuk olacaklar:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -6995,7 +7021,7 @@ msgstr "" "dışında bir sürüme bağımlılar veya şu anda kurulmuş olan sürümle " "çakışıyorlar:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -7003,11 +7029,11 @@ msgstr "" "Bu paketler %B%s%b paketi ile çakışıyorlar veya kurulmayacak olan bir " "sürümüne bağımlılar:" -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "Bu paketler %B%s%b ile çakışıyorlar:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -7015,22 +7041,22 @@ msgstr "" "Bu paketler %B%s%b paketinin kurulmuş olan %B%s%b sürümünden farklı bir " "sürümüne bağımlı:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." msgstr "" "Bu paketler kurulmayacak olan %B%s%b paketinin bir sürümüne bağımlılar." -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "güncellenirse" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "eski sürümü kurulursa" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7040,7 +7066,7 @@ msgstr "" "bağımlılar veya (%B%s%b) olacak sürümü ile çakışıyorlar ve %s bozuk " "olacaklar." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7048,7 +7074,7 @@ msgstr "" "Bu paketler %B%s%b sürümündeki %B%s%b paketi ile çakışıyorlar ve eğer bu " "paket %s kırık bağımlılıkları olacak." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7084,47 +7110,47 @@ msgstr "Uygula" msgid "Close" msgstr "Kapat" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s %s ile çakışıyor [%s %s tarafından sağlanıyor]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "%s kaldırılıyor" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "%s %s (%s) kuruluyor" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "Aşağıdaki paketleri %Bkaldır%b:%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "Aşağıdaki paketleri %Bkur%b:%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "Aşağıdaki paketleri mevcut sürümlerinde %BTut%b:%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "Aşağıdaki paketleri %Byükselt%b:%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "Aşağıdaki paketlerin %Beski sürümünü kur%b:%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "Aşağıdaki bağımlılıkları çözülmemiş bırak:%n" @@ -7223,10 +7249,6 @@ msgstr "H:" msgid "W:" msgstr "U:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "Ara:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7603,7 +7625,9 @@ msgid "Error while dumping resolver state" msgstr "Çözücü durumu kaydedilirken hata" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "Çözücü durumunun kaydedileceği dosya:" #: src/ui.cc:2265 @@ -8114,6 +8138,12 @@ msgid "You can only view changelogs of official Debian packages." msgstr "" "Sadece resmi Debian paketlerinin değişiklik güncelerini görebilirsiniz." +#~ msgid "Press Return to continue" +#~ msgstr "Devam etmek için Enter tuşuna basın." + +#~ msgid "Search for:" +#~ msgstr "Ara:" + #, fuzzy #~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." @@ -8241,11 +8271,6 @@ msgstr "" #~ msgid "gtk-yes" #~ msgstr "evet" -#, fuzzy -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "Geçersiz işlem %s" - #~ msgid "but it is not installable" #~ msgstr "fakat kurulabilir değil" @@ -8413,10 +8438,6 @@ msgstr "" #~ msgstr "" #~ " -V Paketlerin hangi sürümlerinin kurulacağını göster.\n" -#, fuzzy -#~ msgid " indicators.\n" -#~ msgstr " -h Bu yardım metni\n" - #~ msgid "Downloading " #~ msgstr "İndiriliyor " @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2008-09-05 09:43+0200\n" "Last-Translator: Borys Yanovych <borman@pravex.kiev.ua>\n" "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n" @@ -18,42 +18,36 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: KBabel 1.11.4\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" -msgstr "" -"%BПараметр:%b %s\n" -"%BТипово:%b %s\n" -"%BЗначення:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " +msgstr "%BПараметр:%b " + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " +msgstr "%BТипово:%b " -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "True" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "False" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " -msgstr "%BПараметр:%b " - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "%BТипово:%b " - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "%BЗначення:%b " -#: src/apt_config_treeitems.cc:279 -#, c-format -msgid "Editing \"%ls\"" +#: src/apt_config_treeitems.cc:280 +#, fuzzy, c-format +#| msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "Редагування \"%ls\"" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "%BВибір:%b " @@ -672,8 +666,8 @@ msgstr "Невиправна помилка в розв'язувачі." msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] Розв'язання залежностей" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "Внутрішня помилка: неочікувана відсутність вирішення." @@ -970,7 +964,7 @@ msgid "" msgstr "Не вдається розв'язати залежності для оновлення (%s)." #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "Перервати.\n" @@ -1342,7 +1336,7 @@ msgid "No packages to show -- enter the package names on the line after 'i'.\n" msgstr "" "Немає пакунків для показу -- введіть назви пакунків в рядку після 'i'.\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "Натисніть Enter для продовження." @@ -1351,10 +1345,6 @@ msgstr "Натисніть Enter для продовження." msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "Пакунків не знайдено -- введіть назви пакунків в рядку після 'c'.\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "Натисніть Enter для продовження." - #: src/cmdline/cmdline_prompt.cc:806 #, fuzzy, c-format #| msgid "" @@ -1671,7 +1661,7 @@ msgstr "Стан розв'язувача залежностей успішно #| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F" #| "%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F" @@ -1947,7 +1937,7 @@ msgstr "" "Я хочу розв'язати залежності, проте розв'язувача залежностей не створено." #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "Розв'язання залежностей..." @@ -1983,7 +1973,9 @@ msgid "Invalid response; please enter one of the following commands:" msgstr "Неправильна відповідь; будь ласка, введіть одну з таких команд:" #: src/cmdline/cmdline_resolver.cc:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +msgid "No solution found within the allotted time. Try harder? [Y/n] " msgstr "" "Не вдалося знайти розв'язок за виділений час. Спробувати ретельніше? [Y/n]" @@ -2190,7 +2182,7 @@ msgstr "Пакунок: " msgid "State" msgstr "Стан" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "Забезпечується" @@ -2298,27 +2290,31 @@ msgstr "Замінює" msgid "Obsoletes" msgstr "Робить застарілими" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Забезпечує" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Опис: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "Домівка: " -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "Неможливо знайти пакунок %s" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "Не вдалося проаналізувати шаблон %s" @@ -2660,6 +2656,12 @@ msgstr "" msgid "Unknown version selection, something is very wrong." msgstr "" +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "Помилкова дія %s" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "Неочікуваний кінець файла (EOF) на стандартному вході" @@ -2677,7 +2679,7 @@ msgstr "[ПОМИЛКА]" msgid "UNSATISFIED" msgstr "" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "НЕДОСТУПНО" @@ -2687,7 +2689,7 @@ msgstr "НЕДОСТУПНО" msgid "Tags" msgstr "Мітка" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "" @@ -3095,16 +3097,21 @@ msgstr "Неможливо знайти пакунок %s" msgid "Unable to open %s to log actions" msgstr "Не вдалося відкрити %s для реєстрації дій" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "Помилка під час визначення локального часу (%s)" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "журнал звіту" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -3116,81 +3123,81 @@ msgstr "" "незавершеними\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "Буде встановлено %li пакунків(и) і %li пакунків(и) буде видалено.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "%sb дискового простору буде використано\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "%sb дискового простору буде звільнено\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[ОНОВЛЕННЯ] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[ЗАМІНА НА ДАВНІШИЙ] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "ВИДАЛИТИ" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "ВСТАНОВИТИ" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "ПЕРЕВСТАНОВИТИ" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "ЗАФІКСУВАТИ" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "НЕДІЄЗДАТНИЙ" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "ВИДАЛИТИ, НЕ ВИКОРИСТОВУЄТЬСЯ" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "ВИДАЛИТИ, ЗАЛЕЖНОСТІ" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "ВСТАНОВИТИ, ЗАЛЕЖНОСТІ" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "ЗАФІКСУВАТИ, ЗАЛЕЖНОСТІ" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "НЕНАЛАШТОВАНИЙ" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -3213,40 +3220,40 @@ msgstr "" msgid "Filtering packages" msgstr "Завантаження пакунків" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "Невідомий тип дії: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "Незавершений текстовий рядок після %s" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "Невідомий пріоритет: %s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "" -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, fuzzy, c-format #| msgid "Expected ',' or '(', got '%c'" msgid "Expected '%c', got '%c'." msgstr "Очікувалась ',' або '(', отримали '%c'" -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "Невідомий тип залежності: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, fuzzy, c-format #| msgid "Unknown pattern type: %c" msgid "Unknown term type: \"%s\"." @@ -3254,41 +3261,41 @@ msgstr "Невідомий тип шаблону: %c" #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, c-format msgid "" "The ?%s term must be used in a \"wide\" context (a top-level context, or a " "context enclosed by ?%s)." msgstr "" -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "Невідповідна '('" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "Забезпечує: не може бути недієздатним" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "Невідомий тип шаблону: %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "Неможливо здійснити пошук \"\"" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "Неочікуваний порожній вираз" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, fuzzy, c-format #| msgid "Badly formed expression" msgid "Badly formed expression: expected '|', got '%c'" msgstr "Невірно сформований вираз" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "Неочікувана ')'" @@ -4238,22 +4245,22 @@ msgstr "" msgid "%s: Unable to accept a connection: %s" msgstr "Не вдалося створити тимчасову теку з шаблона \"%s\": %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4987,7 +4994,7 @@ msgstr "" msgid "Virtual package" msgstr "Пакунок" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "Не встановлений" @@ -5169,171 +5176,177 @@ msgstr "заміщує" msgid "%s obsoletes %s" msgstr "робить застарілим" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "replaces" +msgid "%s enhances %s" +msgstr "заміщує" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 #, fuzzy #| msgid "%BRemove%b the following packages:%n" msgid "Remove the following packages:" msgstr "%BВидалити%b такі пакунки:%n" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 #, fuzzy #| msgid "%BInstall%b the following packages:%n" msgid "Install the following packages:" msgstr "%BВстановити%b такі пакунки:%n" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 #, fuzzy #| msgid "%BRemove%b the following packages:%n" msgid "Keep the following packages:" msgstr "%BВидалити%b такі пакунки:%n" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 #, fuzzy #| msgid "%BUpgrade%b the following packages:%n" msgid "Upgrade the following packages:" msgstr "%BОновити%b такі пакунки:%n" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 #, fuzzy #| msgid "%BDowngrade%b the following packages:%n" msgid "Downgrade the following packages:" msgstr "%BЗамінити на більш давні%b версії такі пакунки:%n" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 #, fuzzy #| msgid "Leave the following dependencies unresolved:%n" msgid "Leave the following dependencies unresolved:" msgstr "Залишити наступні залежності нерозв'язаними:%n" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, fuzzy, c-format #| msgid "Remove %F [%s (%s)]" msgid "Remove %s [<big>%s</big> (%s)]" msgstr "Видалити %F [%s (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "Install %s [<big>%s</big> (%s)]" msgstr "Встановити %F [%s (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "Cancel the installation of %s" msgstr "Скасувати встановлення %F" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Cancel the removal of %s" msgstr "Скасувати видалення %F" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "Keep %s at version <big>%s</big> (%s)" msgstr "Зберегти %F версії %s (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, fuzzy, c-format #| msgid "Upgrade %F [%s (%s) -> %s (%s)]" msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Оновити %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, fuzzy, c-format #| msgid "Downgrade %F [%s (%s) -> %s (%s)]" msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Замінити %F на більш давню версію [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>Remove</b> %s" msgstr "Видалити(%s)" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>remove</b> %s" msgstr "Видалити(%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>Keep</b> %s at version %s" msgstr "Зберегти %F версії %s (%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>keep</b> %s at version %s" msgstr "Зберегти %F версії %s (%s)" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>Cancel</b> the installation of %s" msgstr "Скасувати встановлення %F" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>cancel</b> the installation of %s" msgstr "Скасувати встановлення %F" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>Install</b> %s %s" msgstr "Встановити %F [%s (%s)]" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>install</b> %s %s" msgstr "Встановити %F [%s (%s)]" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid "libsigc++ version: %s\n" msgid "<b>Downgrade</b> %s to version %s" msgstr "Версія libsigc++: %s\n" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid "libsigc++ version: %s\n" msgid "<b>downgrade</b> %s to version %s" msgstr "Версія libsigc++: %s\n" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>Upgrade</b> %s to version %s" msgstr "%s версії" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>upgrade</b> %s to version %s" msgstr "%s версії" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format #| msgid "%d install" #| msgid_plural "%d installs" @@ -5343,7 +5356,7 @@ msgstr[0] "%d встановити" msgstr[1] "%d встановити" msgstr[2] "%d встановити" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, fuzzy, c-format #| msgid "%d removal" #| msgid_plural "%d removals" @@ -5353,7 +5366,7 @@ msgstr[0] "%d видалити" msgstr[1] "%d видалити" msgstr[2] "%d видалити" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, fuzzy, c-format #| msgid "%d keep" #| msgid_plural "%d keeps" @@ -5363,7 +5376,7 @@ msgstr[0] "%d зберегти" msgstr[1] "%d зберегти" msgstr[2] "%d зберегти" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, fuzzy, c-format #| msgid "%d upgrade" #| msgid_plural "%d upgrades" @@ -5373,7 +5386,7 @@ msgstr[0] "%d оновити" msgstr[1] "%d оновити" msgstr[2] "%d оновити" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, fuzzy, c-format #| msgid "%d downgrade" #| msgid_plural "%d downgrades" @@ -5383,7 +5396,7 @@ msgstr[0] "%d замінити на більш давній" msgstr[1] "%d замінити на більш давні" msgstr[2] "%d замінити на більш давні" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, fuzzy, c-format #| msgid "Audit ^Recommendations" msgid "%s unresolved recommendation" @@ -5392,35 +5405,35 @@ msgstr[0] "Перевірка рекомендацій" msgstr[1] "Перевірка рекомендацій" msgstr[2] "Перевірка рекомендацій" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 #, fuzzy #| msgid "No more solutions." msgid "No solutions yet." msgstr "Більше розв'язків немає." -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 #, fuzzy #| msgid "^Dependency handling" msgid "No dependency solution was found." msgstr "Обробка залежностей" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 #, fuzzy #| msgid "No more solutions." msgid "No solutions." msgstr "Більше розв'язків немає." -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, fuzzy, c-format #| msgid "No more solutions." msgid "%u solutions." msgstr "Більше розв'язків немає." -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Could not open file \"%s\"" msgid "Solution %s of %s." @@ -5754,12 +5767,12 @@ msgstr "Підтримка ept вимкнена.\n" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s скомпільовано о %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5925,29 +5938,35 @@ msgstr " show - Показати детальну інформацію #: src/main.cc:213 #, fuzzy, c-format +#| msgid " show - Display detailed information about a package\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - Показати детальну інформацію про пакунок\n" + +#: src/main.cc:214 +#, fuzzy, c-format #| msgid " clean - Erase downloaded package files\n" msgid " clean - Erase downloaded package files.\n" msgstr " clean - Стерти завантажені файли пакунків\n" -#: src/main.cc:214 +#: src/main.cc:215 #, fuzzy, c-format #| msgid " autoclean - Erase old downloaded package files\n" msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean - Стерти старі завантажені файли пакунків\n" -#: src/main.cc:215 +#: src/main.cc:216 #, fuzzy, c-format #| msgid " changelog - View a package's changelog\n" msgid " changelog - View a package's changelog.\n" msgstr " changelog - Переглянути список змін пакунка\n" -#: src/main.cc:216 +#: src/main.cc:217 #, fuzzy, c-format #| msgid " download - Download the .deb file for a package\n" msgid " download - Download the .deb file for a package.\n" msgstr " download - Завантажити .deb-файл пакунка\n" -#: src/main.cc:217 +#: src/main.cc:218 #, fuzzy, c-format #| msgid "" #| " reinstall - Download and (possibly) reinstall a currently installed " @@ -5959,15 +5978,15 @@ msgstr "" " reinstall - Завантажити і (можливо) перевстановити вже встановлений " "пакунок\n" -#: src/main.cc:218 +#: src/main.cc:219 #, c-format msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" -#: src/main.cc:220 +#: src/main.cc:221 #, c-format msgid "" " why-not - Show the manually installed packages that lead to a " @@ -5976,46 +5995,46 @@ msgid "" " lead to a conflict with the given package if installed.\n" msgstr "" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " Параметри:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " -h This help text.\n" msgstr " -h Цей допоміжний текст\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h Цей допоміжний текст\n" -#: src/main.cc:232 +#: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr "" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s Імітувати дій, але не виконувати їх насправді.\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" @@ -6023,13 +6042,13 @@ msgstr "" " -d Лише завантажити пакунки, нічого не встановлювати і не " "видаляти.\n" -#: src/main.cc:236 +#: src/main.cc:237 #, fuzzy, c-format #| msgid " -P Always prompt for confirmation or actions\n" -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P Завжди запитувати підтвердження дій\n" -#: src/main.cc:237 +#: src/main.cc:238 #, fuzzy, c-format #| msgid "" #| " -y Assume that the answer to simple yes/no questions is " @@ -6040,7 +6059,7 @@ msgstr "" " -y Вважати що відповіддю на прості запитання (yes/no) буде " "'yes'\n" -#: src/main.cc:238 +#: src/main.cc:239 #, fuzzy, c-format #| msgid "" #| " -F format Specify a format for displaying search results; see the " @@ -6052,7 +6071,7 @@ msgstr "" " -F format Вказати формат відображення результатів пошуку; див. " "підручник\n" -#: src/main.cc:239 +#: src/main.cc:240 #, fuzzy, c-format #| msgid "" #| " -O order Specify how search results should be sorted; see the " @@ -6064,7 +6083,7 @@ msgstr "" " -O order Вказати формат сортування результатів пошуку; див. " "підручник\n" -#: src/main.cc:240 +#: src/main.cc:241 #, fuzzy, c-format #| msgid "" #| " -w width Specify the display width for formatting search results\n" @@ -6073,17 +6092,17 @@ msgid "" msgstr "" " -w width Вказати ширину виводу для форматування результатів пошуку\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr " -f Примусово намагатись виправити недієздатні пакунки.\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr " -V Показувати які версії пакунків встановлюються.\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" @@ -6091,13 +6110,13 @@ msgstr "" " -D Показувати залежності пакунків, стан яких був змінений " "автоматично.\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr "" " -Z Показувати зміну розміру для кожного встановленого пакунка.\n" -#: src/main.cc:245 +#: src/main.cc:246 #, fuzzy, c-format #| msgid "" #| " -v Display extra information. (may be supplied multiple " @@ -6109,7 +6128,7 @@ msgstr "" " -v Показувати додаткову інформацію. (можна вказувати " "багаторазово)\n" -#: src/main.cc:246 +#: src/main.cc:247 #, fuzzy, c-format #| msgid "" #| " -t [release] Set the release from which packages should be installed\n" @@ -6118,65 +6137,65 @@ msgid "" msgstr "" " -t [випуск] Задати випуск, з якого потрібно встановлювати пакунки\n" -#: src/main.cc:247 +#: src/main.cc:248 #, fuzzy, c-format #| msgid "" #| " -q In command-line mode, suppress the incremental progress " #| "indicators.\n" msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr "" " -q В режимі командного рядка не показувати індикатор прогресу\n" -#: src/main.cc:249 +#: src/main.cc:250 #, fuzzy, c-format #| msgid " -o key=val Directly set the configuration option named 'key'\n" msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr "" " -o key=val Напряму задати конфігураційний параметр з назвою 'key'\n" -#: src/main.cc:250 +#: src/main.cc:251 #, fuzzy, c-format #| msgid "" #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" #| " strong dependencies\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends\tВказати, вважати чи ні рекомендації строгими\n" " залежностями\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr "" " -S назва_файлу Читати інформацію про розширений стан з вказаного файлу.\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u Завантажити нові списки пакунків при запуску.\n" -#: src/main.cc:254 src/main.cc:256 +#: src/main.cc:255 src/main.cc:257 #, c-format -msgid " (terminal interface only)" +msgid " (terminal interface only)\n" msgstr "" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i Запустити встановлення при запуску.\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " Aptitude не наділена силою SuperCow.\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 #, fuzzy #| msgid "True" msgid "trace" @@ -6184,13 +6203,13 @@ msgstr "True" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 #, fuzzy #| msgid "no" msgid "info" @@ -6198,13 +6217,13 @@ msgstr "ні" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 #, fuzzy #| msgid "Err " msgid "error" @@ -6212,7 +6231,7 @@ msgstr "Пмл " #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 #, fuzzy #| msgid "False" msgid "fatal" @@ -6220,96 +6239,96 @@ msgstr "False" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " "\"warn\", \"error\", \"fatal\", or \"off\")." msgstr "" -#: src/main.cc:487 +#: src/main.cc:488 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "Invalid logger name \"%s\"." msgstr "Помилкова дія %s" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "Після -q= очікується число\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "Після -q= очікується число, отримано %s\n" -#: src/main.cc:802 +#: src/main.cc:794 #, fuzzy, c-format #| msgid "-o requires an argument of the form key=value, got %s" msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o вимагає аргумент у вигляді ключ=значення, отримано %s" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "ДИВИНА: отримано невідомий код параметру\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "" -#: src/main.cc:1039 +#: src/main.cc:1023 #, fuzzy #| msgid "Package" msgid "first-package" msgstr "Пакунок" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "" -#: src/main.cc:1043 +#: src/main.cc:1027 #, fuzzy #| msgid "Packages" msgid "all-packages" msgstr "Пакунки" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -6317,7 +6336,7 @@ msgid "" "versions\"." msgstr "" -#: src/main.cc:1089 +#: src/main.cc:1073 #, fuzzy #| msgid "Only one of -u and -i may be specified\n" msgid "" @@ -6325,7 +6344,7 @@ msgid "" "specified\n" msgstr "Дозволяється вказувати лише один з параметрів -u або -i\n" -#: src/main.cc:1098 +#: src/main.cc:1082 #, fuzzy #| msgid "" #| "-u and -i may not be specified in command-line mode (eg, with 'install')" @@ -6336,23 +6355,23 @@ msgstr "" "-u та -i не можна вказувати в режимі командного рядка (наприклад, з " "'install')" -#: src/main.cc:1115 +#: src/main.cc:1099 #, fuzzy #| msgid "-u and -i may not be specified with a command" msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "-u та -i не можна використовувати разом з командою" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "Невідома команда \"%s\"\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "Необроблене виключення: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, fuzzy, c-format #| msgid "" #| "Backtrace:\n" @@ -6364,7 +6383,8 @@ msgstr "" "Зворотнє трасування:\n" "%s" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 #, fuzzy #| msgid "Search forwards" msgid "Search for: " @@ -7261,24 +7281,28 @@ msgstr "заміщує" msgid "obsoletes" msgstr "робить застарілим" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (забезпечено %F)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." msgstr "" "Якщо ви виберете пакунок, то пояснення його поточного стану з'явиться тут." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -7286,17 +7310,17 @@ msgstr "" "%B%s%b був встановлений автоматично; він видаляється, оскільки видаляються " "всі пакунки, що залежали від нього:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "%B%s%b буде автоматично видалений через проблеми з залежностями:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "" "%B%s%b буде автоматично встановлений для задоволення таких залежностей:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -7304,7 +7328,7 @@ msgstr "" "%B%s%b не може бути оновленим на даний момент, проте навіть якщо б це було " "можливим, він все одно був би зафіксованим на версії %B%s%b." -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -7312,27 +7336,27 @@ msgstr "" "%B%s%b не буде оновленим до версії %B%s%b з метою попередження пошкодження " "залежностей:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b все встановлено." -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b ще не встановлено." -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "Деякі залежності %B%s%b не задоволені:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "%B%s%b буде замінено на більш давню версію." -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b не буде оновлено до забороненої версії %B%s%b." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." @@ -7340,38 +7364,38 @@ msgstr "" "%B%s%b можна оновити до версії %B%s%b, однак він буде зафіксований на версії " "%B%s%b." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b буде перевстановлено." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b буде встановлено." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b буде видалено." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b буде оновлено з версії %B%s%b до версії %B%s%b." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "%B%s%b встановлений лише частково; його встановлення буде завершене." -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "" "Наступні пакунки залежать від %B%s%b і стануть недієздатними після його " "видалення:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "Наступні пакунки залежать від %B%s%b і є недієздатними:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" @@ -7379,7 +7403,7 @@ msgstr "" "Наступні пакунки конфліктують з %B%s%b і стануть недієздатними після його " "встановлення: " -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -7389,7 +7413,7 @@ msgstr "" "встановленої на даний момент версії %B%s%b, або ж конфліктують з поточною " "версією:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -7397,11 +7421,11 @@ msgstr "" "Наступні пакунки конфліктують з %B%s%b або залежать від версії, яка не буде " "встановлена." -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "Наступні пакунки конфліктують з %B%s%b:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -7409,22 +7433,22 @@ msgstr "" "Наступні пакунки залежать від версії %B%s%b, котра відрізняється від " "встановленої на даний момент версії %B%s%b:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." msgstr "" "Наступні пакунки залежать від версії %B%s%b, котра не буде встановлена." -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "оновлено" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "замінено на більш давні" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7433,7 +7457,7 @@ msgstr "" "Наступні пакунки залежать від поточної версії %B%s%b (%B%s%b) або " "конфліктують з %s версії (%B%s%b) і стануть недієздатними при %s." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7441,7 +7465,7 @@ msgstr "" "Наступні пакунки конфліктують з версією %B%s%b %B%s%b і стануть " "недієздатними при %s." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7477,47 +7501,47 @@ msgstr "Застосувати" msgid "Close" msgstr "Закрити" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "Видаляється %s" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "Встановлюється %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%BВидалити%b такі пакунки:%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%BВстановити%b такі пакунки:%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%BЗберегти%b поточні версії таких пакунків:%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%BОновити%b такі пакунки:%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%BЗамінити на більш давні%b версії такі пакунки:%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "Залишити наступні залежності нерозв'язаними:%n" @@ -7625,12 +7649,6 @@ msgstr "E:" msgid "W:" msgstr "W:" -#: src/ui.cc:259 -#, fuzzy -#| msgid "Search forwards" -msgid "Search for:" -msgstr "Пошук вперед" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -8023,7 +8041,9 @@ msgid "Error while dumping resolver state" msgstr "Помилка під час скидання стану розв'язувача" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "Файл, в який потрібно скидати стан розв'язувача:" #: src/ui.cc:2265 @@ -8529,6 +8549,23 @@ msgstr "Завантаження списку змін" msgid "You can only view changelogs of official Debian packages." msgstr "Список змін можна переглянути лише для офіційних пакунків Debian." +#~ msgid "" +#~ "%BOption:%b %s\n" +#~ "%BDefault:%b %s\n" +#~ "%BValue:%b %s\n" +#~ msgstr "" +#~ "%BПараметр:%b %s\n" +#~ "%BТипово:%b %s\n" +#~ "%BЗначення:%b %s\n" + +#~ msgid "Press Return to continue" +#~ msgstr "Натисніть Enter для продовження." + +#, fuzzy +#~| msgid "Search forwards" +#~ msgid "Search for:" +#~ msgstr "Пошук вперед" + #, fuzzy #~| msgid "" #~| "Unable to resolve dependencies for the upgrade (resolver timed out)." @@ -8658,11 +8695,6 @@ msgstr "Список змін можна переглянути лише для #~ msgid "gtk-yes" #~ msgstr "так" -#, fuzzy -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "Помилкова дія %s" - #~ msgid "but it is not installable" #~ 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: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2008-04-22 19:08+0930\n" "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" @@ -18,42 +18,36 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: LocFactoryEditor 1.7b3\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" -msgstr "" -"%BTùy chọn:%b %s\n" -"%BMặc định:%b %s\n" -"%BGiá trị:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " +msgstr "%BTùy chọn:%b " + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " +msgstr "%BMặc định:%b " -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "Đúng" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "Sai" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " -msgstr "%BTùy chọn:%b " - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "%BMặc định:%b " - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "%BGiá trị:%b " -#: src/apt_config_treeitems.cc:279 -#, c-format -msgid "Editing \"%ls\"" +#: src/apt_config_treeitems.cc:280 +#, fuzzy, c-format +#| msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "Đang sửa « %ls »" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "%BSự chọn:%b " @@ -635,8 +629,8 @@ msgstr "Lỗi nghiệm trọng trong bộ giải quyết" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] Đang tháo gỡ các quan hệ phụ thuộc" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "Gặp lỗi nội bộ : giải pháp vô giá trị bất thường." @@ -927,7 +921,7 @@ msgstr "" "chọn « --full-resolver » (bộ tháo gỡ đầy đủ).\n" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "Hủy bỏ.\n" @@ -1297,7 +1291,7 @@ msgstr "" "Không có gói nào cần hiển thị: hãy nhập các tên gói vào dòng, sau chữ « i " "».\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "Bấm phím Return để tiếp tục." @@ -1307,10 +1301,6 @@ msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "" "Không tìm thấy gói nào: hãy nhập các tên gói vào dòng, sau chữ « c ».\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "Bấm phím Return để tiếp tục" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1623,7 +1613,7 @@ msgstr "Tình trạng bộ tháo gỡ đã được ghi." #| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: " #| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na phb gói ...: %F" @@ -1899,7 +1889,7 @@ msgstr "" "quan hệ phụ thuộc." #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "Đang tháo gỡ các quan hệ phụ thuộc..." @@ -1938,7 +1928,9 @@ 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:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +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" @@ -2149,7 +2141,7 @@ msgstr "Gói: " msgid "State" msgstr "Tình trạng" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "Cung cấp bởi" @@ -2258,27 +2250,31 @@ msgstr "Thay thế" msgid "Obsoletes" msgstr "Làm cũ" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Cung cấp" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Mô tả: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "Trang chủ : " -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "Không thể định vị gói %s" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "Không thể phân tích hình mẫu %s" @@ -2593,6 +2589,12 @@ msgstr "%s: lệnh này cần thiết ít nhất một đối số (gói cần t msgid "Unknown version selection, something is very wrong." msgstr "" +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "Thao tác không hợp lệ %s" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "Gặp kết thúc tập tin bất thường trên thiết bị nhập chuẩn" @@ -2610,7 +2612,7 @@ msgstr "[LỖI]" msgid "UNSATISFIED" msgstr "CHƯA ỔN" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "KHÔNG CÓ SẴN" @@ -2618,7 +2620,7 @@ msgstr "KHÔNG CÓ SẴN" msgid "Tags" msgstr "Thẻ" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "Thẻ người dùng" @@ -3028,16 +3030,21 @@ msgstr "Không thể định vị gói %s" msgid "Unable to open %s to log actions" msgstr "Không thể mở %s để ghi lưu các hành động" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "Gặp lỗi khi tạo ra giờ địa phương (%s)" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "thông báo ghi lưu" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -3048,83 +3055,83 @@ msgstr "" "lỗi do vấn đề dpkg có lẽ chưa hoàn thành.\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "Sẽ cài đặt %li gói, và gỡ bỏ %li gói.\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "%sB chỗ trên đĩa sẽ được chiếm\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "%sB thêm chỗ trên đĩa sẽ được giải phóng\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[NÂNG CẤP] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[HẠ CẤP] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "BỎ" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "CÀI" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "CÀI LẠI" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "GIỮ LẠI" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "HỎNG" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "BỎ, KHÔNG DÙNG" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "BỎ, PHỤ THUỘC" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "CÀI, PHỤ THUỘC" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "GIỮ LẠI, PHỤ THUỘC" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "CHƯA CẤU HÌNH" # Do not translate/ đừng dịch -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" # Variable: do not translate/ biến: đừng dịch -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -3147,39 +3154,39 @@ msgstr "" msgid "Filtering packages" msgstr "Đang tài về các gói" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "Không rõ kiểu hành động: %s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "Có chuỗi nghĩa chữ chưa chấm dứt nằm sau %s" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "Không rõ ưu tiên %s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "Mẫu khớp kết thúc bất thường (đợi « %c »)." -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "Đợi « %c », còn nhận « %c »." -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "Không rõ kiểu quan hệ phụ thuộc: %s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, fuzzy, c-format #| msgid "Unknown matcher type: \"%s\"." msgid "Unknown term type: \"%s\"." @@ -3187,7 +3194,7 @@ msgstr "Không rõ kiểu hình mẫu : « %s »" #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, fuzzy, c-format #| msgid "" #| "The ?%s matcher must be used in a \"wide\" context (a top-level context, " @@ -3199,34 +3206,34 @@ msgstr "" "Ký hiệu khớp ?%s phải được dùng trong ngữ cảnh « rộng » (một ngữ cảnh cấp " "đầu, hoặc một ngữ cảnh nằm giữa ?%s)." -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "Có dấu « ( » riêng lẻ" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "Cung cấp: không thể ngắt" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "Không rõ kiểu hình mẫu : %c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "Không thể tìm kiếm « »" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "Biểu thức rỗng bất thường" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, fuzzy, c-format #| msgid "Badly formed expression" msgid "Badly formed expression: expected '|', got '%c'" msgstr "Biểu thức dạng sai" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "Dấu « ) » bất thường" @@ -4168,22 +4175,22 @@ msgstr "" msgid "%s: Unable to accept a connection: %s" msgstr "Không thể tạo thư mục tạm từ mẫu « %s »: %s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4913,7 +4920,7 @@ msgstr "" msgid "Virtual package" msgstr "Gói" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "Chưa cài đặt" @@ -5079,163 +5086,169 @@ msgstr "%s thay thế %s" msgid "%s obsoletes %s" msgstr "%s làm cũ %s" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s thay thế %s" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "Gỡ bỏ những gói sau :" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "Cài đặt những gói sau :" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 #, fuzzy #| msgid "Remove the following packages:" msgid "Keep the following packages:" msgstr "Gỡ bỏ những gói sau :" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "Nâng cấp những gói sau :" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "Hạ cấp những gói sau :" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 #, fuzzy #| msgid "Leave the following dependencies unresolved:%n" msgid "Leave the following dependencies unresolved:" msgstr "Để những quan hệ phụ thuộc sau lại chưa được tháo gỡ :%n" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, fuzzy, c-format #| msgid "Remove %F [%s (%s)]" msgid "Remove %s [<big>%s</big> (%s)]" msgstr "Gỡ bỏ %F [%s (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "Install %s [<big>%s</big> (%s)]" msgstr "Cài đặt %F [%s (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "Cancel the installation of %s" msgstr "Thôi việc cài đặt %F" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Cancel the removal of %s" msgstr "Thôi việc gỡ bỏ %F" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "Keep %s at version <big>%s</big> (%s)" msgstr "Giữ %F ở phiên bản %s (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, fuzzy, c-format #| msgid "Upgrade %F [%s (%s) -> %s (%s)]" msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Nâng cấp %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, fuzzy, c-format #| msgid "Downgrade %F [%s (%s) -> %s (%s)]" msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Hạ cấp %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>Remove</b> %s" msgstr "Bỏ(%s)" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>remove</b> %s" msgstr "Bỏ(%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>Keep</b> %s at version %s" msgstr "Giữ %F ở phiên bản %s (%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>keep</b> %s at version %s" msgstr "Giữ %F ở phiên bản %s (%s)" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>Cancel</b> the installation of %s" msgstr "Thôi việc cài đặt %F" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>cancel</b> the installation of %s" msgstr "Thôi việc cài đặt %F" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>Install</b> %s %s" msgstr "Cài đặt %F [%s (%s)]" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>install</b> %s %s" msgstr "Cài đặt %F [%s (%s)]" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "<b>Downgrade</b> %s to version %s" msgstr " cwidget phiên bản: %s\n" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "<b>downgrade</b> %s to version %s" msgstr " cwidget phiên bản: %s\n" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>Upgrade</b> %s to version %s" msgstr "Phiên bản %s" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>upgrade</b> %s to version %s" msgstr "Phiên bản %s" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format #| msgid "%d install" #| msgid_plural "%d installs" @@ -5243,7 +5256,7 @@ msgid "%s install" msgid_plural "%s installs" msgstr[0] "%d lần cài" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, fuzzy, c-format #| msgid "%d removal" #| msgid_plural "%d removals" @@ -5251,7 +5264,7 @@ msgid "%s remove" msgid_plural "%s removes" msgstr[0] "%d lần gỡ bỏ" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, fuzzy, c-format #| msgid "%d keep" #| msgid_plural "%d keeps" @@ -5259,7 +5272,7 @@ msgid "%s keep" msgid_plural "%s keeps" msgstr[0] "%d lần giữ" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, fuzzy, c-format #| msgid "%d upgrade" #| msgid_plural "%d upgrades" @@ -5267,7 +5280,7 @@ msgid "%s upgrade" msgid_plural "%s upgrades" msgstr[0] "%d lần nâng cấp" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, fuzzy, c-format #| msgid "%d downgrade" #| msgid_plural "%d downgrades" @@ -5275,42 +5288,42 @@ msgid "%s downgrade" msgid_plural "%s downgrades" msgstr[0] "%d lần hạ cấp" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, fuzzy, c-format #| msgid "Audit ^Recommendations" msgid "%s unresolved recommendation" msgid_plural "%s unresolved recommendations" msgstr[0] "Kiểm tra sự ^Khuyên" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 #, fuzzy #| msgid "No more solutions." msgid "No solutions yet." msgstr "Không có giải pháp nữa." -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 #, fuzzy #| msgid "Dependency handling" msgid "No dependency solution was found." msgstr "Quản lý quan hệ phụ thuộc" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 #, fuzzy #| msgid "No more solutions." msgid "No solutions." msgstr "Không có giải pháp nữa." -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, fuzzy, c-format #| msgid "No more solutions." msgid "%u solutions." msgstr "Không có giải pháp nữa." -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Could not open file \"%s\"" msgid "Solution %s of %s." @@ -5623,12 +5636,12 @@ msgstr " Hỗ trợ Ept bị tắt.\n" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s được biên dịch vào %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5780,29 +5793,35 @@ msgstr " show _Hiển thị_ thông tin chi tiết về gói\n" #: src/main.cc:213 #, fuzzy, c-format +#| msgid " show - Display detailed information about a package\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show _Hiển thị_ thông tin chi tiết về gói\n" + +#: src/main.cc:214 +#, fuzzy, c-format #| msgid " clean - Erase downloaded package files\n" msgid " clean - Erase downloaded package files.\n" msgstr " clean _Xóa_ các tập tin gói đã tải về\n" -#: src/main.cc:214 +#: src/main.cc:215 #, fuzzy, c-format #| msgid " autoclean - Erase old downloaded package files\n" msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean _Xóa_ các tập tin gói cũ đã tải về (_tự động_)\n" -#: src/main.cc:215 +#: src/main.cc:216 #, fuzzy, c-format #| msgid " changelog - View a package's changelog\n" msgid " changelog - View a package's changelog.\n" msgstr " changelog Xem _bản ghi thay đổi_ của gói\n" -#: src/main.cc:216 +#: src/main.cc:217 #, fuzzy, c-format #| msgid " download - Download the .deb file for a package\n" msgid " download - Download the .deb file for a package.\n" msgstr " download _Tải về_ tập tin kiểu .deb cho gói\n" -#: src/main.cc:217 +#: src/main.cc:218 #, fuzzy, c-format #| msgid "" #| " reinstall - Download and (possibly) reinstall a currently installed " @@ -5813,17 +5832,21 @@ msgid "" msgstr "" " reinstall Tải về và (có thể) _cài đặt lại_ gói được cài đặt hiện thời\n" -#: src/main.cc:218 -#, c-format +#: src/main.cc:219 +#, fuzzy, c-format +#| msgid "" +#| " why - Show the manually installed packages that require a " +#| "package, or\n" +#| " why one or more packages would require the given package\n" msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " why\t\tHiển thị các gói đã cài đặt bằng tay mà cần thiết một gói nào đó,\n" "\t\thoặc lý do một hay nhiều gói có thể cần thiết gói đã cho.\n" -#: src/main.cc:220 +#: src/main.cc:221 #, fuzzy, c-format #| msgid "" #| " why-not - Show the manually installed packages that lead to a " @@ -5842,58 +5865,58 @@ msgstr "" "\t\t\tmột hay nhiều gói (nếu được cài đặt) sẽ đưa tới\n" "\t\t\ttrường hợp này.\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " Tùy chọn:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " -h This help text.\n" msgstr " -h _Trợ giúp_ này\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h _Trợ giúp_ này\n" -#: src/main.cc:232 +#: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr "" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s _Mô phỏng_ hành động còn không thật thực hiện\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr " -d Chỉ _tải về_ gói, không cài đặt hoặc gỡ bỏ gì.\n" -#: src/main.cc:236 +#: src/main.cc:237 #, fuzzy, c-format #| msgid " -P Always prompt for confirmation or actions\n" -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P Luôn luôn _nhắc_ với sự xác nhận hoặc hành động\n" -#: src/main.cc:237 +#: src/main.cc:238 #, fuzzy, c-format #| msgid "" #| " -y Assume that the answer to simple yes/no questions is " @@ -5904,7 +5927,7 @@ msgstr "" " -y Giả sử trả lời cho câu hỏi kiểu « có/không » đơn giản là " "_Có_ (yes)\n" -#: src/main.cc:238 +#: src/main.cc:239 #, fuzzy, c-format #| msgid "" #| " -F format Specify a format for displaying search results; see the " @@ -5915,7 +5938,7 @@ msgid "" msgstr "" " -F format Ghi rõ _định dạng_ hiển thị kết quả tìm kiếm; xem sổ tay\n" -#: src/main.cc:239 +#: src/main.cc:240 #, fuzzy, c-format #| msgid "" #| " -O order Specify how search results should be sorted; see the " @@ -5927,7 +5950,7 @@ msgstr "" " -O order Ghi rõ cách sắp xếp kết quả tìm kiếm; xem sổ tay (_thứ " "tự_).\n" -#: src/main.cc:240 +#: src/main.cc:241 #, fuzzy, c-format #| msgid "" #| " -w width Specify the display width for formatting search results\n" @@ -5935,17 +5958,17 @@ msgid "" " -w width Specify the display width for formatting search results.\n" msgstr " -w width Ghi rõ _độ rộng_ hiển thị kết quả tìm kiếm\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr " -f Cố gắng _sửa chữa_ các gói bị hỏng một cách năng nổ.\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr " -V Hiển thị _phiên bản_ nào của gói sẽ được cài đặt.\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" @@ -5953,12 +5976,12 @@ msgstr "" " -D Hiển thị điều kiện _phụ thuộc_ của các gói đã thay đổi tự " "động.\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr " -Z\t\t Hiển thị hiệu số kích cỡ đã cài đặt của mỗi gói.\n" -#: src/main.cc:245 +#: src/main.cc:246 #, fuzzy, c-format #| msgid "" #| " -v Display extra information. (may be supplied multiple " @@ -5969,7 +5992,7 @@ msgid "" msgstr "" " -v Hiển thị thông tin thêm (có lẽ cung cấp nhiều lần [_chi tiết_])\n" -#: src/main.cc:246 +#: src/main.cc:247 #, fuzzy, c-format #| msgid "" #| " -t [release] Set the release from which packages should be installed\n" @@ -5977,17 +6000,17 @@ msgid "" " -t [release] Set the release from which packages should be installed.\n" msgstr " -t [bản] \tĐặt bản phát hành từ đó cần cài đặt gói\n" -#: src/main.cc:247 +#: src/main.cc:248 #, fuzzy, c-format #| msgid "" #| " -q In command-line mode, suppress the incremental progress\n" #| " indicators.\n" msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr " -q\t\tTrong chế độ dòng lệnh, thu hồi các cái chỉ tiến hành dần.\n" -#: src/main.cc:249 +#: src/main.cc:250 #, fuzzy, c-format #| msgid " -o key=val Directly set the configuration option named 'key'\n" msgid " -o key=val Directly set the configuration option named 'key'.\n" @@ -5995,41 +6018,42 @@ msgstr "" " -o key=giá_trị Đặt trực tiếp _tùy chọn_ cấu hình có tên « key » (phím/" "khoá)\n" -#: src/main.cc:250 +#: src/main.cc:251 #, fuzzy, c-format #| msgid "" #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" #| " strong dependencies\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" " --with(out)-recommends\tGhi rõ có nên xử lý gói đã khuyến khích (recommend) " "như là quan hệ phụ thuộc mạnh hay không (_[không] khuyến khích_).\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr "" " -S tên_tập_tin: Đọc thông tin _trạng thái_ kéo dài aptitude từ tập tin " "này.\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u Tải về các danh sách gói mới khi khởi chạy.\n" -#: src/main.cc:254 src/main.cc:256 -#, c-format -msgid " (terminal interface only)" -msgstr "" +#: src/main.cc:255 src/main.cc:257 +#, fuzzy, c-format +#| msgid " indicators.\n" +msgid " (terminal interface only)\n" +msgstr "\t\tcác chỉ thị.\n" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i Chạy lệnh _cài đặt_ (install) khi khởi chạy.\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr "" @@ -6038,7 +6062,7 @@ msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 #, fuzzy #| msgid "true" msgid "trace" @@ -6046,13 +6070,13 @@ msgstr "đúng" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 #, fuzzy #| msgid "no" msgid "info" @@ -6060,13 +6084,13 @@ msgstr "không" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 #, fuzzy #| msgid "Err " msgid "error" @@ -6074,7 +6098,7 @@ msgstr "Lỗi " #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 #, fuzzy #| msgid "false" msgid "fatal" @@ -6082,95 +6106,95 @@ msgstr "sai" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " "\"warn\", \"error\", \"fatal\", or \"off\")." msgstr "" -#: src/main.cc:487 +#: src/main.cc:488 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "Invalid logger name \"%s\"." msgstr "Thao tác không hợp lệ %s" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "Đợi một số nằm sau « -q= »\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "Đợi một số nằm sau « -q= », còn nhận %s\n" -#: src/main.cc:802 +#: src/main.cc:794 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "Tùy chọn « -o » cần thiết đối số dạng « key=giá_trị », còn nhân %s\n" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "Không có dấu phẩy đi theo tên thẻ « %s ».\n" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "LẠ: nhận mã tùy chọn không rõ\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "" -#: src/main.cc:1039 +#: src/main.cc:1023 #, fuzzy #| msgid "Package" msgid "first-package" msgstr "Gói" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "" -#: src/main.cc:1043 +#: src/main.cc:1027 #, fuzzy #| msgid "All Packages" msgid "all-packages" msgstr "Mọi gói" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -6178,7 +6202,7 @@ msgid "" "versions\"." msgstr "" -#: src/main.cc:1089 +#: src/main.cc:1073 #, fuzzy #| msgid "Only one of -u and -i may be specified\n" msgid "" @@ -6186,7 +6210,7 @@ msgid "" "specified\n" msgstr "Có thể ghi rõ chỉ một của hai tùy chọn « -u » và « -i »\n" -#: src/main.cc:1098 +#: src/main.cc:1082 #, fuzzy #| msgid "" #| "-u and -i may not be specified in command-line mode (eg, with 'install')" @@ -6197,23 +6221,23 @@ msgstr "" "Không thể ghi rõ tùy chọn « -u » hay « -i » trong chế độ dòng lệnh (v.d. với " "lệnh 'install' (cài) đặt)." -#: src/main.cc:1115 +#: src/main.cc:1099 #, fuzzy #| msgid "-u and -i may not be specified with a command" msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "Không thể ghi rõ tùy chọn « -u » hay « -i » với lệnh nào" -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "Không rõ lệnh « %s »\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "Ngoại lệ chưa bắt: %s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" @@ -6222,7 +6246,8 @@ msgstr "" "Vết lùi:\n" "%s\n" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "Tìm kiếm:" @@ -7111,18 +7136,22 @@ msgstr "thay thế" msgid "obsoletes" msgstr "làm cũ" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (cung cấp bởi %F)" # Variable: do not translate/ biến: đừng dịch -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." @@ -7130,7 +7159,7 @@ msgstr "" "Nếu bạn lựa chọn gói nào, một mô tả về tình trạng hiện thời của nó sẽ xuất " "hiện trong vùng này." -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" @@ -7138,16 +7167,16 @@ msgstr "" "%B%s%b đã được cài đặt tự động; nhưng nó đang được gỡ bỏ vì các gói phụ " "thuộc vào nó cũng đang được gỡ bỏ:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "%B%s%b sẽ được gỡ bỏ tự đông vì gặp lỗi quan hệ phụ thuộc:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "%B%s%b sẽ được cài đặt tự động để thỏa những quan hệ phụ thuộc này:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." @@ -7155,7 +7184,7 @@ msgstr "" "%B%s%b không thể được nâng cấp ngay bây giờ, nhưng nếu có thể, nó vẫn sẽ " "được giữ lại ở phiên bản %B%s%b." -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" @@ -7163,27 +7192,27 @@ msgstr "" "%B%s%b sẽ không được nâng cấp lên phiên bản %B%s%b, để tránh ngắt những quan " "hệ phụ thuộc này:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b hiện thời được cài đặt." -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b hiện thời không được cài đặt." -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "Một số quan hệ phụ thuộc của %B%s%b chưa được thỏa:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "%B%s%b sẽ được hạ cấp" -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b sẽ không được nâng cấp lên phiên bản cấm %B%s%b." -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." @@ -7191,42 +7220,42 @@ msgstr "" "%B%s%b có thể được nâng cấp lên phiên bản %B%s%b, nhưng mà hiện thời có được " "giữ lại nó ở phiên bản %B%s%b." -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b sẽ được cài lại." -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b sẽ được cài đặt." -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b sẽ được gỡ bỏ." -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b sẽ được nâng cấp từ phiên bản %B%s%b lên phiên bản %B%s%b." -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "%B%s%b chỉ được cài đặt bộ phận nên sẽ cài đặt xong." -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "Những gói sau phụ thuộc vào %B%s%b nên bị hỏng do việc gỡ bỏ nó :" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "Những gói sau phụ thuộc vào %B%s%b nên bị hỏng:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" msgstr "Những gói sau xung đột với %B%s%b nên bị hỏng do việc cài đặt nó :" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -7236,7 +7265,7 @@ msgstr "" "thời được cài đặt (%B%s%b), hoặc xung đột với phiên bản hiện thời được cài " "đặt:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." @@ -7244,11 +7273,11 @@ msgstr "" "Những gói sau xung đột với %B%s%b, hoặc phụ thuộc vào một phiên bản nó sẽ " "không được cài." -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "Những gói sau xung đột với %B%s%b:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" @@ -7256,22 +7285,22 @@ msgstr "" "Những gói sau phụ thuộc vào một phiên bản %B%s%b khác với phiên bản %B%s%b " "hiện thời được cài đặt:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." msgstr "" "Những gói sau phụ thuôc vào một phiên bản %B%s%b sẽ không được cài đặt." -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "đã nâng cấp" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "đã hạ cấp" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7281,7 +7310,7 @@ msgstr "" "%b), hoặc xung đột với phiên bản tới đó sẽ được %s (%B%s%b) nên bị hỏng nếu " "nó là %s." -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7289,7 +7318,7 @@ msgstr "" "Những gói sau xung đột với phiên bản %B%s%b của %B%s%b nên bị hỏng nếu nó là " "%s." -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7325,47 +7354,47 @@ msgstr "Áp dụng" msgid "Close" msgstr "Đóng" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s xung đột với %s [cung cấp bởi %s %s]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "Đang gỡ bỏ %s" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "Đang cài đặt %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%BBỏ%b những gói sau :%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%BCài%b những gói sau :%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%BGiữ%b những gói sau ở phiên bản hiện có :%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%BNâng cấp%b những gói sau :%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%BHạ cấp%b những gói sau :%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "Để những quan hệ phụ thuộc sau lại chưa được tháo gỡ :%n" @@ -7464,10 +7493,6 @@ msgstr "Đ." msgid "W:" msgstr "T." -#: src/ui.cc:259 -msgid "Search for:" -msgstr "Tìm kiếm:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7845,7 +7870,9 @@ msgid "Error while dumping resolver state" msgstr "Gặp lỗi khi đổ tình trạng bộ tháo gỡ" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "Tập tin vào đó cần đổ tình trạng bộ tháo gỡ :" #: src/ui.cc:2265 @@ -8357,6 +8384,21 @@ msgid "You can only view changelogs of official Debian packages." msgstr "Bạn chỉ có thể xem bản ghi đổi của gói Debian chính thức." #~ msgid "" +#~ "%BOption:%b %s\n" +#~ "%BDefault:%b %s\n" +#~ "%BValue:%b %s\n" +#~ msgstr "" +#~ "%BTùy chọn:%b %s\n" +#~ "%BMặc định:%b %s\n" +#~ "%BGiá trị:%b %s\n" + +#~ msgid "Press Return to continue" +#~ msgstr "Bấm phím Return để tiếp tục" + +#~ msgid "Search for:" +#~ msgstr "Tìm kiếm:" + +#~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." #~ msgstr "" #~ "Không thể giải quyết các quan hệ phụ thuộc cho tiến trình nâng cấp (bộ " @@ -8484,11 +8526,6 @@ msgstr "Bạn chỉ có thể xem bản ghi đổi của gói Debian chính th #~ msgid "gtk-yes" #~ msgstr "có" -#, fuzzy -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "Thao tác không hợp lệ %s" - #~ msgid "but it is not installable" #~ msgstr "nhưng mà nó không có khả năng cài đặt" @@ -8676,9 +8713,6 @@ msgstr "Bạn chỉ có thể xem bản ghi đổi của gói Debian chính th #~ " lead to a conflict with the given package if installed\n" #~ msgstr " \t\tcài đặt thì đưa tới trường hợp xung đột với gói đã cho\n" -#~ msgid " indicators.\n" -#~ msgstr "\t\tcác chỉ thị.\n" - #~ msgid "There are now %F." #~ msgstr "Giờ này có %F." diff --git a/po/zh_CN.po b/po/zh_CN.po index 1c779274..e3ac4373 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2010-08-27 01:49+0800\n" "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" @@ -23,42 +23,36 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" -msgstr "" -"%B选项：%b %s\n" -"%B默认：%b %s\n" -"%B值：%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " +msgstr "%B选项：%b " + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " +msgstr "%B默认：%b " -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "True" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "False" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " -msgstr "%B选项：%b " - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "%B默认：%b " - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "%B值：%b " -#: src/apt_config_treeitems.cc:279 -#, c-format -msgid "Editing \"%ls\"" +#: src/apt_config_treeitems.cc:280 +#, fuzzy, c-format +#| msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "正在编辑“%ls”" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "%B选择：%b " @@ -590,8 +584,8 @@ msgstr "解决器发生致命错误" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] 正在解决依赖关系" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "内部错误：意料之外的空解决方案。" @@ -867,7 +861,7 @@ msgid "" msgstr "无法安全解决依赖关系，请尝试使用 --full-resolver 来运行。\n" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "放弃。\n" @@ -1222,7 +1216,7 @@ msgstr "解包后将释放 %sB。\n" msgid "No packages to show -- enter the package names on the line after 'i'.\n" msgstr "无可显示的软件包 -- 请在“i”之后的那一行输入软件包名称。\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "按回车继续。" @@ -1231,10 +1225,6 @@ msgstr "按回车继续。" msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "未发现软件包 -- 请在“c”之后的那一行输入软件包名称。\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "按回车继续" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1530,9 +1520,12 @@ msgid "Resolver state successfully written!" msgstr "成功写入依赖关系解决状态！" #: src/cmdline/cmdline_resolver.cc:222 -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +#| "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " @@ -1787,7 +1780,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created." msgstr "我想解决依赖关系，但没有创建依赖关系解决器" #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "依赖关系分析中..." @@ -1823,7 +1816,9 @@ msgid "Invalid response; please enter one of the following commands:" msgstr "无效响应；请输入下列命令之一：" #: src/cmdline/cmdline_resolver.cc:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +msgid "No solution found within the allotted time. Try harder? [Y/n] " msgstr "在限定的时间内没能找到解决方案。加把劲再试试？[Y/n]" #: src/cmdline/cmdline_resolver.cc:1080 @@ -2025,7 +2020,7 @@ msgstr "软件包：" msgid "State" msgstr "状态" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "提供者：" @@ -2133,27 +2128,31 @@ msgstr "代替" msgid "Obsoletes" msgstr "过期" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "提供" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "描述：" -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "主页：" -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "无法定位软件包 %s" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "无法分析模式 %s" @@ -2458,6 +2457,12 @@ msgstr "%s：这个命令要求至少一个参数(要查询的软件包)。\n" msgid "Unknown version selection, something is very wrong." msgstr "未知的版本选择，有一些严重错误。" +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "无效的操作 %s" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "标准输入中遇到意料之外的文件结束标志" @@ -2474,7 +2479,7 @@ msgstr "[ 错误] %s" msgid "UNSATISFIED" msgstr "未满足" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "不可用" @@ -2482,7 +2487,7 @@ msgstr "不可用" msgid "Tags" msgstr "标签" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "用户标签" @@ -2869,16 +2874,21 @@ msgstr "无法创建截断的缓存 %s" msgid "Unable to open %s to log actions" msgstr "无法打开 %s 来记录动作" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "生成本地时间(%s)时错误" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "日志报告" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -2888,81 +2898,81 @@ msgstr "" "重要：该日志只记录预期动作；由于 dpkg 问题而出错的动作可能尚未完成。\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "将要安装 %li 个软件包，卸载 %li 个软件包。\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "将要占用 %sB 的磁盘空间\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "将要释放 %sB 的磁盘空间\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[升级] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[降级] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "卸载" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "安装" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "重新安装" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "保持" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "破坏" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "卸载，未用" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "卸载，依赖关系" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "安装，依赖关系" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "保持，依赖关系" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "未配置的" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -2983,46 +2993,46 @@ msgstr "正在访问索引" msgid "Filtering packages" msgstr "分类软件包" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "未知的操作类型：%s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "%s 之后有未结束的文字字符串" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "未知的优先级：%s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "匹配模式异常结束(预期为'%c')。" -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "预期得到“%c”，却得到“%c”。" -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "未知依赖类型：%s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, c-format msgid "Unknown term type: \"%s\"." msgstr "未知的项目类型：“%s”。" #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, c-format msgid "" "The ?%s term must be used in a \"wide\" context (a top-level context, or a " @@ -3030,33 +3040,33 @@ msgid "" msgstr "" "?%s 匹配器必须在“宽”上下文中使用(顶层上下文，或者被 ?%s 包含的上下文)。" -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "不匹配的“(”" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "“提供”类型不可能损坏" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "未知的模式类型：%c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "无法搜索“”" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "意外的空表达式" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, c-format msgid "Badly formed expression: expected '|', got '%c'" msgstr "错误格式的表达式：期望 '|'，得到了 '%c'" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "意外的“)”" @@ -3875,22 +3885,22 @@ msgstr "内部错误：临时套接字名 \"%s\" 太长！" msgid "%s: Unable to accept a connection: %s" msgstr "%s：无法接受连接：%s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "[%s] dpkg 处理正在启动...\n" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "[%s] dpkg 处理完成。\n" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "[%s] dpkg 处理失败。\n" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "[%s] dpkg 处理完成；有更多剩余的包要处理。\n" @@ -4510,7 +4520,7 @@ msgstr "" msgid "Virtual package" msgstr "虚报" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "未安装的" @@ -4668,197 +4678,203 @@ msgstr "%s 替代 %s" msgid "%s obsoletes %s" msgstr "%s 过期 %s" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s 替代 %s" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "删除下列软件包：" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "安装下列软件包：" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 msgid "Keep the following packages:" msgstr "保持下列软件包：" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "升级下列软件包：" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "降级下列软件包：" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 msgid "Leave the following dependencies unresolved:" msgstr "保留下列未解决的依赖关系：" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, c-format msgid "Remove %s [<big>%s</big> (%s)]" msgstr "删除 %s [<big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, c-format msgid "Install %s [<big>%s</big> (%s)]" msgstr "安装 %s [<big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, c-format msgid "Cancel the installation of %s" msgstr "取消 %s 的安装" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, c-format msgid "Cancel the removal of %s" msgstr "取消删除 %s" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, c-format msgid "Keep %s at version <big>%s</big> (%s)" msgstr "保持 %s 在版本 <big>%s</big> (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, c-format msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "升级 %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, c-format msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "降级 %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, c-format msgid "<b>Remove</b> %s" msgstr "<b>移除</b> %s" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, c-format msgid "<b>remove</b> %s" msgstr "<b>移除</b> %s" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, c-format msgid "<b>Keep</b> %s at version %s" msgstr "<b>保持</b> %s 在版本 %s" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, c-format msgid "<b>keep</b> %s at version %s" msgstr "<b>保持</b> %s 在版本 %s" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, c-format msgid "<b>Cancel</b> the installation of %s" msgstr "<b>取消</b> %s 的安装。" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, c-format msgid "<b>cancel</b> the installation of %s" msgstr "<b>取消</b> %s 的安装。" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, c-format msgid "<b>Install</b> %s %s" msgstr "<b>安装</b> %s %s" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, c-format msgid "<b>install</b> %s %s" msgstr "<b>安装</b> %s %s" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>Downgrade</b> %s to version %s" msgstr "<b>降级</b> %s 到版本 %s" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>downgrade</b> %s to version %s" msgstr "<b>降级</b> %s 到版本 %s" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>Upgrade</b> %s to version %s" msgstr "<b>升级</b> %s 到版本 %s" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>upgrade</b> %s to version %s" msgstr "<b>升级</b> %s 到版本 %s" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "遗留 %s 为未解决的" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "遗留 %s 为未解决的" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, c-format msgid "%s install" msgid_plural "%s installs" msgstr[0] "%s 安装" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, c-format msgid "%s remove" msgid_plural "%s removes" msgstr[0] "%s 删除" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, c-format msgid "%s keep" msgid_plural "%s keeps" msgstr[0] "%s 保持" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, c-format msgid "%s upgrade" msgid_plural "%s upgrades" msgstr[0] "%s 升级" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, c-format msgid "%s downgrade" msgid_plural "%s downgrades" msgstr[0] "%s 降级" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, c-format msgid "%s unresolved recommendation" msgid_plural "%s unresolved recommendations" msgstr[0] "%s 未解决的推荐" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 msgid "No solutions yet." msgstr "还解决方案。" -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 msgid "No dependency solution was found." msgstr "没有发现依赖关系解决方案。" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 msgid "No solutions." msgstr "没有解决方案" -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "要查看解决方案，从列表中选择其到右侧。" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, c-format msgid "%u solutions." msgstr "%u 解决方案。" -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, c-format msgid "Solution %s of %s." msgstr "解决方案 %s (共 %s 个)。" @@ -5154,12 +5170,12 @@ msgstr " Gtk+ 支持已禁用\n" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s 编译于 %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5290,43 +5306,53 @@ msgid " show - Display detailed information about a package.\n" msgstr " show - 显示一个软件包的详细信息。\n" #: src/main.cc:213 +#, fuzzy, c-format +#| msgid " show - Display detailed information about a package.\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - 显示一个软件包的详细信息。\n" + +#: src/main.cc:214 #, c-format msgid " clean - Erase downloaded package files.\n" msgstr " clean - 删除已下载的软件包文件。\n" -#: src/main.cc:214 +#: src/main.cc:215 #, c-format msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean - 删除旧的已下载软件包文件。\n" -#: src/main.cc:215 +#: src/main.cc:216 #, c-format msgid " changelog - View a package's changelog.\n" msgstr " changelog - 查看一个软件包的变更日志。\n" -#: src/main.cc:216 +#: src/main.cc:217 #, c-format msgid " download - Download the .deb file for a package.\n" msgstr " download - 下载软件包的 .deb 文件。\n" -#: src/main.cc:217 +#: src/main.cc:218 #, c-format msgid "" " reinstall - Download and (possibly) reinstall a currently installed " "package.\n" msgstr " reinstall - 下载并(可能)重新安装一个现在已经安装了的软件包。\n" -#: src/main.cc:218 -#, c-format +#: src/main.cc:219 +#, fuzzy, c-format +#| msgid "" +#| " why - Show the manually installed packages that require a " +#| "package, or\n" +#| " why one or more packages would require the given package\n" msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " why - 显示需要另一软件包的手动安装的软件包，或者\n" " 为什么一个或多个软件包需要给定的软件包。\n" -#: src/main.cc:220 +#: src/main.cc:221 #, c-format msgid "" " why-not - Show the manually installed packages that lead to a " @@ -5337,34 +5363,34 @@ msgstr "" " why-not - 显示导致与给定软件包包冲突的手动安装的包，或者为什么\n" " 如果安装一个或多个软件包会导致与给定软件包冲突。\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " 选项：\n" -#: src/main.cc:225 +#: src/main.cc:226 #, c-format msgid " -h This help text.\n" msgstr " -h 此帮助文本。\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr " --gui 即使配置中禁用了，也要使用 GTK 图形用户界面。\n" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr " --no-gui 即使可用，也不使用 GTK 图形用户界面。\n" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text.\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h 此帮助文本。\n" -#: src/main.cc:232 +#: src/main.cc:233 #, fuzzy, c-format #| msgid "" #| " --gui Use the GTK GUI even if disabled in the configuration.\n" @@ -5372,171 +5398,179 @@ msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr " --gui 即使配置中禁用了，也要使用 GTK 图形用户界面。\n" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s 模拟动作，但是并不真正执行。\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr " -d 仅仅下载软件包，不安装或者卸载任何东西。\n" -#: src/main.cc:236 -#, c-format -msgid " -P Always prompt for confirmation or actions.\n" +#: src/main.cc:237 +#, fuzzy, c-format +#| msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P 总是提示确认执行动作。\n" -#: src/main.cc:237 +#: src/main.cc:238 #, c-format msgid "" " -y Assume that the answer to simple yes/no questions is 'yes'.\n" msgstr " -y 假设对简单的 yes/no 问题回答“yes”。\n" -#: src/main.cc:238 +#: src/main.cc:239 #, c-format msgid "" " -F format Specify a format for displaying search results; see the " "manual.\n" msgstr " -F 格式 指定显示搜索结果的格式；参见手册。\n" -#: src/main.cc:239 +#: src/main.cc:240 #, c-format msgid "" " -O order Specify how search results should be sorted; see the " "manual.\n" msgstr " -O 次序 指定如何排列显示搜索结果；参见手册。\n" -#: src/main.cc:240 +#: src/main.cc:241 #, c-format msgid "" " -w width Specify the display width for formatting search results.\n" msgstr " -w 宽度 指定显示搜索结果的格式宽度。\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr " -f 积极地尝试修复损坏的软件包。\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr " -V 显示就要安装的软件包版本。\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr " -D 显示自动改变的软件包的依赖关系\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr " -Z\t\t 显示每个软件包的安装尺寸的变化。\n" -#: src/main.cc:245 +#: src/main.cc:246 #, c-format msgid "" " -v Display extra information. (may be supplied multiple " "times).\n" msgstr " -v 显示附加信息。(可能会提供多次)。\n" -#: src/main.cc:246 +#: src/main.cc:247 #, c-format msgid "" " -t [release] Set the release from which packages should be installed.\n" msgstr " -t [release] 设置将要从中安装软件包的发布版本。\n" -#: src/main.cc:247 -#, c-format +#: src/main.cc:248 +#, fuzzy, c-format +#| msgid "" +#| " -q In command-line mode, suppress the incremental progress.\n" +#| " indicators.\n" msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr " -q 在命令行状态下，不显示增量进度指示器。\n" -#: src/main.cc:249 +#: src/main.cc:250 #, c-format msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr " -o key=val 直接设置名为“key”的配置选项。\n" -#: src/main.cc:250 -#, c-format +#: src/main.cc:251 +#, fuzzy, c-format +#| msgid "" +#| " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +#| " strong dependencies.\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr " --with(out)-recommends\t指定是否将推荐处理为强依赖关系。\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr " -S fname 从文件名中读取 aptitude 的扩展状态信息。\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u 开始运行时下载新的软件包列表。\n" -#: src/main.cc:254 src/main.cc:256 -#, c-format -msgid " (terminal interface only)" +#: src/main.cc:255 src/main.cc:257 +#, fuzzy, c-format +#| msgid " (terminal interface only)" +msgid " (terminal interface only)\n" msgstr " (只有终端界面)" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i 开始运行时执行安装。\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " 这个 aptitude 没有超级牛力。\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 msgid "trace" msgstr "跟踪" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "调试" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 msgid "info" msgstr "信息" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "警告" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 msgid "error" msgstr "错误" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 msgid "fatal" msgstr "致命错误" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "关闭" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " @@ -5545,77 +5579,77 @@ msgstr "" "未知的日志级别名“%s” (可用的值有 \"trace\", \"debug\", \"info\", \"warn\", " "\"error\", \"fatal\", or \"off\")。" -#: src/main.cc:487 +#: src/main.cc:488 #, c-format msgid "Invalid logger name \"%s\"." msgstr "无效日志记录名 %s。" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "在 -q= 之后需要一个数字\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "在 -q= 之后需要一个数字，但却得到 %s\n" -#: src/main.cc:802 +#: src/main.cc:794 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o 要求参数格式为 key=val，却接受到 %s\n" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "标签名“%s”后没有逗号。\n" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "“诡异”：收到未知的选项代码\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "--show-package-names|never" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "--show-package-names|auto" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "--show-package-names|always" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "无效的软件包名称显示模式 %s (应为 never、auto 或 always 之一)。" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "无摘要" -#: src/main.cc:1039 +#: src/main.cc:1023 msgid "first-package" msgstr "首个软件包" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "首个软件包及类型" -#: src/main.cc:1043 +#: src/main.cc:1027 msgid "all-packages" msgstr "全部包" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "全部软件包及依赖版本" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -5626,14 +5660,14 @@ msgstr "" "\"，\"first-package-and-type\"，\"all-packages\" 或 \"all-packages-with-dep-" "versions\"。" -#: src/main.cc:1089 +#: src/main.cc:1073 msgid "" "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be " "specified\n" msgstr "" "选项 --auto-clean-on-startup，--clean-on-startup，-i 和 -u 只能指定一个\n" -#: src/main.cc:1098 +#: src/main.cc:1082 msgid "" "-u, -i, and --clean-on-startup may not be specified in command-line mode " "(eg, with 'install')" @@ -5641,21 +5675,21 @@ msgstr "" "选项 -u，-i 和 --clean-on-startup 不能在命令行模式中指定 (例如，和“install”一" "起)" -#: src/main.cc:1115 +#: src/main.cc:1099 msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "选项 -u，-i 和 --clean-on-startup 不能在和一个命令一起指定 " -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "未知的命令“%s”\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "未知的例外：%s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" @@ -5664,7 +5698,8 @@ msgstr "" "回溯：\n" "%s\n" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "搜索：" @@ -6540,112 +6575,116 @@ msgstr "替代" msgid "obsoletes" msgstr "过期" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr "(由 %F 提供)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." msgstr "如果您选择了一个软件包，其当前状态的描述将会出现在这片空间。" -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" msgstr "" "%B%s%b 被自动安装；现在它将被删除，因为所有依赖于它的软件包都将被删除：" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "由于依赖关系出错，%B%s%b 将被自动删除：" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "%B%s%b 将被自动安装以满足下列依赖关系：" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." msgstr "%B%s%b 现在无法升级，但是如果可以升级的话，它仍将被保持在版本 %B%s%b。" -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" msgstr "%B%s%b 将不会被升级到版本 %B%s%b，以避免破坏下列依赖关系：" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b 目前已安装。" -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b 目前未被安装。" -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "%B%s%b 的某些依赖关系未被满足：" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "%B%s%b 将被降级。" -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b 将从不会升级到禁止的版本 %B%s%b。" -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." msgstr "%B%s%b 可以升级到版本 %B%s%b，但是它将被保持在版本%B%s%b。" -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b 将被重新安装。" -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b 将被安装。" -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b 将被删除。" -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b 将从版本 %B%s%b升级到版本%B%s%b。" -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "%B%s%b 仅被部分安装；它的安装将会完成。" -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "下列软件包依赖于 %B%s%b，删除该软件包将使它们破损：" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "下列软件包依赖于 %B%s%b，它们目前是破损的：" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" msgstr "下列软件包与 %B%s%b 相冲突，安装该软件包将使它们破损：" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -6654,37 +6693,37 @@ msgstr "" "下列软件包依赖于某一版本的 %B%s%b，该版本当前安装的版本 %B%s%b 不同，或者它们" "与当前安装的版本冲突：" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." msgstr "下列软件包与 %B%s%b 冲突，或者依赖于它的某一版本，该版本将不被安装。" -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "下列软件包与 %B%s%b 相冲突：" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" msgstr "下列软件包依赖于某一版本的 %B%s%b，该版本当前安装的版本 %B%s%b 不同：" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." msgstr "下列软件包依赖于 %B%s%b 的某一版本，该版本将不被安装。" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "已升级" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "已下载" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -6693,13 +6732,13 @@ msgstr "" "下列软件包依赖于当前安装版本的 %B%s%b ( %B%s%b )，或者与它将被 %s 至的版本 " "(%B%s%b)冲突，并且将会破损如果它是 %s。" -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." msgstr "下列软件包与版本 %B%s%b 的 %B%s%b 冲突，并且将会破损如果它是 %s。" -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -6733,47 +6772,47 @@ msgstr "应用" msgid "Close" msgstr "关闭" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s 和 %s 冲突 [由 %s %s 提供]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "%s 删除中" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "正在安装 %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "遗留 %ls 未解决。" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%B删除%b 下列软件包：%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%B安装%b 下列软件包：%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%B保持%b 下列软件包于其当前版本：%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%B升级%b 下列软件包：%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%B降级%b 下列软件包：%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "保留下列未解决的依赖关系：%n" @@ -6871,10 +6910,6 @@ msgstr "E:" msgid "W:" msgstr "W:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "搜索：" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7222,7 +7257,9 @@ msgid "Error while dumping resolver state" msgstr "存储依赖关系解决状态时出错" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "存储依赖关系解决状态的文件：" #: src/ui.cc:2265 @@ -7719,6 +7756,21 @@ msgid "You can only view changelogs of official Debian packages." msgstr "您只能查看官方 Debian 软件包的变更日志。" #~ msgid "" +#~ "%BOption:%b %s\n" +#~ "%BDefault:%b %s\n" +#~ "%BValue:%b %s\n" +#~ msgstr "" +#~ "%B选项：%b %s\n" +#~ "%B默认：%b %s\n" +#~ "%B值：%b %s\n" + +#~ msgid "Press Return to continue" +#~ msgstr "按回车继续" + +#~ msgid "Search for:" +#~ msgstr "搜索：" + +#~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." #~ msgstr "未能为此升级解决依赖关系(解决器超时)。" diff --git a/po/zh_TW.po b/po/zh_TW.po index d1673a09..2c0b1f88 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2008-10-26 21:02+0100\n" "Last-Translator: Asho Yeh <ashoyeh@gmail.com>\n" "Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n" @@ -20,42 +20,36 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" -msgstr "" -"%B 選項:%b %s\n" -"%B 預設:%b %s\n" -"%B 值:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " +msgstr "%B選項:%b " + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " +msgstr "%B預設:%b " -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "真" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "否" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " -msgstr "%B選項:%b " - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "%B預設:%b " - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "%B值:%b " -#: src/apt_config_treeitems.cc:279 -#, c-format -msgid "Editing \"%ls\"" +#: src/apt_config_treeitems.cc:280 +#, fuzzy, c-format +#| msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "編輯中 \"%ls\"" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "%B 種類:%b " @@ -587,8 +581,8 @@ msgstr "反解發生錯誤" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] 正在解決相依賴關係" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "內部錯誤：意料之外的無效解決方案。" @@ -868,7 +862,7 @@ msgid "" msgstr "無法解決相依關係。試著執行時加入--full-resolver參數\n" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "放棄。\n" @@ -1227,7 +1221,7 @@ msgstr "解裝後將釋出 %sB.\n" msgid "No packages to show -- enter the package names on the line after 'i'.\n" msgstr "無顯示套件 -- 請在 'i' 之後輸入套件名稱。\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "按 Return 繼續。" @@ -1236,10 +1230,6 @@ msgstr "按 Return 繼續。" msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "未找到套件 -- 請在 'c' 之後輸入套件名稱。\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "按 Return 繼續。" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1537,7 +1527,7 @@ msgstr "成功寫入每依關係解決狀態！" #| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: " #| "%F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: %F" @@ -1803,7 +1793,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created." msgstr "我想要自動解決相依功能，但沒有相依解決器被建立。" #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "相依賴關係分析中..." @@ -1839,7 +1829,9 @@ msgid "Invalid response; please enter one of the following commands:" msgstr "錯誤回應。請輸入以下任一個指令：" #: src/cmdline/cmdline_resolver.cc:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +msgid "No solution found within the allotted time. Try harder? [Y/n] " msgstr "在分配的時間內未找到解決方案。加把勁再試試？[Y/n]" #: src/cmdline/cmdline_resolver.cc:1080 @@ -2043,7 +2035,7 @@ msgstr "套件:" msgid "State" msgstr "狀態" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "提供於" @@ -2151,27 +2143,31 @@ msgstr "替換" msgid "Obsoletes" msgstr "過期檔案" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "提供" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "描述: " -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "官網： " -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "無法定位套件 %s" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "無法分析模式 %s" @@ -2483,6 +2479,12 @@ msgstr "%s：該指令至少需要一個參數(被查詢的套件名)。" msgid "Unknown version selection, something is very wrong." msgstr "" +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "無效的操作“%s”" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "標準輸入中遇到意料之外的檔案結束" @@ -2500,7 +2502,7 @@ msgstr "[錯誤]" msgid "UNSATISFIED" msgstr "未滿足的" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "不可用" @@ -2508,7 +2510,7 @@ msgstr "不可用" msgid "Tags" msgstr "標簽" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "使用者自訂標誌" @@ -2896,16 +2898,21 @@ msgstr "無法定位套件 %s" msgid "Unable to open %s to log actions" msgstr "無法打開 %s 來記錄動作" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "產生本地時間(%s)時錯誤" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "紀錄回報" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -2915,81 +2922,81 @@ msgstr "" "重要：該日誌只記錄預期動作；由於 dpkg 問題而出錯的動作可能尚未完成。\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "將要安裝 %li 個套件，移除 %li 個套件。\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "將要佔用 %sB 的磁碟空間\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "將要釋放 %sB 的磁碟空間\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[升級] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[降級] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "移除" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "安裝" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "重新安裝" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "保持" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "損壞" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "移除, 未用" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "移除, 依賴關係" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "安裝, 依賴關係" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "保持, 依賴關係" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "未設定的" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -3012,39 +3019,39 @@ msgstr "" msgid "Filtering packages" msgstr "下載套件中" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "未知的操作類型：%s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "無法結束 %s 之後的未結束字串" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "未知的優先值 %s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "配對規則意外終止(預期'%c')" -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "期許“%c”，卻得到“%c”" -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "未知依賴類型：%s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, fuzzy, c-format #| msgid "Unknown matcher type: \"%s\"." msgid "Unknown term type: \"%s\"." @@ -3052,7 +3059,7 @@ msgstr "未知的匹配類型：“%s”" #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, fuzzy, c-format #| msgid "" #| "The ?%s matcher must be used in a \"wide\" context (a top-level context, " @@ -3062,34 +3069,34 @@ msgid "" "context enclosed by ?%s)." msgstr "?%s 配對器必須用在 \"wide\" 內容(最上層的內文，或靠近 ?%s 的內文)。" -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "不匹配“(”" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "“提供”類型不可能損壞" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "未知的模式類型：%c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "無法搜尋“”" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "意外的空表達式" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, fuzzy, c-format #| msgid "Badly formed expression" msgid "Badly formed expression: expected '|', got '%c'" msgstr "錯誤格式的表達式" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "意外的“)”" @@ -4026,22 +4033,22 @@ msgstr "" msgid "%s: Unable to accept a connection: %s" msgstr "無法為模板“%s”建立臨時檔案目錄：%s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "" @@ -4762,7 +4769,7 @@ msgstr "" msgid "Virtual package" msgstr "套件" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "尚未安裝" @@ -4928,163 +4935,169 @@ msgstr "%s 替代 %s" msgid "%s obsoletes %s" msgstr "%s 過期 %s" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s 替代 %s" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "移除下列套件：" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "安裝下列套件：" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 #, fuzzy #| msgid "Remove the following packages:" msgid "Keep the following packages:" msgstr "移除下列套件：" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "升級下列套件：" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "降級下列套件：" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 #, fuzzy #| msgid "Leave the following dependencies unresolved:%n" msgid "Leave the following dependencies unresolved:" msgstr "保留下列未解決的相依關係：%n" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, fuzzy, c-format #| msgid "Remove %F [%s (%s)]" msgid "Remove %s [<big>%s</big> (%s)]" msgstr "刪除 %F [%s (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "Install %s [<big>%s</big> (%s)]" msgstr "安裝 %F [%s (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "Cancel the installation of %s" msgstr "取消 %F 的安裝" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Cancel the removal of %s" msgstr "取消移除 %F" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "Keep %s at version <big>%s</big> (%s)" msgstr "保持 %F 在版本 %s (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, fuzzy, c-format #| msgid "Upgrade %F [%s (%s) -> %s (%s)]" msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "升級 %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, fuzzy, c-format #| msgid "Downgrade %F [%s (%s) -> %s (%s)]" msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "降級 %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>Remove</b> %s" msgstr "移除(%s)" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>remove</b> %s" msgstr "移除(%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>Keep</b> %s at version %s" msgstr "保持 %F 在版本 %s (%s)" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>keep</b> %s at version %s" msgstr "保持 %F 在版本 %s (%s)" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>Cancel</b> the installation of %s" msgstr "取消 %F 的安裝" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "<b>cancel</b> the installation of %s" msgstr "取消 %F 的安裝" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>Install</b> %s %s" msgstr "安裝 %F [%s (%s)]" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>install</b> %s %s" msgstr "安裝 %F [%s (%s)]" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "<b>Downgrade</b> %s to version %s" msgstr "cwidget版本：%s\n" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "<b>downgrade</b> %s to version %s" msgstr "cwidget版本：%s\n" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>Upgrade</b> %s to version %s" msgstr "%s版本號" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>upgrade</b> %s to version %s" msgstr "%s版本號" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format #| msgid "%d install" #| msgid_plural "%d installs" @@ -5092,7 +5105,7 @@ msgid "%s install" msgid_plural "%s installs" msgstr[0] "%d 個可安裝" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, fuzzy, c-format #| msgid "%d removal" #| msgid_plural "%d removals" @@ -5100,7 +5113,7 @@ msgid "%s remove" msgid_plural "%s removes" msgstr[0] "%d 個移除" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, fuzzy, c-format #| msgid "%d keep" #| msgid_plural "%d keeps" @@ -5108,7 +5121,7 @@ msgid "%s keep" msgid_plural "%s keeps" msgstr[0] "%d 個保存" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, fuzzy, c-format #| msgid "%d upgrade" #| msgid_plural "%d upgrades" @@ -5116,7 +5129,7 @@ msgid "%s upgrade" msgid_plural "%s upgrades" msgstr[0] "%d 個可升級" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, fuzzy, c-format #| msgid "%d downgrade" #| msgid_plural "%d downgrades" @@ -5124,42 +5137,42 @@ msgid "%s downgrade" msgid_plural "%s downgrades" msgstr[0] "%d 個可下載" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, fuzzy, c-format #| msgid "Audit ^Recommendations" msgid "%s unresolved recommendation" msgid_plural "%s unresolved recommendations" msgstr[0] "檢查推薦結果(^R)" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 #, fuzzy #| msgid "No more solutions." msgid "No solutions yet." msgstr "沒有更多的解決方案了。" -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 #, fuzzy #| msgid "Dependency handling" msgid "No dependency solution was found." msgstr "處理相依關係" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 #, fuzzy #| msgid "No more solutions." msgid "No solutions." msgstr "沒有更多的解決方案了。" -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, fuzzy, c-format #| msgid "No more solutions." msgid "%u solutions." msgstr "沒有更多的解決方案了。" -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, fuzzy, c-format #| msgid "Could not open file \"%s\"" msgid "Solution %s of %s." @@ -5463,12 +5476,12 @@ msgstr " 不支援 Ept\n" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s 編譯於 %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5617,29 +5630,35 @@ msgstr " show - 顯示套件細節資訊\n" #: src/main.cc:213 #, fuzzy, c-format +#| msgid " show - Display detailed information about a package\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - 顯示套件細節資訊\n" + +#: src/main.cc:214 +#, fuzzy, c-format #| msgid " clean - Erase downloaded package files\n" msgid " clean - Erase downloaded package files.\n" msgstr " clean - 刪除已下載的套件檔案\n" -#: src/main.cc:214 +#: src/main.cc:215 #, fuzzy, c-format #| msgid " autoclean - Erase old downloaded package files\n" msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean - 刪除舊的已下載套件檔案\n" -#: src/main.cc:215 +#: src/main.cc:216 #, fuzzy, c-format #| msgid " changelog - View a package's changelog\n" msgid " changelog - View a package's changelog.\n" msgstr " changelog - 查看套件的更改紀錄\n" -#: src/main.cc:216 +#: src/main.cc:217 #, fuzzy, c-format #| msgid " download - Download the .deb file for a package\n" msgid " download - Download the .deb file for a package.\n" msgstr " download - 下載套件的 .deb 檔案\n" -#: src/main.cc:217 +#: src/main.cc:218 #, fuzzy, c-format #| msgid "" #| " reinstall - Download and (possibly) reinstall a currently installed " @@ -5649,18 +5668,22 @@ msgid "" "package.\n" msgstr " reinstall - 下載並(可能)重新安裝一個現在已經安裝了的套件\n" -#: src/main.cc:218 -#, c-format +#: src/main.cc:219 +#, fuzzy, c-format +#| msgid "" +#| " why - Show the manually installed packages that require a " +#| "package, or\n" +#| " why one or more packages would require the given package\n" msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " why - Show the manually installed packages that require a package, " "or\n" " why one or more packages would require the given package\n" -#: src/main.cc:220 +#: src/main.cc:221 #, fuzzy, c-format #| msgid "" #| " why-not - Show the manually installed packages that lead to a " @@ -5678,58 +5701,58 @@ msgstr "" " 或為何安裝指定套件時會導致一個或更\n" " 多的套件產生衝突\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " 選項：\n" -#: src/main.cc:225 +#: src/main.cc:226 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " -h This help text.\n" msgstr " -h 此求助純文字\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr "" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr "" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h 此求助純文字\n" -#: src/main.cc:232 +#: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr "" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s 模擬動作，但是並不真正執行。\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr " -d 僅僅下載套件，不安裝或者移除任何東西。\n" -#: src/main.cc:236 +#: src/main.cc:237 #, fuzzy, c-format #| msgid " -P Always prompt for confirmation or actions\n" -msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P 總是提示確認執行動作\n" -#: src/main.cc:237 +#: src/main.cc:238 #, fuzzy, c-format #| msgid "" #| " -y Assume that the answer to simple yes/no questions is " @@ -5738,7 +5761,7 @@ msgid "" " -y Assume that the answer to simple yes/no questions is 'yes'.\n" msgstr " -y 假設對簡單的 是/否 問題回答“是”\n" -#: src/main.cc:238 +#: src/main.cc:239 #, fuzzy, c-format #| msgid "" #| " -F format Specify a format for displaying search results; see the " @@ -5748,7 +5771,7 @@ msgid "" "manual.\n" msgstr " -F 格式 指定顯示搜尋結果的格式；參見手冊\n" -#: src/main.cc:239 +#: src/main.cc:240 #, fuzzy, c-format #| msgid "" #| " -O order Specify how search results should be sorted; see the " @@ -5758,7 +5781,7 @@ msgid "" "manual.\n" msgstr " -O 次序 指定如何排列顯示搜尋結果；參見手冊\n" -#: src/main.cc:240 +#: src/main.cc:241 #, fuzzy, c-format #| msgid "" #| " -w width Specify the display width for formatting search results\n" @@ -5766,28 +5789,28 @@ msgid "" " -w width Specify the display width for formatting search results.\n" msgstr " -w 寬度 指定顯示搜尋結果的格式寬度\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr " -f 積極地嘗試修復損壞的套件。\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr " -V 顯示就要安裝的套件版本。\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr " -D 顯示自動改變的套件的依賴關係\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr " -Z\t\t 顯示每個套件的安裝尺寸的變化。\n" -#: src/main.cc:245 +#: src/main.cc:246 #, fuzzy, c-format #| msgid "" #| " -v Display extra information. (may be supplied multiple " @@ -5797,7 +5820,7 @@ msgid "" "times).\n" msgstr " -v 顯示附加訊息。(可能會提供多次) \n" -#: src/main.cc:246 +#: src/main.cc:247 #, fuzzy, c-format #| msgid "" #| " -t [release] Set the release from which packages should be installed\n" @@ -5805,60 +5828,60 @@ msgid "" " -t [release] Set the release from which packages should be installed.\n" msgstr " -t [release] 設置將要安裝的套件的發布版本\n" -#: src/main.cc:247 +#: src/main.cc:248 #, fuzzy, c-format #| msgid "" #| " -q In command-line mode, suppress the incremental progress\n" #| " indicators.\n" msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr " -q 在命令列狀態下，不顯示進度。\n" -#: src/main.cc:249 +#: src/main.cc:250 #, fuzzy, c-format #| msgid " -o key=val Directly set the configuration option named 'key'\n" msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr " -o key=val 直接指定名稱為 'key' 的設定選項\n" -#: src/main.cc:250 +#: src/main.cc:251 #, fuzzy, c-format #| msgid "" #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" #| " strong dependencies\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr " --with(out)-recommends\t指定是否將推薦(建議)處理為強依賴關係。\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr " -S fname 從檔案名中讀取 aptitude 的延伸狀態資訊。\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u 開始執行時下載新的套件列表。\n" -#: src/main.cc:254 src/main.cc:256 -#, c-format -msgid " (terminal interface only)" -msgstr "" +#: src/main.cc:255 src/main.cc:257 +#, fuzzy, c-format +msgid " (terminal interface only)\n" +msgstr " -h 此求助純文字\n" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i 開始執行時執行安裝。\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " 這個 aptitude 無超級牛力。\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 #, fuzzy #| msgid "true" msgid "trace" @@ -5866,13 +5889,13 @@ msgstr "真" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 #, fuzzy #| msgid "no" msgid "info" @@ -5880,13 +5903,13 @@ msgstr "否" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 #, fuzzy #| msgid "Err " msgid "error" @@ -5894,7 +5917,7 @@ msgstr "錯誤 " #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 #, fuzzy #| msgid "false" msgid "fatal" @@ -5902,95 +5925,95 @@ msgstr "否" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " "\"warn\", \"error\", \"fatal\", or \"off\")." msgstr "" -#: src/main.cc:487 +#: src/main.cc:488 #, fuzzy, c-format #| msgid "Invalid operation %s" msgid "Invalid logger name \"%s\"." msgstr "無效的操作“%s”" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "在 -q= 之後需要一個數字\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "在 -q= 之後需要一個數字，但卻得到 %s\n" -#: src/main.cc:802 +#: src/main.cc:794 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o 需要如key=value格式的參數，卻得到%s\n" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "標誌“%s”後沒有逗點。\n" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "詭異：收到未知的選項代碼\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "" -#: src/main.cc:1039 +#: src/main.cc:1023 #, fuzzy #| msgid "Package" msgid "first-package" msgstr "套件" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "" -#: src/main.cc:1043 +#: src/main.cc:1027 #, fuzzy #| msgid "All Packages" msgid "all-packages" msgstr "全部包" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -5998,7 +6021,7 @@ msgid "" "versions\"." msgstr "" -#: src/main.cc:1089 +#: src/main.cc:1073 #, fuzzy #| msgid "Only one of -u and -i may be specified\n" msgid "" @@ -6006,7 +6029,7 @@ msgid "" "specified\n" msgstr "選項 -u 和 -i 只能指定一個\n" -#: src/main.cc:1098 +#: src/main.cc:1082 #, fuzzy #| msgid "" #| "-u and -i may not be specified in command-line mode (eg, with 'install')" @@ -6015,23 +6038,23 @@ msgid "" "(eg, with 'install')" msgstr "選項 -u 和 -i 不能在命令行模式中指定 (例如，和“install”一起)" -#: src/main.cc:1115 +#: src/main.cc:1099 #, fuzzy #| msgid "-u and -i may not be specified with a command" msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "選項 -u 和 -i 不能在和一個命令一起指定 " -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "未知的命令“%s”\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "未知的例外：%s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" @@ -6040,7 +6063,8 @@ msgstr "" "回溯：\n" "%s\n" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "搜尋：" @@ -6911,148 +6935,152 @@ msgstr "取代" msgid "obsoletes" msgstr "荒廢" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr " (由 %F 提供)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." msgstr "如果你選擇了一個套件，它的敘述將會顯示在此空白處。" -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" msgstr "%B%s%b 已自動安裝; 它將與相依的套件一起被移除: " -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "%B%s%b 將會由於相依性錯誤自動移除:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "%B%s%b 將會自動安裝以滿足以下的關聯性:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." msgstr "%B%s%b 目前將不會升級，但如果可以升級，它依舊會保持在版本 %B%s%b。" -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" msgstr "%B%s%b 將會升級到 %B%s%b, 以避免破壞以下相依性:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b 已安裝。" -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b 尚未安裝。" -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "%B%s%b 的某些關聯將不會滿足:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "%B%s%b 將會降級。" -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b 遭禁制，將不會升級到版本 %B%s%b。" -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." msgstr "%B%s%b 可以升級到版本 %B%s%b，但它將會保持為版本 %B%s%b。" -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b 將被重新安裝。" -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b 將被安裝。" -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b 將被移除。" -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b 將從版本 %B%s%b 升級到版本 %B%s%b。" -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "%B%s%b只有部份安裝；它的安裝程序將會完成。" -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "以下套件將會由於 %B%s%b 遭到移除而毀斷:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "以下相依於·%B%s%b 的套件將毀損:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" msgstr "以下套件與 %B%s%b 衝突 且將在此次安裝中毀斷:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " "installed version:" msgstr "以下套件相依於 %B%s%b，而非目前安裝版本 %B%s%b，或與目前安裝版本衝突:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." msgstr "以下套件與 %B%s%b 衝突，或相依於將不被安裝的版本。" -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "以下套件與 %B%s%b 衝突:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" msgstr "以下套件相依於版本 %B%s%b 而非現有安裝的版本 %B%s%b:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." msgstr "以下相依於版本 %B%s%b 的套件將不會安裝。" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "已升級" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "已下載" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -7061,13 +7089,13 @@ msgstr "" "以下套件相依於現有安裝版本 %B%s%b (%b%s%b)，或與版本 %s (%B%s%b) 衝突，且 若" "為 %s 將造成毀斷。" -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." msgstr "以下套件與版本 %B%s%b 的 %B%s%b 衝突，使用 %s 將會造成毀斷。" -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -7101,47 +7129,47 @@ msgstr "套用" msgid "Close" msgstr "關閉" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s 和 %s 衝突 [由 %s %s 提供]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "%s 移除中" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "正在安裝 %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%B移除%b 下列套件：%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%B安裝%b 下列套件：%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%B保持%b 下列套件於其當前版本：%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%B升級%b 下列套件：%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%B降級%b 下列套件：%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "保留下列未解決的相依關係：%n" @@ -7239,10 +7267,6 @@ msgstr "E:" msgid "W:" msgstr "W:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "搜尋：" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7597,7 +7621,9 @@ msgid "Error while dumping resolver state" msgstr "傾印相依關係解決狀態時出錯" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "傾印相依賴關係解決狀態的檔案：" #: src/ui.cc:2265 @@ -8095,6 +8121,21 @@ msgid "You can only view changelogs of official Debian packages." msgstr "您只能閱讀官方 Debian 套件的更改紀錄。" #~ msgid "" +#~ "%BOption:%b %s\n" +#~ "%BDefault:%b %s\n" +#~ "%BValue:%b %s\n" +#~ msgstr "" +#~ "%B 選項:%b %s\n" +#~ "%B 預設:%b %s\n" +#~ "%B 值:%b %s\n" + +#~ msgid "Press Return to continue" +#~ msgstr "按 Return 繼續。" + +#~ msgid "Search for:" +#~ msgstr "搜尋：" + +#~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." #~ msgstr "未能解決升級時產生的相依問題。(解決器逾時)" @@ -8220,11 +8261,6 @@ msgstr "您只能閱讀官方 Debian 套件的更改紀錄。" #~ msgid "gtk-yes" #~ msgstr "是" -#, fuzzy -#~| msgid "Invalid operation %s" -#~ msgid "Invalid command-line option '%s'" -#~ msgstr "無效的操作“%s”" - #~ msgid "but it is not installable" #~ msgstr "但這無法安裝" @@ -8411,10 +8447,6 @@ msgstr "您只能閱讀官方 Debian 套件的更改紀錄。" #~ " lead to a conflict with the given package if installed\n" #~ msgstr " -V 顯示就要安裝的套件版本。\n" -#, fuzzy -#~ msgid " indicators.\n" -#~ msgstr " -h 此求助純文字\n" - #~ msgid "Downloading " #~ msgstr "正在下載 " |