summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-01-25 21:54:52 +0100
committerMichael Vogt <mvo@debian.org>2014-01-25 21:54:52 +0100
commit62dcafb391a940534d5fb3b804dc461b1187d706 (patch)
tree83d28ffd4b0af97a0bba4f59c9a44e18091186b6 /po
parente093518c03b49a2def83d8b680be4490fed6e69c (diff)
parent8c39c4b6e65036390b8ca4d74174192739a4139d (diff)
Merge branch 'debian/experimental-no-abi-break' into debian/sid
Diffstat (limited to 'po')
-rw-r--r--po/ar.po227
-rw-r--r--po/ast.po245
-rw-r--r--po/bg.po246
-rw-r--r--po/bs.po227
-rw-r--r--po/ca.po245
-rw-r--r--po/cs.po247
-rw-r--r--po/cy.po227
-rw-r--r--po/da.po247
-rw-r--r--po/de.po247
-rw-r--r--po/dz.po227
-rw-r--r--po/el.po227
-rw-r--r--po/es.po245
-rw-r--r--po/eu.po227
-rw-r--r--po/fi.po227
-rw-r--r--po/fr.po247
-rw-r--r--po/gl.po245
-rw-r--r--po/hu.po246
-rw-r--r--po/it.po246
-rw-r--r--po/ja.po245
-rw-r--r--po/km.po227
-rw-r--r--po/ko.po244
-rw-r--r--po/ku.po227
-rw-r--r--po/lt.po227
-rw-r--r--po/mr.po227
-rw-r--r--po/nb.po245
-rw-r--r--po/ne.po227
-rw-r--r--po/nl.po245
-rw-r--r--po/nn.po227
-rw-r--r--po/pl.po247
-rw-r--r--po/pt.po246
-rw-r--r--po/pt_BR.po227
-rw-r--r--po/ro.po228
-rw-r--r--po/ru.po247
-rw-r--r--po/sk.po247
-rw-r--r--po/sl.po248
-rw-r--r--po/sv.po245
-rw-r--r--po/th.po240
-rw-r--r--po/tl.po227
-rw-r--r--po/tr.po246
-rw-r--r--po/uk.po247
-rw-r--r--po/vi.po245
-rw-r--r--po/zh_CN.po236
-rw-r--r--po/zh_TW.po227
43 files changed, 5715 insertions, 4524 deletions
diff --git a/po/ar.po b/po/ar.po
index 081e8de47..483401781 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2006-10-20 21:28+0300\n"
"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
"Language-Team: Arabic <support@arabeyes.org>\n"
@@ -96,7 +96,7 @@ msgid "Total space accounted for: "
msgstr "مجموع المساحة المحسوب حسابها:"
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr ""
@@ -104,7 +104,7 @@ msgstr ""
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "لم يُعثر على أية حزم"
@@ -546,7 +546,7 @@ msgstr "%s هي النسخة الأحدث.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -575,6 +575,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -592,14 +597,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -635,11 +644,11 @@ msgid "File not found"
msgstr "لم يُعثر على الملف"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "فشيل تنفيذ stat"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "فشل تعيين وقت التعديل"
@@ -714,9 +723,9 @@ msgstr ""
msgid "Protocol corruption"
msgstr ""
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "خطأ في الكتابة"
@@ -728,7 +737,7 @@ msgstr ""
msgid "Could not connect data socket, connection timed out"
msgstr ""
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "فشل"
@@ -970,7 +979,7 @@ msgstr "فشل الاتصال"
msgid "Internal error"
msgstr "خطأ داخلي"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1203,101 +1212,101 @@ msgstr "تثبيت هذه الحزم دون التحقق منها؟"
msgid "Failed to fetch %s %s\n"
msgstr "فشل إحضار %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [مُثبّتة]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [مُثبّتة]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [مُثبّتة]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr ""
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "إلا أن %s مثبت"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "إلا أنه سيتم تثبيت %s"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "إلا أنه غير قابل للتثبيت"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "إلا أنها حزمة وهمية"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "إلا أنها غير مثبتة"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "إلا أنه لن يتم تثبيتها"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " أو"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "سيتم تثبيت الحزم الجديدة التالية:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "سيتم إزالة الحزم التالية:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "سيتم الإبقاء على الحزم التالية:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "ستتم ترقية الحزم التالية:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "سيتم تثبيط الحزم التالية:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "سيتم تغيير الحزم المبقاة التالية:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (بسبب %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1305,27 +1314,27 @@ msgstr ""
"تحذير: ستتم إزالة الحزم الأساسية التالية.\n"
"لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً، "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu أعيد تثبيتها، "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu مثبطة، "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu غير مثبتة بالكامل أو مزالة.\n"
@@ -1334,7 +1343,7 @@ msgstr "%lu غير مثبتة بالكامل أو مزالة.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[Y/n]"
@@ -1342,21 +1351,21 @@ msgstr "[Y/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[y/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -1397,16 +1406,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "لا يقبل الأمر update أية مُعطيات"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "حساب الترقية..."
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "تمّ"
@@ -1414,7 +1423,19 @@ msgstr "تمّ"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1426,12 +1447,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "فشل تغيير اسم %s إلى %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1477,8 +1498,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1516,20 +1537,6 @@ msgstr "فشل إغلاق الملف %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr ""
@@ -2506,76 +2513,86 @@ msgstr ""
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "فتح %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr ""
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2787,35 +2804,35 @@ msgstr "الحجم غير متطابق"
msgid "Invalid file format"
msgstr "عمليّة غير صالحة %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2823,24 +2840,24 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3154,57 +3171,61 @@ msgstr "التحضير لإزالة %s بالكامل"
msgid "Completely removed %s"
msgstr "تمت إزالة %s بالكامل"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "تعذرت الكتابة إلى %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/ast.po b/po/ast.po
index 723546842..e26ac48e1 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.18\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2010-10-02 23:35+0100\n"
"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
"Language-Team: Asturian (ast)\n"
@@ -89,7 +89,7 @@ msgid "Total space accounted for: "
msgstr "Informe del total d'espaciu: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "El ficheru de paquetes %s nun ta sincronizáu."
@@ -97,7 +97,7 @@ msgstr "El ficheru de paquetes %s nun ta sincronizáu."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Nun s'alcontraron paquetes"
@@ -652,7 +652,7 @@ msgstr "%s yá ta na versión más nueva.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperaba %s pero nun taba ellí"
@@ -681,6 +681,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -698,14 +703,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -741,11 +750,11 @@ msgid "File not found"
msgstr "Nun s'atopa'l ficheru."
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Falló al lleer"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Nun se pudo afitar la hora de modificación"
@@ -820,9 +829,9 @@ msgstr "Una rempuesta revirtió'l buffer."
msgid "Protocol corruption"
msgstr "Corrupción del protocolu"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Fallu d'escritura"
@@ -834,7 +843,7 @@ msgstr "Nun se pudo crear un socket"
msgid "Could not connect data socket, connection timed out"
msgstr "Nun se pudo coneutar el zócalu de datos; gandió'l tiempu de conexón"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Falló"
@@ -1079,7 +1088,7 @@ msgstr "Fallo la conexón"
msgid "Internal error"
msgstr "Fallu internu"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1325,101 +1334,101 @@ msgstr "¿Instalar esos paquetes ensin verificación?"
msgid "Failed to fetch %s %s\n"
msgstr "Falló algamar %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Instaláu]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Instaláu]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Instaláu]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Los siguientes paquetes nun cumplen dependencies:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "pero %s ta instaláu"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "pero %s ta pa instalar"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "pero nun ye instalable"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "pero ye un paquete virtual"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "pero nun ta instaláu"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "pero nun va instalase"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " o"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Van instalase los siguientes paquetes NUEVOS:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Los siguientes paquetes van DESANICIASE:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Los siguientes paquetes tan reteníos:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Los siguientes paquetes van actualizase:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Los siguientes paquetes van DESACTUALIZASE:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Van camudase los siguientes paquetes reteníos:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (por %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1427,27 +1436,27 @@ msgstr ""
"AVISU: Los siguientes paquetes esenciales van desaniciase.\n"
"¡Esto NUN hai que facelo si nun sabes esautamente lo que faes!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu actualizaos, %lu nuevos instalaos, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalaos, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desactualizaos, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu para desaniciar y %lu nun actualizaos.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nun instalaos dafechu o desaniciaos.\n"
@@ -1456,7 +1465,7 @@ msgstr "%lu nun instalaos dafechu o desaniciaos.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[S/n]"
@@ -1464,21 +1473,21 @@ msgstr "[S/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[s/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "S"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error de compilación d'espresión regular - %s"
@@ -1519,16 +1528,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "La orde update nun lleva argumentos"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Calculando l'anovamientu... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Error internu, AllUpgrade rompió coses"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Fecho"
@@ -1536,7 +1545,19 @@ msgstr "Fecho"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1553,12 +1574,12 @@ msgstr ""
" asina que nun dependen de la pertinencia de la verdadera situación "
"actual!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Nun pudo renomase %s como %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1604,8 +1625,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1643,24 +1664,6 @@ msgstr "Nun s'alcontró ficheru espeyu '%s'"
msgid "[Mirror: %s]"
msgstr "[Espeyu: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Nun pudo parchease %s con mmap y col usu de la operación de ficheru - el "
-"parche parez corruptu."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Nun pudo parchease %s con mmap (pero nun ye un fallu especificu de mmap) - "
-"el parche parez corruptu."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Falló criar un tubu IPC al soprocesu"
@@ -2720,79 +2723,89 @@ msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Nun se pudo tratar el ficheru de paquetes %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís d'URI)"
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Llinia %lu mal formada na llista d'oríxe %s ([opción] nun parcheable)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"Llinia %lu mal formada na llista d'oríxenes %s ([option] enforma curtia)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Llinia %lu mal formada na llista d'oríxenes %s ([%s] nun ye una asignación)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Llinia %lu mal formada na llista d'oríxenes %s ([%s] nun tien clave)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Llinia %lu mal formada na llista d'oríxenes %s ([%s] clave %s nun tien valor)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Llinia %lu mal formada na llista d'oríxenes %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Llinia %lu mal formada na llista d'oríxenes %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís d'URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Llinia %lu mal formada na llista d'oríxenes %s (dist absoluta)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís de dist)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Abriendo %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Llinia %u enforma llarga na llista d'oríxenes %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Llinia %u mal formada na llista d'oríxenes %s (triba)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3014,35 +3027,35 @@ msgstr "El tamañu nun concasa"
msgid "Invalid file format"
msgstr "Operación incorreuta: %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nun se pudo parchear el ficheru release %s"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "Nun hai clave pública denguna disponible pa les IDs de clave darréu:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Conflictu de distribución: %s (esperábase %s pero obtúvose %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3052,12 +3065,12 @@ msgstr ""
"anováu y va usase un ficheru índiz. Fallu GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "Fallu GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3066,12 +3079,12 @@ msgstr ""
"Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que "
"necesites iguar manualmente esti paquete (por faltar una arquitectura)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3405,33 +3418,37 @@ msgstr "Preparándose pa desinstalar dafechu %s"
msgid "Completely removed %s"
msgstr "Desinstalóse dafechu %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Nun se pue escribir en %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr "Ensin informe escritu d'apport porque MaxReports llegó dafechu"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "problemes de dependencies - déxase ensin configurar"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3439,7 +3456,7 @@ msgstr ""
"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu que "
"siguió dende un fallu previu"
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3447,7 +3464,7 @@ msgstr ""
"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
"discu llenu"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3455,7 +3472,7 @@ msgstr ""
"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
"memoria"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3464,7 +3481,7 @@ msgstr ""
"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
"discu llenu"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3499,6 +3516,20 @@ msgstr ""
msgid "Not locked"
msgstr "Non bloquiáu"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Nun pudo parchease %s con mmap y col usu de la operación de ficheru - el "
+#~ "parche parez corruptu."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Nun pudo parchease %s con mmap (pero nun ye un fallu especificu de mmap) "
+#~ "- el parche parez corruptu."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Nota, escoyendo '%s' pa la xera '%s'\n"
diff --git a/po/bg.po b/po/bg.po
index bb93a3e72..6dd0822a5 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.21\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-06-25 17:23+0300\n"
"Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -95,7 +95,7 @@ msgid "Total space accounted for: "
msgstr "Общо отчетено пространство: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Пакетният файл %s не е синхронизиран."
@@ -103,7 +103,7 @@ msgstr "Пакетният файл %s не е синхронизиран."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Няма намерени пакети"
@@ -659,7 +659,7 @@ msgstr "Пакетът „%s“ вече е задържан.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Изчака се завършването на %s, но той не беше пуснат"
@@ -679,6 +679,7 @@ msgid "Executing dpkg failed. Are you root?"
msgstr "Неуспех при изпълняване на dpkg. Имате ли административни права?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -688,6 +689,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -724,14 +730,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -767,11 +777,11 @@ msgid "File not found"
msgstr "Файлът не е намерен"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Неуспех при получаването на атрибути"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Неуспех при задаването на време на промяна"
@@ -846,9 +856,9 @@ msgstr "Отговорът препълни буфера."
msgid "Protocol corruption"
msgstr "Развален протокол"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Грешка при запис"
@@ -862,7 +872,7 @@ msgstr ""
"Неуспех при свързването на гнездо за данни, допустимото време за свързване "
"изтече"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Неуспех"
@@ -1110,7 +1120,7 @@ msgstr "Неуспех при свързването"
msgid "Internal error"
msgstr "Вътрешна грешка"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1358,101 +1368,101 @@ msgstr "Инсталиране на тези пакети без проверк
msgid "Failed to fetch %s %s\n"
msgstr "Неуспех при изтеглянето на %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Инсталиран]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Инсталиран]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Инсталиран]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Следните пакети имат неудовлетворени зависимости:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "но е инсталиран %s"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "но ще бъде инсталиран %s"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "но той не може да бъде инсталиран"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "но той е виртуален пакет"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "но той не е инсталиран"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "но той няма да бъде инсталиран"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " или"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Следните НОВИ пакети ще бъдат инсталирани:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Следните пакети няма да бъдат променени:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Следните пакети ще бъдат актуализирани:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Следните задържани пакети ще бъдат променени:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (поради %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1460,27 +1470,27 @@ msgstr ""
"ПРЕДУПРЕЖДЕНИЕ: Следните необходими пакети ще бъдат премахнати.\n"
"Това НЕ би трябвало да става освен ако знаете точно какво правите!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu актуализирани, %lu нови инсталирани, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu преинсталирани, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu върнати към по-стара версия, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu за премахване и %lu без промяна.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu не са напълно инсталирани или премахнати.\n"
@@ -1489,7 +1499,7 @@ msgstr "%lu не са напълно инсталирани или премах
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[Y/n]"
@@ -1497,21 +1507,21 @@ msgstr "[Y/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[y/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Грешка при компилирането на регулярния израз - %s"
@@ -1554,16 +1564,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Командата „update“ не възприема аргументи"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Изчисляване на актуализацията..."
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Готово"
@@ -1571,7 +1581,19 @@ msgstr "Готово"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1587,12 +1609,12 @@ msgstr ""
" Заключването е деактивирано, така че не разчитайте\n"
" на повтаряемост в реална ситуация."
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Неуспех при преименуването на %s на %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1638,8 +1660,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1677,24 +1699,6 @@ msgstr "Грешка при четене файла „%s“ от огледал
msgid "[Mirror: %s]"
msgstr "[Огледален сървър: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Неуспех при закърпване на %s с mmap и операции с файл – кръпката изглежда "
-"повредена."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Неуспех при закърпване на %s с mmap (без грешка, специфична за mmap) – "
-"кръпката изглежда повредена."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Неуспех при създаването на IPC pipe към подпроцеса"
@@ -2758,83 +2762,93 @@ msgstr "Неуспех при анализирането на пакетен ф
msgid "Unable to parse package file %s (2)"
msgstr "Неуспех при анализирането на пакетен файл %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)"
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Лошо форматиран ред %lu в списъка с източници %s (неразбираема [опция])"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"Лошо форматиран ред %lu в списъка с източници %s (твърде кратка [опция])"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Лошо форматиран ред %lu в списъка с източници %s ([%s] не е присвояване)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Лошо форматиран ред %lu в списъка с източници %s (липсва ключ в [%s])"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Лошо форматиран ред %lu в списъка с източници %s ([%s] ключът %s няма "
"стойност)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Лошо форматиран ред %lu в списъка с източници %s (адрес-URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Лошо форматиран ред %lu в списъка с източници %s (дистрибуция)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
"Лошо форматиран ред %lu в списъка с източници %s (неограничена дистрибуция)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
"Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Отваряне на %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Ред %u в списъка с източници %s е твърде дълъг."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен."
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен."
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3066,7 +3080,7 @@ msgstr "Несъответствие на размера"
msgid "Invalid file format"
msgstr "Невалидна операция %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3075,16 +3089,16 @@ msgstr ""
"Не може да се открие елемент „%s“ във файла Release (объркан ред в sources."
"list или повреден файл)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Не е открита контролна сума за „%s“ във файла Release"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3093,12 +3107,12 @@ msgstr ""
"Файлът със служебна информация за „%s“ е остарял (валиден до %s). Няма да се "
"прилагат обновявания от това хранилище."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Конфликт в дистрибуцията: %s (очаквана: %s, намерена: %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3108,12 +3122,12 @@ msgstr ""
"използват старите индексни файлове. Грешка от GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "Грешка от GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3122,12 +3136,12 @@ msgstr ""
"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
"ръчно да оправите този пакет (поради пропусната архитектура)."
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Не е открит източник, от който да се изтегли версия „%s“ на „%s“"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3459,35 +3473,39 @@ msgstr "Подготовка за пълно премахване на %s"
msgid "Completely removed %s"
msgstr "%s е напълно премахнат"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Неуспех при записа на %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "Операцията е прекъсната"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Поради достигане на максималния брой доклади (MaxReports) не е записан нов "
"доклад за зависимостите."
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "отлагане на настройката поради неудовлетворени зависимости"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3495,7 +3513,7 @@ msgstr ""
"Доклад за зависимостите не е записан защото съобщението за грешка е породено "
"от друга грешка."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3503,7 +3521,7 @@ msgstr ""
"Доклад за зависимостите не е записан защото грешката е причинена от "
"недостатъчно дисково пространство"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3511,7 +3529,7 @@ msgstr ""
"Доклад за зависимостите не е записан защото грешката е причинена от "
"недостатъчна оперативна памет"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3520,7 +3538,7 @@ msgstr ""
"Доклад за зависимостите не е записан защото грешката е причинена от "
"недостатъчно дисково пространство"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3556,6 +3574,20 @@ msgstr ""
msgid "Not locked"
msgstr "Без заключване"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Неуспех при закърпване на %s с mmap и операции с файл – кръпката изглежда "
+#~ "повредена."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Неуспех при закърпване на %s с mmap (без грешка, специфична за mmap) – "
+#~ "кръпката изглежда повредена."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Избиране на %s за задача „%s“\n"
diff --git a/po/bs.po b/po/bs.po
index 1f3a0a13a..79cc5ec5d 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2004-05-06 15:25+0100\n"
"Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
"Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -92,7 +92,7 @@ msgid "Total space accounted for: "
msgstr ""
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr ""
@@ -100,7 +100,7 @@ msgstr ""
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Paketi nisu pronađeni"
@@ -552,7 +552,7 @@ msgstr ""
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -581,6 +581,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -598,14 +603,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -641,11 +650,11 @@ msgid "File not found"
msgstr "Datoteka nije pronađena"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr ""
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr ""
@@ -719,9 +728,9 @@ msgstr ""
msgid "Protocol corruption"
msgstr "Oštećenje protokola"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Greška pri pisanju"
@@ -733,7 +742,7 @@ msgstr ""
msgid "Could not connect data socket, connection timed out"
msgstr ""
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Neuspješno"
@@ -976,7 +985,7 @@ msgstr "Povezivanje neuspješno"
msgid "Internal error"
msgstr "Unutrašnja greška"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1203,128 +1212,128 @@ msgstr ""
msgid "Failed to fetch %s %s\n"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr "[Instalirano]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr "[Instalirano]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr "[Instalirano]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr ""
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "ali je %s instaliran"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "ali se %s treba instalirati"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "ali se ne može instalirati"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "ali je virtuelni paket"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "ali nije instaliran"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "ali se neće instalirati"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " ili"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Slijedeći NOVI paketi će biti instalirani:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Slijedeći paketi će biti UKLONJENI:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
#, fuzzy
msgid "The following packages have been kept back:"
msgstr "Slijedeći paketi su zadržani:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Slijedeći paketi će biti nadograđeni:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr ""
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr ""
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr ""
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr ""
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr ""
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr ""
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr ""
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr ""
@@ -1333,7 +1342,7 @@ msgstr ""
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr ""
@@ -1341,21 +1350,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -1396,15 +1405,15 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr ""
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Računam nadogradnju..."
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
msgid "Internal error, Upgrade broke stuff"
msgstr ""
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Urađeno"
@@ -1412,7 +1421,19 @@ msgstr "Urađeno"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1424,12 +1445,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Ne mogu otvoriti %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1472,8 +1493,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1511,20 +1532,6 @@ msgstr "Ne mogu otvoriti %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr ""
@@ -2501,76 +2508,86 @@ msgstr ""
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Otvaram %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr ""
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2780,35 +2797,35 @@ msgstr ""
msgid "Invalid file format"
msgstr ""
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Ne mogu otvoriti DB datoteku %s"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2816,24 +2833,24 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3147,57 +3164,61 @@ msgstr ""
msgid "Completely removed %s"
msgstr "Ne mogu ukloniti %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Ne mogu zapisati na %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index be559ae68..342f71b42 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.6\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-10-19 13:30+0200\n"
"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -92,7 +92,7 @@ msgid "Total space accounted for: "
msgstr "Nombre total de l'espai atribuït a: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "El fitxer %s del paquet està desincronitzat."
@@ -100,7 +100,7 @@ msgstr "El fitxer %s del paquet està desincronitzat."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "No s'han trobat paquets"
@@ -663,7 +663,7 @@ msgstr "%s ja estava no retingut.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperava %s però no hi era"
@@ -692,6 +692,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -709,14 +714,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -752,11 +761,11 @@ msgid "File not found"
msgstr "Fitxer no trobat"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "L'estat ha fallat"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "No s'ha pogut establir el temps de modificació"
@@ -831,9 +840,9 @@ msgstr "Una resposta ha desbordat la memòria intermèdia."
msgid "Protocol corruption"
msgstr "Protocol corromput"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Error d'escriptura"
@@ -845,7 +854,7 @@ msgstr "No s'ha pogut crear un sòcol"
msgid "Could not connect data socket, connection timed out"
msgstr "No s'ha pogut connectar amb el sòcol de dades, connexió finalitzada"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Ha fallat"
@@ -1095,7 +1104,7 @@ msgstr "Ha fallat la connexió"
msgid "Internal error"
msgstr "Error intern"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1348,101 +1357,101 @@ msgstr "Voleu instaŀlar aquests paquets sense verificar-los?"
msgid "Failed to fetch %s %s\n"
msgstr "No s'ha pogut obtenir %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Instaŀlat]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Instaŀlat]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Instaŀlat]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Els següents paquets tenen dependències sense satisfer:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "però està instaŀlat %s"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "però s'instaŀlarà %s"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "però no és instaŀlable"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "però és un paquet virtual"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "però no està instaŀlat"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "però no serà instaŀlat"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " o"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "S'instaŀlaran els paquets NOUS següents:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Es SUPRIMIRAN els paquets següents:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "S'han mantingut els paquets següents:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "S'actualitzaran els paquets següents:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Es DESACTUALITZARAN els paquets següents:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Es canviaran els paquets retinguts següents:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (per %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1450,27 +1459,27 @@ msgstr ""
"AVÍS: Es suprimiran els paquets essencials següents.\n"
"Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu actualitzats, %lu nous a instaŀlar, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstaŀlats, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desactualitzats, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu a suprimir i %lu no actualitzats.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu no instaŀlats o suprimits completament.\n"
@@ -1479,7 +1488,7 @@ msgstr "%lu no instaŀlats o suprimits completament.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[S/n]"
@@ -1487,21 +1496,21 @@ msgstr "[S/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[s/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "S"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "S'ha produït un error de compilació de l'expressió regular - %s"
@@ -1542,16 +1551,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "L'ordre update no pren arguments"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "S'està calculant l'actualització… "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Error intern, AllUpgrade ha trencat coses"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Fet"
@@ -1559,7 +1568,19 @@ msgstr "Fet"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1575,12 +1596,12 @@ msgstr ""
" Tingueu en ment que el bloqueig està desactivat,\n"
" per tant, no es depèn de la situació actual real."
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "No s'ha pogut canviar el nom de %s a %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1626,8 +1647,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1665,24 +1686,6 @@ msgstr "No es pot llegir el fitxer rèplica «%s»"
msgid "[Mirror: %s]"
msgstr "[Rèplica: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"No s'ha pogut apedaçar %s amb el mmap ni amb la utilització de la operació "
-"del fitxer - el pedaç sembla ser incorrecte"
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"No s'ha pogut apedaçar %s amb el mmap (però no s'ha produït un error "
-"específic del mmap) - el pedaç sembla ser incorrecte"
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "No s'ha pogut crear el conducte IPC al subprocés"
@@ -2743,79 +2746,89 @@ msgstr "No es pot analitzar el fitxer del paquet %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "No es pot analitzar el fitxer del paquet %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)"
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Línia %lu malformada en la llista de fonts %s ([opció] no reconeixible)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Línia %lu malformada en la llista de fonts %s ([opció] massa curta)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Línia %lu malformada en la llista de fonts %s ([%s] no és una assignació)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Línia %lu malformada en la llista de fonts %s ([%s] no té clau)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Línia %lu malformada en la llista de fonts %s ([%s] la clau %s no té valor)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Línia %lu malformada en la llista de fonts %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Línia %lu malformada en la llista de fonts %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Línia %lu malformada en la llista de fonts %s (dist absoluta)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Línia %lu malformada en la llista de fonts %s (analitzant dist)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "S'està obrint %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "La línia %u és massa llarga en la llista de fonts %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "La línia %u és malformada en la llista de fonts %s (tipus)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3048,7 +3061,7 @@ msgstr "La mida no concorda"
msgid "Invalid file format"
msgstr "Operació no vàlida %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3057,16 +3070,16 @@ msgstr ""
"No s'ha trobat l'entrada «%s» esperada, al fitxer Release (entrada errònia "
"al sources.list o fitxer malformat)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "No s'ha trobat la suma de comprovació per a «%s» al fitxer Release"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3075,12 +3088,12 @@ msgstr ""
"El fitxer Release per a %s ha caducat (invàlid des de %s). Les "
"actualitzacions per a aquest dipòsit no s'aplicaran."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3091,12 +3104,12 @@ msgstr ""
"%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "S'ha produït un error amb el GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3106,12 +3119,12 @@ msgstr ""
"significar que haureu d'arreglar aquest paquet manualment (segons "
"arquitectura)."
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "No es troba una font per baixar la versió «%s» de «%s»"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3446,33 +3459,37 @@ msgstr "S'està preparant per a suprimir completament el paquet %s"
msgid "Completely removed %s"
msgstr "S'ha suprimit completament el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "No es pot escriure en %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "S'ha interromput l'operació abans que pogués finalitzar"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr "No s'ha escrit cap informe perquè ja s'ha superat MaxReports"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "S'han produït problemes de depències, es deixa sense configurar"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3480,7 +3497,7 @@ msgstr ""
"No s'ha escrit cap informe perquè el missatge d'error indica que és un error "
"consequent de una fallida anterior."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3488,7 +3505,7 @@ msgstr ""
"No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
"disc ple"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3496,7 +3513,7 @@ msgstr ""
"No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
"falta de memòria"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3505,7 +3522,7 @@ msgstr ""
"No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
"disc ple"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3540,6 +3557,20 @@ msgstr ""
msgid "Not locked"
msgstr "No blocat"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "No s'ha pogut apedaçar %s amb el mmap ni amb la utilització de la "
+#~ "operació del fitxer - el pedaç sembla ser incorrecte"
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "No s'ha pogut apedaçar %s amb el mmap (però no s'ha produït un error "
+#~ "específic del mmap) - el pedaç sembla ser incorrecte"
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Nota: s'està seleccionant «%s» per a la tasca «%s»\n"
diff --git a/po/cs.po b/po/cs.po
index c4f634ac0..83afed769 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-07-08 13:46+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -91,7 +91,7 @@ msgid "Total space accounted for: "
msgstr "Celkem přiřazeného místa: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Soubor balíku %s je špatně synchronizovaný."
@@ -99,7 +99,7 @@ msgstr "Soubor balíku %s je špatně synchronizovaný."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Nebyly nalezeny žádné balíky"
@@ -642,7 +642,7 @@ msgstr "%s již nebyl držen v aktuální verzi.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Čekal jsem na %s, ale nebyl tam"
@@ -662,6 +662,7 @@ msgid "Executing dpkg failed. Are you root?"
msgstr "Spuštění dpkg selhalo. Jste root?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -671,6 +672,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -706,14 +712,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -749,11 +759,11 @@ msgid "File not found"
msgstr "Soubor nebyl nalezen"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Selhalo vyhodnocení"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Nelze nastavit čas modifikace"
@@ -828,9 +838,9 @@ msgstr "Odpověď přeplnila buffer."
msgid "Protocol corruption"
msgstr "Porušení protokolu"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Chyba zápisu"
@@ -842,7 +852,7 @@ msgstr "Nelze vytvořit socket"
msgid "Could not connect data socket, connection timed out"
msgstr "Nelze připojit datový socket, čas spojení vypršel"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Selhalo"
@@ -1086,7 +1096,7 @@ msgstr "Spojení selhalo"
msgid "Internal error"
msgstr "Vnitřní chyba"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1336,101 +1346,101 @@ msgstr "Instalovat tyto balíky bez ověření?"
msgid "Failed to fetch %s %s\n"
msgstr "Selhalo stažení %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr "[Instalovaný]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr "[Instalovaný]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr "[Instalovaný]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Následující balíky mají nesplněné závislosti:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "ale %s je nainstalován"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "ale %s se bude instalovat"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "ale nedá se nainstalovat"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "ale je to virtuální balík"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "ale není nainstalovaný"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "ale nebude se instalovat"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " nebo"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Následující NOVÉ balíky budou nainstalovány:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Následující balíky budou ODSTRANĚNY:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Následující balíky jsou podrženy v aktuální verzi:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Následující balíky budou aktualizovány:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Následující balíky budou DEGRADOVÁNY:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Následující podržené balíky budou změněny:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (kvůli %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1438,27 +1448,27 @@ msgstr ""
"VAROVÁNÍ: Následující nezbytné balíky budou odstraněny.\n"
"Pokud přesně nevíte, co děláte, NEDĚLEJTE to!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualizováno, %lu nově instalováno, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu přeinstalováno, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu degradováno, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu k odstranění a %lu neaktualizováno.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu instalováno nebo odstraněno pouze částečně.\n"
@@ -1467,7 +1477,7 @@ msgstr "%lu instalováno nebo odstraněno pouze částečně.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[Y/n]"
@@ -1475,21 +1485,21 @@ msgstr "[Y/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[y/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba při kompilaci regulárního výrazu - %s"
@@ -1530,16 +1540,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Příkaz update neakceptuje žádné argumenty"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Propočítávám aktualizaci… "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Hotovo"
@@ -1547,7 +1557,20 @@ msgstr "Hotovo"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1563,12 +1586,12 @@ msgstr ""
" Mějte také na paměti, že je vypnuto zamykání, tudíž\n"
" tyto výsledky nemusí mít s realitou nic společného!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Selhalo přejmenování %s na %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1614,8 +1637,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1653,24 +1676,6 @@ msgstr "Nelze číst soubor se zrcadly „%s“"
msgid "[Mirror: %s]"
msgstr "[Zrcadlo: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Nelze záplatovat %s pomocí mmapu a souborových operací - zdá se, že je "
-"záplata porušená."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Nelze záplatovat %s pomocí mmapu (ovšem žádná chyba specifická pro mmap "
-"nebyla zaznamenána) - zdá se, že je záplata porušená."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Selhalo vytvoření meziprocesové roury k podprocesu"
@@ -2717,76 +2722,86 @@ msgstr "Nelze zpracovat soubor %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Nelze zpracovat soubor %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)"
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (nezpracovatelná [volba])"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (příliš krátká [volba])"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] není přiřazení)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] nemá klíč)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] klíč %s nemá hodnotu)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (Absolutní dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování dist)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Otevírám %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Řádek %u v seznamu zdrojů %s je příliš dlouhý."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3007,7 +3022,7 @@ msgstr "Velikosti nesouhlasí"
msgid "Invalid file format"
msgstr "Neplatná operace %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3016,16 +3031,16 @@ msgstr ""
"V souboru Release nelze najít očekávanou položku „%s“ (chybný sources.list "
"nebo porušený soubor)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "V souboru Release nelze najít kontrolní součet „%s“"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3034,12 +3049,12 @@ msgstr ""
"Soubor Release pro %s již expiroval (neplatný od %s). Aktualizace z tohoto "
"repositáře se nepoužijí."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konfliktní distribuce: %s (očekáváno %s, obdrženo %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3049,12 +3064,12 @@ msgstr ""
"se použijí předchozí indexové soubory. Chyba GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "Chyba GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3063,12 +3078,12 @@ msgstr ""
"Nebylo možné nalézt soubor s balíkem %s. To by mohlo znamenat, že tento "
"balík je třeba opravit ručně (kvůli chybějící architektuře)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Nelze najít zdroj pro stažení verze „%s“ balíku „%s“"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3392,34 +3407,38 @@ msgstr "Připravuji úplné odstranění %s"
msgid "Completely removed %s"
msgstr "Kompletně odstraněn %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Nelze zapsat do %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "Operace byla přerušena dříve, než mohla skončit"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Žádné apport hlášení nebylo vytvořeno, protože již byl dosažen MaxReports"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "problémy se závislostmi - ponechávám nezkonfigurované"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3427,7 +3446,7 @@ msgstr ""
"Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že "
"se jedná o chybu způsobenou předchozí chybou."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3435,7 +3454,7 @@ msgstr ""
"Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že "
"je chyba způsobena zcela zaplněným diskem."
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3443,7 +3462,7 @@ msgstr ""
"Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že "
"je chyba způsobena zcela zaplněnou pamětí."
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3452,7 +3471,7 @@ msgstr ""
"Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že "
"je chyba způsobena zcela zaplněným diskem."
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3483,6 +3502,20 @@ msgstr "dpkg byl přerušen, pro nápravu problému musíte ručně spustit „%
msgid "Not locked"
msgstr "Není uzamčen"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Nelze záplatovat %s pomocí mmapu a souborových operací - zdá se, že je "
+#~ "záplata porušená."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Nelze záplatovat %s pomocí mmapu (ovšem žádná chyba specifická pro mmap "
+#~ "nebyla zaznamenána) - zdá se, že je záplata porušená."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Pozn: vybírám „%s“ pro úlohu „%s“\n"
diff --git a/po/cy.po b/po/cy.po
index d2456f053..a57084931 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: APT\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2005-06-06 13:46+0100\n"
"Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
"Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
@@ -105,7 +105,7 @@ msgid "Total space accounted for: "
msgstr "Cyfanswm Gofod Cyfrifwyd: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig."
@@ -113,7 +113,7 @@ msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Canfuwyd dim pecyn"
@@ -666,7 +666,7 @@ msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, fuzzy, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Arhoswyd am %s ond nid oedd e yna"
@@ -695,6 +695,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -712,14 +717,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -759,11 +768,11 @@ msgid "File not found"
msgstr "Ffeil heb ei ganfod"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Methwyd stat()"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Methwyd gosod amser newid"
@@ -839,9 +848,9 @@ msgstr "Gorlifodd ateb y byffer."
msgid "Protocol corruption"
msgstr "Llygr protocol"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Gwall ysgrifennu"
@@ -853,7 +862,7 @@ msgstr "Methwyd creu soced"
msgid "Could not connect data socket, connection timed out"
msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Methwyd"
@@ -1105,7 +1114,7 @@ msgstr "Methodd y cysylltiad"
msgid "Internal error"
msgstr "Gwall mewnol"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1350,104 +1359,104 @@ msgstr ""
msgid "Failed to fetch %s %s\n"
msgstr "Methwyd cyrchu %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Sefydliwyd]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Sefydliwyd]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Sefydliwyd]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "ond mae %s wedi ei sefydlu"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "ond ni ellir ei sefydlu"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "ond mae'n becyn rhithwir"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "ond nid yw wedi ei sefydlu"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "ond nid yw'n mynd i gael ei sefydlu"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " neu"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Caiff y pecynnau canlynol eu TYNNU:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
#, fuzzy
msgid "The following packages have been kept back:"
msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
#, fuzzy
msgid "The following packages will be upgraded:"
msgstr "Caiff y pecynnau canlynol eu uwchraddio"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
#, fuzzy
msgid "The following packages will be DOWNGRADED:"
msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (oherwydd %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -1457,27 +1466,27 @@ msgstr ""
"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
"ei wneud!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu wedi ailsefydlu, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu wedi eu israddio, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n"
@@ -1486,7 +1495,7 @@ msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr ""
@@ -1494,21 +1503,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "I"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Gwall crynhoi patrwm - %s"
@@ -1549,17 +1558,17 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
#, fuzzy
msgid "Calculating upgrade... "
msgstr "Yn Cyfrifo'r Uwchraddiad... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Wedi Gorffen"
@@ -1567,7 +1576,19 @@ msgstr "Wedi Gorffen"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1579,12 +1600,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Methwyd ailenwi %s at %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1630,8 +1651,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1669,20 +1690,6 @@ msgstr "Methwyd agor ffeil %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Methwyd creu pibell cyfathrebu at isbroses"
@@ -2760,81 +2767,91 @@ msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
+
+#: apt-pkg/sourcelist.cc:155
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Yn agor %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, fuzzy, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3066,7 +3083,7 @@ msgstr "Camgyfatebiaeth maint"
msgid "Invalid file format"
msgstr "Gweithred annilys %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3074,28 +3091,28 @@ msgid ""
msgstr ""
# FIXME: number?
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3103,13 +3120,13 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
# FIXME: case
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3118,12 +3135,12 @@ msgstr ""
"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
"drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3444,57 +3461,61 @@ msgstr "Yn agor y ffeil cyfluniad %s"
msgid "Completely removed %s"
msgstr "Methwyd dileu %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Ni ellir ysgrifennu i %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/da.po b/po/da.po
index fad5ec57f..7896cfb00 100644
--- a/po/da.po
+++ b/po/da.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2013-12-14 23:51+0200\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -94,7 +94,7 @@ msgid "Total space accounted for: "
msgstr "Total plads, der kan gøres rede for: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Pakkefilen %s er ude af trit."
@@ -102,7 +102,7 @@ msgstr "Pakkefilen %s er ude af trit."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Fandt ingen pakker"
@@ -654,7 +654,7 @@ msgstr "%s var allerede ikke i bero.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Ventede på %s, men den var der ikke"
@@ -674,6 +674,7 @@ msgid "Executing dpkg failed. Are you root?"
msgstr "Kørsel af dpkg fejlede. Er du root (administrator)?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -683,6 +684,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -716,18 +722,23 @@ msgstr ""
"Se manualsiderne apt-mark(8) og apt.conf(5) for yderligere information."
#: cmdline/apt.cc:71
+#, fuzzy
msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -776,11 +787,11 @@ msgid "File not found"
msgstr "Fil blev ikke fundet"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Kunne ikke finde"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Kunne ikke angive ændringstidspunkt"
@@ -855,9 +866,9 @@ msgstr "Mellemlageret blev overfyldt af et svar."
msgid "Protocol corruption"
msgstr "Protokolfejl"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Skrivefejl"
@@ -869,7 +880,7 @@ msgstr "Kunne ikke oprette sokkel"
msgid "Could not connect data socket, connection timed out"
msgstr "Kunne ikke forbinde datasokkel, tidsudløb på forbindelsen"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Mislykkedes"
@@ -1119,7 +1130,7 @@ msgid "Internal error"
msgstr "Intern fejl"
# måske visning, kategorisering
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr "Listing"
@@ -1365,98 +1376,98 @@ msgstr "Installér disse pakker uden verifikation?"
msgid "Failed to fetch %s %s\n"
msgstr "Kunne ikke hente %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr "installeret,kan opgraderes til: "
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
msgid "[installed,local]"
msgstr "[Installeret,lokalt]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr "[installeret,kan auto-fjernes]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
msgid "[installed,automatic]"
msgstr "[Installeret,automatisk]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
msgid "[installed]"
msgstr "[Installeret]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr "[kan opgraderes fra: "
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr "[residual-konfig]"
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Følgende pakker har uopfyldte afhængigheder:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "men %s er installeret"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "men %s forventes installeret"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "men den kan ikke installeres"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "men det er en virtuel pakke"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "men den er ikke installeret"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "men den bliver ikke installeret"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " eller"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Følgende NYE pakker vil blive installeret:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Følgende pakker vil blive AFINSTALLERET:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Følgende pakker er blevet holdt tilbage:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Følgende pakker vil blive opgraderet:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Følgende pakker vil blive NEDGRADERET:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Følgende tilbageholdte pakker vil blive ændret:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (grundet %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1464,27 +1475,27 @@ msgstr ""
"ADVARSEL: Følgende essentielle pakker vil blive afinstalleret\n"
"Dette bør IKKE ske medmindre du er helt klar over, hvad du laver!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu opgraderes, %lu nyinstalleres, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu geninstalleres, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderes, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu afinstalleres og %lu opgraderes ikke.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n"
@@ -1493,7 +1504,7 @@ msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[J/n]"
@@ -1501,21 +1512,21 @@ msgstr "[J/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[j/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "J"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fejl ved tolkning af regulært udtryk - %s"
@@ -1556,15 +1567,15 @@ msgstr "Sortering"
msgid "The update command takes no arguments"
msgstr "»update«-kommandoen benytter ingen parametre"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Beregner opgraderingen ... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
msgid "Internal error, Upgrade broke stuff"
msgstr "Intern fejl, opgradering blev afbrudt"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Færdig"
@@ -1572,7 +1583,19 @@ msgstr "Færdig"
msgid "Full Text Search"
msgstr "Fuldtekst-søgning"
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr "ikke en reel pakke (virtuel)"
@@ -1588,12 +1611,12 @@ msgstr ""
" Husk også at låsning er deaktiveret,\n"
" så stol ikke på relevansen for den reelle aktuelle situation!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Kunne ikke fortolke %s. Rediger igen? "
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr "Din »%s« fil blev ændret, kør venligst »apt-get update«."
@@ -1639,8 +1662,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1678,24 +1701,6 @@ msgstr "Ingen post fundet i spejlfil »%s«"
msgid "[Mirror: %s]"
msgstr "[Spejl: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Kunne ikke fejlrette (patch) %s med mmap og med filhandlingsbrug - "
-"fejlrettelsen ser ud til at være ødelagt."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Kunne ikke fejlrette (patch) %s med mmap (men ingen mmap specifik fejl) - "
-"fejlrettelsen ser ud til at være ødelagt."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Kunne ikke oprette IPC-videreførsel til underproces"
@@ -2749,76 +2754,86 @@ msgstr "Kunne ikke tolke pakkefilen %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Kunne ikke tolke pakkefilen %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)"
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] kunne ikke fortolkes)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] for kort)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Ugyldig linje %lu i kildelisten %s ([%s] er ikke en opgave)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Ugyldig linje %lu i kildelisten %s ([%s] har ingen nøgle)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Ugyldig linje %lu i kildelisten %s ([%s] nøgle %s har ingen værdi)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Ugyldig linje %lu i kildelisten %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Ugyldig linje %lu i kildelisten %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Ugyldig linje %lu i kildelisten %s (absolut dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Åbner %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linjen %u er for lang i kildelisten %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Ugyldig linje %u i kildelisten %s (type)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typen »%s« er ukendt på linje %u i kildelisten %s"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typen »%s« er ukendt på linje %u i kildelisten %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3042,7 +3057,7 @@ msgstr "Størrelsen stemmer ikke"
msgid "Invalid file format"
msgstr "Ugyldigt filformat"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3051,17 +3066,17 @@ msgstr ""
"Kunne ikke finde uventet punkt »%s« i udgivelsesfil (forkert sources.list-"
"punkt eller forkert udformet fil)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Kunne ikke finde hashsum for »%s« i udgivelsesfilen"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Der er ingen tilgængelige offentlige nøgler for følgende nøgle-ID'er:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3070,12 +3085,12 @@ msgstr ""
"Udgivelsesfil for %s er udløbet (ugyldig siden %s). Opdateringer for dette "
"arkiv vil ikke blive anvendt."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konfliktdistribution: %s (forventede %s men fik %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3085,12 +3100,12 @@ msgstr ""
"og den forrige indeksfil vil blive brugt. GPG-fejl: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-fejl: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3099,12 +3114,12 @@ msgstr ""
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
"nødt til manuelt at reparere denne pakke. (grundet manglende arch)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Kan ikke finde en kilde til at hente version »%s« for »%s«"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3429,34 +3444,38 @@ msgstr "Gør klar til at fjerne %s helt"
msgid "Completely removed %s"
msgstr "Fjernede %s helt"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, c-format
msgid "Can not write log (%s)"
msgstr "Kan ikke skrive log (%s)"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr "Er /dev/pts monteret?"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr "Er standardud en terminal?"
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "Handling blev afbrudt før den kunne afsluttes"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Ingen apportrapport skrevet da MaxReports (maks rapporter) allerede er nået"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "afhængighedsproblemer - efterlader ukonfigureret"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3464,14 +3483,14 @@ msgstr ""
"Ingen apportrapport skrevet da fejlbeskeden indikerer, at det er en "
"opfølgningsfejl fra en tidligere fejl."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
"Ingen apportrapport skrevet da fejlbeskeden indikerer en fuld disk-fejl"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3479,7 +3498,7 @@ msgstr ""
"Ingen apportrapport skrevet da fejlbeskeden indikerer en ikke nok "
"hukommelsesfejl"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
@@ -3487,7 +3506,7 @@ msgstr ""
"Ingen apportrapport skrevet da fejlbeskeden indikerer en fejl på det lokale "
"system"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr "Ingen apportrapport skrevet da fejlbeskeden indikerer en dpkg I/O-fejl"
@@ -3516,3 +3535,17 @@ msgstr "dpkg blev afbrudt, du skal manuelt køre »%s« for at rette problemet."
#: apt-pkg/deb/debsystem.cc:121
msgid "Not locked"
msgstr "Ikke låst"
+
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Kunne ikke fejlrette (patch) %s med mmap og med filhandlingsbrug - "
+#~ "fejlrettelsen ser ud til at være ødelagt."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Kunne ikke fejlrette (patch) %s med mmap (men ingen mmap specifik fejl) - "
+#~ "fejlrettelsen ser ud til at være ødelagt."
diff --git a/po/de.po b/po/de.po
index 858ef4faa..062c446e9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.2\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-06-27 10:55+0200\n"
"Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
"Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -94,7 +94,7 @@ msgid "Total space accounted for: "
msgstr "Gesamtmenge an Speicher: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Paketdatei %s ist nicht synchronisiert."
@@ -102,7 +102,7 @@ msgstr "Paketdatei %s ist nicht synchronisiert."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Keine Pakete gefunden"
@@ -675,7 +675,7 @@ msgstr "Die Halten-Markierung für %s wurde bereits entfernt.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Es wurde auf %s gewartet, war jedoch nicht vorhanden"
@@ -695,6 +695,7 @@ msgid "Executing dpkg failed. Are you root?"
msgstr "Ausführen von dpkg fehlgeschlagen. Sind Sie root?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -704,6 +705,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -741,14 +747,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -787,11 +797,11 @@ msgstr "Datei nicht gefunden"
# looks like someone hardcoded English grammar
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Abfrage mit »stat« fehlgeschlagen"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Änderungszeitpunkt kann nicht gesetzt werden."
@@ -866,9 +876,9 @@ msgstr "Durch eine Antwort wurde der Puffer zum Überlaufen gebracht."
msgid "Protocol corruption"
msgstr "Protokoll beschädigt"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Schreibfehler"
@@ -880,7 +890,7 @@ msgstr "Socket konnte nicht erzeugt werden."
msgid "Could not connect data socket, connection timed out"
msgstr "Daten-Socket konnte wegen Zeitüberschreitung nicht verbunden werden."
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Fehlgeschlagen"
@@ -1138,7 +1148,7 @@ msgstr "Verbindung fehlgeschlagen"
msgid "Internal error"
msgstr "Interner Fehler"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1391,102 +1401,102 @@ msgstr "Diese Pakete ohne Überprüfung installieren?"
msgid "Failed to fetch %s %s\n"
msgstr "Fehlschlag beim Holen von %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Installiert]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Installiert]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Installiert]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Die folgenden Pakete haben unerfüllte Abhängigkeiten:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "aber %s ist installiert"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "aber %s soll installiert werden"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "ist aber nicht installierbar"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "ist aber ein virtuelles Paket"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "ist aber nicht installiert"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "soll aber nicht installiert werden"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " oder"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Die folgenden NEUEN Pakete werden installiert:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Die folgenden Pakete werden ENTFERNT:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Die folgenden Pakete sind zurückgehalten worden:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Die folgenden Pakete werden aktualisiert (Upgrade):"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr ""
"Die folgenden Pakete werden durch eine ÄLTERE VERSION ERSETZT (Downgrade):"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Die folgenden zurückgehaltenen Pakete werden verändert:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (wegen %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1494,27 +1504,27 @@ msgstr ""
"WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n"
"Dies sollte NICHT geschehen, außer Sie wissen genau, was Sie tun!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualisiert, %lu neu installiert, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu erneut installiert, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu durch eine ältere Version ersetzt, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nicht vollständig installiert oder entfernt.\n"
@@ -1523,7 +1533,7 @@ msgstr "%lu nicht vollständig installiert oder entfernt.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[J/n]"
@@ -1531,21 +1541,21 @@ msgstr "[J/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[j/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "J"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s"
@@ -1586,16 +1596,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Der Befehl »update« akzeptiert keine Argumente."
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Paketaktualisierung (Upgrade) wird berechnet... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Interner Fehler, AllUpgrade hat etwas beschädigt."
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Fertig"
@@ -1603,7 +1613,19 @@ msgstr "Fertig"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1620,12 +1642,12 @@ msgstr ""
" sind, verlassen Sie sich also bezüglich des reellen aktuellen\n"
" Status der Sperre nicht darauf!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "%s konnte nicht in %s umbenannt werden."
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1671,8 +1693,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1710,24 +1732,6 @@ msgstr "Datei »%s« von Spiegelserver kann nicht gelesen werden."
msgid "[Mirror: %s]"
msgstr "[Spiegelserver: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Patch konnte nicht mit mmap und unter Verwendung von Dateioperationen auf %s "
-"angewendet werden - der Patch scheint beschädigt zu sein."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Patch konnte nicht mit mmap auf %s angewendet werden (es ist jedoch nichts "
-"mmap-spezifisches fehlgeschlagen) - der Patch scheint beschädigt zu sein."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr ""
@@ -2803,77 +2807,87 @@ msgstr "Paketdatei %s konnte nicht verarbeitet werden (1)."
msgid "Unable to parse package file %s (2)"
msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)."
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)"
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] nicht auswertbar)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] zu kurz)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s ([%s] ist keine Zuweisung)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s ([%s] hat keinen Schlüssel)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Missgestaltete Zeile %lu in Quellliste %s ([%s] Schlüssel %s hat keinen Wert)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "%s wird geöffnet."
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Zeile %u in Quellliste %s zu lang."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt."
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt."
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3114,7 +3128,7 @@ msgstr "Größe stimmt nicht überein"
msgid "Invalid file format"
msgstr "Ungültige Operation %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3123,17 +3137,17 @@ msgstr ""
"Erwarteter Eintrag »%s« konnte in Release-Datei nicht gefunden werden "
"(falscher Eintrag in sources.list oder missgebildete Datei)."
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Hash-Summe für »%s« kann in Release-Datei nicht gefunden werden."
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Es gibt keine öffentlichen Schlüssel für die folgenden Schlüssel-IDs:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3142,12 +3156,12 @@ msgstr ""
"Release-Datei für %s ist abgelaufen (ungültig seit %s). Aktualisierungen für "
"dieses Depot werden nicht angewendet."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konflikt bei Distribution: %s (%s erwartet, aber %s bekommen)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3158,12 +3172,12 @@ msgstr ""
"GPG-Fehler: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-Fehler: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3173,14 +3187,14 @@ msgstr ""
"Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender "
"Architektur)."
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
"Es konnte keine Quelle gefunden werden, um Version »%s« von »%s« "
"herunterzuladen."
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3515,35 +3529,39 @@ msgstr "Vollständiges Entfernen von %s wird vorbereitet."
msgid "Completely removed %s"
msgstr "%s vollständig entfernt"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Schreiben nach %s nicht möglich"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "Operation wurde unterbrochen, bevor sie beendet werden konnte."
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Es wurde kein Apport-Bericht verfasst, da das Limit MaxReports bereits "
"erreicht ist."
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "Abhängigkeitsprobleme - verbleibt unkonfiguriert"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3551,7 +3569,7 @@ msgstr ""
"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung darauf "
"hindeutet, dass dies lediglich ein Folgefehler eines vorherigen Problems ist."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3559,7 +3577,7 @@ msgstr ""
"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
"wegen voller Festplatte hindeutet."
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3567,7 +3585,7 @@ msgstr ""
"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
"wegen erschöpftem Arbeitsspeicher hindeutet."
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3576,7 +3594,7 @@ msgstr ""
"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
"wegen voller Festplatte hindeutet."
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3612,6 +3630,21 @@ msgstr ""
msgid "Not locked"
msgstr "Nicht gesperrt"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Patch konnte nicht mit mmap und unter Verwendung von Dateioperationen auf "
+#~ "%s angewendet werden - der Patch scheint beschädigt zu sein."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Patch konnte nicht mit mmap auf %s angewendet werden (es ist jedoch "
+#~ "nichts mmap-spezifisches fehlgeschlagen) - der Patch scheint beschädigt "
+#~ "zu sein."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Hinweis: »%s« wird für Task »%s« gewählt.\n"
diff --git a/po/dz.po b/po/dz.po
index f32a8809e..5c9a2cfcf 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po.pot\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2006-09-19 09:49+0530\n"
"Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n"
"Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -96,7 +96,7 @@ msgid "Total space accounted for: "
msgstr "གི་དོན་ལུ་རྩིས་ཐོ་བཏོན་ཡོད་པའི་བར་སྟོང:"
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "ཐུམ་སྒྲིལ་ཡིག་སྣོད་ %sའདི་མཉམ་འབྱུང་གི་ཕྱི་ཁར་ཨིན་པས།"
@@ -104,7 +104,7 @@ msgstr "ཐུམ་སྒྲིལ་ཡིག་སྣོད་ %sའདི་
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "ཐུམ་སྒྲིལ་ཚུ་མ་ཐོབ།"
@@ -644,7 +644,7 @@ msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རི
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག"
@@ -673,6 +673,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -690,14 +695,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -734,11 +743,11 @@ msgid "File not found"
msgstr "ཡིག་སྣོད་འཚོལ་མ་ཐོབ།"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབཐ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
@@ -813,9 +822,9 @@ msgstr "ལན་གྱིས་ གནད་ཁོངས་གུར་ལས
msgid "Protocol corruption"
msgstr "གནད་སྤེལ་ལམ་ལུགས་ ངན་ཅན།"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "འཛོལ་བ་འབྲི།"
@@ -827,7 +836,7 @@ msgstr "སོ་ཀེཊི་ཅིག་གསར་བསྐྲུན་འ
msgid "Could not connect data socket, connection timed out"
msgstr "གནད་སྡུད་སོ་ཀེཊི་མཐུད་མ་ཚུགས་པར་ཡོདཔ་ཨིན་ མཐུད་ལམ་ངལ་མཚམས།"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
@@ -1074,7 +1083,7 @@ msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོ
msgid "Internal error"
msgstr "ནང་འཁོད་འཛོལ་བ།"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1317,101 +1326,101 @@ msgstr "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི
msgid "Failed to fetch %s %s\n"
msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "འདི་འབདཝ་ད་%s་འདི་གཞི་བཙུགས་འབད་ཡོད།"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "འདི་འབདཝ་ད་%s་འདི་གཟི་བཙུགས་འབད་མི་བཏུབ་པས།"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "འདི་འབདཝ་ད་ འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན་པས།"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་པས།"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr "ཡང་ན།"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་རྩ བསྐྲད་གཏང་འོང་:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ལོག་སྟེ་རང་བཞག་ནུག:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ཡར་བསྐྱེད་འབད་འོང་:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "འོག་གི་ཐུམ་སྒྲལ་འདི་ཚུ་མར་ཕབ་འབད་འོང་:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "འོག་གི་འཆང་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་བསྒྱུར་བཅོས་འབད་འོང་:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s( %s་གིས་སྦེ)"
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1419,27 +1428,27 @@ msgstr ""
"ཉེན་བརྡ:འོག་གི་ཉོ་མཁོ་བའི་ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏང་འོང་།\n"
"ཁྱོད་ཀྱིས་ཁྱོད་རང་ག་ཅི་འབདཝ་ཨིན་ན་ངེས་སྦེ་མ་ཤེས་ཚུན་འདི་འབད་ནི་མི་འོང་།!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu་ཡར་བསྐྱེད་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད།"
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོད།"
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོད།"
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "རྩ་བསྐྲད་འབད་ནི་ལུ་%lu་དང་%lu་ཡར་བསྐྱེད་མ་འབད་བས།\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བསྐྲད་མ་གཏང་པས།\n"
@@ -1448,7 +1457,7 @@ msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr ""
@@ -1456,21 +1465,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "ཝའི།"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s"
@@ -1511,16 +1520,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "ནང་འགོད་འཛོལ་བ་ ཡར་བསྐྱེད་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་ཐལ་ཡོད།"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "འབད་ཚར་ཡི།"
@@ -1528,7 +1537,19 @@ msgstr "འབད་ཚར་ཡི།"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1540,12 +1561,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1591,8 +1612,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1630,20 +1651,6 @@ msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚ
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་ཨའི་པི་སི་རྒྱུད་དུང་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
@@ -2704,76 +2711,86 @@ msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་
msgid "Unable to parse package file %s (2)"
msgstr "%s (༢་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།"
+
+#: apt-pkg/sourcelist.cc:155
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu འབྱུང་ཁུངས་ཐོ་ཡིག་ %s (ཡུ་ཨར་ཨའི་)གི་ནང་ན།"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(ཡང་དག་ dist)གི་ནང་ན།"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "%s་ཁ་ཕྱེ་དོ།"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "གྲལ་ཐིག་%u་འདི་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་ནང་ལུ་གནམ་མེད་ས་མེད་རིངམོ་འདུག"
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (དབྱེ་བ)་ནང་ན།"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2995,35 +3012,35 @@ msgstr "ཚད་མ་མཐུན།"
msgid "Invalid file format"
msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འཐོབ་མི་ཚུགས་པས:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3031,12 +3048,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3045,12 +3062,12 @@ msgstr ""
" %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ "
"འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3372,57 +3389,61 @@ msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བས
msgid "Completely removed %s"
msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr " %sལུ་འབྲི་མ་ཚུགས།"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/el.po b/po/el.po
index 7d2685f38..3c723313c 100644
--- a/po/el.po
+++ b/po/el.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_el\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2008-08-26 18:25+0300\n"
"Last-Translator: Θανάσης Νάτσης <natsisthanasis@gmail.com>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -102,7 +102,7 @@ msgid "Total space accounted for: "
msgstr "Συνολικός Καταμετρημένος Χώρος: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Το αρχείο πακέτου %s δεν είναι ενημερωμένο."
@@ -110,7 +110,7 @@ msgstr "Το αρχείο πακέτου %s δεν είναι ενημερωμέ
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Δε βρέθηκαν πακέτα"
@@ -656,7 +656,7 @@ msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί"
@@ -685,6 +685,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -702,14 +707,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -745,11 +754,11 @@ msgid "File not found"
msgstr "Το αρχείο Δε Βρέθηκε"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Αποτυχία εύρεσης της κατάστασης"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης"
@@ -824,9 +833,9 @@ msgstr "Το μήνυμα απάντησης υπερχείλισε την εν
msgid "Protocol corruption"
msgstr "Αλλοίωση του πρωτοκόλλου"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Σφάλμα εγγραφής"
@@ -838,7 +847,7 @@ msgstr "Αδύνατη η δημιουργία μιας υποδοχής (socket
msgid "Could not connect data socket, connection timed out"
msgstr "Αδύνατη η σύνδεση υποδοχής δεδομένων, λήξη χρόνου σύνδεσης"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Απέτυχε"
@@ -1088,7 +1097,7 @@ msgstr "Η σύνδεση απέτυχε"
msgid "Internal error"
msgstr "Εσωτερικό Σφάλμα"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1335,101 +1344,101 @@ msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευ
msgid "Failed to fetch %s %s\n"
msgstr "Αποτυχία ανάκτησης του %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Εγκατεστημένα]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Εγκατεστημένα]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Εγκατεστημένα]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "αλλά το %s είναι εγκατεστημένο"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "αλλά το %s πρόκειται να εγκατασταθεί"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "αλλά δεν είναι εγκαταστάσημο"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "αλλά είναι ένα εικονικό πακέτο"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "αλλά δεν είναι εγκατεστημένο"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "αλλά δεν πρόκειται να εγκατασταθεί"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " η"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (λόγω του %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1437,27 +1446,27 @@ msgstr ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n"
"Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu επανεγκατεστημένα,"
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu υποβαθμισμένα, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n"
@@ -1466,7 +1475,7 @@ msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκα
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[Ν/ο]"
@@ -1474,21 +1483,21 @@ msgstr "[Ν/ο]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[ν/Ο]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "σφάλμα μεταγλωτισμου - %s"
@@ -1531,16 +1540,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Η εντολή update δεν παίρνει ορίσματα"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Υπολογισμός της αναβάθμισης... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Εσωτερικό Σφάλμα, η διαδικασία αναβάθμισης χάλασε"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Ετοιμο"
@@ -1548,7 +1557,19 @@ msgstr "Ετοιμο"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1560,12 +1581,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Αποτυχία μετονομασίας του %s σε %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1611,8 +1632,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1650,20 +1671,6 @@ msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Αποτυχία κατά τη δημιουργία διασωλήνωσης IPC στην υποδιεργασία"
@@ -2727,76 +2734,86 @@ msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s
msgid "Unable to parse package file %s (2)"
msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)"
+
+#: apt-pkg/sourcelist.cc:155
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Απόλυτο dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Άνοιγμα του %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος "
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος "
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3024,35 +3041,35 @@ msgstr "Ανόμοιο μέγεθος"
msgid "Invalid file format"
msgstr "Μη έγκυρη λειτουργία %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "Δεν υπάρχει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3060,12 +3077,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3074,12 +3091,12 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3401,57 +3418,61 @@ msgstr "Προετοιμασία πλήρης αφαίρεσης του %s"
msgid "Completely removed %s"
msgstr "Το %s διαγράφηκε πλήρως"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Αδύνατη η εγγραφή στο %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/es.po b/po/es.po
index 98cae4093..c8f2f05e4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -33,7 +33,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.10\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2011-01-24 11:47+0100\n"
"Last-Translator: Javier Fernández-Sanguino Peña <jfs@debian.org>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -147,7 +147,7 @@ msgid "Total space accounted for: "
msgstr "Espacio registrado total: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "El archivo de paquetes %s está desincronizado."
@@ -155,7 +155,7 @@ msgstr "El archivo de paquetes %s está desincronizado."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "No se encontró ningún paquete"
@@ -716,7 +716,7 @@ msgstr "%s ya está en su versión más reciente.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperaba %s pero no estaba allí"
@@ -745,6 +745,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -762,14 +767,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -805,11 +814,11 @@ msgid "File not found"
msgstr "Fichero no encontrado"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "No pude leer"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "No pude poner el tiempo de modificación"
@@ -884,9 +893,9 @@ msgstr "No pude crear un socket."
msgid "Protocol corruption"
msgstr "Fallo del protocolo"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Error de escritura"
@@ -898,7 +907,7 @@ msgstr "No pude crear un socket"
msgid "Could not connect data socket, connection timed out"
msgstr "No pude conectar el socket de datos, expiró el tiempo de conexión"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Falló"
@@ -1145,7 +1154,7 @@ msgstr "Fallo la conexión"
msgid "Internal error"
msgstr "Error interno"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1399,101 +1408,101 @@ msgstr "¿Instalar estos paquetes sin verificación?"
msgid "Failed to fetch %s %s\n"
msgstr "Imposible obtener %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Los siguientes paquetes tienen dependencias incumplidas:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "pero %s está instalado"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "pero %s va a ser instalado"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "pero no es instalable"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "pero es un paquete virtual"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "pero no está instalado"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "pero no va a instalarse"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " o"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Se instalarán los siguientes paquetes NUEVOS:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Los siguientes paquetes se ELIMINARÁN:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Los siguientes paquetes se han retenido:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Se actualizarán los siguientes paquetes:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Se DESACTUALIZARÁN los siguientes paquetes:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Se cambiarán los siguientes paquetes retenidos:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (por %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1501,27 +1510,27 @@ msgstr ""
"AVISO: Se van a eliminar los siguientes paquetes esenciales.\n"
"¡NO debe hacerse a menos que sepa exactamente lo que está haciendo!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu actualizados, %lu se instalarán, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desactualizados, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu para eliminar y %lu no actualizados.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu no instalados del todo o eliminados.\n"
@@ -1530,7 +1539,7 @@ msgstr "%lu no instalados del todo o eliminados.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[S/n]"
@@ -1538,21 +1547,21 @@ msgstr "[S/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[s/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "S"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error de compilación de expresiones regulares - %s"
@@ -1593,16 +1602,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "El comando de actualización no toma argumentos"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Calculando la actualización... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Error Interno, AllUpgrade rompió cosas"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Listo"
@@ -1610,7 +1619,19 @@ msgstr "Listo"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1626,12 +1647,12 @@ msgstr ""
" Tenga también en cuenta que se han desactivado los bloqueos,\n"
" ¡no dependa de la relevancia a la situación real actual!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "No pude abrir %s.new"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1677,8 +1698,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1716,24 +1737,6 @@ msgstr "No se encontró un archivo de réplica «%s»"
msgid "[Mirror: %s]"
msgstr "[Réplica: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"No se pudo parchear %s con mmap y con el modo de uso de la operación de "
-"ficheros - el paquete parece dañado."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"No se pudo parchear %s con mmap (pero no hay un fallo mmap específico) - el "
-"parche parece dañado."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Falló la creación de una tubería IPC para el subproceso"
@@ -2803,82 +2806,92 @@ msgstr "No se pudo tratar el archivo de paquetes %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "No se pudo tratar el archivo de paquetes %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de URI)"
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Línea %lu mal formada en la lista de fuentes %s ([opción] no parseable)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"Línea %lu mal formada en la lista de fuentes %s ([opción] demasiado corta)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Línea %lu mal formada en la lista de fuentes %s ([%s] no es una asignación)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
"Línea %lu mal formada en la lista de fuentes %s (no hay clave para [%s])"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Línea %lu mal formada en la lista de fuentes %s ([%s] la clave %s no tiene "
"asociado un valor)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Línea %lu mal formada en la lista de fuentes %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Línea %lu mal formada en la lista de fuentes %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Línea %lu mal formada en la lista de fuentes %s (dist absoluta)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de dist)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Abriendo %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Línea %u demasiado larga en la lista de fuentes %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Línea %u mal formada en la lista de fuentes %s (tipo)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3109,37 +3122,37 @@ msgstr "El tamaño difiere"
msgid "Invalid file format"
msgstr "Operación inválida: %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "No se pudo leer el archivo «Release» %s"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"No existe ninguna clave pública disponible para los siguientes "
"identificadores de clave:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribución conflictiva: %s (se esperaba %s, pero se obtuvo %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3150,12 +3163,12 @@ msgstr ""
"GPG es: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "Error de GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3165,12 +3178,12 @@ msgstr ""
"que necesita arreglar manualmente este paquete (debido a que falta una "
"arquitectura)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3505,35 +3518,39 @@ msgstr "Preparándose para eliminar completamente %s"
msgid "Completely removed %s"
msgstr "Se borró completamente %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "No se puede escribir en %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"No se escribió ningún informe «apport» porque ya se ha alcanzado el valor de "
"«MaxReports»"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "problemas de dependencias - dejando sin instalar"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3541,7 +3558,7 @@ msgstr ""
"No se escribió un informe «apport» porque el mensaje de error indica que es "
"un mensaje de error asociado a un fallo previo."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3549,7 +3566,7 @@ msgstr ""
"No se escribió un informe «apport» porque el mensaje de error indica que el "
"error es de disco lleno"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3557,7 +3574,7 @@ msgstr ""
"No se escribió un informe «apport» porque el mensaje de error indica un "
"error de memoria excedida"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3566,7 +3583,7 @@ msgstr ""
"No se escribió un informe «apport» porque el mensaje de error indica que el "
"error es de disco lleno"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3601,6 +3618,20 @@ msgstr ""
msgid "Not locked"
msgstr "No bloqueado"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "No se pudo parchear %s con mmap y con el modo de uso de la operación de "
+#~ "ficheros - el paquete parece dañado."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "No se pudo parchear %s con mmap (pero no hay un fallo mmap específico) - "
+#~ "el parche parece dañado."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Nota, seleccionando «%s» para la tarea «%s»\n"
diff --git a/po/eu.po b/po/eu.po
index 743367e45..222cd7fa1 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_eu\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2009-05-17 00:41+0200\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
@@ -93,7 +93,7 @@ msgid "Total space accounted for: "
msgstr "Guztira erregistratutako lekua: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "%s pakete fitxategia ez dago sinkronizatuta."
@@ -101,7 +101,7 @@ msgstr "%s pakete fitxategia ez dago sinkronizatuta."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Ez da paketerik aurkitu"
@@ -643,7 +643,7 @@ msgstr "%s bertsiorik berriena da jada.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s espero zen baina ez zegoen han"
@@ -672,6 +672,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -689,14 +694,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -733,11 +742,11 @@ msgid "File not found"
msgstr "Ez da fitxategia aurkitu"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Huts egin du atzitzean"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Huts egin du aldaketa ordua ezartzean"
@@ -814,9 +823,9 @@ msgstr "Erantzun batek bufferrari gainez eragin dio."
msgid "Protocol corruption"
msgstr "Protokolo hondatzea"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Idazketa errorea"
@@ -829,7 +838,7 @@ msgid "Could not connect data socket, connection timed out"
msgstr ""
"Ezin izan da datu-socketa konektatu; konexioak denbora muga gainditu du"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Huts egin du"
@@ -1075,7 +1084,7 @@ msgstr "Konexioak huts egin du"
msgid "Internal error"
msgstr "Barne errorea"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1325,101 +1334,101 @@ msgstr "Paketeak egiaztapen gabe instalatu?"
msgid "Failed to fetch %s %s\n"
msgstr "Ezin da lortu %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Instalatuta]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Instalatuta]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Instalatuta]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "baina %s instalatuta dago"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "baina %s instalatzeko dago"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "baina ez da instalagarria"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "baina pakete birtuala da"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "baina ez dago instalatuta"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "baina ez da instalatuko"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " edo"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Ondorengo pakete BERRIAK instalatuko dira:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Ondorengo paketeak KENDUKO dira:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Ondorengo paketeak mantendu egin dira:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Ondorengo paketeak bertsio-berrituko dira:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Ondorengo pakete atxikiak aldatu egingo dira:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (arrazoia: %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1427,27 +1436,27 @@ msgstr ""
"KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n"
"EZ ezazu horrelakorik egin, ez badakizu ondo zertan ari zaren!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu bertsio berritua(k), %lu berriki instalatuta, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu berrinstalatuta, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu aurreko bertsiora itzulita, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ez erabat instalatuta edo kenduta.\n"
@@ -1456,7 +1465,7 @@ msgstr "%lu ez erabat instalatuta edo kenduta.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[B/e]"
@@ -1464,21 +1473,21 @@ msgstr "[B/e]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[b/E]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Adierazpen erregularren konpilazio errorea - %s"
@@ -1519,16 +1528,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Eguneratzeko komandoak ez du argumenturik hartzen"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Berriketak kalkulatzen... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Eginda"
@@ -1536,7 +1545,19 @@ msgstr "Eginda"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1548,12 +1569,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Huts egin du %s izenaren ordez %s ipintzean"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1599,8 +1620,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1638,20 +1659,6 @@ msgstr "%s fitxategia ezin izan da ireki"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Huts egin du azpiprozesuarentzako IPC kanalizazio bat sortzean"
@@ -2706,76 +2713,86 @@ msgstr "Ezin da %s pakete fitxategia analizatu (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Ezin da %s pakete fitxategia analizatu (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)"
+
+#: apt-pkg/sourcelist.cc:155
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (banaketa orokorra)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "%s irekitzen"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "%2$s iturburu zerrendako %1$u lerroa luzeegia da."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2993,35 +3010,35 @@ msgstr "Tamaina ez dator bat"
msgid "Invalid file format"
msgstr "Eragiketa baliogabea: %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Ezin da %s pakete fitxategia analizatu (1)"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3029,12 +3046,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3043,12 +3060,12 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea. (arkitektura falta delako)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3371,57 +3388,61 @@ msgstr "%s guztiz ezabatzeko prestatzen"
msgid "Completely removed %s"
msgstr "%s guztiz ezabatu da"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "%s : ezin da idatzi"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 5fceb73ef..4b8c34ab5 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2008-12-11 14:52+0200\n"
"Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -93,7 +93,7 @@ msgid "Total space accounted for: "
msgstr "Käytetty tila yhteensä: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Pakettitiedosto %s ei ole ajan tasalla."
@@ -101,7 +101,7 @@ msgstr "Pakettitiedosto %s ei ole ajan tasalla."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Yhtään pakettia ei löytynyt"
@@ -638,7 +638,7 @@ msgstr "%s on jo uusin versio.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Odotettiin %s, mutta sitä ei ollut"
@@ -667,6 +667,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -684,14 +689,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -727,11 +736,11 @@ msgid "File not found"
msgstr "Tiedostoa ei löydy"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Komento stat ei toiminut"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua"
@@ -806,9 +815,9 @@ msgstr "Vastaus aiheutti puskurin ylivuodon."
msgid "Protocol corruption"
msgstr "Yhteyskäytäntö on turmeltunut"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Virhe kirjoitettaessa"
@@ -820,7 +829,7 @@ msgstr "Pistoketta ei voitu luoda"
msgid "Could not connect data socket, connection timed out"
msgstr "Pistoketta ei voitu kytkeä, yhteys aikakatkaistiin"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Ei onnistunut"
@@ -1067,7 +1076,7 @@ msgstr "Yhteys ei toiminut"
msgid "Internal error"
msgstr "Sisäinen virhe"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1317,101 +1326,101 @@ msgstr "Asennetaanko nämä paketit ilman todennusta?"
msgid "Failed to fetch %s %s\n"
msgstr "Tiedoston %s nouto ei onnistunut %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Asennettu]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Asennettu]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Asennettu]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "mutta %s on asennettu"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "mutta %s on merkitty asennettavaksi"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "mutta ei ole asennuskelpoinen"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "mutta on näennäispaketti"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "mutta ei ole asennettu"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "mutta ei ole merkitty asennettavaksi"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " tai"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Seuraavat UUDET paketit asennetaan:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Seuraavat paketit POISTETAAN:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Nämä paketit on jätetty odottamaan:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Nämä paketit päivitetään:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Nämä paketit VARHENNETAAN:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Seuraavat pysytetyt paketit muutetaan:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (syynä %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1419,27 +1428,27 @@ msgstr ""
"VAROITUS: Seuraavat välttämättömät paketit poistetaan.\n"
"Näin EI PITÄISI tehdä jos ei aivan tarkkaan tiedä mitä tekee!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu päivitetty, %lu uutta asennusta, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu uudelleen asennettua, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu varhennettua, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ei asennettu kokonaan tai poistettiin.\n"
@@ -1448,7 +1457,7 @@ msgstr "%lu ei asennettu kokonaan tai poistettiin.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[K/e]"
@@ -1456,21 +1465,21 @@ msgstr "[K/e]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "K"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Käännösvirhe lausekkeessa - %s"
@@ -1511,16 +1520,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Komento update ei käytä parametreja"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Käsitellään päivitystä ... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Valmis"
@@ -1528,7 +1537,19 @@ msgstr "Valmis"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1540,12 +1561,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1591,8 +1612,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1630,20 +1651,6 @@ msgstr "Tiedostoa %s ei voitu avata"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "IPC-putken luominen aliprosessiin ei onnistunut"
@@ -2697,76 +2704,86 @@ msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
msgid "Unable to parse package file %s (2)"
msgstr "Pakettitiedostoa %s (2) ei voi jäsentää"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)"
+
+#: apt-pkg/sourcelist.cc:155
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (Absoluuttinen dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Avataan %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Rivi %u on liian pitkä lähdeluettelossa %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2984,35 +3001,35 @@ msgstr "Koko ei täsmää"
msgid "Invalid file format"
msgstr "Virheellinen toiminto %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3020,12 +3037,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3034,12 +3051,12 @@ msgstr ""
"En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan "
"tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3363,57 +3380,61 @@ msgstr "Valmistaudutaan poistamaan %s kokonaan"
msgid "Completely removed %s"
msgstr "%s poistettiin kokonaan"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 2c7f2114d..bb644f8d5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2013-08-17 07:57+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -93,7 +93,7 @@ msgid "Total space accounted for: "
msgstr "Total de l'espace attribué : "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Fichier %s désynchronisé."
@@ -101,7 +101,7 @@ msgstr "Fichier %s désynchronisé."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Aucun paquet n'a été trouvé"
@@ -675,7 +675,7 @@ msgstr "%s était déjà marqué comme non figé.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "A attendu %s mais il n'était pas présent"
@@ -697,6 +697,7 @@ msgstr ""
"superutilisateur ?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -706,6 +707,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -745,14 +751,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -790,11 +800,11 @@ msgid "File not found"
msgstr "Fichier non trouvé"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Impossible de statuer"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Impossible de modifier l'heure "
@@ -870,9 +880,9 @@ msgstr "Une réponse a fait déborder le tampon."
msgid "Protocol corruption"
msgstr "Corruption du protocole"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Erreur d'écriture"
@@ -885,7 +895,7 @@ msgid "Could not connect data socket, connection timed out"
msgstr ""
"Impossible de se connecter sur le port de données, délai de connexion dépassé"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Échec"
@@ -1137,7 +1147,7 @@ msgstr "Échec de la connexion"
msgid "Internal error"
msgstr "Erreur interne"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1399,101 +1409,101 @@ msgstr "Faut-il installer ces paquets sans vérification ?"
msgid "Failed to fetch %s %s\n"
msgstr "Impossible de récupérer %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Installé]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Installé]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Installé]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Les paquets suivants contiennent des dépendances non satisfaites :"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "mais %s est installé"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "mais %s devra être installé"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "mais il n'est pas installable"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "mais c'est un paquet virtuel"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "mais il n'est pas installé"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "mais ne sera pas installé"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " ou"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Les NOUVEAUX paquets suivants seront installés :"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Les paquets suivants seront ENLEVÉS :"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Les paquets suivants ont été conservés :"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Les paquets suivants seront mis à jour :"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Les paquets retenus suivants seront changés :"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (en raison de %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1502,27 +1512,27 @@ msgstr ""
"Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n"
"que vous êtes en train de faire."
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu mis à jour, %lu nouvellement installés, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu réinstallés, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu remis à une version inférieure, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu à enlever et %lu non mis à jour.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu partiellement installés ou enlevés.\n"
@@ -1531,7 +1541,7 @@ msgstr "%lu partiellement installés ou enlevés.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[O/n]"
@@ -1539,21 +1549,21 @@ msgstr "[O/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[o/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "O"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erreur de compilation de l'expression rationnelle - %s"
@@ -1594,16 +1604,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "La commande de mise à jour ne prend pas de paramètre"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Calcul de la mise à jour... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Erreur interne, AllUpgrade a cassé le boulot !"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Fait"
@@ -1611,7 +1621,19 @@ msgstr "Fait"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1629,12 +1651,12 @@ msgstr ""
" et la situation n'est donc pas forcément représentative\n"
" de la réalité !"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Impossible de changer le nom %s en %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1680,8 +1702,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1719,24 +1741,6 @@ msgstr "Pas d'entrée trouvée dans le fichier de miroir « %s »."
msgid "[Mirror: %s]"
msgstr "[Miroir : %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Impossible de modifier %s avec mmap et l'utilisation des opérations de "
-"fichiers : le correctif semble être corrompu."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Impossible de modifier %s avec mmap (sans échec particulier de mmap) : le "
-"correctif semble être corrompu."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Impossible de créer le tube IPC sur le sous-processus"
@@ -2810,87 +2814,98 @@ msgstr "Impossible de traiter le fichier %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Impossible de traiter le fichier %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)"
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Ligne %lu mal formée dans la liste des sources %s (impossible d'analyser "
"[option])"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"Ligne %lu mal formée dans la liste de sources %s ([option] trop courte)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Ligne %lu mal formée dans la liste des sources %s ([%s] n'est pas une "
"affectation)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
"Ligne %lu mal formée dans la liste des sources %s ([%s] n'a pas de clé)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Ligne %lu mal formée dans la liste des sources %s ([%s] la clé %s n'a pas de "
"valeur)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Ligne %lu mal formée dans le fichier de source %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Ligne %lu mal formée dans la liste de sources %s (distribution)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
"Ligne %lu mal formée dans la liste des sources %s (distribution absolue)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
"Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Ouverture de %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "La ligne %u du fichier des listes de sources %s est trop longue."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Ligne %u mal formée dans la liste des sources %s (type)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr ""
+"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3134,7 +3149,7 @@ msgstr "Taille incohérente"
msgid "Invalid file format"
msgstr "L'opération %s n'est pas valable"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3143,18 +3158,18 @@ msgstr ""
"Impossible de trouver l'entrée « %s » attendue dans le fichier « Release » : "
" ligne non valable dans sources.list ou fichier corrompu"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr ""
"Impossible de trouver la comme de contrôle de « %s » dans le fichier Release"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3163,12 +3178,12 @@ msgstr ""
"Le fichier « Release » pour %s a expiré (plus valable depuis %s). Les mises "
"à jour depuis ce dépôt ne s'effectueront pas."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3179,12 +3194,12 @@ msgstr ""
"GPG : %s : %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "Erreur de GPG : %s : %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3193,14 +3208,14 @@ msgstr ""
"Impossible de localiser un fichier du paquet %s. Cela signifie que vous "
"devrez corriger ce paquet vous-même (absence d'architecture)."
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
"Impossible de trouver une source de téléchargement de la version « %s » de "
"« %s »"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3536,33 +3551,37 @@ msgstr "Préparation de la suppression complète de %s"
msgid "Completely removed %s"
msgstr "%s complètement supprimé"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Impossible d'écrire sur %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "L'opération a été interrompue avant de se terminer"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr "Aucun rapport « apport » écrit car MaxReports a déjà été atteint"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "problème de dépendances : laissé non configuré"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3570,14 +3589,14 @@ msgstr ""
"Aucun rapport « apport » n'a été créé car le message d'erreur indique une "
"erreur consécutive à un échec précédent."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
"Aucun rapport « apport » n'a été créé car un disque plein a été signalé"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3585,7 +3604,7 @@ msgstr ""
"Aucun « apport » n'a été créé car une erreur de dépassement de capacité "
"mémoire a été signalée"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3593,7 +3612,7 @@ msgid ""
msgstr ""
"Aucun rapport « apport » n'a été créé car un disque plein a été signalé"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3630,6 +3649,20 @@ msgstr ""
msgid "Not locked"
msgstr "Non verrouillé"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Impossible de modifier %s avec mmap et l'utilisation des opérations de "
+#~ "fichiers : le correctif semble être corrompu."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Impossible de modifier %s avec mmap (sans échec particulier de mmap) : le "
+#~ "correctif semble être corrompu."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Note : sélection de %s pour la tâche « %s »\n"
diff --git a/po/gl.po b/po/gl.po
index 594340651..a3f6596a0 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_gl\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2011-05-12 15:28+0100\n"
"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
"Language-Team: galician <proxecto@trasno.net>\n"
@@ -96,7 +96,7 @@ msgid "Total space accounted for: "
msgstr "Espazo total contabilizado: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "O ficheiro de paquete %s está sen sincronizar."
@@ -104,7 +104,7 @@ msgstr "O ficheiro de paquete %s está sen sincronizar."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Non se atopou ningún paquete"
@@ -661,7 +661,7 @@ msgstr "%s xa é a versión máis recente.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Agardouse por %s pero non estaba alí"
@@ -690,6 +690,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -707,14 +712,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -750,11 +759,11 @@ msgid "File not found"
msgstr "Non se atopou o ficheiro"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Non foi posíbel determinar o estado"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Non foi posíbel estabelecer a hora de modificación"
@@ -829,9 +838,9 @@ msgstr "Unha resposta desbordou o búfer."
msgid "Protocol corruption"
msgstr "Dano no protocolo"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Produciuse un erro de escritura"
@@ -844,7 +853,7 @@ msgid "Could not connect data socket, connection timed out"
msgstr ""
"Non é posíbel conectar o socket de datos, o tempo esgotouse para a conexión"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Fallou"
@@ -1094,7 +1103,7 @@ msgstr "Produciuse un fallo na conexión"
msgid "Internal error"
msgstr "Produciuse un erro interno"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1349,101 +1358,101 @@ msgstr "Instalar estes paquetes sen verificación?"
msgid "Failed to fetch %s %s\n"
msgstr "Non foi posíbel obter %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Os seguintes paquetes teñen dependencias sen cumprir:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "mais %s está instalado"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "mais vaise instalar %s"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "mais non é instalábel"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "mais é un paquete virtual"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "mais non está instalado"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "mais non se vai a instalar"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " ou"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Os seguintes paquetes NOVOS hanse instalar:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Vanse RETIRAR os paquetes seguintes:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Consérvanse os seguintes paquetes:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Vanse anovar os paquetes seguintes:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Vanse REVERTER os seguintes paquetes :"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Vanse modificar os paquetes retidos seguintes:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (por mor de %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1451,27 +1460,27 @@ msgstr ""
"AVISO: Retiraranse os seguintes paquetes esenciais.\n"
"Isto NON se debe facer a menos que saiba exactamente o que está a facer!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu anovados, %lu instalados, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu revertidos, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "Vanse retirar %lu e deixar %lu sen anovar.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu non instalados ou retirados de todo.\n"
@@ -1480,7 +1489,7 @@ msgstr "%lu non instalados ou retirados de todo.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[S/n]"
@@ -1488,21 +1497,21 @@ msgstr "[S/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[s/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "S"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Produciuse un erro na compilación da expresión regular - %s"
@@ -1543,16 +1552,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "A orde «update» non toma argumentos"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Calculando a anovación... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Produciuse un erro interno, AllUpgrade estragou cousas"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Feito"
@@ -1560,7 +1569,19 @@ msgstr "Feito"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1577,12 +1598,12 @@ msgstr ""
" Lembre tamén que o bloqueo está desactivado,\n"
" polo que non debe depender da relevancia da situación actual real."
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Non foi posíbel cambiar o nome de %s a %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1628,8 +1649,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1667,24 +1688,6 @@ msgstr "Non é posíbel ler o ficheiro de replica «%s»"
msgid "[Mirror: %s]"
msgstr "[Replica: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Non foi posíbel actualizar %s con mmap e co ficheiro usado na operación - a "
-"actualización semella estar danada."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Non foi posíbel actualizar %s con mmap e (mais non hai un fallo específico "
-"de mmap) - a actualización semella estar danada."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Non foi posíbel crear a canle IPC ao subproceso"
@@ -2750,80 +2753,90 @@ msgstr "Non é posíbel analizar o ficheiro de paquetes %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Non é posíbel analizar o ficheiro de paquetes %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Liña %lu mal construída na lista de orixes %s (análise de URI)"
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Liña %lu mal construída na lista de fontes %s ([opción] non analizábel)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"Liña %lu mal construída na lista de fontes %s ([opción] demasiado curta)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Liña %lu mal construída na lista de fontes %s ([%s] non é unha asignación)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Liña %lu mal construída na lista de fontes %s ([%s] non ten chave)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Liña %lu mal construída na lista de fontes %s ([%s] a chave %s non ten valor)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Liña %lu mal construída na lista de orixes %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Liña %lu mal construída na lista de orixes %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Liña %lu mal construída na lista de orixes %s (análise de URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Liña %lu mal construída na lista de orixes %s (dist absoluta)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Liña %lu mal construída na lista de orixes %s (análise de dist)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Abrindo %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Liña %u longa de máis na lista de orixes %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Liña %u mal construída na lista de orixes %s (tipo)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3050,7 +3063,7 @@ msgstr "Os tamaños non coinciden"
msgid "Invalid file format"
msgstr "Operación incorrecta: %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3059,29 +3072,29 @@ msgstr ""
"Non é posíbel atopar a entrada agardada «%s» no ficheiro de publicación "
"(entrada sources.list incorrecta ou ficheiro con formato incorrecto)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr ""
"Non é posíbel ler a suma de comprobación para «%s» no ficheiro de publicación"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "Non hai unha chave pública dispoñíbel para os seguintes ID de chave:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Conflito na distribución: %s (agardábase %s mais obtívose %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3092,12 +3105,12 @@ msgstr ""
"%s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "Produciuse un erro de GPG: %s %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3106,12 +3119,12 @@ msgstr ""
"Non é posíbel atopar un ficheiro para o paquete %s. Isto pode significar que "
"ten que arranxar este paquete a man. (Falta a arquitectura)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3447,35 +3460,39 @@ msgstr "Preparándose para retirar %s completamente"
msgid "Completely removed %s"
msgstr "Retirouse %s completamente"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Non é posíbel escribir en %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Non se escribiu ningún informe de Apport porque xa se acadou o nivel "
"MaxReports"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "problemas de dependencias - déixase sen configurar"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3483,7 +3500,7 @@ msgstr ""
"Non se escribiu ningún informe de Apport porque a mensaxe de erro indica que "
"é un error provinte dun fallo anterior."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3491,7 +3508,7 @@ msgstr ""
"Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un "
"erro de disco cheo."
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3499,7 +3516,7 @@ msgstr ""
"Non se escribiu un informe de contribución porque a mensaxe de erro indica "
"un erro de falta de memoria"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3508,7 +3525,7 @@ msgstr ""
"Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un "
"erro de disco cheo."
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3544,6 +3561,20 @@ msgstr ""
msgid "Not locked"
msgstr "Non está bloqueado"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Non foi posíbel actualizar %s con mmap e co ficheiro usado na operación - "
+#~ "a actualización semella estar danada."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Non foi posíbel actualizar %s con mmap e (mais non hai un fallo "
+#~ "específico de mmap) - a actualización semella estar danada."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Nota, seleccione «%s» para a tarefa «%s»\n"
diff --git a/po/hu.po b/po/hu.po
index d91bd407e..238737cd3 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt trunk\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-06-25 17:09+0200\n"
"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
@@ -95,7 +95,7 @@ msgid "Total space accounted for: "
msgstr "Nyilvántartott terület összesen: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "%s csomagfájl nincs szinkronban."
@@ -103,7 +103,7 @@ msgstr "%s csomagfájl nincs szinkronban."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Nem találhatók csomagok"
@@ -656,7 +656,7 @@ msgstr "%s eddig sem volt visszafogva.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Nem található a(z) %s, a várakozás után sem"
@@ -676,6 +676,7 @@ msgid "Executing dpkg failed. Are you root?"
msgstr "A dpkg futtatása sikertelen. Van root jogosultsága?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -685,6 +686,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -722,14 +728,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -766,11 +776,11 @@ msgid "File not found"
msgstr "A fájl nem található"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Nem érhető el"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "A módosítási idő beállítása sikertelen"
@@ -847,9 +857,9 @@ msgstr "A válasz túlcsordította a puffert."
msgid "Protocol corruption"
msgstr "Protokollhiba"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Írási hiba"
@@ -862,7 +872,7 @@ msgid "Could not connect data socket, connection timed out"
msgstr ""
"Nem lehet kapcsolódni az adatfoglalathoz, a kapcsolat túllépte az időkorlátot"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Sikertelen"
@@ -1107,7 +1117,7 @@ msgstr "Sikertelen kapcsolódás"
msgid "Internal error"
msgstr "Belső hiba"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1354,101 +1364,101 @@ msgstr "Valóban ellenőrzés nélkül telepíti a csomagokat?"
msgid "Failed to fetch %s %s\n"
msgstr "Sikertelen letöltés: %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Telepítve]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Telepítve]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Telepítve]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "de %s van telepítve"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "de csak %s telepíthető"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "de az nem telepíthető"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "de az egy virtuális csomag"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "de az nincs telepítve"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "de az nincs telepítésre megjelölve"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " vagy"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Az alábbi ÚJ csomagok lesznek telepítve:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Az alábbi csomagok el lesznek TÁVOLÍTVA:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Az alábbi csomagok vissza lesznek tartva:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Az alábbi csomagok frissítve lesznek:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Az alábbi csomagok VISSZAFEJLESZTÉSRE kerülnek:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Az alábbi visszafogott csomagokat cserélem:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (%s miatt) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1456,27 +1466,27 @@ msgstr ""
"FIGYELMEZTETÉS: Az alábbi alapvető csomagok el lesznek távolítva.\n"
"NE tegye ezt, hacsak nem tudja pontosan, mit csinál!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu frissített, %lu újonnan telepített, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu újratelepítendő, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu visszafejlesztendő, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu eltávolítandó és %lu nem frissített.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nincs teljesen telepítve/eltávolítva.\n"
@@ -1485,7 +1495,7 @@ msgstr "%lu nincs teljesen telepítve/eltávolítva.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[I/n]"
@@ -1493,21 +1503,21 @@ msgstr "[I/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[i/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "I"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex fordítási hiba - %s"
@@ -1548,16 +1558,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Az update parancsnak nincsenek argumentumai"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Frissítés kiszámítása... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Belső hiba, az AllUpgrade megsértett valamit"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Kész"
@@ -1565,7 +1575,19 @@ msgstr "Kész"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1581,12 +1603,12 @@ msgstr ""
" Ne feledje, hogy a zárolás is ki van kapcsolva,\n"
" így ne számítson a jelenlegi helyzet valósságára!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "„%s” átnevezése sikertelen erre: %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1632,8 +1654,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1671,24 +1693,6 @@ msgstr "A(z) „%s” tükörfájl nem olvasható"
msgid "[Mirror: %s]"
msgstr "[Tükör: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"%s nem foltozható mmappel és fájlművelet használatával - a folt sérültnek "
-"tűnik."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"%s nem foltozható mmappel (nem mmap specifikus hiba) - a folt sérültnek "
-"tűnik."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Nem sikerült IPC-adatcsatornát létrehozni az alfolyamathoz"
@@ -2750,86 +2754,96 @@ msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI-feldolgozás)"
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] "
"feldolgozhatatlan)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] túl "
"rövid)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] nem "
"érvényes hozzárendelés)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] nem "
"tartalmaz kulcsot)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] %s kulcsnak "
"nincs értéke)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI-feldolgozás)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (Abszolút dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (dist feldolgozás)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "%s megnyitása"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "A(z) %u. sor túl hosszú a(z) %s forráslistában."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "A(z) %u. sor hibás a(z) %s forráslistában (típus)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3057,7 +3071,7 @@ msgstr "A méret nem megfelelő"
msgid "Invalid file format"
msgstr "%s érvénytelen művelet"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3066,16 +3080,16 @@ msgstr ""
"A várt „%s” bejegyzés nem található a Release fájlban (Rossz sources.list "
"bejegyzés vagy helytelenül formázott fájl)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nem található a(z) „%s” ellenőrzőösszege a Release fájlban"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "Nem érhető el nyilvános kulcs az alábbi kulcsazonosítókhoz:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3084,12 +3098,12 @@ msgstr ""
"A Release fájl elavult ehhez: %s (érvénytelen ez óta: %s). A tároló "
"frissítései nem kerülnek alkalmazásra."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Ütköző disztribúció: %s (a várt %s helyett %s érkezett)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3099,12 +3113,12 @@ msgstr ""
"előző indexfájl lesz használva. GPG hiba: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG hiba: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3113,12 +3127,12 @@ msgstr ""
"Egy fájl nem található a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
"kell kijavítani a csomagot. (hiányzó arch. miatt)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Nem található forrás a(z) „%2$s” „%1$s” verziójának letöltéséhez"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3445,33 +3459,37 @@ msgstr "%s teljes eltávolításának előkészítése"
msgid "Completely removed %s"
msgstr "%s teljesen eltávolítva"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Nem lehet írni ebbe: %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "A művelet megszakadt, mielőtt befejeződhetett volna"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr "Nem került írásra apport jelentés, mivel a MaxReports már elérve"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "függőségi hibák - a csomag beállítatlan maradt"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3479,7 +3497,7 @@ msgstr ""
"Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint ez a hiba "
"egy korábbi hiba következménye."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3487,7 +3505,7 @@ msgstr ""
"Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint megtelt a "
"lemez"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3495,7 +3513,7 @@ msgstr ""
"Nem került kiírásra apport jelentés, mivel a hibaüzenet memóriaelfogyási "
"hibát jelez"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
@@ -3503,7 +3521,7 @@ msgstr ""
"Nem került kiírásra apport jelentés, mert a hibaüzenet a helyi rendszeren "
"lévő hibát jelez"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3538,6 +3556,20 @@ msgstr ""
msgid "Not locked"
msgstr "Nincs zárolva"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "%s nem foltozható mmappel és fájlművelet használatával - a folt sérültnek "
+#~ "tűnik."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "%s nem foltozható mmappel (nem mmap specifikus hiba) - a folt sérültnek "
+#~ "tűnik."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Megjegyzés: „%s” kijelölése „%s” feladathoz\n"
diff --git a/po/it.po b/po/it.po
index d7f8a8a24..d566d7de7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2013-08-27 22:06+0200\n"
"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -94,7 +94,7 @@ msgid "Total space accounted for: "
msgstr "Totale spazio occupato: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Il file dei pacchetti %s non è sincronizzato."
@@ -102,7 +102,7 @@ msgstr "Il file dei pacchetti %s non è sincronizzato."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Nessun pacchetto trovato"
@@ -669,7 +669,7 @@ msgstr "%s era già non bloccato.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "In attesa di %s ma non era presente"
@@ -689,6 +689,7 @@ msgid "Executing dpkg failed. Are you root?"
msgstr "Esecuzione di dpkg non riuscita. È stato lanciato come root?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -698,6 +699,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -736,14 +742,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -779,11 +789,11 @@ msgid "File not found"
msgstr "File non trovato"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Esecuzione di stat non riuscita"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Impostazione della data di modifica non riuscita"
@@ -859,9 +869,9 @@ msgstr "Una risposta ha superato le dimensioni del buffer."
msgid "Protocol corruption"
msgstr "Protocollo danneggiato"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Errore di scrittura"
@@ -874,7 +884,7 @@ msgid "Could not connect data socket, connection timed out"
msgstr ""
"Impossibile connettersi al socket dati, tempo esaurito per la connessione"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Non riuscito"
@@ -1125,7 +1135,7 @@ msgstr "Connessione non riuscita"
msgid "Internal error"
msgstr "Errore interno"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1382,101 +1392,101 @@ msgstr "Installare questi pacchetti senza verificarli?"
msgid "Failed to fetch %s %s\n"
msgstr "Impossibile recuperare %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Installato]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Installato]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Installato]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "ma la versione %s è installata"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "ma la versione %s sta per essere installata"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "ma non è installabile"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "ma è un pacchetto virtuale"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "ma non è installato"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "ma non sta per essere installato"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " oppure"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "I seguenti pacchetti NUOVI saranno installati:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "I seguenti pacchetti saranno RIMOSSI:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "I seguenti pacchetti saranno aggiornati:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "I seguenti pacchetti saranno RETROCESSI:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "I seguenti pacchetti bloccati saranno cambiati:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (a causa di %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1485,27 +1495,27 @@ msgstr ""
"Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa "
"si sta facendo."
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aggiornati, %lu installati, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstallati, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu retrocessi, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu da rimuovere e %lu non aggiornati.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu non completamente installati o rimossi.\n"
@@ -1514,7 +1524,7 @@ msgstr "%lu non completamente installati o rimossi.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[S/n]"
@@ -1522,21 +1532,21 @@ msgstr "[S/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[s/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "S"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Errore di compilazione dell'espressione regolare - %s"
@@ -1577,16 +1587,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Il comando update non accetta argomenti"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Calcolo dell'aggiornamento... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Errore interno, AllUpgrade ha rovinato qualche cosa"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Eseguito"
@@ -1594,7 +1604,19 @@ msgstr "Eseguito"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1610,12 +1632,12 @@ msgstr ""
" Inoltre, il meccanismo di blocco non è attivato e non è quindi\n"
" utile dare importanza a tutto ciò per una situazione reale."
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Rinomina di %s in %s non riuscita"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1662,8 +1684,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1701,24 +1723,6 @@ msgstr "Nessuna voce trovata nel file mirror \"%s\""
msgid "[Mirror: %s]"
msgstr "[Mirror: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Impossibile applicare la patch a %s con mmap e con l'utilizzo di operazioni "
-"file. La patch sembra essere danneggiata."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Impossibile applicare la patch a %s con mmap (nessun errore da parte di "
-"mmap). La patch sembra essere danneggiata."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Creazione di una pipe IPC verso il sottoprocesso non riuscita"
@@ -2792,86 +2796,96 @@ msgstr "Impossibile analizzare il file di pacchetto %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Impossibile analizzare il file di pacchetto %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "La riga %lu nel file %s non è corretta (URI parse)"
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"La riga %lu nel file delle sorgenti %s non è corretta ([opzione] non "
"analizzabile)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"La riga %lu nel file delle sorgenti %s non è corretta ([opzione] troppo "
"corta)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"La riga %lu nel file delle sorgenti %s non è corretta ([%s] non è "
"un'assegnazione)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
"La riga %lu nel file delle sorgenti %s non è corretta ([%s] non ha una "
"chiave)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"La riga %lu nel file delle sorgenti %s non è corretta ([%s] la chiave %s non "
"ha un valore)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "La riga %lu nel file %s non è corretta (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "La riga %lu nel file %s non è corretta (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "La riga %lu nel file %s non è corretta (URI parse)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "La riga %lu nel file %s non è corretta (absolute dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "La riga %lu nel file %s non è corretta (dist parse)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Apertura di %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Riga %u troppo lunga nel file %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "La riga %u nel file %s non è corretta (type)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3107,7 +3121,7 @@ msgstr "Le dimensioni non corrispondono"
msgid "Invalid file format"
msgstr "Operazione %s non valida"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3116,17 +3130,17 @@ msgstr ""
"Impossibile trovare la voce \"%s\" nel file Release (voce in sources.list "
"errata o file danneggiato)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Impossibile trovare la somma hash per \"%s\" nel file Release"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Non è disponibile alcuna chiave pubblica per i seguenti ID di chiavi:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3135,12 +3149,12 @@ msgstr ""
"Il file Release per %s è scaduto (non valido dal %s). Gli aggiornamenti per "
"questo repository non verranno applicati."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribuzione in conflitto: %s (atteso %s ma ottenuto %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3150,12 +3164,12 @@ msgstr ""
"aggiornato e verranno usati i file indice precedenti. Errore GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "Errore GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3164,14 +3178,14 @@ msgstr ""
"Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario "
"sistemare manualmente questo pacchetto (a causa dell'architettura mancante)."
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
"Impossibile trovare una sorgente per scaricare la versione \"%s\" di \"%s\""
# (ndt) sarebbe da controllare se veramente possono esistere più file indice
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3507,35 +3521,39 @@ msgstr "Preparazione alla rimozione completa di %s"
msgid "Completely removed %s"
msgstr "Pacchetto %s rimosso completamente"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Impossibile scrivere in %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "L'operazione è stata interrotta prima di essere completata"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Segnalazione apport non scritta poiché è stato raggiunto il valore massimo "
"di MaxReports"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "Problemi con le dipendenze - Viene lasciato non configurato"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3543,7 +3561,7 @@ msgstr ""
"Segnalazione apport non scritta poiché il messaggio di errore indica la "
"presenza di un fallimento precedente."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3551,7 +3569,7 @@ msgstr ""
"Segnalazione apport non scritta poiché il messaggio di errore indica un "
"errore per disco pieno."
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3559,7 +3577,7 @@ msgstr ""
"Segnalazione apport non scritta poiché il messaggio di errore indica un "
"errore di memoria esaurita"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3568,7 +3586,7 @@ msgstr ""
"Segnalazione apport non scritta poiché il messaggio di errore indica un "
"errore per disco pieno."
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3605,6 +3623,20 @@ msgstr ""
msgid "Not locked"
msgstr "Non bloccato"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Impossibile applicare la patch a %s con mmap e con l'utilizzo di "
+#~ "operazioni file. La patch sembra essere danneggiata."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Impossibile applicare la patch a %s con mmap (nessun errore da parte di "
+#~ "mmap). La patch sembra essere danneggiata."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Nota, viene selezionato \"%s\" per il task \"%s\"\n"
diff --git a/po/ja.po b/po/ja.po
index 0b495027e..02984f34a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.9.4\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2013-08-11 19:39+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -92,7 +92,7 @@ msgid "Total space accounted for: "
msgstr "総占有容量: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Package ファイル %s が同期していません。"
@@ -100,7 +100,7 @@ msgstr "Package ファイル %s が同期していません。"
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "パッケージが見つかりません"
@@ -661,7 +661,7 @@ msgstr "%s はすでに保留されていません。\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s を待ちましたが、そこにはありませんでした"
@@ -681,6 +681,7 @@ msgid "Executing dpkg failed. Are you root?"
msgstr "dpkg の実行に失敗しました。root 権限で実行していますか?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -690,6 +691,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -726,14 +732,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -769,11 +779,11 @@ msgid "File not found"
msgstr "ファイルが見つかりません"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "状態の取得に失敗しました"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "変更時刻の設定に失敗しました"
@@ -848,9 +858,9 @@ msgstr "レスポンスがバッファをオーバフローさせました。"
msgid "Protocol corruption"
msgstr "プロトコルが壊れています"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "書き込みエラー"
@@ -862,7 +872,7 @@ msgstr "ソケットを作成できません"
msgid "Could not connect data socket, connection timed out"
msgstr "データソケットへ接続できませんでした。接続がタイムアウトしました"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "失敗"
@@ -1108,7 +1118,7 @@ msgstr "接続失敗"
msgid "Internal error"
msgstr "内部エラー"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1351,101 +1361,101 @@ msgstr "検証なしにこれらのパッケージをインストールします
msgid "Failed to fetch %s %s\n"
msgstr "%s の取得に失敗しました %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [インストール済み]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [インストール済み]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [インストール済み]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "以下のパッケージには満たせない依存関係があります:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "しかし、%s はインストールされています"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "しかし、%s はインストールされようとしています"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "しかし、インストールすることができません"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "しかし、これは仮想パッケージです"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "しかし、インストールされていません"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "しかし、インストールされようとしていません"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " または"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "以下のパッケージが新たにインストールされます:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "以下のパッケージは「削除」されます:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "以下のパッケージは保留されます:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "以下のパッケージはアップグレードされます:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "以下のパッケージは「ダウングレード」されます:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "以下の変更禁止パッケージは変更されます:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (%s のため) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1453,27 +1463,27 @@ msgstr ""
"警告: 以下の不可欠パッケージが削除されます。\n"
"何をしようとしているか本当にわかっていない場合は、実行してはいけません!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "アップグレード: %lu 個、新規インストール: %lu 個、"
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "再インストール: %lu 個、"
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "ダウングレード: %lu 個、"
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "削除: %lu 個、保留: %lu 個。\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n"
@@ -1482,7 +1492,7 @@ msgstr "%lu 個のパッケージが完全にインストールまたは削除
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[Y/n]"
@@ -1490,21 +1500,21 @@ msgstr "[Y/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[y/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "正規表現の展開エラー - %s"
@@ -1547,16 +1557,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "update コマンドは引数をとりません"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "アップグレードパッケージを検出しています ... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "内部エラー、AllUpgrade が何かを破壊しました"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "完了"
@@ -1564,7 +1574,18 @@ msgstr "完了"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1580,12 +1601,12 @@ msgstr ""
" ロックが非アクティブであることから、今この時点の状態に妥当性が\n"
" あるとは言い切れないことに注意してください!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "%s を %s に名前変更できませんでした"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1631,8 +1652,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1670,24 +1691,6 @@ msgstr "ミラーファイル '%s' のエントリが見つかりません"
msgid "[Mirror: %s]"
msgstr "[ミラー: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"mmap およびファイル操作用法へのパッチ %s を適用できません - パッチが壊れてい"
-"るようです。"
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"mmap へのパッチ %s を適用できません (しかし mmap 固有の失敗ではありません) - "
-"パッチが壊れているようです。"
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "子プロセスへの IPC パイプの作成に失敗しました"
@@ -2739,80 +2742,90 @@ msgstr "パッケージファイル %s を解釈することができません (
msgid "Unable to parse package file %s (2)"
msgstr "パッケージファイル %s を解釈することができません (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)"
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"ソースリスト %2$s の %1$lu 行目が不正です ([オプション] を解釈できません)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"ソースリスト %2$s の %1$lu 行目が不正です ([オプション] が短かすぎます)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] は割り当てられていません)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s にキーがありません)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] キー %4$s に値がありません)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "ソースリスト %2$s の %1$lu 行目が不正です (absolute dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist parse)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "%s をオープンしています"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "ソースリスト %2$s の %1$u 行目が長すぎます。"
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3042,7 +3055,7 @@ msgstr "サイズが適合しません"
msgid "Invalid file format"
msgstr "不正な操作 %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3051,16 +3064,16 @@ msgstr ""
"期待されるエントリ '%s' が Release ファイル内に見つかりません (誤った "
"sources.list エントリか、壊れたファイル)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Release ファイル中の '%s' のハッシュサムを見つけられません"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3069,14 +3082,14 @@ msgstr ""
"%s の Release ファイルは期限切れ (%s 以来無効) です。このリポジトリからの更新"
"物は適用されません。"
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
"ディストリビューションが競合しています: %s (%s を期待していたのに %s を取得し"
"ました)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3086,12 +3099,12 @@ msgstr ""
"ファイルが使われます。GPG エラー: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG エラー: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3100,12 +3113,12 @@ msgstr ""
"パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
"で修正する必要があります (存在しないアーキテクチャのため)。"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "'%2$s' のバージョン '%1$s' をダウンロードするソースが見つかりません"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3435,33 +3448,37 @@ msgstr "%s を完全に削除する準備をしています"
msgid "Completely removed %s"
msgstr "%s を完全に削除しました"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "%s に書き込めません"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "操作はそれが完了する前に中断されました"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr "MaxReports にすでに達しているため、レポートは書き込まれません"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "依存関係の問題 - 未設定のままにしています"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3469,7 +3486,7 @@ msgstr ""
"エラーメッセージは前の失敗から続くエラーであることを示しているので、レポート"
"は書き込まれません。"
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3477,7 +3494,7 @@ msgstr ""
"エラーメッセージはディスクフルエラーであることを示しているので、レポートは書"
"き込まれません。"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3485,7 +3502,7 @@ msgstr ""
"エラーメッセージはメモリ超過エラーであることを示しているので、レポートは書き"
"込まれません。"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3494,7 +3511,7 @@ msgstr ""
"エラーメッセージはディスクフルエラーであることを示しているので、レポートは書"
"き込まれません。"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3530,6 +3547,20 @@ msgstr ""
msgid "Not locked"
msgstr "ロックされていません"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "mmap およびファイル操作用法へのパッチ %s を適用できません - パッチが壊れて"
+#~ "いるようです。"
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "mmap へのパッチ %s を適用できません (しかし mmap 固有の失敗ではありませ"
+#~ "ん) - パッチが壊れているようです。"
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "注意: タスク '%2$s' に対して '%1$s' を選択しています\n"
diff --git a/po/km.po b/po/km.po
index 9729de5c1..c76ef42d3 100644
--- a/po/km.po
+++ b/po/km.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_km\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2006-10-10 09:48+0700\n"
"Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
"Language-Team: Khmer <support@khmeros.info>\n"
@@ -97,7 +97,7 @@ msgid "Total space accounted for: "
msgstr "ទំហំ​សរុប​ដែល​ទុក​សម្រាប់ ៖ "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "ឯកសារ​កញ្ចប់ %s នៅ​ខាងក្រៅ​ការ​ធ្វើសមកាលកម្ម ។"
@@ -105,7 +105,7 @@ msgstr "ឯកសារ​កញ្ចប់ %s នៅ​ខាងក្រៅ
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "រក​កញ្ចប់​មិន​ឃើញ"
@@ -636,7 +636,7 @@ msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទ
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "រង់ចាំប់​ %s ប៉ុន្តែ ​វា​មិន​នៅទីនោះ"
@@ -665,6 +665,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -682,14 +687,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -725,11 +734,11 @@ msgid "File not found"
msgstr "រកឯកសារ​មិន​ឃើញ​"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "បរាជ័យ​ក្នុងការថ្លែង"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "បរាជ័យក្នុងការកំណត់​ពេលវេលា​ការកែប្រែ​"
@@ -803,9 +812,9 @@ msgstr "ឆ្លើយតប​សតិ​បណ្តោះអាសន្ន
msgid "Protocol corruption"
msgstr "ការបង្ខូច​ពិធីការ​"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "ការសរសេរ​មានកំហុស"
@@ -817,7 +826,7 @@ msgstr "មិន​អាច​បង្កើត​រន្ធបានឡើ
msgid "Could not connect data socket, connection timed out"
msgstr "មិន​អាច​តភ្ជាប់​​រន្ធទិន្នន័យ​បានឡើយ អស់​ពេល​ក្នុងការតភ្ជាប់​"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "បាន​បរាជ័យ"
@@ -1060,7 +1069,7 @@ msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​"
msgid "Internal error"
msgstr "កំហុស​ខាង​ក្នុង​"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1299,101 +1308,101 @@ msgstr "ដំឡើង​កញ្ចប់​ទាំងនេះ ​ដោ
msgid "Failed to fetch %s %s\n"
msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [បានដំឡើង​]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [បានដំឡើង​]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [បានដំឡើង​]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "កញ្ចប់​ខាងក្រោម​មាន​ភាពអាស្រ័យ​ដែល​ខុស​គ្នា ៖"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "ប៉ុន្តែ​ %s ត្រូវ​បាន​ដំឡើង​"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "ប៉ុន្តែ​​វា​មិន​អាច​ដំឡើង​បាន​ទេ​"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "ប៉ុន្តែ​​វា​ជា​កញ្ចប់​និម្មិត​"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "ប៉ុន្តែ​វា​មិន​បាន​ដំឡើង​ទេ​"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "ប៉ុន្តែ វា​នឹង​មិន​ត្រូវ​បាន​ដំឡើង​ទេ"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " ឬ"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "កញ្ចប់​ខាងក្រោម​នឹងត្រូវ​បាន​យកចេញ ៖"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "​កញ្ចប់​ខាង​ក្រោម​ត្រូវ​បាន​យក​ត្រឡប់​មក​វិញ ៖"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​​ធ្វើ​ឲ្យប្រសើ​ឡើង ៖"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​បន្ទាប ៖"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "កញ្ចប់​រង់ចាំ​ខាងក្រោម​នឹង​ត្រូវ​​បានផ្លាស់​​ប្តូរ​ ៖"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (ដោយ​សារតែ​ %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1401,27 +1410,27 @@ msgstr ""
"ព្រមាន​ ៖ កញ្ចប់ដែល​ចាំបាច់​ខាងក្រោម​នឹង​ត្រូវ​បាន​យកចេញ ។\n"
"ការយកចេញ​នេះ​មិន​ត្រូវ​បានធ្វើ​ទេ​លុះត្រា​តែ​អ្នកដឹង​ថា​​អ្នក​កំពុង​ធ្វើ​អ្វីឲ្យប្រាកដ !"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu ត្រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ %lu ត្រូវ​បានដំឡើង​ថ្មី "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu ត្រូវ​បាន​ដំឡើង​ឡើង​វិញ "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu ​ត្រូវបានបន្ទាប់ "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu ដែលត្រូវ​យក​ចេញ​ ហើយ​ %lu មិន​​បាន​ធ្វើ​ឲ្យ​ប្រសើរឡើយ ។\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញបានគ្រប់ជ្រុងជ្រោយ​ឡើយ​ ។\n"
@@ -1430,7 +1439,7 @@ msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញប
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr ""
@@ -1438,21 +1447,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex កំហុស​ការចងក្រង​ - %s"
@@ -1493,16 +1502,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម័យ​គ្មាន​អាគុយម៉ង់​ទេ"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "កំហុស​ខាងក្នុង ការធ្វើឲ្យប្រសើរ​ទាំងអស់បានធ្វើឲ្យ​ឧបករណ៍​ខូច"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "ធ្វើរួច​"
@@ -1510,7 +1519,19 @@ msgstr "ធ្វើរួច​"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1522,12 +1543,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1573,8 +1594,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1612,20 +1633,6 @@ msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡ
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​បំពង់​ IPC សម្រាប់​ដំណើរ​ការ​រង​"
@@ -2676,76 +2683,86 @@ msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1
msgid "Unable to parse package file %s (2)"
msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់​ %s (2) បានឡើយ"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "បន្ទាត់​ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)"
+
+#: apt-pkg/sourcelist.cc:155
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​ញ្ជី​ប្រភព​ %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "បន្ទាត់​ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist លែងប្រើ)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "កំពុង​បើក​ %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "បន្ទាត់​ %u មាន​ប្រវែង​វែងពេកនៅ​ក្នុង​បញ្ជី​ប្រភព​ %s ។"
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "បន្ទាត់​ Malformed %u ក្នុង​បញ្ជី​ប្រភព​ %s (ប្រភេទ​)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2963,35 +2980,35 @@ msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​"
msgid "Invalid file format"
msgstr "ប្រតិបត្តិការ​មិន​ត្រឹមត្រូវ​ %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "គ្មាន​កូនសោ​សាធារណៈ​អាច​រក​បាន​ក្នុងកូនសោ IDs ខាងក្រោម​នេះទេ ៖\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2999,12 +3016,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3013,12 +3030,12 @@ msgstr ""
"ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។ "
"(ដោយសារ​​បាត់​ស្ថាបត្យកម្ម)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3336,57 +3353,61 @@ msgstr "កំពុង​រៀបចំ​យក %s ចេញ​ទាំង
msgid "Completely removed %s"
msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "មិន​អាច​សរសេរ​ទៅ %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/ko.po b/po/ko.po
index d6968b85f..5d88f7e89 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2010-08-30 02:31+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -89,7 +89,7 @@ msgid "Total space accounted for: "
msgstr "차지하는 전체 용량: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "패키지 파일 %s 파일이 동기화되지 않았습니다."
@@ -97,7 +97,7 @@ msgstr "패키지 파일 %s 파일이 동기화되지 않았습니다."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "패키지가 없습니다"
@@ -643,7 +643,7 @@ msgstr "%s 패키지는 이미 최신 버전입니다.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다"
@@ -672,6 +672,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -689,14 +694,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -732,11 +741,11 @@ msgid "File not found"
msgstr "파일이 없습니다"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "파일 정보를 읽는데 실패했습니다"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "파일 변경 시각을 설정하는데 실패했습니다"
@@ -811,9 +820,9 @@ msgstr "응답이 버퍼 크기를 넘어갔습니다."
msgid "Protocol corruption"
msgstr "프로토콜이 틀렸습니다"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "쓰기 오류"
@@ -825,7 +834,7 @@ msgstr "소켓을 만들 수 없습니다"
msgid "Could not connect data socket, connection timed out"
msgstr "데이터 소켓을 연결할 수 없습니다. 연결 시간이 초과되었습니다"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "실패"
@@ -1068,7 +1077,7 @@ msgstr "연결이 실패했습니다"
msgid "Internal error"
msgstr "내부 오류"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1310,101 +1319,101 @@ msgstr "확인하지 않고 패키지를 설치하시겠습니까?"
msgid "Failed to fetch %s %s\n"
msgstr "%s 파일을 받는데 실패했습니다 %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [설치함]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [설치함]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [설치함]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "다음 패키지의 의존성이 맞지 않습니다:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "하지만 %s 패키지를 설치했습니다"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "하지만 %s 패키지를 설치할 것입니다"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "하지만 설치할 수 없습니다"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "하지만 가상 패키지입니다"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "하지만 설치하지 않았습니다"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "하지만 %s 패키지를 설치하지 않을 것입니다"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " 혹은"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "다음 새 패키지를 설치할 것입니다:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "다음 패키지를 지울 것입니다:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "다음 패키지를 과거 버전으로 유지합니다:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "다음 패키지를 업그레이드할 것입니다:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "다음 패키지를 다운그레이드할 것입니다:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "고정되었던 다음 패키지를 바꿀 것입니다:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (%s때문에) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1412,27 +1421,27 @@ msgstr ""
"경고: 꼭 필요한 다음 패키지를 지우게 됩니다.\n"
"무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu개 업그레이드, %lu개 새로 설치, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu개 다시 설치, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu개 업그레이드, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu개 제거 및 %lu개 업그레이드 안 함.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n"
@@ -1441,7 +1450,7 @@ msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[Y/n]"
@@ -1449,21 +1458,21 @@ msgstr "[Y/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[y/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "정규식 컴파일 오류 - %s"
@@ -1505,16 +1514,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "update 명령은 인수를 받지 않습니다"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "업그레이드를 계산하는 중입니다... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "내부 오류, AllUpgrade 프로그램이 무언가를 망가뜨렸습니다"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "완료"
@@ -1522,7 +1531,18 @@ msgstr "완료"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1538,12 +1558,12 @@ msgstr ""
" 또 잠금 기능을 사용하지 않는 상태이므로, 현재 상황에 의존하지\n"
" 않도록 하십시오!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1589,8 +1609,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1628,24 +1648,6 @@ msgstr "'%s' 미러 파일이 없습니다 "
msgid "[Mirror: %s]"
msgstr "[미러 사이트: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"%s 패치를 mmap과 파일 동작을 이용해 적용할 수 없습니다. 패치 파일이 손상된 것"
-"처럼 보입니다."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"%s 패치를 mmap을 이용해 (mmap 관련 실패는 없음) 적용할 수 없습니다. 패치 파일"
-"이 손상된 것처럼 보입니다."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "하위 프로세스에 대한 IPC 파이프를 만드는데 실패했습니다"
@@ -2696,77 +2698,87 @@ msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (1)"
msgid "Unable to parse package file %s (2)"
msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)"
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 파싱 불가)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 너무 짧음)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 대입이 아님)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 키가 없음)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] %4$s 키에 값이 없음)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (절대 dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파싱)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "%s 파일을 여는 중입니다"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "소스 리스트 %2$s의 %1$u번 줄이 너무 깁니다."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2986,35 +2998,35 @@ msgstr "크기가 맞지 않습니다"
msgid "Invalid file format"
msgstr "잘못된 작업 %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Release 파일 %s 파일을 파싱할 수 없습니다"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "다음 키 ID의 공개키가 없습니다:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "배포판 충돌: %s (예상값 %s, 실제값 %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3024,12 +3036,12 @@ msgstr ""
"예전의 인덱스 파일을 사용합니다. GPG 오류: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG 오류: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3038,12 +3050,12 @@ msgstr ""
"%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습"
"니다. (아키텍쳐가 빠졌기 때문입니다)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3366,33 +3378,37 @@ msgstr "%s 패키지를 완전히 지울 준비를 하는 중입니다"
msgid "Completely removed %s"
msgstr "%s 패키지를 완전히 지웠습니다"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "%s에 쓸 수 없습니다"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr "보고서를 작성하지 않습니다. 이미 MaxReports 값에 도달했습니다."
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "의존성 문제 - 설정하지 않은 상태로 남겨둡니다"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3400,20 +3416,20 @@ msgstr ""
"보고서를 작성하지 않습니다. 오류 메시지에 따르면 예전의 실패 때문에 생긴 부수"
"적인 오류입니다."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
"보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다."
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr "보고서를 작성하지 않습니다. 오류 메시지에 따르면 메모리가 부족합니다."
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3421,7 +3437,7 @@ msgid ""
msgstr ""
"보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다."
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3454,6 +3470,20 @@ msgstr ""
msgid "Not locked"
msgstr "잠기지 않음"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "%s 패치를 mmap과 파일 동작을 이용해 적용할 수 없습니다. 패치 파일이 손상"
+#~ "된 것처럼 보입니다."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "%s 패치를 mmap을 이용해 (mmap 관련 실패는 없음) 적용할 수 없습니다. 패치 "
+#~ "파일이 손상된 것처럼 보입니다."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "주의, 작업 '%2$s'에 대해 '%1$s'을(를) 선택합니다\n"
diff --git a/po/ku.po b/po/ku.po
index 7777615c3..d982977f3 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-ku\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2008-05-08 12:48+0200\n"
"Last-Translator: Erdal Ronahi <erdal dot ronahi at gmail dot com>\n"
"Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n"
@@ -96,7 +96,7 @@ msgid "Total space accounted for: "
msgstr "Cihê giştî yê veqetandî: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Pakêta dosya %s li derveyî demê ye."
@@ -104,7 +104,7 @@ msgstr "Pakêta dosya %s li derveyî demê ye."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Pakêt nayên dîtin"
@@ -558,7 +558,7 @@ msgstr "%s jixwe guhertoya nûtirîn e.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -587,6 +587,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -604,14 +609,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -645,12 +654,12 @@ msgid "File not found"
msgstr "Pel nehate dîtin"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
#, fuzzy
msgid "Failed to stat"
msgstr "%s venebû"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr ""
@@ -723,9 +732,9 @@ msgstr ""
msgid "Protocol corruption"
msgstr ""
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Çewtiya nivîsînê"
@@ -737,7 +746,7 @@ msgstr ""
msgid "Could not connect data socket, connection timed out"
msgstr ""
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Serneket"
@@ -982,7 +991,7 @@ msgstr "Girêdan pêk nehatiye"
msgid "Internal error"
msgstr "Çewtiya hundirîn"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1208,127 +1217,127 @@ msgstr ""
msgid "Failed to fetch %s %s\n"
msgstr "Anîna %s %s biserneket\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Sazkirî]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Sazkirî]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Sazkirî]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr ""
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "lê %s sazkirî ye"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "lê %s dê were sazkirin"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "lê sazkirina wê ne gengaz e"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "lê paketeke farazî ye"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "lê ne sazkirî ye"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "lê dê neyê sazkirin"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " û"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Ev pakêtên NÛ dê werine sazkirin:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Ev pakêt dê werine RAKIRIN:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr ""
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Ev paket dê werine bilindkirin:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr ""
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr ""
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (ji ber %s)"
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu hatine bilindkirin, %lu nû hatine sazkirin."
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu ji nû ve sazkirî,"
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu hatine nizmkirin."
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu werin rakirin û %lu neyên bilindkirin. \n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr ""
@@ -1337,7 +1346,7 @@ msgstr ""
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
#, fuzzy
msgid "[Y/n]"
msgstr "[E/n]"
@@ -1346,21 +1355,21 @@ msgstr "[E/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "E"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -1401,15 +1410,15 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr ""
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Bilindkirin tê hesibandin..."
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
msgid "Internal error, Upgrade broke stuff"
msgstr ""
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Temam"
@@ -1417,7 +1426,19 @@ msgstr "Temam"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1429,12 +1450,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "%s ji hev nehate veçirandin"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1477,8 +1498,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1516,20 +1537,6 @@ msgstr "Nikarî pelê %s veke"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr ""
@@ -2519,76 +2526,86 @@ msgstr "Pakêt nehate dîtin %s"
msgid "Unable to parse package file %s (2)"
msgstr "Pakêt nehate dîtin %s"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "%s tê vekirin"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr ""
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2798,35 +2815,35 @@ msgstr "Mezinahî li hev nayên"
msgid "Invalid file format"
msgstr ""
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Pakêt nehate dîtin %s"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2834,24 +2851,24 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3164,57 +3181,61 @@ msgstr "Bi tevahî rakirina %s tê amadekirin"
msgid "Completely removed %s"
msgstr "%s bi tevahî hatine rakirin"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Nivîsandin ji bo %s ne pêkane"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 12ec54dbc..390ab5cb6 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2008-08-02 01:47-0400\n"
"Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -95,7 +95,7 @@ msgid "Total space accounted for: "
msgstr ""
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr ""
@@ -103,7 +103,7 @@ msgstr ""
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Paketų nerasta"
@@ -562,7 +562,7 @@ msgstr "%s ir taip jau yra naujausias.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -591,6 +591,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -608,14 +613,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -649,11 +658,11 @@ msgid "File not found"
msgstr "Failas nerastas"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr ""
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr ""
@@ -726,9 +735,9 @@ msgstr ""
msgid "Protocol corruption"
msgstr ""
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Rašymo klaida"
@@ -740,7 +749,7 @@ msgstr ""
msgid "Could not connect data socket, connection timed out"
msgstr ""
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Nepavyko"
@@ -982,7 +991,7 @@ msgstr "Prisijungti nepavyko"
msgid "Internal error"
msgstr "Vidinė klaida"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1220,101 +1229,101 @@ msgstr "Įdiegti šiuos paketus be patvirtinimo?"
msgid "Failed to fetch %s %s\n"
msgstr "Nepavyko parsiųsti %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Įdiegtas]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Įdiegtas]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Įdiegtas]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Šie paketai turi neįdiegtų priklausomybių:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "bet %s yra įdiegtas"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "bet %s bus įdiegtas"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "tačiau jis negali būti įdiegtas"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "bet tai yra virtualus paketas"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "bet jis nėra įdiegtas"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "bet jis nebus įdiegtas"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " arba"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Bus įdiegti šie NAUJI paketai:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Bus PAŠALINTI šie paketai:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Šių paketų atnaujinimas sulaikomas:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Bus atnaujinti šie paketai:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Bus PAKEISTI SENESNIAIS šie paketai:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Bus pakeisti šie sulaikyti paketai:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (dėl %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1322,27 +1331,27 @@ msgstr ""
"Įspėjimas: Šie būtini paketai bus pašalinti.\n"
"Tai NETURĖTŲ būti daroma, kol tiksliai nežinote ką darote!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu atnaujinti, %lu naujai įdiegti, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu įdiegti iš naujo, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu pasendinti, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu bus pašalinta ir %lu neatnaujinta.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nepilnai įdiegti ar pašalinti.\n"
@@ -1351,7 +1360,7 @@ msgstr "%lu nepilnai įdiegti ar pašalinti.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[T/n]"
@@ -1359,21 +1368,21 @@ msgstr "[T/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[t/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "T"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -1415,16 +1424,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Atnaujinimo komandai argumentų nereikia"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Skaičiuojami atnaujinimai... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Vidinė klaida, problemos sprendimas kažką sugadino"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Įvykdyta"
@@ -1432,7 +1441,19 @@ msgstr "Įvykdyta"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1444,12 +1465,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Nepavyko pervadinti %s į %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1495,8 +1516,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1534,20 +1555,6 @@ msgstr "Nepavyko atverti failo %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Nepavyko subprocesui sukurti IPC gijos"
@@ -2608,76 +2615,86 @@ msgstr ""
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Atveriama %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr ""
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2890,35 +2907,35 @@ msgstr "Neatitinka dydžiai"
msgid "Invalid file format"
msgstr "Klaidingas veiksmas %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nepavyko atverti DB failo %s: %s"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2926,24 +2943,24 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG klaida: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3259,57 +3276,61 @@ msgstr "Ruošiamasi visiškai pašalinti %s"
msgid "Completely removed %s"
msgstr "Visiškai pašalintas %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Nepavyko įrašyti į %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/mr.po b/po/mr.po
index ee2238550..fc382d9bc 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2008-11-20 23:27+0530\n"
"Last-Translator: Sampada <sampadanakhare@gmail.com>\n"
"Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India "
@@ -91,7 +91,7 @@ msgid "Total space accounted for: "
msgstr "हिशेबात घेतलेली एकूण अवकाश(जागा):"
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "पॅकेज संचिका %s सिंक्रोनाइज नाहीत"
@@ -99,7 +99,7 @@ msgstr "पॅकेज संचिका %s सिंक्रोनाइज
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "पॅकेजेस सापडले नाहीत"
@@ -632,7 +632,7 @@ msgstr "%s ही आधीच नविन आवृत्ती आहे.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s साठी थांबलो पण ते तेथे नव्हते"
@@ -661,6 +661,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -678,14 +683,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -721,11 +730,11 @@ msgid "File not found"
msgstr "फाईल सापडली नाही"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "स्टॅट करण्यास असमर्थ"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "बदलण्याचा वेळ निश्चित करण्यास असमर्थ"
@@ -800,9 +809,9 @@ msgstr "प्रतिसाधाने बफर भरुन गेले."
msgid "Protocol corruption"
msgstr "प्रोटोकॉल खराब झाले"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "लिहिण्यात त्रुटी"
@@ -814,7 +823,7 @@ msgstr "सॉकेट तयार करू शकत नाही"
msgid "Could not connect data socket, connection timed out"
msgstr "डेटा सॉकेट जोडू शकत नाही,जोडणी वेळेअभावी बंद केली"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "असमर्थ"
@@ -1058,7 +1067,7 @@ msgstr "जोडणी अयशस्वी"
msgid "Internal error"
msgstr "अंतर्गत त्रुटी"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1303,101 +1312,101 @@ msgstr "पडताळून पाहिल्याशिवाय ही प
msgid "Failed to fetch %s %s\n"
msgstr "%s %s आणणे असफल\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr "[संस्थापित केले]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr "[संस्थापित केले]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr "[संस्थापित केले]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "खालील पॅकेजेस मध्ये नमिळणाऱ्या निर्भरता/ डिपेन्डन्सीज आहेत:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "पण %s संस्थापित झाले"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "पण %s संस्थापित करायचे आहे"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "पण ते संस्थापित करण्याजोगे नाही"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "पण ते आभासी पॅकेज आहे"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "पण ते संस्थापित केले नाही"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "पण ते संस्थापित होणार नाही"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr "किंवा"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "खालील नविन पॅकेजेस संस्थापित होतील:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "खालील नविन पॅकेजेस कायमची काढून टाकली जातील:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "खालील पॅकेजेस परत ठेवली गेली:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "खालील पॅकेजेस पुढिल आवृत्तीकृत होतील:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "खालील पॅकेजेस पुढच्या आवृत्तीकृत होणार नाहीत:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "पुढिल ठेवलेली पॅकेजेस बदलतील:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (च्या मुळे %s)"
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1405,27 +1414,27 @@ msgstr ""
"धोक्याची सूचना:खालील जरूरीची पॅकेजेस कायमची काढून टाकली जातील।\n"
"तुम्हाला तुम्ही काय करत आहात हे कळेपर्यंत असं करता येणार नाही!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu पुढे आवृत्तीकृत केले, %lu नव्याने संस्थापित केले,"
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu पुनर्संस्थापित केले,"
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu मागील आवृत्तीकृत केले,"
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu कायमचे काढून टाकण्यासाठी आणि %lu पुढच्या आवृत्तीकृत झालेली नाही.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu संपूर्ण संस्थापित किंवा कायमची काढून टाकलेली नाही.\n"
@@ -1434,7 +1443,7 @@ msgstr "%lu संपूर्ण संस्थापित किंवा
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr ""
@@ -1442,21 +1451,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "होय"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "रिजेक्स कंपायलेशन त्रुटी -%s "
@@ -1497,16 +1506,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ शकत नाही."
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "पुढिल आवृत्तीची गणती करीत आहे..."
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "अंतर्गत त्रुटी,ऑलअपग्रेडने स्टफला तोडले"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "झाले"
@@ -1514,7 +1523,19 @@ msgstr "झाले"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1526,12 +1547,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ "
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1577,8 +1598,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1616,20 +1637,6 @@ msgstr "%s फाईल उघडता येत नाही"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "उपक्रियेचा आयपीसी वाहिनी तयार करण्यास असमर्थ"
@@ -2680,76 +2687,86 @@ msgstr "%s (1) पॅकेज फाईल पार्स करण्या
msgid "Unable to parse package file %s (2)"
msgstr "%s (२) पॅकेज फाईल पार्स करण्यात असमर्थ"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा"
+
+#: apt-pkg/sourcelist.cc:155
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "स्त्रोत सुची %s (यूआरआय) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "स्त्रोत सुची %s (absolute dist) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "%s उघडत आहे"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "%s स्त्रोत सुचीमध्ये ओळ %u खूप लांब आहे."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "स्त्रोत सुची %s (प्रकार) मध्ये %u वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही "
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही "
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2971,35 +2988,35 @@ msgstr "आकार जुळतनाही"
msgid "Invalid file format"
msgstr "%s अवैध क्रिया"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "पुढील कळ ओळखचिन्हांसाठी सार्वजनिक कळ उपलब्ध नाही:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3007,12 +3024,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3021,12 +3038,12 @@ msgstr ""
"मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते "
"स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) "
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3348,57 +3365,61 @@ msgstr "%s संपूर्ण काढून टाकण्याची त
msgid "Completely removed %s"
msgstr "%s संपूर्ण काढून टाकले"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "%s मध्ये लिहिण्यास असमर्थ "
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 3cca09bb2..835cd4d15 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2010-09-01 21:10+0200\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -96,7 +96,7 @@ msgid "Total space accounted for: "
msgstr "Samlet mengde redegjort plass: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Pakkefila %s er ikke oppdatert."
@@ -104,7 +104,7 @@ msgstr "Pakkefila %s er ikke oppdatert."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Fant ingen pakker"
@@ -647,7 +647,7 @@ msgstr "%s er allerede nyeste versjon.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Ventet på %s, men den ble ikke funnet"
@@ -676,6 +676,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -693,14 +698,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -738,11 +747,11 @@ msgid "File not found"
msgstr "Fant ikke fila"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Klarte ikke å få status"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Klarte ikke å sette endringstidspunkt"
@@ -817,9 +826,9 @@ msgstr "Et svar oversvømte bufferen."
msgid "Protocol corruption"
msgstr "Protokollødeleggelse"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Skrivefeil"
@@ -831,7 +840,7 @@ msgstr "Klarte ikke å opprette en sokkel"
msgid "Could not connect data socket, connection timed out"
msgstr "Klarte ikke å kople til datasokkelen, tidsavbrudd på forbindelsen"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Mislyktes"
@@ -1076,7 +1085,7 @@ msgstr "Forbindelsen mislykkes"
msgid "Internal error"
msgstr "Intern feil"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1324,101 +1333,101 @@ msgstr "Installer disse pakkene uten verifikasjon?"
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikke å skaffe %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Installert]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Installert]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Installert]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Følgende pakker har uinnfridde avhengighetsforhold:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "men %s er installert"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "men %s skal installeres"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "men lar seg ikke installere"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "men er en virtuell pakke"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "men er ikke installert"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "men skal ikke installeres"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " eller"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Følgende NYE pakker vil bli installert:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Følgende pakker vil bli FJERNET:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Følgende pakker er holdt tilbake:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Følgende pakker vil bli oppgradert:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Følgende pakker vil bli NEDGRADERT:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Følgende pakker vil bli endret:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (pga. %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1426,27 +1435,27 @@ msgstr ""
"ADVARSEL: Følgende essensielle pakker vil bli fjernet.\n"
"Dette bør IKKE gjøres, med mindre du vet nøyaktig hva du gjør!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu oppgraderte, %lu nylig installerte, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu installert på nytt, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderte, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu å fjerne og %lu ikke oppgradert.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pakker ikke fullt installert eller fjernet.\n"
@@ -1455,7 +1464,7 @@ msgstr "%lu pakker ikke fullt installert eller fjernet.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[J/n]"
@@ -1463,21 +1472,21 @@ msgstr "[J/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[j/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "J"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Kompileringsfeil i regulært uttrykk - %s"
@@ -1518,16 +1527,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Oppdaterings-kommandoen tar ingen argumenter"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Beregner oppgradering... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Intern feil - «AllUpgrade» ødela noe"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Utført"
@@ -1535,7 +1544,19 @@ msgstr "Utført"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1551,12 +1572,12 @@ msgstr ""
" Husk også at låsing er deaktivert, så ikke regn med \n"
" relevans i forhold til den reelle gjeldende situasjonen."
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Klarte ikke å endre navnet på %s til %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1602,8 +1623,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1641,24 +1662,6 @@ msgstr "Ingen speilfil «%s» funnet"
msgid "[Mirror: %s]"
msgstr "[Speil: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Klarte ikke rette %s med mmap og med filoperasjonbruk - programrettelsen ser "
-"ut til å være korrupt."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Klarte ikke rette %s med mmap (men ingen mmap-spesifikk feil) - "
-"programrettelsen ser ut til å være korrupt."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Klarte ikke å opprette IPC-rør til underprosessen"
@@ -2714,76 +2717,86 @@ msgstr "Klarer ikke å fortolke pakkefila %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Klarer ikke å fortolke pakkefila %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)"
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Feil på linje %lu i kildelista %s ([valg] ikke tolkbar)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Feil på linje %lu i kildelista %s ([valg] for kort)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Feil på linje %lu i kildelista %s ([%s] er ingen tilordning)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Feil på linje %lu i kildelista %s ([%s] har ingen nøkkel)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Feil på linje %lu i kildelista %s ([%s] nøkkel %s har ingen verdi)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Feil på linje %lu i kildelista %s (nettadresse)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Feil på linje %lu i kildelista %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Feil på %lu i kildelista %s (Absolutt dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Feil på %lu i kildelista %s (dist fortolking)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Åpner %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linje %u i kildelista %s er for lang"
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Feil på %u i kildelista %s (type)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typen «%s» er ukjent i linje %u i kildelista %s"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typen «%s» er ukjent i linje %u i kildelista %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3004,36 +3017,36 @@ msgstr "Feil størrelse"
msgid "Invalid file format"
msgstr "Ugyldig operasjon %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Klarer ikke å fortolke Release-fila %s"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Det er ingen offentlig nøkkel tilgjengelig for de følgende nøkkel-ID-ene:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3043,12 +3056,12 @@ msgstr ""
"forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-feil: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3057,12 +3070,12 @@ msgstr ""
"Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne pakken "
"selv (fordi arkitekturen mangler)."
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3391,33 +3404,37 @@ msgstr "Forbereder å fullstendig slette %s"
msgid "Completely removed %s"
msgstr "Fjernet %s fullstendig"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Kan ikke skrive til %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr "Ingen apport-rapport skrevet for MaxReports allerede er nådd"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "avhengighetsproblemer - lar den være uoppsatt"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3425,7 +3442,7 @@ msgstr ""
"Ingen apport-rapport skrevet fordi feilmeldingen indikerer at den er en "
"følgefeil fra en tidligere feil."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3433,7 +3450,7 @@ msgstr ""
"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-"
"feil"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3441,7 +3458,7 @@ msgstr ""
"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «tom for "
"minne»-feil"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3450,7 +3467,7 @@ msgstr ""
"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-"
"feil"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3481,6 +3498,20 @@ msgstr "dpkg ble avbrutt. Du må kjøre «%s» manuelt for å rette problemet,"
msgid "Not locked"
msgstr "Ikke låst"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Klarte ikke rette %s med mmap og med filoperasjonbruk - programrettelsen "
+#~ "ser ut til å være korrupt."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Klarte ikke rette %s med mmap (men ingen mmap-spesifikk feil) - "
+#~ "programrettelsen ser ut til å være korrupt."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Merk, velger «%s» for oppgaven «%s»\n"
diff --git a/po/ne.po b/po/ne.po
index 660924b79..a64e22bab 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2006-06-12 14:35+0545\n"
"Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n"
"Language-Team: Nepali <info@mpp.org.np>\n"
@@ -94,7 +94,7 @@ msgid "Total space accounted for: "
msgstr "को लागि कूल खाली ठाऊँ लेखांकन:"
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "प्याकेज फाइल %s sync भन्दा बाहिर छ ।"
@@ -102,7 +102,7 @@ msgstr "प्याकेज फाइल %s sync भन्दा बाहि
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "कुनै प्याकेजहरू फेला परेन"
@@ -634,7 +634,7 @@ msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन"
@@ -663,6 +663,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -680,14 +685,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -723,11 +732,11 @@ msgid "File not found"
msgstr "फाइल फेला परेन "
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "स्थिर गर्न असफल भयो"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "परिमार्जन समय सेट असफल भयो"
@@ -802,9 +811,9 @@ msgstr "एउटा प्रतिक्रियाले बफर अधि
msgid "Protocol corruption"
msgstr "प्रोटोकल दूषित"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "त्रुटि लेख्नुहोस्"
@@ -816,7 +825,7 @@ msgstr "एउटा सकेट सिर्जना गर्न सके
msgid "Could not connect data socket, connection timed out"
msgstr "डेटा सकेट जडान गर्न सकिएन, जडान समय सकियो"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "असफल भयो"
@@ -1059,7 +1068,7 @@ msgstr "जडान असफल भयो"
msgid "Internal error"
msgstr "आन्तरिक त्रुटि"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1300,101 +1309,101 @@ msgstr "यी प्याकेजहरू रूजू बिना स्
msgid "Failed to fetch %s %s\n"
msgstr "%s %s तान्न असफल भयो\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [स्थापना भयो]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [स्थापना भयो]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [स्थापना भयो]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "निम्न प्याकेजहरुले निर्भरताहरू भेटेनन्:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "तर %s स्थापना भयो"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "तर %s स्थापना हुनुपर्यो"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "तर यो स्थापनायोग्य छैन"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "तर यो अवास्तविक प्याकेज होइन"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "तर यो स्थापना भएन"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "तर यो स्थापना हुन गइरहेको छैन"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr "वा"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "निम्न प्याकेजहरू हटाइनेछन्:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "निम्न प्याकेजहरू पछाडि राखिनेछन्:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "निम्न प्याकेजहरू स्तर वृद्धि हुनेछन्:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "निम्न प्याकेजहरू स्तरकम गरिनेछन्:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "निम्न भइरहेको प्याकेजहरू परिवर्तन हुनेछैन:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (%s कारणले) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1402,27 +1411,27 @@ msgstr ""
"चेतावनी: निम्न आवश्यक प्याकेजहरू हटाइनेछन् ।\n"
"तपाईँ के गरिरहेको यकिन नभएसम्म यो काम गरिने छैन!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu स्तर वृद्धि गरियो, %lu नयाँ स्थापना भयो, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu पुन: स्थापना गरियो, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu स्तर कम गरियो, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu हटाउन र %lu स्तर वृद्धि गरिएन ।\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu पूर्णरुपले स्थापना भएन र हटाइएन ।\n"
@@ -1431,7 +1440,7 @@ msgstr "%lu पूर्णरुपले स्थापना भएन र
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr ""
@@ -1439,21 +1448,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s"
@@ -1494,16 +1503,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "स्तर वृद्धि गणना गरिदैछ..."
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "आन्तरिक त्रुटि,सबै स्तरवृद्धिले उत्तम गुण नष्ट गर्दछ"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "काम भयो"
@@ -1511,7 +1520,19 @@ msgstr "काम भयो"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1523,12 +1544,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr " %s मा %s पुन:नामकरण असफल भयो"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1574,8 +1595,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1613,20 +1634,6 @@ msgstr "फाइल %s खोल्न सकिएन"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "सहायक प्रक्रियामा IPC पाइप सिर्जना गर्न असफल"
@@ -2678,76 +2685,86 @@ msgstr "प्याकेज फाइल पद वर्णन गर्न
msgid "Unable to parse package file %s (2)"
msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (२)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)"
+
+#: apt-pkg/sourcelist.cc:155
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (पूर्ण dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "%s खोलिदैछ"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "लाइन %u स्रोत सूचि %s मा अति लामो छ ।"
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (प्रकार)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2965,35 +2982,35 @@ msgstr "साइज मेल खाएन"
msgid "Invalid file format"
msgstr "अवैध सञ्चालन %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "निम्न कुञ्जी IDs को लागि कुनै सार्वजनिक कुञ्जी उपलब्ध छैन:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3001,12 +3018,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3015,12 +3032,12 @@ msgstr ""
"%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज "
"निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) "
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3339,57 +3356,61 @@ msgstr " %s पूर्ण रुपले हटाउन तयार गर
msgid "Completely removed %s"
msgstr " %s पूर्ण रुपले हट्यो"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr " %s मा लेख्न असक्षम"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 150c456e4..3ae34ade3 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.15.9\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2011-12-05 17:10+0100\n"
"Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -95,7 +95,7 @@ msgid "Total space accounted for: "
msgstr "Totale hoeveelheid verantwoorde ruimte: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Pakketbestand %s is niet meer gesynchroniseerd."
@@ -103,7 +103,7 @@ msgstr "Pakketbestand %s is niet meer gesynchroniseerd."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Geen pakketten gevonden"
@@ -659,7 +659,7 @@ msgstr "%s is reeds de nieuwste versie.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Er is gewacht op %s, maar die kwam niet"
@@ -688,6 +688,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -705,14 +710,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -749,11 +758,11 @@ msgid "File not found"
msgstr "Bestand niet gevonden"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "stat is mislukt"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Instellen van de aanpassingstijd is mislukt"
@@ -828,9 +837,9 @@ msgstr "Een reactie deed de buffer overlopen"
msgid "Protocol corruption"
msgstr "Protocolcorruptie"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Schrijffout"
@@ -842,7 +851,7 @@ msgstr "Kon geen socket aanmaken"
msgid "Could not connect data socket, connection timed out"
msgstr "Kon de datasocket niet verbinden, de verbinding verliep"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Mislukt"
@@ -1093,7 +1102,7 @@ msgstr "Verbinding mislukt"
msgid "Internal error"
msgstr "Interne fout"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1344,101 +1353,101 @@ msgstr "Wilt u deze pakketten installeren zonder verificatie?"
msgid "Failed to fetch %s %s\n"
msgstr "Ophalen van %s is mislukt %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Geïnstalleerd]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Geïnstalleerd]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Geïnstalleerd]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "De volgende pakketten hebben niet-voldane vereisten:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "maar %s is geïnstalleerd"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "maar %s zal geïnstalleerd worden"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "maar het is niet installeerbaar"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "maar het is een virtueel pakket"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "maar het is niet geïnstalleerd"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "maar het zal niet geïnstalleerd worden"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " of"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "De volgende pakketten zullen VERWIJDERD worden:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "De volgende pakketten zijn achtergehouden:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "De volgende pakketten zullen opgewaardeerd worden:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "De volgende pakketten zullen GEDEGRADEERD worden:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (vanwege %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1446,27 +1455,27 @@ msgstr ""
"WAARSCHUWING: De volgende essentiële pakketten zullen verwijderd worden.\n"
"Dit dient NIET gedaan te worden tenzij u precies weet wat u doet!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu pakketten opgewaardeerd, %lu pakketten nieuw geïnstalleerd, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu opnieuw geïnstalleerd, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu gedegradeerd, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu te verwijderen en %lu niet opgewaardeerd.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n"
@@ -1475,7 +1484,7 @@ msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[J/n]"
@@ -1483,21 +1492,21 @@ msgstr "[J/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[j/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "J"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-compilatiefout - %s"
@@ -1538,16 +1547,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "De opdracht 'update' aanvaard geen argumenten"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Opwaardering wordt doorgerekend... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Klaar"
@@ -1555,7 +1564,19 @@ msgstr "Klaar"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1571,12 +1592,12 @@ msgstr ""
" Houd er ook rekening mee ook dat vergrendeling is uitgeschakeld en\n"
" vertrouw dus niet op de relevantie voor de werkelijke huidige situatie!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Hernoemen van %s naar %s is mislukt"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1622,8 +1643,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1661,24 +1682,6 @@ msgstr "Geen spiegelbestand '%s' gevonden "
msgid "[Mirror: %s]"
msgstr "[Spiegelserver: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Kon %s niet patchen met mmap of met een bestandsoperatie - de patch lijkt "
-"beschadigd te zijn."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Kon %s niet patchen met mmap (maar zonder mmap-specifieke fout) - de patch "
-"lijkt beschadigd te zijn."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Aanmaken van IPC-pijp naar subproces is mislukt"
@@ -2748,77 +2751,87 @@ msgstr "Kon pakketbestand %s niet ontleden (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Kon pakketbestand %s niet ontleden (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Misvormde regel %lu in bronlijst %s (URI parse)"
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Misvormde regel %lu in bronlijst %s ([optie] onbegrijpelijk)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Misvormde regel %lu in bronlijst %s ([optie] te kort)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Misvormde regel %lu in bronlijst %s ([%s] is geen toekenning)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Misvormde regel %lu in bronlijst %s ([%s] heeft geen sleutel)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Misvormde regel %lu in bronlijst %s ([%s] sleutel %s heeft geen waarde)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Misvormde regel %lu in bronlijst %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Misvormde regel %lu in bronlijst %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Misvormde regel %lu in bronlijst %s (URI parse)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Misvormde regel %lu in bronlijst %s (absolute dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Misvormde regel %lu in bronlijst %s (dist parse)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "%s wordt geopend"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Regel %u van de bronlijst %s is te lang."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Misvormde regel %u in bronlijst %s (type)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Type '%s' op regel %u in bronlijst %s is onbekend"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Type '%s' op regel %u in bronlijst %s is onbekend"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3051,36 +3064,36 @@ msgstr "Grootte komt niet overeen"
msgid "Invalid file format"
msgstr "Ongeldige operatie %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Kon Release-bestand %s niet ontleden"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Conflicterende distributie: %s (verwachtte %s, maar kreeg %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3091,12 +3104,12 @@ msgstr ""
"%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-fout: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3105,12 +3118,12 @@ msgstr ""
"Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
"dit pakket handmatig moet repareren (wegens missende architectuur)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3445,35 +3458,39 @@ msgstr "Volledige verwijdering van %s wordt voorbereid"
msgid "Completely removed %s"
msgstr "%s is volledig verwijderd"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Kan niet naar %s schrijven"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Er is geen apport-verslag weggeschreven omdat het maximum aantal verslagen "
"(MaxReports) al is bereikt"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "problemen met vereisten - wordt niet geconfigureerd"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3481,7 +3498,7 @@ msgstr ""
"Er is geen apport-verslag weggeschreven omdat de foutmelding volgt op een "
"eerdere mislukking."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3489,7 +3506,7 @@ msgstr ""
"Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is "
"over een volle schijf."
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3497,7 +3514,7 @@ msgstr ""
"Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is "
"over onvoldoende-geheugen."
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3506,7 +3523,7 @@ msgstr ""
"Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is "
"over een volle schijf."
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3540,6 +3557,20 @@ msgstr ""
msgid "Not locked"
msgstr "Niet vergrendeld"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Kon %s niet patchen met mmap of met een bestandsoperatie - de patch lijkt "
+#~ "beschadigd te zijn."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Kon %s niet patchen met mmap (maar zonder mmap-specifieke fout) - de "
+#~ "patch lijkt beschadigd te zijn."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Let op, '%s' wordt geselecteerd omwille van de taak '%s'\n"
diff --git a/po/nn.po b/po/nn.po
index 6cb37a7a3..937597248 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_nn\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2005-02-14 23:30+0100\n"
"Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
"Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -96,7 +96,7 @@ msgid "Total space accounted for: "
msgstr "Brukt plass i alt: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Pakkefila %s er ute av takt."
@@ -104,7 +104,7 @@ msgstr "Pakkefila %s er ute av takt."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Fann ingen pakkar"
@@ -641,7 +641,7 @@ msgstr "Den nyaste versjonen av %s er installert fr fr.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Venta p %s, men den fanst ikkje"
@@ -670,6 +670,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -687,14 +692,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -732,11 +741,11 @@ msgid "File not found"
msgstr "Fann ikkje fila"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Klarte ikkje f status"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Klarte ikkje setja endringstidspunkt"
@@ -811,9 +820,9 @@ msgstr "Eit svar flaumde over bufferen."
msgid "Protocol corruption"
msgstr "Protokollydeleggjing"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Skrivefeil"
@@ -825,7 +834,7 @@ msgstr "Klarte ikkje oppretta sokkel"
msgid "Could not connect data socket, connection timed out"
msgstr "Klarte ikkje kopla til datasokkel, tidsavbrot p sambandet"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Mislukkast"
@@ -1068,7 +1077,7 @@ msgstr "Sambandet mislukkast"
msgid "Internal error"
msgstr "Intern feil"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1309,101 +1318,101 @@ msgstr "Installer desse pakkane utan verifikasjon?"
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikkje henta %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Installert]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Installert]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Installert]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Flgjande pakkar har krav som ikkje er oppfylte:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "men %s er installert"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "men %s skal installerast"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "men lt seg ikkje installera"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "men er ein virtuell pakke"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "men er ikkje installert"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "men skal ikkje installerast"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " eller"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Dei flgjande NYE pakkane vil verta installerte:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Dei flgjande pakkane vil verta FJERNA:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Dei flgjande pakkane er haldne tilbake:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Dei flgjande pakkane vil verta oppgraderte:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Dei flgjande pakkane vil verta NEDGRADERTE:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Dei flgjande pakkane som er haldne tilbake vil verta endra:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (fordi %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -1412,27 +1421,27 @@ msgstr ""
"TVARING: Dei flgjande ndvendige pakkane vil verta fjerna.\n"
"Dette br IKKJE gjerast utan at du er fullstendig klar over kva du gjer!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu oppgraderte, %lu nyleg installerte, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu installerte p nytt, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderte, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
@@ -1441,7 +1450,7 @@ msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[J/n]"
@@ -1449,21 +1458,21 @@ msgstr "[J/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[j/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "J"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-kompileringsfeil - %s"
@@ -1505,16 +1514,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Oppdateringskommandoen tek ingen argument"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Reknar ut oppgradering ... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Intern feil. AllUpgrade ydelagde noko"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Ferdig"
@@ -1522,7 +1531,19 @@ msgstr "Ferdig"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1534,12 +1555,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Klarte ikkje endra namnet p %s til %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1585,8 +1606,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1624,20 +1645,6 @@ msgstr "Klarte ikkje opna fila %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Klarte ikkje oppretta IPC-ryr til underprosessen"
@@ -2684,76 +2691,86 @@ msgstr "Klarte ikkje tolka pakkefila %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Klarte ikkje tolka pakkefila %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)"
+
+#: apt-pkg/sourcelist.cc:155
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Misforma linje %lu i kjeldelista %s (dist)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Misforma linje %lu i kjeldelista %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Misforma linje %lu i kjeldelista %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Misforma linje %lu i kjeldelista %s (absolutt dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Opnar %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linja %u i kjeldelista %s er for lang."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Misforma linje %u i kjeldelista %s (type)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, fuzzy, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typen %s er ukjend i linja %u i kjeldelista %s"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typen %s er ukjend i linja %u i kjeldelista %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2977,35 +2994,35 @@ msgstr "Feil storleik"
msgid "Invalid file format"
msgstr "Ugyldig operasjon %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Klarte ikkje tolka pakkefila %s (1)"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3013,12 +3030,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3027,12 +3044,12 @@ msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv "
"(fordi arkitekturen manglar)."
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3352,57 +3369,61 @@ msgstr "Opnar oppsettsfila %s"
msgid "Completely removed %s"
msgstr "Klarte ikkje fjerna %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Klarte ikkje skriva til %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 7f42430fa..832a17000 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-07-28 21:53+0200\n"
"Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
"Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -97,7 +97,7 @@ msgid "Total space accounted for: "
msgstr "Całkowity rozmiar: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Plik pakietu %s jest przestarzały."
@@ -105,7 +105,7 @@ msgstr "Plik pakietu %s jest przestarzały."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Nie znaleziono żadnych pakietów"
@@ -663,7 +663,7 @@ msgstr "%s został już odznaczony jako zatrzymany.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Oczekiwano na proces %s, ale nie było go"
@@ -685,6 +685,7 @@ msgstr ""
"Uruchomienie dpkg nie powiodło się. Czy użyto uprawnień administratora?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -694,6 +695,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -732,14 +738,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -775,11 +785,11 @@ msgid "File not found"
msgstr "Nie odnaleziono pliku"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Nie udało się wykonać operacji stat"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Nie udało się ustawić czasu modyfikacji"
@@ -856,9 +866,9 @@ msgstr "Odpowiedź przepełniła bufor."
msgid "Protocol corruption"
msgstr "Naruszenie zasad protokołu"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Błąd zapisu"
@@ -870,7 +880,7 @@ msgstr "Nie udało się utworzyć gniazda"
msgid "Could not connect data socket, connection timed out"
msgstr "Nie udało się połączyć gniazda danych, przekroczenie czasu połączenia"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Nie udało się"
@@ -1117,7 +1127,7 @@ msgstr "Połączenie nie powiodło się"
msgid "Internal error"
msgstr "Błąd wewnętrzny"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1381,101 +1391,101 @@ msgstr "Zainstalować te pakiety bez weryfikacji?"
msgid "Failed to fetch %s %s\n"
msgstr "Nie udało się pobrać %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Zainstalowany]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Zainstalowany]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Zainstalowany]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Następujące pakiety mają niespełnione zależności:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "ale %s jest zainstalowany"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "ale %s ma zostać zainstalowany"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "ale nie da się go zainstalować"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "ale jest pakietem wirtualnym"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "ale nie jest zainstalowany"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "ale nie zostanie zainstalowany"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " lub"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Zostaną zainstalowane następujące NOWE pakiety:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Następujące pakiety zostaną USUNIĘTE:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Następujące pakiety zostały zatrzymane:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Następujące pakiety zostaną zaktualizowane:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Zostaną zainstalowane STARE wersje następujących pakietów:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Zostaną zmienione następujące zatrzymane pakiety:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (z powodu %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1483,27 +1493,27 @@ msgstr ""
"UWAGA: Zostaną usunięte następujące istotne pakiety.\n"
"NIE należy kontynuować, jeśli nie jest się pewnym tego co się robi!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualizowanych, %lu nowo instalowanych, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu ponownie instalowanych, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu cofniętych wersji, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu usuwanych i %lu nieaktualizowanych.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n"
@@ -1512,7 +1522,7 @@ msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[T/n]"
@@ -1520,21 +1530,21 @@ msgstr "[T/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[t/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "T"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Błąd kompilacji wyrażenia regularnego - %s"
@@ -1575,16 +1585,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Polecenie update nie wymaga żadnych argumentów"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Obliczanie aktualizacji..."
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Błąd wewnętrzny spowodowany przez AllUpgrade"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Gotowe"
@@ -1592,7 +1602,20 @@ msgstr "Gotowe"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1608,12 +1631,12 @@ msgstr ""
" Aktualnie blokowanie jest wyłączone, więc nie należy polegać\n"
" na związku z rzeczywistą sytuacją!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Nie udało się zmienić nazwy %s na %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1662,8 +1685,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1701,24 +1724,6 @@ msgstr "Nie udało się otworzyć pliku serwera lustrzanego \"%s\""
msgid "[Mirror: %s]"
msgstr "[Serwer lustrzany: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Nie udało się nałożyć łatki %s przy użyciu mmap i operacji plikowej - łatka "
-"wygląda na uszkodzoną."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Nie udało się nałożyć łatki %s przy użyciu mmap, ale błąd nie pochodzi z "
-"mmap - łatka wygląda na uszkodzoną"
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Nie udało się utworzyć potoku IPC do podprocesu"
@@ -2781,78 +2786,88 @@ msgstr "Nie udało się zanalizować pliku pakietu %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Nie udało się zanalizować pliku pakietu %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza URI)"
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Nieprawidłowa linia %lu w liście źródeł %s ([opcja] nie dająca się sparsować)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([opcja] zbyt krótka)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([%s] nie jest przypisane)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([%s] nie ma klucza)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Nieprawidłowa linia %lu w liście źródeł %s ([%s] klucz %s nie ma wartości)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s (dystrybucja)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s (bezwzględna dystrybucja)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza dystrybucji)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Otwieranie %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linia %u w liście źródeł %s jest zbyt długa."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3077,7 +3092,7 @@ msgstr "Błędny rozmiar"
msgid "Invalid file format"
msgstr "Nieprawidłowa operacja %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3086,16 +3101,16 @@ msgstr ""
"Nie udało się znaleźć oczekiwanego wpisu \"%s\" w pliku Release "
"(nieprawidłowy wpis sources.list lub nieprawidłowy plik)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nie udało się znaleźć sumy kontrolnej \"%s\" w pliku Release"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "Dla następujących identyfikatorów kluczy brakuje klucza publicznego:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3104,12 +3119,12 @@ msgstr ""
"Plik Release dla %s wygasnął (nieprawidłowy od %s). Aktualizacje z tego "
"repozytorium nie będą wykonywane."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Nieprawidłowa dystrybucja: %s (oczekiwano %s, a otrzymano %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3119,12 +3134,12 @@ msgstr ""
"w dalszym ciągu będą używane poprzednie pliki indeksu. Błąd GPG %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "Błąd GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3133,12 +3148,12 @@ msgstr ""
"Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba "
"będzie ręcznie naprawić ten pakiet (z powodu brakującej architektury)."
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Nie można znaleźć źródła do pobrania wersji \"%s\" pakietu \"%s\""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3473,33 +3488,37 @@ msgstr "Przygotowywanie do całkowitego usunięcia %s"
msgid "Completely removed %s"
msgstr "Pakiet %s został całkowicie usunięty"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Nie udało się pisać do %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "Operacja została przerwana, zanim mogła zostać zakończona"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr "Brak raportu programu apport, ponieważ osiągnięto limit MaxReports"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "problemy z zależnościami - pozostawianie nieskonfigurowanego"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3507,7 +3526,7 @@ msgstr ""
"Brak raportu programu apport, ponieważ komunikat błędu wskazuje, że "
"przyczyna niepowodzenia leży w poprzednim błędzie."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3515,7 +3534,7 @@ msgstr ""
"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na "
"przepełnienie dysku"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3523,7 +3542,7 @@ msgstr ""
"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd "
"braku wolnej pamięci"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3532,7 +3551,7 @@ msgstr ""
"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na "
"przepełnienie dysku"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3569,6 +3588,20 @@ msgstr ""
msgid "Not locked"
msgstr "Niezablokowany"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Nie udało się nałożyć łatki %s przy użyciu mmap i operacji plikowej - "
+#~ "łatka wygląda na uszkodzoną."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Nie udało się nałożyć łatki %s przy użyciu mmap, ale błąd nie pochodzi z "
+#~ "mmap - łatka wygląda na uszkodzoną"
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Uwaga, wybieranie %s dla zadania \"%s\"\n"
diff --git a/po/pt.po b/po/pt.po
index 2ca93d930..3618f52ec 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-06-29 15:45+0100\n"
"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -92,7 +92,7 @@ msgid "Total space accounted for: "
msgstr "Espaço total contabilizado: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "O ficheiro do pacote %s está dessincronizado."
@@ -100,7 +100,7 @@ msgstr "O ficheiro do pacote %s está dessincronizado."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Não foi encontrado nenhum pacote"
@@ -659,7 +659,7 @@ msgstr "%s já estava para não manter.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperou por %s mas não estava lá"
@@ -679,6 +679,7 @@ msgid "Executing dpkg failed. Are you root?"
msgstr "Falhou executar dpkg. É root?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -688,6 +689,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -725,14 +731,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -768,11 +778,11 @@ msgid "File not found"
msgstr "Ficheiro não encontrado"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Falhou o stat"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Falhou definir hora de modificação"
@@ -847,9 +857,9 @@ msgstr "Uma resposta sobrecarregou o buffer."
msgid "Protocol corruption"
msgstr "Corrupção de protocolo"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Erro de escrita"
@@ -861,7 +871,7 @@ msgstr "Não foi possível criar um socket"
msgid "Could not connect data socket, connection timed out"
msgstr "Não foi possível ligar socket de dados, a ligação expirou"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Falhou"
@@ -1109,7 +1119,7 @@ msgstr "A ligação falhou"
msgid "Internal error"
msgstr "Erro interno"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1357,101 +1367,101 @@ msgstr "Instalar estes pacotes sem verificação?"
msgid "Failed to fetch %s %s\n"
msgstr "Falhou obter %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Os pacotes a seguir têm dependências não satisfeitas:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "mas %s está instalado"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "mas %s está para ser instalado"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "mas não é instalável"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "mas é um pacote virtual"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "mas não está instalado"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "mas não vai ser instalado"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " ou"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Serão instalados os seguintes NOVOS pacotes:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Serão REMOVIDOS os seguintes pacotes:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Serão mantidos em suas versões actuais os seguintes pacotes:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Serão actualizados os seguintes pacotes:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Será feito o DOWNGRADE aos seguintes pacotes:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Os seguintes pacotes mantidos serão mudados:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (devido a %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1459,27 +1469,27 @@ msgstr ""
"AVISO: Os seguintes pacotes essenciais serão removidos.\n"
"Isso NÃO deverá ser feito a menos que saiba exactamente o que está a fazer!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu a que foi feito o downgrade, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu a remover e %lu não actualizados.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
@@ -1488,7 +1498,7 @@ msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[S/n]"
@@ -1496,21 +1506,21 @@ msgstr "[S/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "s/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "S"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilação de regex - %s"
@@ -1551,16 +1561,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "O comando update não leva argumentos"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "A calcular a actualização... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Erro Interno, AllUpgrade estragou algo"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Pronto"
@@ -1568,7 +1578,19 @@ msgstr "Pronto"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1584,12 +1606,12 @@ msgstr ""
"\tTenha em mente que o acesso exclusivo está desabilitado,\n"
"\tpor isso não confie na relevância da real situação actual!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Falha ao baixar %s %s\n"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1635,8 +1657,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1674,24 +1696,6 @@ msgstr "Não pode ler ficheiro de mirror '%s'"
msgid "[Mirror: %s]"
msgstr "[Mirror: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Não foi possível aplicar o patch %s com mmap e com a utilização de operação "
-"de ficheiro - o patch parece estar corrompido."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Não foi possível aplicar o patch %s com mmap (mas não é uma falha especifica "
-"do mmap) - o patch parece corrompido."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Falha ao criar pipe IPC para subprocesso"
@@ -2758,79 +2762,89 @@ msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Não foi possível fazer parse ao ficheiro de pacote %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Linha mal formada %lu na lista de fontes %s (parse de URI)"
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Linha mal formada %lu na lista de fontes %s ([opção] não interpretável)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Linha mal formada %lu na lista de fontes %s ([opção] demasiado curta)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Linha mal formada %lu na lista de fontes %s ([%s] não é uma atribuição)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Linha mal formada %lu na lista de fontes %s ([%s] não tem chave)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Linha mal formada %lu na lista de fontes %s ([%s] chave %s não tem valor)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Linha mal formada %lu na lista de fontes %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Linha mal formada %lu na lista de fontes %s (distribuição)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Linha mal formada %lu na lista de fontes %s (parse de URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Linha mal formada %lu na lista de fontes %s (distribuição absoluta)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Linha mal formada %lu na lista de fontes %s (dist parse)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "A abrir %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linha %u é demasiado longa na lista de fontes %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Linha mal formada %u na lista de fontes %s (tipo)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3065,7 +3079,7 @@ msgstr "Tamanho incorrecto"
msgid "Invalid file format"
msgstr "Operação %s inválida"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3074,18 +3088,18 @@ msgstr ""
"Incapaz de encontrar a entrada '%s' esperada no ficheiro Release (entrada "
"errada em sources.list ou ficheiro malformado)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Não foi possível encontrar hash sum para '%s' no ficheiro Release"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Não existe qualquer chave pública disponível para as seguintes IDs de "
"chave:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3094,12 +3108,12 @@ msgstr ""
"O ficheiro Release para %s está expirado (inválido desde %s). Não serão "
"aplicadas as actualizações para este repositório."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribuição em conflito: %s (esperado %s mas obtido %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3110,12 +3124,12 @@ msgstr ""
"GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "Erro GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3125,12 +3139,12 @@ msgstr ""
"significar que você precisa corrigir manualmente este pacote. (devido a "
"arquitectura em falta)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Não conseguiu encontrar uma fonte para obter a versão '%s' de '%s'"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3464,33 +3478,37 @@ msgstr "A preparar para remover completamente %s"
msgid "Completely removed %s"
msgstr "Remoção completa de %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Não conseguiu escrever para %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "A operação foi interrompida antes de poder terminar"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr "Nenhum relatório apport escrito pois MaxReports já foi atingido"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "problemas de dependências - deixando por configurar"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3498,7 +3516,7 @@ msgstr ""
"Nenhum relatório apport escrito pois a mensagem de erro indica que é um erro "
"de seguimento de um erro anterior."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3506,7 +3524,7 @@ msgstr ""
"Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco "
"cheio"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3514,7 +3532,7 @@ msgstr ""
"Nenhum relatório apport escrito pois a mensagem de erro indica um erro de "
"memória esgotada"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3523,7 +3541,7 @@ msgstr ""
"Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco "
"cheio"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3560,6 +3578,20 @@ msgstr ""
msgid "Not locked"
msgstr "Sem acesso exclusivo"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Não foi possível aplicar o patch %s com mmap e com a utilização de "
+#~ "operação de ficheiro - o patch parece estar corrompido."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Não foi possível aplicar o patch %s com mmap (mas não é uma falha "
+#~ "especifica do mmap) - o patch parece corrompido."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Note, a seleccionar '%s' para a tarefa '%s'\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 05027f37c..1e7596ba2 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2008-11-17 02:33-0200\n"
"Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -92,7 +92,7 @@ msgid "Total space accounted for: "
msgstr "Total de espaço contabilizado para: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "O arquivo de pacote %s está fora de sincronia."
@@ -100,7 +100,7 @@ msgstr "O arquivo de pacote %s está fora de sincronia."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Nenhum pacote encontrado"
@@ -651,7 +651,7 @@ msgstr "%s já é a versão mais nova.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperado %s mas este não estava lá"
@@ -680,6 +680,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -697,14 +702,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -740,11 +749,11 @@ msgid "File not found"
msgstr "Arquivo não encontrado"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Falhou ao executar \"stat\""
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Falhou ao definir hora de modificação"
@@ -819,9 +828,9 @@ msgstr "Uma resposta sobrecarregou o buffer"
msgid "Protocol corruption"
msgstr "Corrupção de protocolo"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Erro de escrita"
@@ -833,7 +842,7 @@ msgstr "Não foi possível criar um socket"
msgid "Could not connect data socket, connection timed out"
msgstr "Não foi possível conectar um socket de dados, conexão expirou"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Falhou"
@@ -1082,7 +1091,7 @@ msgstr "Conexão falhou"
msgid "Internal error"
msgstr "Erro interno"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1333,101 +1342,101 @@ msgstr "Instalar estes pacotes sem verificação?"
msgid "Failed to fetch %s %s\n"
msgstr "Falhou ao buscar %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Os pacotes a seguir têm dependências desencontradas:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "mas %s está instalado"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "mas %s está para ser instalado"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "mas não é instalável"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "mas é um pacote virtual"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "mas não está instalado"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "mas não será instalado"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " ou"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Os NOVOS pacotes a seguir serão instalados:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Os pacotes a seguir serão REMOVIDOS:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Os pacotes a seguir serão mantidos em suas versões atuais:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Os pacotes a seguir serão atualizados:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Os pacotes a seguir serão REVERTIDOS:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Os seguintes pacotes mantidos serão mudados:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (por causa de %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1436,27 +1445,27 @@ msgstr ""
"Isso NÃO deveria ser feito a menos que você saiba exatamente o que você está "
"fazendo!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu revertidos, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu a serem removidos e %lu não atualizados.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
@@ -1465,7 +1474,7 @@ msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[S/n]"
@@ -1473,21 +1482,21 @@ msgstr "[S/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[s/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "S"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilação de regex - %s"
@@ -1528,16 +1537,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "O comando update não leva argumentos"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Calculando atualização... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Erro interno, AllUpgrade quebrou coisas"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Pronto"
@@ -1545,7 +1554,19 @@ msgstr "Pronto"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1557,12 +1578,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Falha ao baixar %s %s\n"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1608,8 +1629,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1647,20 +1668,6 @@ msgstr "Não foi possível abrir arquivo %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Falhou ao criar pipe IPC para sub-processo"
@@ -2722,81 +2729,91 @@ msgstr "Impossível analisar arquivo de pacote %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Impossível analisar arquivo de pacote %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Linha mal formada %lu no arquivo de fontes %s (análise de URI)"
+
+#: apt-pkg/sourcelist.cc:155
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Linha mal formada %lu no arquivo de fontes %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Linha mal formada %lu no arquivo de fontes %s (análise de URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição absoluta)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Abrindo %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linha %u muito longa na lista de fontes %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Linha mal formada %u no arquivo de fontes %s (tipo)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3024,35 +3041,35 @@ msgstr "Tamanho incorreto"
msgid "Invalid file format"
msgstr "Operação %s inválida"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Impossível analisar arquivo de pacote %s (1)"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "Não existem chaves públicas para os seguintes IDs de chaves:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3060,12 +3077,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3075,12 +3092,12 @@ msgstr ""
"que você precisa consertar manualmente este pacote. (devido a arquitetura "
"não especificada)."
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3404,57 +3421,61 @@ msgstr "Preparando para remover completamente %s"
msgid "Completely removed %s"
msgstr "%s completamente removido"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Impossível escrever para %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 7f36345dd..af121cc95 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ro\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2008-11-15 02:21+0200\n"
"Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -94,7 +94,7 @@ msgid "Total space accounted for: "
msgstr "Total spațiu contorizat pentru: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Fișierul pachetului %s este desincronizat."
@@ -102,7 +102,7 @@ msgstr "Fișierul pachetului %s este desincronizat."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Nu s-au găsit pachete"
@@ -650,7 +650,7 @@ msgstr "%s este deja la cea mai nouă versiune.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Așteptat %s, dar n-a fost acolo"
@@ -679,6 +679,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -696,14 +701,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -739,11 +748,11 @@ msgid "File not found"
msgstr "Fișier negăsit"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Eșec la „stat”"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Eșec la ajustarea timpului de modificare"
@@ -818,9 +827,9 @@ msgstr "Un răspuns a depășit zona de tampon."
msgid "Protocol corruption"
msgstr "Protocol corupt"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Eroare de scriere"
@@ -834,7 +843,7 @@ msgstr ""
"Nu s-a putut realiza conectarea la socket-ul de date, timpul de conectare a "
"expirat"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Eșec"
@@ -1084,7 +1093,7 @@ msgstr "Conectare eșuată"
msgid "Internal error"
msgstr "Eroare internă"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1339,101 +1348,101 @@ msgstr "Instalați aceste pachete fără verificare?"
msgid "Failed to fetch %s %s\n"
msgstr "Eșec la aducerea lui %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Instalat]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Instalat]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Instalat]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Următoarele pachete au dependențe neîndeplinite:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "dar %s este instalat"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "dar %s este pe cale de a fi instalat"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "dar nu este instalabil"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "dar este un pachet virtual"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "dar nu este instalat"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "dar nu este pe cale să fie instalat"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " sau"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Următoarele pachete NOI vor fi instalate:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Următoarele pachete vor fi ȘTERSE:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Următoarele pachete au fost reținute:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Următoarele pachete vor fi ÎNNOITE:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Următoarele pachete vor fi DE-GRADATE:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Următoarele pachete ținute vor fi schimbate:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (datorită %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1441,27 +1450,27 @@ msgstr ""
"AVERTISMENT: Următoarele pachete esențiale vor fi șterse.\n"
"Aceasta NU ar trebui făcută decât dacă știți exact ce vreți!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu înnoite, %lu nou instalate, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalate, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu de-gradate, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu de șters și %lu neînnoite.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu instalate sau șterse incomplet.\n"
@@ -1470,7 +1479,7 @@ msgstr "%lu instalate sau șterse incomplet.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr ""
@@ -1478,21 +1487,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Eroare de compilare expresie regulată - %s"
@@ -1533,16 +1542,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Comanda de actualizare nu are argumente"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Calculez înnoirea... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Terminat"
@@ -1550,7 +1559,20 @@ msgstr "Terminat"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1562,12 +1584,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Eșec la redenumirea lui %s în %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1613,8 +1635,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1652,20 +1674,6 @@ msgstr "Nu s-a putut deschide fișierul %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Eșec la crearea conexiunii IPC către subproces"
@@ -2731,76 +2739,86 @@ msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Nu s-a putut analiza fișierul pachet %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Linie greșită %lu în lista sursă %s (analiza URI)"
+
+#: apt-pkg/sourcelist.cc:155
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Linie greșită %lu în lista sursă %s (dist)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Linie greșită %lu în lista sursă %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Linie greșită %lu în lista sursă %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Linie greșită %lu în lista sursă %s (analiza URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Linie greșită %lu în lista sursă %s (dist. absolută)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Deschidere %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linia %u prea lungă în lista sursă %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Linie greșită %u în lista sursă %s (tip)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3028,37 +3046,37 @@ msgstr "Nepotrivire dimensiune"
msgid "Invalid file format"
msgstr "Operațiune invalidă %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Nu există nici o cheie publică disponibilă pentru următoarele "
"identificatoare de chei:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3066,12 +3084,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3080,12 +3098,12 @@ msgstr ""
"N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna "
"că aveți nevoie să reparați manual acest pachet (din pricina unui arch lipsă)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3409,57 +3427,61 @@ msgstr "Se pregătește ștergerea completă a %s"
msgid "Completely removed %s"
msgstr "Șters complet %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Nu s-a putut scrie în %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 74e1e9ee3..88e6d3a00 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt rev2227.1.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-06-30 08:47+0400\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -100,7 +100,7 @@ msgid "Total space accounted for: "
msgstr "Полное учтённое пространство: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Список пакетов %s рассинхронизирован."
@@ -108,7 +108,7 @@ msgstr "Список пакетов %s рассинхронизирован."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Не найдено ни одного пакета"
@@ -662,7 +662,7 @@ msgstr "%s уже помечен как не зафиксированный.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Ожидалось завершение процесса %s, но он не был запущен"
@@ -683,6 +683,7 @@ msgstr ""
"Выполнение dpkg завершилось с ошибкой. У вас есть права суперпользователя?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -692,6 +693,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -730,14 +736,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -773,11 +783,11 @@ msgid "File not found"
msgstr "Файл не найден"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Не удалось получить атрибуты"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Не удалось установить время модификации"
@@ -854,9 +864,9 @@ msgstr "Ответ переполнил буфер."
msgid "Protocol corruption"
msgstr "Искажение протокола"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Ошибка записи"
@@ -870,7 +880,7 @@ msgstr ""
"Не удалось присоединиться к сокету данных, время на установление соединения "
"истекло"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Неудачно"
@@ -1116,7 +1126,7 @@ msgstr "Соединение разорвано"
msgid "Internal error"
msgstr "Внутренняя ошибка"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1375,102 +1385,102 @@ msgstr "Установить эти пакеты без проверки?"
msgid "Failed to fetch %s %s\n"
msgstr "Не удалось получить %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Установлен]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Установлен]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Установлен]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Пакеты, имеющие неудовлетворённые зависимости:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "но %s уже установлен"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "но %s будет установлен"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "но он не может быть установлен"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "но это виртуальный пакет"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "но он не установлен"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "но он не будет установлен"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " или"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "НОВЫЕ пакеты, которые будут установлены:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Пакеты, которые будут УДАЛЕНЫ:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Пакеты, которые будут оставлены в неизменном виде:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Пакеты, которые будут обновлены:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr ""
"Пакеты, которые должны были бы остаться без изменений, но будут заменены:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (вследствие %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1478,27 +1488,27 @@ msgstr ""
"ВНИМАНИЕ: Эти существенно важные пакеты будут удалены.\n"
"НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "обновлено %lu, установлено %lu новых пакетов, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "переустановлено %lu переустановлено, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu пакетов заменены на старые версии, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "не установлено до конца или удалено %lu пакетов.\n"
@@ -1507,7 +1517,7 @@ msgstr "не установлено до конца или удалено %lu п
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[Д/н]"
@@ -1515,21 +1525,21 @@ msgstr "[Д/н]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "д"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "н"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Ошибка компиляции регулярного выражения — %s"
@@ -1572,16 +1582,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Команде update не нужны аргументы"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Расчёт обновлений…"
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Внутренняя ошибка, AllUpgrade всё поломал"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Готово"
@@ -1589,7 +1599,20 @@ msgstr "Готово"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1605,12 +1628,12 @@ msgstr ""
" Учтите, что блокировка не используется,\n"
" поэтому нет полного соответствия с текущей реальной ситуацией!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Не удалось переименовать %s в %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1656,8 +1679,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1695,24 +1718,6 @@ msgstr "Невозможно прочитать файл на зеркале «%
msgid "[Mirror: %s]"
msgstr "[Зеркало: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Не удалось наложить заплату %s с использованием mmap и файловой операции — "
-"вероятно, повреждена заплата."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Не удалось наложить заплату %s с использованием mmap (но не из-за mmap) — "
-"вероятно, повреждена заплата."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Не удалось создать IPC-канал для порождённого процесса"
@@ -2782,80 +2787,90 @@ msgstr "Невозможно разобрать содержимое пакет
msgid "Unable to parse package file %s (2)"
msgstr "Невозможно разобрать содержимое пакета %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Искажённая строка %lu в списке источников %s (анализ URI)"
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Искажённая строка %lu в списке источников %s ([параметр] неразбираем)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"Искажённая строка %lu в списке источников %s ([параметр] слишком короткий)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Искажённая строка %lu в списке источников %s (([%s] не назначаем)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Искажённая строка %lu в списке источников %s ([%s] не имеет ключа)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Искажённая строка %lu в списке источников %s (([%s] ключ %s не имеет "
"значения)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Искажённая строка %lu в списке источников %s (проблема в URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
"Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Искажённая строка %lu в списке источников %s (анализ URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Искажённая строка %lu в списке источников %s (absolute dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Искажённая строка %lu в списке источников %s (dist parse)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Открытие %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Строка %u в списке источников %s слишком длинна."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Искажённая строка %u в списке источников %s (тип)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Неизвестный тип «%s» в строке %u в списке источников %s"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Неизвестный тип «%s» в строке %u в списке источников %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3084,7 +3099,7 @@ msgstr "Не совпадает размер"
msgid "Invalid file format"
msgstr "Неверная операция %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3093,16 +3108,16 @@ msgstr ""
"Невозможно найти ожидаемый элемент «%s» в файле Release (некорректная запись "
"в sources.list или файл)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Невозможно найти хеш-сумму «%s» в файле Release"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "Недоступен открытый ключ для следующих ID ключей:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3111,12 +3126,12 @@ msgstr ""
"Файл Release для %s просрочен (недостоверный начиная с %s). Обновление этого "
"репозитория производиться не будет."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Конфликт распространения: %s (ожидался %s, но получен %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3126,12 +3141,12 @@ msgstr ""
"использованы предыдущие индексные файлы. Ошибка GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "Ошибка GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3140,12 +3155,12 @@ msgstr ""
"Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся "
"вручную исправить этот пакет (возможно, пропущен arch)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Невозможно найти источник для загрузки «%2$s» версии «%1$s»"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3477,33 +3492,37 @@ msgstr "Подготовка к полному удалению %s"
msgid "Completely removed %s"
msgstr "%s полностью удалён"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Невозможно записать в %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "Действие прервано до его завершения"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr "Отчёты apport не записаны, так достигнут MaxReports"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "проблемы с зависимостями — оставляем ненастроенным"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3511,7 +3530,7 @@ msgstr ""
"Отчёты apport не записаны, так как сообщение об ошибке указывает на "
"повторную ошибку от предыдущего отказа."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3519,7 +3538,7 @@ msgstr ""
"Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
"места на диске"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3527,7 +3546,7 @@ msgstr ""
"Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
"памяти"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3536,7 +3555,7 @@ msgstr ""
"Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
"места на диске"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3573,6 +3592,20 @@ msgstr ""
msgid "Not locked"
msgstr "Не заблокирован"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Не удалось наложить заплату %s с использованием mmap и файловой операции "
+#~ "— вероятно, повреждена заплата."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Не удалось наложить заплату %s с использованием mmap (но не из-за mmap) — "
+#~ "вероятно, повреждена заплата."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Заметьте, выбирается «%s» для задачи «%s»\n"
diff --git a/po/sk.po b/po/sk.po
index a1a2aff50..e4f6f1180 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-06-28 20:49+0100\n"
"Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -94,7 +94,7 @@ msgid "Total space accounted for: "
msgstr "Celkom priradeného miesta: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Súbor balíkov %s je neaktuálny."
@@ -102,7 +102,7 @@ msgstr "Súbor balíkov %s je neaktuálny."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Neboli nájdené žiadne balíky"
@@ -651,7 +651,7 @@ msgstr "%s bol už nastavený na nepodržanie.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Čakalo sa na %s, ale nebolo to tam"
@@ -671,6 +671,7 @@ msgid "Executing dpkg failed. Are you root?"
msgstr "Vykonanie dpkg zlyhalo. Ste root?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -680,6 +681,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -716,14 +722,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -759,11 +769,11 @@ msgid "File not found"
msgstr "Súbor sa nenašiel"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Vyhodnotenie zlyhalo"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Zlyhalo nastavenie času zmeny"
@@ -838,9 +848,9 @@ msgstr "Odpoveď preplnila zásobník."
msgid "Protocol corruption"
msgstr "Narušenie protokolu"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Chyba pri zápise"
@@ -852,7 +862,7 @@ msgstr "Nedá sa vytvoriť socket"
msgid "Could not connect data socket, connection timed out"
msgstr "Nedá sa pripojiť dátový socket, uplynul čas spojenia"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Chyba"
@@ -1096,7 +1106,7 @@ msgstr "Spojenie zlyhalo"
msgid "Internal error"
msgstr "Vnútorná chyba"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1352,101 +1362,101 @@ msgstr "Nainštalovať tieto nekontrolované balíky?"
msgid "Failed to fetch %s %s\n"
msgstr "Zlyhalo stiahnutie %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Nainštalovaný]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Nainštalovaný]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Nainštalovaný]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Nasledovné balíky majú nesplnené závislosti:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "ale nainštalovaný je %s"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "ale inštalovať sa bude %s"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "ale sa nedá nainštalovať"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "ale je to virtuálny balík"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "ale nie je nainštalovaný"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "ale sa nebude inštalovať"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " alebo"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Nainštalujú sa nasledovné NOVÉ balíky:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Nasledovné balíky sa ODSTRÁNIA:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Nasledovné balíky sa aktualizujú:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Nasledovné balíky sa DEGRADUJÚ:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Nasledovné pridržané balíky sa zmenia:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (kvôli %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1454,27 +1464,27 @@ msgstr ""
"UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n"
"Ak presne neviete, čo robíte, tak to NEROBTE!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualizovaných, %lu nových nainštalovaných, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinštalovaných, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu degradovaných, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu na odstránenie a %lu neaktualizovaných.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n"
@@ -1483,7 +1493,7 @@ msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr ""
@@ -1491,21 +1501,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba pri preklade regulárneho výrazu - %s"
@@ -1546,16 +1556,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Príkaz update neprijíma žiadne argumenty"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Prepočítava sa aktualizácia... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Hotovo"
@@ -1563,7 +1573,20 @@ msgstr "Hotovo"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1579,12 +1602,12 @@ msgstr ""
" Tiež pamätajte, že zamykanie je deaktivované, takže\n"
" sa nespoliehajte na to že to bude platiť v reálnej situácii!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Premenovanie %s na %s zlyhalo"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1630,8 +1653,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1669,24 +1692,6 @@ msgstr "Nepodarilo sa prečítať súbor „%s“ na zrkadle"
msgid "[Mirror: %s]"
msgstr "[Zrkadlo: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Nepodarilo sa záplatovať %s pomocou mmap a pomocou operácie so súborom - zdá "
-"sa, že záplata je poškodená."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Nepodarilo sa záplatovať %s pomocou mmap (ale nevyskytla sa chyba týkajúca "
-"sa mmap) - zdá sa, že záplata je poškodená."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Zlyhalo vytvorenie IPC rúry k podprocesu"
@@ -2737,77 +2742,87 @@ msgstr "Súbor %s sa nedá spracovať (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Súbor %s sa nedá spracovať (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)"
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Skomolený riadok %lu v zozname zdrojov %s (nie je možné spracovať [option])"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s ([option] je príliš krátke)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nie je priradenie)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nemá kľúč)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] kľúč %s nemá hodnotu)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (absolútny dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie dist)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Otvára sa %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Riadok %u v zozname zdrojov %s je príliš dlhý."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3029,7 +3044,7 @@ msgstr "Veľkosti sa nezhodujú"
msgid "Invalid file format"
msgstr "Neplatná operácia %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3038,16 +3053,16 @@ msgstr ""
"Nepodarilo sa nájsť očakávanú položku „%s“ v súbore Release (Nesprávna "
"položka sources.list alebo chybný formát súboru)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nepodarilo sa nájsť haš „%s“ v súbore Release"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "Nie sú dostupné žiadne verejné kľúče ku kľúčom s nasledovnými ID:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3056,12 +3071,12 @@ msgstr ""
"Súbor Release pre %s vypršal (neplatný od %s). Aktualizácie tohto zdroja "
"softvéru sa nepoužijú."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "V konflikte s distribúciou: %s (očakávalo sa %s ale dostali sme %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3071,12 +3086,12 @@ msgstr ""
"použijú sa predošlé indexové súbory. Chyba GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "Chyba GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3085,12 +3100,12 @@ msgstr ""
"Nedá sa nájsť súbor s balíkom %s. To by mohlo znamenať, že tento balík je "
"potrebné opraviť manuálne (kvôli chýbajúcej architektúre)."
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Nie je možné nájsť zdroj na stiahnutie verzie „%s“ balíka „%s“"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3418,33 +3433,37 @@ msgstr "Pripravuje sa úplné odstránenie %s"
msgid "Completely removed %s"
msgstr "Balík „%s“ je úplne odstránený"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Do %s sa nedá zapisovať"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "Operácia bola prerušená predtým, než sa stihla dokončiť"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr "Nezapíše sa správa apport, pretože už bol dosiahnutý limit MaxReports"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "problém so závislosťami - ponecháva sa nenakonfigurované"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3452,7 +3471,7 @@ msgstr ""
"Nezapíše sa správa apport, pretože chybová správa indikuje, že je to chyba v "
"nadväznosti na predošlé zlyhanie."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3460,7 +3479,7 @@ msgstr ""
"Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk "
"zaplnený"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3468,7 +3487,7 @@ msgstr ""
"Nezapíše sa správa apport, pretože chybová správa indikuje chybu nedostatku "
"pamäte"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3477,7 +3496,7 @@ msgstr ""
"Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk "
"zaplnený"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3507,6 +3526,20 @@ msgstr "dpkg bol prerušený, musíte ručne opraviť problém spustením „%s
msgid "Not locked"
msgstr "Nie je zamknuté"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Nepodarilo sa záplatovať %s pomocou mmap a pomocou operácie so súborom - "
+#~ "zdá sa, že záplata je poškodená."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Nepodarilo sa záplatovať %s pomocou mmap (ale nevyskytla sa chyba "
+#~ "týkajúca sa mmap) - zdá sa, že záplata je poškodená."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Poznámka: vyberá sa „%s“ pre úlohu „%s“\n"
diff --git a/po/sl.po b/po/sl.po
index ebf149be0..bab9da29c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-06-27 21:29+0000\n"
"Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -94,7 +94,7 @@ msgid "Total space accounted for: "
msgstr "Celotna velikost, izračunana za: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Datoteka paketa %s ni usklajena."
@@ -102,7 +102,7 @@ msgstr "Datoteka paketa %s ni usklajena."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Noben paket ni bil najden"
@@ -647,7 +647,7 @@ msgstr "paket %s je bil že nastavljen kot ne na čakanju.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Program je čakal na %s a ga ni bilo tam"
@@ -667,6 +667,7 @@ msgid "Executing dpkg failed. Are you root?"
msgstr "Izvajanje dpkg je spodletelo. Ali ste skrbnik?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -676,6 +677,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -711,14 +717,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -754,11 +764,11 @@ msgid "File not found"
msgstr "Datoteke ni mogoče najti"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Določitev ni uspela"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Nastavitev časa spremembe je spodletela"
@@ -833,9 +843,9 @@ msgstr "Odgovor je prekoračil predpomnilnik."
msgid "Protocol corruption"
msgstr "Okvara protokola"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Napaka pisanja"
@@ -847,7 +857,7 @@ msgstr "Ni mogoče ustvariti vtiča"
msgid "Could not connect data socket, connection timed out"
msgstr "Ni mogoče povezati podatkovnega vtiča. Povezava je zakasnela."
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Spodletelo"
@@ -1091,7 +1101,7 @@ msgstr "Povezava ni uspela"
msgid "Internal error"
msgstr "Notranja napaka"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1351,101 +1361,101 @@ msgstr "Ali želite te pakete namestiti brez preverjanja?"
msgid "Failed to fetch %s %s\n"
msgstr "Ni mogoče dobiti %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Nameščeno]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Nameščeno]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Nameščeno]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Naslednji paketi imajo nerešene odvisnosti:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "vendar je paket %s nameščen"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "vendar bo paket %s nameščen"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "vendar se ga ne da namestiti"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "vendar je navidezen paket"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "vendar ni nameščen"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "vendar ne bo nameščen"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " ali"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Naslednji NOVI paketi bodo nameščeni:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Naslednji novi paketi bodo ODSTRANJENI:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Naslednji paketi so bili zadržani:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Naslednji paketi bodo nadgrajeni:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Naslednji paketi bodo POSTARANI:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Naslednji zadržani paketi bodo spremenjeni:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (zaradi %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1453,27 +1463,27 @@ msgstr ""
"OPOZORILO: Naslednji nujni paketi bodo odstranjeni.\n"
"Tega NE storite, razen če ne veste natanko kaj počenjate!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu nadgrajenih, %lu na novo nameščenih, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu posodobljenih, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu postaranih, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n"
@@ -1482,7 +1492,7 @@ msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr ""
@@ -1490,21 +1500,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Napaka med prevajanjem logičnega izraza - %s"
@@ -1545,16 +1555,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Ukaz update ne sprejema argumentov"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Preračunavanje nadgradnje ... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Notranja napaka zaradi AllUpgrade."
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Opravljeno"
@@ -1562,7 +1572,21 @@ msgstr "Opravljeno"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1578,12 +1602,12 @@ msgstr ""
" Zaklepanje je onemogočeno, zato se ne zanašajte\n"
" na pomembnost trenutnega pravega stanja!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Ni mogoče preimenovati %s v %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1629,8 +1653,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1668,24 +1692,6 @@ msgstr "Datoteke zrcalnega strežnika '%s' ni mogoče prebrati"
msgid "[Mirror: %s]"
msgstr "[Zrcalni strežnik: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"%s ni mogoče zakrpati z mmap in z uporabo opravila datotek - popravek je "
-"videti pokvarjen"
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"%s ni mogoče zakrpati z mmap (toda napaka ni specifična za mmap) - popravek "
-"je videti pokvarjen."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Ustvarjanje cevi IPC do podopravila je spodletelo"
@@ -2738,82 +2744,92 @@ msgstr "Ni mogoče razčleniti datoteke paketa %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Ni mogoče razčleniti datoteke paketa %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)"
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Slabo oblikovana vrstica %lu na seznamu virov %s ([možnosti] ni mogoče "
"razčleniti)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Slabo oblikovana vrstica %lu na seznamu virov %s ([možnost] prekratka)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Slabo oblikovana vrstica %lu na seznamu vrstic %s ([%s] ni dodelitev)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] nima ključa)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] ključ %s nima "
"vrednosti)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (distribucija)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
"Slabo oblikovana vrstica %lu v seznamu virov %s (absolutna distribucija)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
"Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev distribucije)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Odpiranje %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Vrstica %u v seznamu virov %s je predolga."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Slabo oblikovana vrstica %u v seznamu virov %s (vrsta)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3033,7 +3049,7 @@ msgstr "Neujemanje velikosti"
msgid "Invalid file format"
msgstr "Neveljavno opravilo %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3042,16 +3058,16 @@ msgstr ""
"Ni mogoče najti pričakovanega vnosa '%s' v datoteki Release (napačen vnos "
"sources.list ali slabo oblikovana datoteka)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Ni mogoče najti vsote razprševanja za '%s' v datoteki Release"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "Za naslednje ID-je ključa ni na voljo javnih ključev:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3060,12 +3076,12 @@ msgstr ""
"Datoteka Release za %s je potekla (neveljavna od %s). Posodobitev za to "
"skladišče ne bo uveljavljena."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribucija v sporu: %s (pričakovana %s, toda dobljena %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3075,12 +3091,12 @@ msgstr ""
"zato bodo uporabljene predhodne datoteke kazal. Napaka GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "Napaka GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3089,12 +3105,12 @@ msgstr ""
"Ni bilo mogoče najti datoteke za paket %s. Morda boste morali ročno "
"popraviti ta paket (zaradi manjkajočega arhiva)."
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Ni mogoče najti vira za prejem različice '%s' paketa '%s'"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3423,34 +3439,38 @@ msgstr "Pripravljanje na popolno odstranitev %s"
msgid "Completely removed %s"
msgstr "%s je bil popolnoma odstranjen"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Ni mogoče pisati na %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "Opravilo je bilo prekinjeno preden se je lahko končalo"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Poročilo apport ni bilo napisano, ker je bilo število MaxReports že doseženo"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "težave odvisnosti - puščanje nenastavljenega"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3458,7 +3478,7 @@ msgstr ""
"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na "
"navezujočo napako iz predhodne napake."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3466,7 +3486,7 @@ msgstr ""
"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako "
"polnega diska"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3474,7 +3494,7 @@ msgstr ""
"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako "
"zaradi pomanjkanja pomnilnika"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
@@ -3482,7 +3502,7 @@ msgstr ""
"Poročilo apport je bilo napisano, ker sporočilo o napaki nakazuje na težavo "
"na krajevnem sistemu"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3514,6 +3534,20 @@ msgstr "dpkg je bil prekinjen. Za popravilo napake morate ročno pognati '%s'. "
msgid "Not locked"
msgstr "Ni zaklenjeno"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "%s ni mogoče zakrpati z mmap in z uporabo opravila datotek - popravek je "
+#~ "videti pokvarjen"
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "%s ni mogoče zakrpati z mmap (toda napaka ni specifična za mmap) - "
+#~ "popravek je videti pokvarjen."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Izbiranje '%s' za nalogo '%s'\n"
diff --git a/po/sv.po b/po/sv.po
index 57da1162d..29731acea 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2010-08-24 21:18+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <debian-l10n-swedish@debian.org>\n"
@@ -94,7 +94,7 @@ msgid "Total space accounted for: "
msgstr "Totalt utrymme som kan redogöras för: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Paketfilen %s är inte synkroniserad."
@@ -102,7 +102,7 @@ msgstr "Paketfilen %s är inte synkroniserad."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Inga paket hittades"
@@ -650,7 +650,7 @@ msgstr "%s är redan den senaste versionen.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Väntade på %s men den fanns inte där"
@@ -679,6 +679,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -696,14 +701,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -739,11 +748,11 @@ msgid "File not found"
msgstr "Filen hittades inte"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Kunde inte ta status"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Misslyckades ställa in ändringstid"
@@ -818,9 +827,9 @@ msgstr "Ett svar spillde bufferten."
msgid "Protocol corruption"
msgstr "Protokollet skadat"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Skrivfel"
@@ -832,7 +841,7 @@ msgstr "Kunde inte skapa ett uttag (socket)"
msgid "Could not connect data socket, connection timed out"
msgstr "Kunde inte ansluta datauttaget (socket), inget svar inom tidsgräns"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Misslyckades"
@@ -1084,7 +1093,7 @@ msgstr "Anslutningen misslyckades"
msgid "Internal error"
msgstr "Internt fel"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1336,101 +1345,101 @@ msgstr "Installera dessa paket utan verifiering?"
msgid "Failed to fetch %s %s\n"
msgstr "Misslyckades med att hämta %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Installerat]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Installerat]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Installerat]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Följande paket har beroenden som inte kan tillfredsställas:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "men %s är installerat"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "men %s kommer att installeras"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "men det kan inte installeras"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "men det är ett virtuellt paket"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "men det är inte installerat"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "men det kommer inte att installeras"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " eller"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Följande NYA paket kommer att installeras:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Följande paket kommer att TAS BORT:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Följande paket har hållits tillbaka:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Följande paket kommer att uppgraderas:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Följande paket kommer att NEDGRADERAS:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Följande tillbakahållna paket kommer att ändras:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (på grund av %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1438,27 +1447,27 @@ msgstr ""
"VARNING: Följande systemkritiska paket kommer att tas bort.\n"
"Detta bör INTE genomföras såvida du inte vet exakt vad du gör!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu att uppgradera, %lu att nyinstallera, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu att installera om, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu att nedgradera, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu att ta bort och %lu att inte uppgradera.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu är inte helt installerade eller borttagna.\n"
@@ -1467,7 +1476,7 @@ msgstr "%lu är inte helt installerade eller borttagna.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[J/n]"
@@ -1475,21 +1484,21 @@ msgstr "[J/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[j/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "J"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fel vid kompilering av reguljärt uttryck - %s"
@@ -1530,16 +1539,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Uppdateringskommandot tar inga argument"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Beräknar uppgradering... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Internt fel, AllUpgrade förstörde något"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Färdig"
@@ -1547,7 +1556,19 @@ msgstr "Färdig"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1563,12 +1584,12 @@ msgstr ""
" Tänk också på att låsningen är inaktiverad, så\n"
" förlita dig inte på relevansen till den verkliga situationen!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Misslyckades med att byta namn på %s till %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1619,8 +1640,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1659,24 +1680,6 @@ msgstr "Ingen spegelfil \"%s\" hittades "
msgid "[Mirror: %s]"
msgstr "[Spegel: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Kunde inte patcha %s med mmap och med filoperationsanvändning - patchen "
-"verkar vara skadad."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Kunde inte patcha %s med mmap (men inga mmap-specifika fel) - patchen verkar "
-"vara skadad."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Misslyckades med att skapa IPC-rör till underprocess"
@@ -2739,76 +2742,86 @@ msgstr "Kunde inte tolka paketfilen %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Kunde inte tolka paketfilen %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)"
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Rad %lu i källistan %s har fel format ([option] ej tolkningsbar)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Rad %lu i källistan %s har fel format ([option] för kort)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Rad %lu i källistan %s har fel format ([%s] är inte en tilldelning)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Rad %lu i källistan %s har fel format ([%s] saknar nyckel)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Rad %lu i källistan %s har fel format ([%s] nyckeln %s saknar värde)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Rad %lu i källistan %s har (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Rad %lu i källistan %s har fel format (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Rad %lu i källistan %s har fel format (Absolut dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Rad %lu i källistan %s har fel format (dist-tolkning)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Öppnar %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Rad %u är för lång i källistan %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Rad %u i källistan %s har fel format (typ)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3033,35 +3046,35 @@ msgstr "Storleken stämmer inte"
msgid "Invalid file format"
msgstr "Felaktig åtgärd %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Kunde inte tolka \"Release\"-filen %s"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "Det finns ingen öppen nyckel tillgänglig för följande nyckel-id:n:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konflikt i distribution: %s (förväntade %s men fick %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3072,12 +3085,12 @@ msgstr ""
"%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-fel: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3086,12 +3099,12 @@ msgstr ""
"Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du "
"manuellt måste reparera detta paket (på grund av saknad arkitektur)."
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3422,33 +3435,37 @@ msgstr "Förbereder borttagning av hela %s"
msgid "Completely removed %s"
msgstr "Tog bort hela %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Kunde inte skriva till %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr "Ingen apport-rapport skrevs därför att MaxReports redan har uppnåtts"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "beroendeproblem - lämnar okonfigurerad"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3456,7 +3473,7 @@ msgstr ""
"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att det är "
"ett efterföljande fel från ett tidigare problem."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3464,7 +3481,7 @@ msgstr ""
"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att "
"diskutrymmet är slut"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3472,7 +3489,7 @@ msgstr ""
"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att minnet "
"är slut"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3481,7 +3498,7 @@ msgstr ""
"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att "
"diskutrymmet är slut"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3514,6 +3531,20 @@ msgstr ""
msgid "Not locked"
msgstr "Inte låst"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Kunde inte patcha %s med mmap och med filoperationsanvändning - patchen "
+#~ "verkar vara skadad."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Kunde inte patcha %s med mmap (men inga mmap-specifika fel) - patchen "
+#~ "verkar vara skadad."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Observera, väljer \"%s\" för funktionen \"%s\"\n"
diff --git a/po/th.po b/po/th.po
index 509107d08..0fc6417db 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-10-27 22:44+0700\n"
"Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
"Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -92,7 +92,7 @@ msgid "Total space accounted for: "
msgstr "พื้นที่ที่นับรวมทั้งหมด: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "ข้อมูลแฟ้ม Package %s ไม่ตรงกับความเป็นจริง"
@@ -100,7 +100,7 @@ msgstr "ข้อมูลแฟ้ม Package %s ไม่ตรงกับค
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "ไม่พบแพกเกจ"
@@ -635,7 +635,7 @@ msgstr "%s ไม่ได้คงรุ่นอยู่ก่อนแล้
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่"
@@ -655,6 +655,7 @@ msgid "Executing dpkg failed. Are you root?"
msgstr "เรียกทำงาน dpkg ไม่สำเร็จ คุณเป็น root หรือเปล่า?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -664,6 +665,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -698,14 +704,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -740,11 +750,11 @@ msgid "File not found"
msgstr "ไม่พบแฟ้ม"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "stat ไม่สำเร็จ"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "กำหนดเวลาแก้ไขไม่สำเร็จ"
@@ -817,9 +827,9 @@ msgstr "คำตอบท่วมบัฟเฟอร์"
msgid "Protocol corruption"
msgstr "มีความเสียหายของโพรโทคอล"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "การเขียนข้อมูลผิดพลาด"
@@ -831,7 +841,7 @@ msgstr "ไม่สามารถสร้างซ็อกเก็ต"
msgid "Could not connect data socket, connection timed out"
msgstr "ไม่สามารถเชื่อมต่อซ็อกเก็ตข้อมูล เนื่องจากหมดเวลาคอย"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "ล้มเหลว"
@@ -1073,7 +1083,7 @@ msgstr "เชื่อมต่อไม่สำเร็จ"
msgid "Internal error"
msgstr "ข้อผิดพลาดภายใน"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1308,101 +1318,101 @@ msgstr "จะติดตั้งแพกเกจเหล่านี้โ
msgid "Failed to fetch %s %s\n"
msgstr "ไม่สามารถดาวน์โหลด %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [ติดตั้งอยู่]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [ติดตั้งอยู่]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [ติดตั้งอยู่]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "แพกเกจต่อไปนี้ขาดแพกเกจที่ต้องใช้:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "แต่รุ่นที่ติดตั้งไว้คือ %s"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "แต่รุ่นที่จะติดตั้งคือ %s"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "แต่ไม่สามารถติดตั้งได้"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "แต่แพกเกจนี้เป็นแพกเกจเสมือน"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "แต่ได้ติดตั้งไว้"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "แต่แพกเกจนี้จะไม่ถูกติดตั้ง"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " หรือ"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "จะติดตั้งแพกเกจ *ใหม่* ต่อไปนี้:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "จะ *ลบ* แพกเกจต่อไปนี้:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "จะคงรุ่นแพกเกจต่อไปนี้:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ขึ้น:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ *ลง*:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "จะเปลี่ยนแปลงรายการคงรุ่นแพกเกจต่อไปนี้:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (เนื่องจาก %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1410,27 +1420,27 @@ msgstr ""
"*คำเตือน*: แพกเกจที่จำเป็นต่อไปนี้จะถูกถอดถอน\n"
"คุณ *ไม่ควร* ทำเช่นนี้ นอกจากคุณเข้าใจสิ่งที่จะทำ!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "ปรับรุ่นขึ้น %lu, ติดตั้งใหม่ %lu, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "ติดตั้งซ้ำ %lu, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "ปรับรุ่นลง %lu, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "ถอดถอน %lu และไม่ปรับรุ่น %lu\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "ติดตั้งหรือถอดถอนไม่ครบ %lu\n"
@@ -1439,7 +1449,7 @@ msgstr "ติดตั้งหรือถอดถอนไม่ครบ %l
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr ""
@@ -1447,21 +1457,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s"
@@ -1502,16 +1512,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "กำลังคำนวณการปรับรุ่น... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "เกิดข้อผิดพลาดภายใน: AllUpgrade ทำความเสียหาย"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "เสร็จแล้ว"
@@ -1519,7 +1529,18 @@ msgstr "เสร็จแล้ว"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1535,12 +1556,12 @@ msgstr ""
" อย่าลืมด้วยว่าการล็อคก็ไม่ทำงานเช่นกัน\n"
" ดังนั้น อย่าถือผลลัพธ์นี้ว่าตรงกับสภาพความเป็นจริงของระบบ!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1586,8 +1607,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1625,21 +1646,6 @@ msgstr "ไม่สามารถอ่านแฟ้มแหล่งสำ
msgid "[Mirror: %s]"
msgstr "[แหล่งสำเนา: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr "ไม่สามารถปรับแก้ %s ด้วย mmap และการกระทำแฟ้ม - ดูเหมือนแพตช์จะเสีย"
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"ไม่สามารถปรับแก้ %s ด้วย mmap (แต่ไม่พบข้อผิดพลาดที่เจาะจงเฉพาะ mmap) - ดูเหมือนแพตช์จะเสีย"
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "ไม่สามารถสร้างไปป์ IPC ไปยังโพรเซสย่อย"
@@ -2678,76 +2684,86 @@ msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1
msgid "Unable to parse package file %s (2)"
msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)"
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] แจงไม่ผ่าน)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] สั้นเกินไป)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่ใช่การกำหนดค่า)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่มีคีย์)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] คีย์ %s ไม่มีค่า)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist แบบสัมบูรณ์)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง dist)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "กำลังเปิด %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ยาวเกินไป"
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ชนิด)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2966,7 +2982,7 @@ msgstr "ขนาดไม่ตรงกัน"
msgid "Invalid file format"
msgstr "ไม่รู้จักคำสั่ง %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2975,16 +2991,16 @@ msgstr ""
"ไม่พบรายการ '%s' ที่ต้องการในแฟ้ม Release (รายการ sources.list ไม่ถูกต้อง "
"หรือแฟ้มผิดรูปแบบ)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "ไม่พบผลรวมแฮชสำหรับ '%s' ในแฟ้ม Release"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "ไม่มีกุญแจสาธารณะสำหรับกุญแจหมายเลขต่อไปนี้:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2993,12 +3009,12 @@ msgstr ""
"แฟ้ม Release สำหรับ %s หมดอายุแล้ว (ตั้งแต่ %s ที่แล้ว) จะไม่ใช้รายการปรับรุ่นต่างๆ "
"ของคลังแพกเกจนี้"
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "ชุดจัดแจกขัดแย้งกัน: %s (ต้องการ %s แต่พบ %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3008,24 +3024,24 @@ msgstr ""
"ข้อผิดพลาดจาก GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "ข้อผิดพลาดจาก GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง (ไม่มี arch)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "ไม่พบแหล่งที่จะดาวน์โหลดรุ่น '%s' ของ '%s' ได้"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3343,59 +3359,63 @@ msgstr "กำลังเตรียมถอดถอน %s อย่าง
msgid "Completely removed %s"
msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "ไม่สามารถเขียนลงแฟ้ม %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "ปฏิบัติการถูกขัดจังหวะก่อนที่จะสามารถทำงานเสร็จ"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr "ไม่มีการเขียนรายงาน apport เพราะถึงขีดจำกัด MaxReports แล้ว"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "มีปัญหาความขึ้นต่อกัน - จะทิ้งไว้โดยไม่ตั้งค่า"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
"ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเป็นสิ่งที่ตามมาจากข้อผิดพลาดก่อนหน้า"
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากดิสก์เต็ม"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากหน่วยความจำเต็ม"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากดิสก์เต็ม"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3425,6 +3445,18 @@ msgstr "dpkg ถูกขัดจังหวะ คุณต้องเรี
msgid "Not locked"
msgstr "ไม่ได้ล็อคอยู่"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr "ไม่สามารถปรับแก้ %s ด้วย mmap และการกระทำแฟ้ม - ดูเหมือนแพตช์จะเสีย"
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "ไม่สามารถปรับแก้ %s ด้วย mmap (แต่ไม่พบข้อผิดพลาดที่เจาะจงเฉพาะ mmap) - "
+#~ "ดูเหมือนแพตช์จะเสีย"
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "หมายเหตุ: จะเลือก '%s' สำหรับงานติดตั้ง '%s'\n"
diff --git a/po/tl.po b/po/tl.po
index 05d606f97..6fd552706 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2007-03-29 21:36+0800\n"
"Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
"Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -97,7 +97,7 @@ msgid "Total space accounted for: "
msgstr "Kabuuan ng puwang na napag-tuosan: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Wala sa sync ang talaksan ng paketeng %s."
@@ -105,7 +105,7 @@ msgstr "Wala sa sync ang talaksan ng paketeng %s."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Walang nahanap na mga pakete"
@@ -647,7 +647,7 @@ msgstr "%s ay pinakabagong bersyon na.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Naghintay, para sa %s ngunit wala nito doon"
@@ -676,6 +676,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -693,14 +698,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -736,11 +745,11 @@ msgid "File not found"
msgstr "Hindi Nahanap ang Talaksan"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Bigo ang pag-stat"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Bigo ang pagtakda ng oras ng pagbago"
@@ -815,9 +824,9 @@ msgstr "May sagot na bumubo sa buffer."
msgid "Protocol corruption"
msgstr "Sira ang protocol"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Error sa pagsulat"
@@ -829,7 +838,7 @@ msgstr "Hindi maka-likha ng socket"
msgid "Could not connect data socket, connection timed out"
msgstr "Hindi maka-konekta sa socket ng datos, nag-time-out ang koneksyon"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Bigo"
@@ -1077,7 +1086,7 @@ msgstr "Bigo ang koneksyon"
msgid "Internal error"
msgstr "Internal na error"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1323,101 +1332,101 @@ msgstr "Iluklok ang mga paketeng ito na walang beripikasyon?"
msgid "Failed to fetch %s %s\n"
msgstr "Bigo sa pagkuha ng %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Nakaluklok]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Nakaluklok]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Nakaluklok]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "ngunit ang %s ay nakaluklok"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "ngunit ang %s ay iluluklok"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "ngunit hindi ito maaaring iluklok"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "ngunit ito ay birtwal na pakete"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "ngunit ito ay hindi nakaluklok"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "ngunit ito ay hindi iluluklok"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " o"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Ang susunod na mga pakete ay iu-upgrade:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (dahil sa %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1425,27 +1434,27 @@ msgstr ""
"BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n"
"HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu na nai-upgrade, %lu na bagong luklok, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu iniluklok muli, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nai-downgrade, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n"
@@ -1454,7 +1463,7 @@ msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[O/h]"
@@ -1462,21 +1471,21 @@ msgstr "[O/h]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[o/H]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "O"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "H"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error sa pag-compile ng regex - %s"
@@ -1517,16 +1526,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Sinusuri ang pag-upgrade... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Tapos"
@@ -1534,7 +1543,19 @@ msgstr "Tapos"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1546,12 +1567,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1597,8 +1618,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1636,20 +1657,6 @@ msgstr "Hindi mabuksan ang talaksang %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Bigo sa paglikha ng IPC pipe sa subprocess"
@@ -2715,76 +2722,86 @@ msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Hindi ma-parse ang talaksang pakete %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)"
+
+#: apt-pkg/sourcelist.cc:155
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (absolute dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Binubuksan %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3012,35 +3029,35 @@ msgstr "Di tugmang laki"
msgid "Invalid file format"
msgstr "Di tanggap na operasyon %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "Walang public key na magamit para sa sumusunod na key ID:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3048,12 +3065,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3062,12 +3079,12 @@ msgstr ""
"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
"niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3392,57 +3409,61 @@ msgstr "Naghahanda upang tanggalin ng lubusan ang %s"
msgid "Completely removed %s"
msgstr "Natanggal ng lubusan ang %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Hindi makapagsulat sa %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/tr.po b/po/tr.po
index beead72f9..dcef63cc9 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2013-02-18 03:41+0200\n"
"Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
"Language-Team: Debian l10n Turkish\n"
@@ -94,7 +94,7 @@ msgid "Total space accounted for: "
msgstr "Hesaplanan toplam alan: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "%s paket dosyası eşzamansız."
@@ -102,7 +102,7 @@ msgstr "%s paket dosyası eşzamansız."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Hiç paket bulunamadı"
@@ -653,7 +653,7 @@ msgstr "%s zaten tutulmayacak şekilde ayarlanmış.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s için beklenildi ama o gelmedi"
@@ -673,6 +673,7 @@ msgid "Executing dpkg failed. Are you root?"
msgstr "'dpkg' çalıştırılamadı. root olduğunuzdan emin misiniz?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -682,6 +683,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -718,14 +724,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -761,11 +771,11 @@ msgid "File not found"
msgstr "Dosya bulunamadı"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Durum bilgisi okunamadı"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Değişiklik zamanı ayarlanamadı"
@@ -840,9 +850,9 @@ msgstr "Bir yanıt arabelleği taşırdı."
msgid "Protocol corruption"
msgstr "İletişim kuralları bozulması"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Yazma hatası"
@@ -854,7 +864,7 @@ msgstr "Bir soket oluşturulamadı"
msgid "Could not connect data socket, connection timed out"
msgstr "Veri soketine bağlanılamadı, bağlantı zaman aşımına uğradı"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Başarısız"
@@ -1096,7 +1106,7 @@ msgstr "Bağlantı başarısız"
msgid "Internal error"
msgstr "İç hata"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1348,101 +1358,101 @@ msgstr "Paketler doğrulanmadan kurulsun mu?"
msgid "Failed to fetch %s %s\n"
msgstr "%s ağdan alınamadı. %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Kuruldu]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Kuruldu]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Kuruldu]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Aşağıdaki paketler karşılanmamış bağımlılıklara sahip:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "ama %s kurulu"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "ama %s kurulacak"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "ama kurulabilir değil"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "ama o bir sanal paket"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "ama kurulu değil"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "ama kurulmayacak"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " ya da"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Aşağıdaki YENİ paketler kurulacak:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Aşağıdaki paketler KALDIRILACAK:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Aşağıdaki paketlerin mevcut durumları korunacak:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Aşağıdaki paketler yükseltilecek:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Aşağıdaki paketlerin SÜRÜMLERİ DÜŞÜRÜLECEK:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Aşağıdaki eski sürümlerinde tutulan paketler değiştirilecek:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (%s nedeniyle) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1450,27 +1460,27 @@ msgstr ""
"UYARI: Aşağıdaki temel paketler kaldırılacak.\n"
"Bu işlem ne yaptığınızı tam olarak bilmediğiniz takdirde YAPILMAMALIDIR!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu paket yükseltilecek, %lu yeni paket kurulacak, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu paket yeniden kurulacak, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu paketin sürümü düşürülecek, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu paket kaldırılacak ve %lu paket yükseltilmeyecek.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n"
@@ -1479,7 +1489,7 @@ msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[E/h]"
@@ -1487,21 +1497,21 @@ msgstr "[E/h]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[e/H]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "E"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "H"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex derleme hatası - %s"
@@ -1544,16 +1554,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "'update' komutu bağımsız değişken almamaktadır"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Yükseltme hesaplanıyor... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "İç hata, AllUpgrade bazı şeyleri bozdu"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Bitti"
@@ -1561,7 +1571,19 @@ msgstr "Bitti"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1577,12 +1599,12 @@ msgstr ""
" Unutmayın ki simülasyonda kilitleme yapılmaz,\n"
" bu nedenle bu simülasyonun tam uygunluğuna güvenmeyin."
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "%s, %s olarak yeniden adlandırılamadı"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1628,8 +1650,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1667,23 +1689,6 @@ msgstr "Yansı dosyası %s okunamıyor"
msgid "[Mirror: %s]"
msgstr "[Yansı: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"%s mmap ve dosya işlem kullanımı ile yamalanamadı - yama bozuk gibi duruyor."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"%s mmap ile yamalanamadı (mmap'e özel bir hata değil) - yama bozuk gibi "
-"duruyor."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Altsürece IPC borusu oluşturulamadı"
@@ -2747,87 +2752,98 @@ msgstr "Paket dosyası %s ayrıştırılamadı (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Paket dosyası %s ayrıştırılamadı (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr ""
+"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI ayrıştırma)"
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([seçenek] "
"ayrıştırılamıyor)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([seçenek] çok kısa)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] bir atama "
"değil)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] seçeneğinin "
"anahtarı yok)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] %4$s "
"anahtarına değer atanmamış)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI ayrıştırma)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (mutlak dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dağıtım ayrıştırma)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "%s Açılıyor"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı çok uzun."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı hatalı (tür)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "'%s' türü bilinmiyor. (Satır: %u, Kaynak Listesi: %s)"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "'%s' türü bilinmiyor. (Satır: %u, Kaynak Listesi: %s)"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3053,7 +3069,7 @@ msgstr "Boyutlar eşleşmiyor"
msgid "Invalid file format"
msgstr "Geçersiz işlem: %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3062,17 +3078,17 @@ msgstr ""
"'Release' dosyasında olması beklenilen '%s' girdisi bulunamadı (sources.list "
"dosyasındaki girdi ya da satır hatalı)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "'Release' dosyasında '%s' için uygun bir sağlama toplamı bulunamadı"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Aşağıdaki anahtar kimlikleri için kullanılır hiçbir genel anahtar yok:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3081,12 +3097,12 @@ msgstr ""
"%s konumundaki 'Release' dosyasının vâdesi dolmuş (%s önce). Bu deponun "
"güncelleştirmeleri uygulanmayacak."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Dağıtım çakışması: %s (beklenen %s ama eldeki %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3096,12 +3112,12 @@ msgstr ""
"indeks dosyaları kullanılacak. GPG hatası: %s:%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG hatası: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3110,12 +3126,12 @@ msgstr ""
"%s paketindeki dosyalardan biri konumlandırılamadı. Bu durum, bu paketi elle "
"düzeltmeniz gerektiği anlamına gelebilir. (eksik mimariden dolayı)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "'%2$s' paketinin '%1$s' sürümü hiçbir kaynakta bulunamadı"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3438,34 +3454,38 @@ msgstr "%s paketinin tamamen kaldırılmasına hazırlanılıyor"
msgid "Completely removed %s"
msgstr "%s tamamen kaldırıldı"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "%s dosyasına yazılamıyor"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "İşlem yarıda kesildi"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"En fazla rapor miktarına (MaxReports) ulaşıldığı için apport raporu yazılmadı"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "bağımlılık sorunları - yapılandırılmamış durumda bırakılıyor"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3473,14 +3493,14 @@ msgstr ""
"Apport raporu yazılmadı çünkü hata iletisi bu durumun bir önceki hatadan "
"kaynaklanan bir hata olduğunu belirtiyor."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
"Hata iletisi diskin dolu olduğunu belirttiği için apport raporu yazılamadı"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3488,7 +3508,7 @@ msgstr ""
"Hata iletisi bir bellek yetersizliği hatasına işaret ettiği için apport "
"raporu yazılamadı"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3496,7 +3516,7 @@ msgid ""
msgstr ""
"Hata iletisi diskin dolu olduğunu belirttiği için apport raporu yazılamadı"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3530,6 +3550,20 @@ msgstr ""
msgid "Not locked"
msgstr "Kilitlenmemiş"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "%s mmap ve dosya işlem kullanımı ile yamalanamadı - yama bozuk gibi "
+#~ "duruyor."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "%s mmap ile yamalanamadı (mmap'e özel bir hata değil) - yama bozuk gibi "
+#~ "duruyor."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Bilgi, '%2$s' görevi için '%1$s' seçiliyor\n"
diff --git a/po/uk.po b/po/uk.po
index a6858646e..058a451e0 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-all\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-09-25 20:19+0300\n"
"Last-Translator: A. Bondarenko <artem.brz@gmail.com>\n"
"Language-Team: Українська <uk@li.org>\n"
@@ -101,7 +101,7 @@ msgid "Total space accounted for: "
msgstr "Загальний простір полічений для: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Перелік пакунків %s розсинхронізований."
@@ -109,7 +109,7 @@ msgstr "Перелік пакунків %s розсинхронізований.
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Не знайдено жодного пакунка"
@@ -663,7 +663,7 @@ msgstr "%s вже був незафіксований.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Очікував на %s, але його там не було"
@@ -683,6 +683,7 @@ msgid "Executing dpkg failed. Are you root?"
msgstr "Не вдалося виконати dpkg. Ви root?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -692,6 +693,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -728,14 +734,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -772,12 +782,12 @@ msgid "File not found"
msgstr "Файл не знайдено"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
#, fuzzy
msgid "Failed to stat"
msgstr "Не вдалося одержати атрибути (stat)"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Не вдалося встановити час модифікації"
@@ -852,9 +862,9 @@ msgstr "Відповідь переповнила буфер."
msgid "Protocol corruption"
msgstr "Спотворений протокол"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Помилка запису"
@@ -866,7 +876,7 @@ msgstr "Неможливо створити сокет (socket)"
msgid "Could not connect data socket, connection timed out"
msgstr "Неможливо під'єднати сокет (socket) з даними, час з'єднання вичерпався"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Невдача"
@@ -1112,7 +1122,7 @@ msgstr "З'єднання не вдалося"
msgid "Internal error"
msgstr "Внутрішня помилка"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1369,101 +1379,101 @@ msgstr "Встановити ці пакунки без перевірки?"
msgid "Failed to fetch %s %s\n"
msgstr "Не вдалося завантажити %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Встановлено]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Встановлено]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Встановлено]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Пакунки, що мають незадоволені залежності:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "але %s вже встановлений"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "але %s буде встановлений"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "але він не може бути встановлений"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "але це віртуальний пакунок"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "але він не встановлений"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "але він не буде встановлений"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " чи"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "НОВІ пакунки, які будуть встановлені:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Пакунки, які будуть ВИДАЛЕНІ:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Пакунки, які залишені в незмінному стані:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Пакунки, які будуть ОНОВЛЕНІ:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Пакунки, які будуть замінені на СТАРІШІ версії:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Пакунки, які мали б залишитися без змін, але будуть замінені:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (внаслідок %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1471,27 +1481,27 @@ msgstr ""
"УВАГА: Наступні важливі пакунки будуть вилучені.\n"
"НЕ РОБІТЬ цього, якщо ви НЕ уявляєте собі всі можливі наслідки!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "оновлено %lu, встановлено %lu нових, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu перевстановлено, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu замінено на старіші версії, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu відмічено для видалення і %lu не оновлено.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "не встановлено(видалено) до кінця %lu пакунків.\n"
@@ -1500,7 +1510,7 @@ msgstr "не встановлено(видалено) до кінця %lu пак
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr ""
@@ -1508,21 +1518,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Помилка компіляції регулярного виразу - %s"
@@ -1564,16 +1574,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Команді update не потрібні аргументи"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Обчислення оновлень... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Внутрішня помилка, AllUpgrade щось поламав"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Виконано"
@@ -1581,7 +1591,20 @@ msgstr "Виконано"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1597,12 +1620,12 @@ msgstr ""
" Також не забувайте, що блокування вимикається,\n"
" тому не очікуйте на відповідність поточній реальній ситуації!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Не вдалося перейменувати %s на %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1648,8 +1671,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1687,24 +1710,6 @@ msgstr "Неможливо прочитати файл дзеркала '%s'"
msgid "[Mirror: %s]"
msgstr "[Дзеркало: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Неможливо пропатчити %s з mmap і з 'file operation usage' - патч виглядає "
-"пошкодженим."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Неможливо пропатчити %s з mmap (але не видно конкретної вини mmap) - патч "
-"виглядає пошкодженим."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Не вдалося створити IPC канал для підпроцесу"
@@ -2782,78 +2787,88 @@ msgstr "Неможливо проаналізувати файл пакунку
msgid "Unable to parse package file %s (2)"
msgstr "Неможливо проаналізувати файл пакунку %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)"
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Спотворений рядок %lu у переліку джерел %s (нечитабельний [параметр])"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"Спотворений рядок %lu у переліку джерел %s ([параметр] занадто короткий)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не є призначенням)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не має ключа)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Спотворений рядок %lu у переліку джерел %s ([%s] ключ %s не має значення)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Спотворений рядок %lu у переліку джерел %s (проблема з URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Спотворений рядок %lu у переліку джерел %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Спотворений рядок %lu у переліку джерел %s (absolute dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Спотворений рядок %lu у переліку джерел %s (dist parse)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Відкриття %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Рядок %u є занадто довгим у переліку джерел %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Спотворений рядок %u у переліку джерел %s (тип)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3077,7 +3092,7 @@ msgstr "Невідповідність розміру"
msgid "Invalid file format"
msgstr "Невірна дія %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3086,16 +3101,16 @@ msgstr ""
"Неможливо знайти очікуваний запис '%s' у 'Release' файлі (Невірний запис у "
"sources.list, або пошкоджений файл)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Неможливо знайти хеш-суму для '%s' у 'Release' файлі"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "Відсутній публічний ключ для заданих ідентифікаторів (ID) ключа:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3104,12 +3119,12 @@ msgstr ""
"Файл 'Release' для %s застарів (недійсний з %s). Оновлення для цього "
"репозиторія не будуть застосовані."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Конфліктуючий дистрибутив: %s (очікувався %s, але є %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3119,12 +3134,12 @@ msgstr ""
"попередні індексні файли будуть використані. Помилка GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "Помилка GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3133,12 +3148,12 @@ msgstr ""
"Я не зміг знайти файл для пакунку %s. Можливо, це значить, що вам потрібно "
"власноруч виправити цей пакунок. (через відсутність 'arch')"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Неможливо знайти джерело для завантаження версії '%s' для '%s'"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3472,35 +3487,39 @@ msgstr "Підготовка до повного видалення %s"
msgid "Completely removed %s"
msgstr "Повністю видалено %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Неможливо записати в %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "Операцію було перервано до того, як вона мала завершитися"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Звіт apport не був записаний, тому що параметр MaxReports вже досягнув "
"максимальної величини"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "проблеми з залежностями - залишено неналаштованим"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3508,7 +3527,7 @@ msgstr ""
"Звіт apport не був записаний, тому що повідомлення про помилку вказує на те, "
"що ця помилка є наслідком попередньої невдачі."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3516,7 +3535,7 @@ msgstr ""
"Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
"відсутність вільного місця на диску"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3524,7 +3543,7 @@ msgstr ""
"Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
"відсутність вільного місця у пам'яті"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3533,7 +3552,7 @@ msgstr ""
"Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
"відсутність вільного місця на диску"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3568,6 +3587,20 @@ msgstr ""
msgid "Not locked"
msgstr "Не заблоковано"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Неможливо пропатчити %s з mmap і з 'file operation usage' - патч виглядає "
+#~ "пошкодженим."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Неможливо пропатчити %s з mmap (але не видно конкретної вини mmap) - патч "
+#~ "виглядає пошкодженим."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Помітьте, вибирається '%s' для завдання '%s'\n"
diff --git a/po/vi.po b/po/vi.po
index 905cadd43..9453cc2de 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.14.2\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2014-01-01 13:45+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -96,7 +96,7 @@ msgid "Total space accounted for: "
msgstr "Tổng chỗ đã tính dành cho: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Tập tin gói %s không đồng bộ được."
@@ -104,7 +104,7 @@ msgstr "Tập tin gói %s không đồng bộ được."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Không tìm thấy gói"
@@ -669,7 +669,7 @@ msgstr "%s đã sẵn được đặt là không giữ lại.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Cần %s nhưng mà không thấy nó ở đây"
@@ -691,6 +691,7 @@ msgstr ""
"việc này"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -700,6 +701,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -733,18 +739,23 @@ msgstr ""
" apt-mark(8) và apt.conf(5)"
#: cmdline/apt.cc:71
+#, fuzzy
msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -793,11 +804,11 @@ msgid "File not found"
msgstr "Không tìm thấy tập tin"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Gặp lỗi khi lấy thống kê"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Gặp lỗi khi đặt giờ sửa đổi"
@@ -872,9 +883,9 @@ msgstr "Một trả lời đã tràn bộ đệm."
msgid "Protocol corruption"
msgstr "Giao thức bị hỏng"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Lỗi ghi"
@@ -886,7 +897,7 @@ msgstr "Không thể tạo ổ cắm"
msgid "Could not connect data socket, connection timed out"
msgstr "Không thể kết nối ổ cắm dữ liệu, kết nối đã quá giờ"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Gặp lỗi"
@@ -1136,7 +1147,7 @@ msgstr "Kết nối bị lỗi"
msgid "Internal error"
msgstr "Gặp lỗi nội bộ"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr "Đang liệt kê"
@@ -1378,98 +1389,98 @@ msgstr "Cài đặt những gói này mà không cần thẩm tra?"
msgid "Failed to fetch %s %s\n"
msgstr "Gặp lỗi khi lấy về %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr "đã cài, có thể nâng cấp thành: "
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
msgid "[installed,local]"
msgstr "[đã cài đặt,nội bộ]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr "[đã cài, có thể tự động gỡ bỏ]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
msgid "[installed,automatic]"
msgstr "[đã cài đặt,tự động]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
msgid "[installed]"
msgstr "[đã cài đặt]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr "[có thể nâng cấp từ: "
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr "[residual-config]"
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Những gói theo đây chưa thỏa mãn quan hệ phụ thuộc:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "nhưng mà %s đã được cài đặt"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "nhưng mà %s sẽ được cài đặt"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "nhưng mà nó không có khả năng cài đặt"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "nhưng mà nó là gói ảo"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "nhưng mà nó không được cài đặt"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "nhưng mà nó sẽ không được cài đặt"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " hay"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Những gói MỚI sau sẽ được cài đặt:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Những gói sau sẽ bị GỠ BỎ:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Những gói sau đây được giữ lại:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Những gói sau đây sẽ được NÂNG CẤP:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Những gói sau đây sẽ bị HẠ CẤP:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Những gói sau đây sẽ được thay đổi:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (bởi vì %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1477,27 +1488,27 @@ msgstr ""
"CẢNH BÁO: Có những gói chủ yếu sau đây sẽ bị gỡ bỏ.\n"
"ĐỪNG làm như thế trừ khi bạn biết chính xác mình đang làm gì!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu nâng cấp, %lu được cài đặt mới, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu được cài đặt lại, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu bị hạ cấp, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu cần gỡ bỏ, và %lu chưa được nâng cấp.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n"
@@ -1506,7 +1517,7 @@ msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[C/k]"
@@ -1514,21 +1525,21 @@ msgstr "[C/k]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[c/K]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "C"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "K"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Lỗi biên dịch biểu thức chính quy - %s"
@@ -1569,15 +1580,15 @@ msgstr "Đang sắp xếp"
msgid "The update command takes no arguments"
msgstr "Lệnh cập nhật không chấp nhận đối số"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Đang tính toán nâng cấp... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
msgid "Internal error, Upgrade broke stuff"
msgstr "Lỗi nội bộ: Upgrade (Nâng cấp) đã làm hỏng thứ gì đó"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Xong"
@@ -1585,7 +1596,18 @@ msgstr "Xong"
msgid "Full Text Search"
msgstr "Tìm kiếm toàn văn"
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr "không là gói thật (ảo)"
@@ -1601,12 +1623,12 @@ msgstr ""
" Cần nhớ rằng chức năng khóa đã bị tắt,\n"
" nên có thể nó không chính xác như những gì làm thật!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Gặp lỗi khi phân tích %s. Sửa lại chứ? "
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr "Tập tin “%s” của bạn đã thay đổi, hãy chạy lệnh “apt-get update”."
@@ -1652,8 +1674,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1691,23 +1713,6 @@ msgstr "Không tìm thấy điểm vào trong tập tin mirror “%s”"
msgid "[Mirror: %s]"
msgstr "[Bản sao: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Không thể vá %s dùng mmap và cách sử dụng tập tin: có vẻ là miếng vá bị hỏng."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Không thể vá %s dùng mmap (mà không có lỗi đặc trưng cho mmap): có vẻ là "
-"miếng vá bị hỏng."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Việc tạo ống IPC đến tiến trình con bị lỗi"
@@ -2784,85 +2789,95 @@ msgstr "Không thể phân tích tập tin gói %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Không thể phân tích tập tin gói %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)"
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Gặp dòng có sai dạng %lu trong danh sách nguồn %s ([tùy chọn] không thể phân "
"tích được)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([tùy chọn] quá ngắn)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không phải là một phép "
"gán)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không có khoá nào)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Gặp dòng sai dạng %lu trong danh sách nguồn %s (khoá [%s] %s không có giá "
"trị)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (địa chỉ URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
"Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
"Gặp dòng sai dạng %lu trong danh sách nguồn %s (phân tách bản phân phối)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Đang mở %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Dòng %u quá dài trong danh sách nguồn %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Gặp dòng sai dạng %u trong danh sách nguồn %s (kiểu)."
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s."
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s."
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3086,7 +3101,7 @@ msgstr "Kích cỡ không khớp nhau"
msgid "Invalid file format"
msgstr "Định dạng tập tập tin không hợp lệ"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3095,16 +3110,16 @@ msgstr ""
"Không tìm thấy mục cần thiết “%s” trong tập tin Phát hành (Sai mục trong "
"sources.list hoặc tập tin bị hỏng)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Không thể tìm thấy mã băm tổng kiểm tra cho tập tin Phát hành %s"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "Không có khóa công sẵn sàng cho những mã số khoá theo đây:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3113,12 +3128,12 @@ msgstr ""
"Tập tin phát hành %s đã hết hạn (không hợp lệ kể từ %s). Cập nhật cho kho "
"này sẽ không được áp dụng."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Bản phát hành xung đột: %s (cần %s nhưng lại nhận được %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3129,12 +3144,12 @@ msgstr ""
"Lỗi GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "Lỗi GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3143,12 +3158,12 @@ msgstr ""
"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói "
"này, do thiếu kiến trúc."
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Không tìm thấy nguồn cho việc tải về phiên bản “%s” of “%s”"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3479,34 +3494,38 @@ msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s"
msgid "Completely removed %s"
msgstr "Gỡ bỏ hoàn toàn %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, c-format
msgid "Can not write log (%s)"
msgstr "Không thể ghi nhật ký (%s)"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr "/dev/pts đã gắn chưa?"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr "Đầu ra là thiết bị cuối?"
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "Hệ điều hành đã ngắt trước khi nó kịp hoàn thành"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Không ghi báo cáo apport, vì đã tới giới hạn số các báo cáo (MaxReports)"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "gặp vấn đề về quan hệ phụ thuộc nên để lại không cấu hình"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3514,14 +3533,14 @@ msgstr ""
"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi kế tiếp "
"do một sự thất bại trước đó."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “đĩa đầy”"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3529,7 +3548,7 @@ msgstr ""
"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “không đủ "
"bộ nhớ”"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
@@ -3537,7 +3556,7 @@ msgstr ""
"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi trên hệ "
"thống nội bộ"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3571,6 +3590,20 @@ msgstr ""
msgid "Not locked"
msgstr "Chưa được khoá"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Không thể vá %s dùng mmap và cách sử dụng tập tin: có vẻ là miếng vá bị "
+#~ "hỏng."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Không thể vá %s dùng mmap (mà không có lỗi đặc trưng cho mmap): có vẻ là "
+#~ "miếng vá bị hỏng."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Ghi chú: đang chọn “%s” cho tác vụ “%s”\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 79ea2286e..13fb44f8c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.0~pre1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2010-08-26 14:42+0800\n"
"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -93,7 +93,7 @@ msgid "Total space accounted for: "
msgstr "总占用空间:"
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "软件包文件 %s 尚未同步。"
@@ -101,7 +101,7 @@ msgstr "软件包文件 %s 尚未同步。"
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "没有发现匹配的软件包"
@@ -639,7 +639,7 @@ msgstr "%s 已经是最新的版本了。\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待子进程 %s 的退出,但是它并不存在"
@@ -668,6 +668,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -685,14 +690,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -728,11 +737,11 @@ msgid "File not found"
msgstr "无法找到该文件"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "无法读取状态"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "无法设置文件的修改日期"
@@ -806,9 +815,9 @@ msgstr "回应超出了缓存区大小。"
msgid "Protocol corruption"
msgstr "协议有误"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "写出错"
@@ -820,7 +829,7 @@ msgstr "无法创建套接字"
msgid "Could not connect data socket, connection timed out"
msgstr "无法连接上数据套接字,连接超时"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "失败"
@@ -1062,7 +1071,7 @@ msgstr "连接失败"
msgid "Internal error"
msgstr "内部错误"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1294,101 +1303,101 @@ msgstr "不经验证就安装这些软件包吗?"
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [已安装]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [已安装]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [已安装]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "下列软件包有未满足的依赖关系:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "但是 %s 已经安装"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "但是 %s 正要被安装"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "但无法安装它"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "但是它是虚拟软件包"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "但是它还没有被安装"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "但是它将不会被安装"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " 或"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "下列【新】软件包将被安装:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "下列软件包将被【卸载】:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "下列软件包的版本将保持不变:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "下列软件包将被升级:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "下列软件包将被【降级】:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "下列被要求保持版本不变的软件包将被改变:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (是由于 %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1396,27 +1405,27 @@ msgstr ""
"【警告】:下列基础软件包将被卸载。\n"
"请勿尝试,除非您确实知道您在做什么!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "升级了 %lu 个软件包,新安装了 %lu 个软件包,"
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "重新安装了 %lu 个软件包,"
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "降级了 %lu 个软件包,"
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "要卸载 %lu 个软件包,有 %lu 个软件包未被升级。\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
@@ -1425,7 +1434,7 @@ msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr ""
@@ -1433,21 +1442,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "编译正则表达式时出错 - %s"
@@ -1488,16 +1497,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr " update 命令不需要参数"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "正在对升级进行计算... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "内部错误,全部升级工具坏事了"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "完成"
@@ -1505,7 +1514,18 @@ msgstr "完成"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1520,12 +1540,12 @@ msgstr ""
"   apt-get 需要 root 特权进行实际的执行。\n"
"   同时请记住此时并未锁定,所以请勿完全相信当前的情况!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "无法将 %s 重命名为 %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1571,8 +1591,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1610,20 +1630,6 @@ msgstr "没有找到镜像文件 %s"
msgid "[Mirror: %s]"
msgstr "[镜像:%s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr "无法连同 mmap 和文件操作用途为 %s 打补丁 - 补丁可能已损坏。"
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr "无法连同 mmap 为 %s 打补丁(但没有 mmap 的错误) - 补丁可能已损坏。"
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "无法为子进程创建 IPC 管道"
@@ -2667,76 +2673,86 @@ msgstr "无法解析软件包文件 %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "无法解析软件包文件 %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"
+
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 不是一个任务)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 没有键)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 键 %4$s 没有值)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "正在打开 %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "源列表 %2$s 的第 %1$u 行太长了。"
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "无法识别在源列表 %3$s 里,第 %2$u 行中的软件包类别“%1$s”"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "无法识别在源列表 %3$s 里,第 %2$u 行中的软件包类别“%1$s”"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2956,35 +2972,35 @@ msgstr "大小不符"
msgid "Invalid file format"
msgstr "无效的操作 %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "无法解析软件包仓库 Release 文件 %s"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下 ID 的密钥没有可用的公钥:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "冲突的发行版:%s (期望 %s 但得到 %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2993,12 +3009,12 @@ msgstr ""
"校验签名出错。此仓库未被更新,仍然使用以前的索引文件。GPG 错误:%s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG 错误:%s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3007,12 +3023,12 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3333,58 +3349,62 @@ msgstr "正在准备完全删除 %s"
msgid "Completely removed %s"
msgstr "完全删除了 %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "无法写入 %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr "由于已经达到 MaxReports 限制,没有写入 apport 报告。"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "依赖问题 - 保持未配置"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr "因为错误消息指示这是由于上一个问题导致的错误,没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr "因为错误消息指示这是由于磁盘已满,没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr "因为错误消息指示这是由于内存不足,没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr "因为错误消息指示这是由于磁盘已满,没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr "因为错误消息指示这是一个 dpkg I/O 错误,没有写入 apport 报告。"
@@ -3413,6 +3433,16 @@ msgstr "dpkg 被中断,您必须手工运行 %s 解决此问题。"
msgid "Not locked"
msgstr "未锁定"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr "无法连同 mmap 和文件操作用途为 %s 打补丁 - 补丁可能已损坏。"
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr "无法连同 mmap 为 %s 打补丁(但没有 mmap 的错误) - 补丁可能已损坏。"
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "注意,为任务 %2$s 选中了 %1$s\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index dedc5ae49..cbf0f314d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.5.4\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2009-01-28 10:41+0800\n"
"Last-Translator: Tetralet <tetralet@gmail.com>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
@@ -93,7 +93,7 @@ msgid "Total space accounted for: "
msgstr "統計後的空間合計:"
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "套件檔 %s 未同步。"
@@ -101,7 +101,7 @@ msgstr "套件檔 %s 未同步。"
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "未找到套件"
@@ -632,7 +632,7 @@ msgstr "%s 已經是最新版本了。\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待 %s 但是它並不存在"
@@ -661,6 +661,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -678,14 +683,18 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -720,11 +729,11 @@ msgid "File not found"
msgstr "找不到檔案"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "無法取得狀態"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "無法設定修改時間"
@@ -798,9 +807,9 @@ msgstr "回應超過緩衝區長度。"
msgid "Protocol corruption"
msgstr "協定失敗"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "寫入錯誤"
@@ -812,7 +821,7 @@ msgstr "無法建立 Socket"
msgid "Could not connect data socket, connection timed out"
msgstr "無法和 data socket 連線,連線逾時"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "失敗"
@@ -1055,7 +1064,7 @@ msgstr "連線失敗"
msgid "Internal error"
msgstr "內部錯誤"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1294,101 +1303,101 @@ msgstr "是否不經驗證就安裝這些套件?"
msgid "Failed to fetch %s %s\n"
msgstr "無法取得 %s,%s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr "【已安裝】"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr "【已安裝】"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr "【已安裝】"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "下列的套件有未滿足的相依關係:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "但 %s 卻已安裝"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "但 %s 卻將被安裝"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "但它卻無法安裝"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "但它是虛擬套件"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "但它卻尚未安裝"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "但它卻將不會被安裝"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr "或"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "下列【新】套件將會被安裝:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "下列套件將會被【移除】:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "下列套件將會維持其原有版本:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "下列套件將會被升級:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "下列套件將會被【降級】:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "下列被保留 (hold) 的套件將會被更改:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s(因為 %s)"
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1396,27 +1405,27 @@ msgstr ""
"【警告】:下列的基本套件都將被移除。\n"
"除非您很清楚您在做什麼,否則請勿輕易嘗試!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "升級 %lu 個,新安裝 %lu 個,"
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "重新安裝 %lu 個,"
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "降級 %lu 個,"
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "移除 %lu 個,有 %lu 個未被升級。\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu 個沒有完整得安裝或移除。\n"
@@ -1425,7 +1434,7 @@ msgstr "%lu 個沒有完整得安裝或移除。\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr ""
@@ -1433,21 +1442,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "編譯正規表示式時發生錯誤 - %s"
@@ -1488,16 +1497,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "update 指令不需任何參數"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "籌備升級中... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "內部錯誤,AllUpgrade 造成了損壞"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "完成"
@@ -1505,7 +1514,19 @@ msgstr "完成"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1517,12 +1538,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "無法將 %s 更名為 %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1568,8 +1589,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1607,20 +1628,6 @@ msgstr "無法開啟檔案 %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "無法和子程序建立 IPC 管線"
@@ -2666,76 +2673,86 @@ msgstr "無法辨識套件檔 %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "無法辨識套件檔 %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(URI 分析)"
+
+#: apt-pkg/sourcelist.cc:155
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版分析)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:169
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版分析)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:175
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版分析)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:178
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版分析)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤 (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(URI 分析)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(絕對發行版)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版分析)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "正在開啟 %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "來源列表 %2$s 中的第 %1$u 行太長。"
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤(類型)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "未知的類型 '%1$s',位於在來源列表 %3$s 中的第 %2$u 行"
+#: apt-pkg/sourcelist.cc:401
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "未知的類型 '%1$s',位於在來源列表 %3$s 中的第 %2$u 行"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2950,35 +2967,35 @@ msgstr "大小不符"
msgid "Invalid file format"
msgstr "無效的操作 %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "無法辨別 Release 檔 %s"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "無法取得以下的密鑰 ID 的公鑰:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "發行版本衝突:%s(應當是 %s 但卻得到 %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2986,12 +3003,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3000,12 +3017,12 @@ msgstr ""
"找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。(因為找不到平"
"台)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3321,57 +3338,61 @@ msgstr "正在準備完整移除 %s"
msgid "Completely removed %s"
msgstr "已完整移除 %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "無法寫入 %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""