summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2015-09-11 23:37:01 +0200
committerMichael Vogt <mvo@ubuntu.com>2015-09-11 23:37:01 +0200
commite49dd9d3e7bb3553104c8c96a0e254e66319155f (patch)
tree43d949d95a980c9e94fe63e006aeb22494ba575e /po
parentf2adfc081dcadf57088d51479b9d5f012775334a (diff)
releasing package apt version 1.1~exp121.1.exp12
Diffstat (limited to 'po')
-rw-r--r--po/apt-all.pot1074
-rw-r--r--po/ar.po1107
-rw-r--r--po/ast.po1131
-rw-r--r--po/bg.po1143
-rw-r--r--po/bs.po1108
-rw-r--r--po/ca.po1139
-rw-r--r--po/cs.po1157
-rw-r--r--po/cy.po1161
-rw-r--r--po/da.po1139
-rw-r--r--po/de.po1171
-rw-r--r--po/dz.po1137
-rw-r--r--po/el.po1147
-rw-r--r--po/es.po1127
-rw-r--r--po/eu.po1129
-rw-r--r--po/fi.po1131
-rw-r--r--po/fr.po1147
-rw-r--r--po/gl.po1131
-rw-r--r--po/hu.po1133
-rw-r--r--po/it.po1135
-rw-r--r--po/ja.po1131
-rw-r--r--po/km.po1133
-rw-r--r--po/ko.po1127
-rw-r--r--po/ku.po1103
-rw-r--r--po/lt.po1115
-rw-r--r--po/mr.po1139
-rw-r--r--po/nb.po1131
-rw-r--r--po/ne.po1135
-rw-r--r--po/nl.po1155
-rw-r--r--po/nn.po1147
-rw-r--r--po/pl.po1141
-rw-r--r--po/pt.po1138
-rw-r--r--po/pt_BR.po1141
-rw-r--r--po/ro.po1145
-rw-r--r--po/ru.po1155
-rw-r--r--po/sk.po1137
-rw-r--r--po/sl.po1141
-rw-r--r--po/sv.po1139
-rw-r--r--po/th.po1113
-rw-r--r--po/tl.po1139
-rw-r--r--po/tr.po1147
-rw-r--r--po/uk.po1153
-rw-r--r--po/vi.po1119
-rw-r--r--po/zh_CN.po1113
-rw-r--r--po/zh_TW.po1125
44 files changed, 25280 insertions, 24629 deletions
diff --git a/po/apt-all.pot b/po/apt-all.pot
index c432ac176..d241d6f1a 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: apt 1.1~exp11\n"
+"Project-Id-Version: apt 1.1~exp12\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -110,7 +110,7 @@ msgstr ""
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr ""
@@ -296,23 +296,23 @@ msgstr ""
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -320,145 +320,145 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr ""
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr ""
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
"package %s can't satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr ""
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -512,20 +512,16 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr ""
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-msgid "Must specifc at least one srv record"
-msgstr ""
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -664,12 +660,12 @@ msgstr ""
msgid "File not found"
msgstr ""
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr ""
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr ""
@@ -758,7 +754,7 @@ msgstr ""
msgid "Could not connect data socket, connection timed out"
msgstr ""
-#: methods/ftp.cc:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr ""
@@ -831,64 +827,64 @@ msgstr ""
msgid "Unable to invoke "
msgstr ""
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr ""
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr ""
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr ""
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr ""
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr ""
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr ""
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr ""
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr ""
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr ""
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, c-format
msgid "System error resolving '%s:%s'"
msgstr ""
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr ""
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr ""
@@ -907,7 +903,7 @@ msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1007,222 +1003,6 @@ msgstr ""
msgid "Internal error"
msgstr ""
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr ""
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:275
-msgid "[installed,local]"
-msgstr ""
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-msgid "[installed,automatic]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[installed]"
-msgstr ""
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr ""
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr ""
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr ""
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr ""
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr ""
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr ""
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr ""
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr ""
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr ""
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr ""
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr ""
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr ""
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr ""
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr ""
-
-#: apt-private/private-output.cc:602
-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:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr ""
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr ""
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr ""
-
-#: apt-private/private-output.cc:641
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr ""
-
-#: apt-private/private-output.cc:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:684
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr ""
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr ""
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1297,18 +1077,6 @@ msgstr ""
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr ""
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
@@ -1317,7 +1085,7 @@ msgstr ""
msgid "Packages need to be removed but remove is disabled."
msgstr ""
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1553,6 +1321,234 @@ msgstr ""
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr ""
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr ""
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:275
+msgid "[installed,local]"
+msgstr ""
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+msgid "[installed,automatic]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[installed]"
+msgstr ""
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr ""
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr ""
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr ""
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr ""
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr ""
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr ""
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr ""
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr ""
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr ""
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr ""
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr ""
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr ""
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr ""
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr ""
+
+#: apt-private/private-output.cc:602
+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:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr ""
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr ""
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr ""
+
+#: apt-private/private-output.cc:641
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr ""
+
+#: apt-private/private-output.cc:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:684
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr ""
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr ""
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1561,46 +1557,39 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr ""
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr ""
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr ""
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr ""
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr ""
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr ""
@@ -1666,16 +1655,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr ""
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -1808,27 +1797,6 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr ""
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "Is the package %s installed?"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:537
-#, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr ""
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr ""
@@ -1915,98 +1883,79 @@ msgstr ""
msgid "Calculating upgrade"
msgstr ""
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
+msgid "The method driver %s could not be found."
msgstr ""
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgid "Is the package %s installed?"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
+#: apt-pkg/acquire-worker.cc:543
+#, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
msgstr ""
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
msgstr ""
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
msgstr ""
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
msgstr ""
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
msgstr ""
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
msgid "Invalid file format"
msgstr ""
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
msgid "Signature error"
msgstr ""
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2014,118 +1963,186 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, 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:1026
+#: apt-pkg/acquire-item.cc:1122
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, c-format
msgid "The repository '%s' is no longer signed."
msgstr ""
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, 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:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, c-format
msgid "Changelog unavailable for %s=%s"
msgstr ""
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr ""
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr ""
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, c-format
msgid "Unable to lock directory %s"
msgstr ""
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, c-format
msgid "Clean of %s is not supported"
msgstr ""
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr ""
+#: apt-pkg/update.cc:76
+#, c-format
+msgid "Failed to fetch %s %s"
+msgstr ""
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr ""
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2152,26 +2169,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr ""
-#: apt-pkg/update.cc:76
-#, c-format
-msgid "Failed to fetch %s %s"
-msgstr ""
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr ""
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2284,30 +2281,29 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
msgstr ""
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
msgstr ""
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
+msgid "Index file type '%s' is not supported"
msgstr ""
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
@@ -2320,130 +2316,146 @@ msgstr ""
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
#, c-format
-msgid "Release '%s' for '%s' was not found"
+msgid "Malformed entry %u in %s file %s (%s)"
msgstr ""
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/sourcelist.cc:367
#, c-format
-msgid "Version '%s' for '%s' was not found"
+msgid "Opening %s"
msgstr ""
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/sourcelist.cc:401
#, c-format
-msgid "Couldn't find task '%s'"
+msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/sourcelist.cc:405
#, c-format
-msgid "Couldn't find any package by regex '%s'"
+msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/sourcelist.cc:425 apt-pkg/sourcelist.cc:431
#, c-format
-msgid "Couldn't find any package by glob '%s'"
+msgid "Malformed stanza %u in source list %s (type)"
msgstr ""
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/sourcelist.cc:441
#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
+msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr ""
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:492
#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgid "Release '%s' for '%s' was not found"
msgstr ""
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:495
#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
+msgid "Version '%s' for '%s' was not found"
msgstr ""
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:730
#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
+msgid "Couldn't find task '%s'"
msgstr ""
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:736
#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+msgid "Couldn't find any package by regex '%s'"
msgstr ""
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
+#: apt-pkg/cacheset.cc:742
#, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
+msgid "Couldn't find any package by glob '%s'"
msgstr ""
-#: apt-pkg/sourcelist.cc:355
+#: apt-pkg/cacheset.cc:781
#, c-format
-msgid "Opening %s"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/sourcelist.cc:389
+#: apt-pkg/cacheset.cc:820
#, c-format
-msgid "Malformed line %u in source list %s (type)"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/sourcelist.cc:393
+#: apt-pkg/cacheset.cc:828
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/sourcelist.cc:413 apt-pkg/sourcelist.cc:419
+#: apt-pkg/cacheset.cc:836
#, c-format
-msgid "Malformed stanza %u in source list %s (type)"
+msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/sourcelist.cc:429
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
+#, c-format
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
+
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
+#, c-format
+msgid "Target %s (%s) is configured multiple times in %s and %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, c-format
msgid "Unable to parse Release file %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr ""
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2604,35 +2616,6 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr ""
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2709,7 +2692,7 @@ msgstr ""
msgid "Could not open file descriptor %d"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr ""
@@ -2746,12 +2729,12 @@ msgstr ""
msgid "Problem syncing the file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, c-format
msgid "Unable to mkstemp %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr ""
@@ -2776,6 +2759,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr ""
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr ""
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr ""
@@ -3072,87 +3084,87 @@ msgstr ""
msgid "Unable to get a cursor"
msgstr ""
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr ""
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr ""
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr ""
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr ""
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr ""
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr ""
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr ""
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr ""
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr ""
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr ""
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr ""
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr ""
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 884adfcaa..66ef5c545 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\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"
@@ -118,7 +118,7 @@ msgstr "يجب أن تعطي صيغة واحدة بالضبط"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "تعذر العثور على الحزمة %s"
@@ -306,23 +306,23 @@ msgstr ""
msgid "Unable to lock the download directory"
msgstr "تعذر قَفْل دليل التنزيل"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "تعذر العثور على مصدر الحزمة %s"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -330,145 +330,145 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "تخطي الملف '%s' المنزل مسبقاً\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "إحضار المصدر %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "فشل إحضار بعض الأرشيفات."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "اكتمل التنزيل وفي وضع التنزيل فقط"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "أمر فك الحزمة '%s' فشل.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "أمر البناء '%s' فشل.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr ""
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
"package %s can't satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr ""
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "الوحدات المدعومة:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -523,21 +523,16 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -678,12 +673,12 @@ msgstr "لم يُعثر على القرص."
msgid "File not found"
msgstr "لم يُعثر على الملف"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "فشيل تنفيذ stat"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "فشل تعيين وقت التعديل"
@@ -774,7 +769,7 @@ msgstr ""
msgid "Could not connect data socket, connection timed out"
msgstr ""
-#: methods/ftp.cc:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "فشل"
@@ -847,64 +842,64 @@ msgstr "استعلام"
msgid "Unable to invoke "
msgstr ""
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "الاتصال بـ%s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr ""
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "تعذر تمهيد الاتصال بـ%s:%s (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "تعذر الاتصال بـ%s:%s (%s)، انتهى وقت الاتصال"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "تعذر الاتصال بـ%s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "الاتصال بـ%s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr ""
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr ""
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, c-format
msgid "System error resolving '%s:%s'"
msgstr ""
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr ""
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "تعذر الاتصال بـ%s %s:"
@@ -923,7 +918,7 @@ msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1023,227 +1018,6 @@ msgstr ""
msgid "Internal error"
msgstr "خطأ داخلي"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "تصحيح المعتمدات..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " فشل."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "لم يمكن تصحيح المعتمدات"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "لم يمكن تقليص مجموعة الترقية"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " تم"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "قد ترغب بتنفيذ الأمر 'apt-get -f install' لتصحيح هذه."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "مُعتمدات غير مستوفاة. حاول استخدام -f."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [مُثبّتة]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [مُثبّتة]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [مُثبّتة]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr " [مُثبّتة]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "إلا أن %s مثبت"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "إلا أنه سيتم تثبيت %s"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "إلا أنه غير قابل للتثبيت"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "إلا أنها حزمة وهمية"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "إلا أنها غير مثبتة"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "إلا أنه لن يتم تثبيتها"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " أو"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "سيتم تثبيت الحزم الجديدة التالية:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "سيتم إزالة الحزم التالية:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "سيتم الإبقاء على الحزم التالية:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "ستتم ترقية الحزم التالية:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "سيتم تثبيط الحزم التالية:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "سيتم تغيير الحزم المبقاة التالية:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (بسبب %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"تحذير: ستتم إزالة الحزم الأساسية التالية.\n"
-"لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!"
-
-#: apt-private/private-output.cc:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً، "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu أعيد تثبيتها، "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu مثبطة، "
-
-#: apt-private/private-output.cc:641
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n"
-
-#: apt-private/private-output.cc:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu غير مثبتة بالكامل أو مزالة.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[Y/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-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:684
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr ""
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "لا يقبل الأمر update أية مُعطيات"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1319,18 +1093,6 @@ msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "لاحظ، تحديد %s بدلاً من %s\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "خطأ داخلي، تم طلب InstallPackages مع وجود حزم معطوبة!"
@@ -1339,7 +1101,7 @@ msgstr "خطأ داخلي، تم طلب InstallPackages مع وجود حزم م
msgid "Packages need to be removed but remove is disabled."
msgstr "حزم بحاجة للإزالة لكن الإزالة مُعطّلة."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1586,6 +1348,239 @@ msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "تصحيح المعتمدات..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " فشل."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "لم يمكن تصحيح المعتمدات"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "لم يمكن تقليص مجموعة الترقية"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " تم"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "قد ترغب بتنفيذ الأمر 'apt-get -f install' لتصحيح هذه."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "مُعتمدات غير مستوفاة. حاول استخدام -f."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [مُثبّتة]"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [مُثبّتة]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [مُثبّتة]"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr " [مُثبّتة]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "إلا أن %s مثبت"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "إلا أنه سيتم تثبيت %s"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "إلا أنه غير قابل للتثبيت"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "إلا أنها حزمة وهمية"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "إلا أنها غير مثبتة"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "إلا أنه لن يتم تثبيتها"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " أو"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "سيتم تثبيت الحزم الجديدة التالية:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "سيتم إزالة الحزم التالية:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "سيتم الإبقاء على الحزم التالية:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "ستتم ترقية الحزم التالية:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "سيتم تثبيط الحزم التالية:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "سيتم تغيير الحزم المبقاة التالية:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (بسبب %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"تحذير: ستتم إزالة الحزم الأساسية التالية.\n"
+"لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!"
+
+#: apt-private/private-output.cc:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً، "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu أعيد تثبيتها، "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu مثبطة، "
+
+#: apt-private/private-output.cc:641
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n"
+
+#: apt-private/private-output.cc:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu غير مثبتة بالكامل أو مزالة.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+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:684
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr ""
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "لا يقبل الأمر update أية مُعطيات"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1594,47 +1589,40 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "تحذير: تعذرت المصادقة على الحزم التالية!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "تم غض النظر عن تحذير المصادقة.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "تعذرت المصادقة على بعض الحزم"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "تثبيت هذه الحزم دون التحقق منها؟"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "هناك مشاكل وتم استخدام -y دون --force-yes"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "فشل إحضار %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "تعذر حساب المساحة الحرة في %s"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "ليس هناك مساحة كافية في %s."
@@ -1703,16 +1691,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "تعذرت قراءة %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -1848,27 +1836,6 @@ msgstr "قد يساعدك تنفيذ الأمر apt-get update في تصحيح
msgid "The list of sources could not be read."
msgstr "تعذرت قراءة قائمة المصادر."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "Is the package %s installed?"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr "الرجاء إدخال القرص المُسمّى '%s' في السوّاقة '%s' وضغط مفتاح الإدخال."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr ""
@@ -1955,101 +1922,83 @@ msgstr "إضافي"
msgid "Calculating upgrade"
msgstr "حساب الترقية"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr ""
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgid "The method driver %s could not be found."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#: apt-pkg/acquire-worker.cc:113
+#, c-format
+msgid "Is the package %s installed?"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "قراءة قوائم الحزم"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr "الرجاء إدخال القرص المُسمّى '%s' في السوّاقة '%s' وضغط مفتاح الإدخال."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
msgstr ""
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
msgstr ""
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
msgstr ""
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "دمج المعلومات المتوفرة"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:252
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "فشل فتح %s"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:257
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "فشلت كتابة الملف %s"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "فشل إعادة التسمية ، %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "MD5Sum غير متطابقة"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "الحجم غير متطابق"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
#, fuzzy
msgid "Invalid file format"
msgstr "عمليّة غير صالحة %s"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "خطأ في الكتابة"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2057,118 +2006,186 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, 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:1026
+#: apt-pkg/acquire-item.cc:1122
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "المسار %s طويل جداً"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, 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:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "الاتصال بـ%s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr ""
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "قراءة قوائم الحزم"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr ""
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, fuzzy, c-format
msgid "Unable to lock directory %s"
msgstr "تعذر قفل دليل القائمة"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, fuzzy, c-format
msgid "Clean of %s is not supported"
msgstr "نظام الحزم '%s' غير مدعوم"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr ""
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "فشل إحضار %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr ""
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2195,26 +2212,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr ""
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "فشل إحضار %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr ""
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2329,32 +2326,30 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
msgstr ""
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "دمج المعلومات المتوفرة"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr ""
-#: apt-pkg/depcache.cc:252
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "فشل فتح %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr ""
-#: apt-pkg/depcache.cc:257
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "فشلت كتابة الملف %s"
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr ""
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2366,130 +2361,146 @@ msgstr ""
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "فتح %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:405
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:425 apt-pkg/sourcelist.cc:431
+#, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:441
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "تعذر العثور على الحزمة %s"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "تعذر العثور على الحزمة %s"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "تعذر العثور على الحزمة %s"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:355
-#, c-format
-msgid "Opening %s"
-msgstr "فتح %s"
-
-#: apt-pkg/sourcelist.cc:389
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:393
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:413 apt-pkg/sourcelist.cc:419
-#, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:429
-#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "لاحظ، تحديد %s بدلاً من %s\n"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "لاحظ، تحديد %s بدلاً من %s\n"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2650,35 +2661,6 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "تعذر العثور على التحديد %s"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2755,7 +2737,7 @@ msgstr ""
msgid "Could not open file descriptor %d"
msgstr "فشل إغلاق الملف %s"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr ""
@@ -2792,12 +2774,12 @@ msgstr "مشكلة في إغلاق الملف"
msgid "Problem syncing the file"
msgstr "مشكلة في مزامنة الملف"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "تعذر إنشاء %s"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "تعذرت الكتابة إلى %s"
@@ -2822,6 +2804,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... تمّ"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "تعذر العثور على التحديد %s"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr ""
@@ -3122,87 +3133,87 @@ msgstr ""
msgid "Unable to get a cursor"
msgstr ""
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: تعذرت قراءة الدليل %s\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr ""
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr ""
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr ""
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr ""
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "فشل فتح %s"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr ""
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr ""
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** فشل ربط %s بـ%s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -3467,6 +3478,10 @@ msgstr "فشل تحقّق Checksum لملف Tar، الأرشيف فاسد"
msgid "Unknown TAR header type %u, member %s"
msgstr ""
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها"
+
#~ msgid "Failed to exec gzip "
#~ msgstr "فشل تنفيذ gzip"
diff --git a/po/ast.po b/po/ast.po
index f47579959..355a48f60 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: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\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"
@@ -110,7 +110,7 @@ msgstr "Has de dar polo menos un patrón de gueta"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Nun pue alcontrase'l paquete %s"
@@ -349,16 +349,16 @@ msgstr "Error internu, l'iguador de problemes frañó coses"
msgid "Unable to lock the download directory"
msgstr "Nun pue bloquiase'l direutoriu de descarga"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "Has de conseñar polo menos un paquete p'algamar so fonte"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nun pudo alcontrase un paquete fonte pa %s"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -367,7 +367,7 @@ msgstr ""
"AVISU: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -379,96 +379,96 @@ msgstr ""
"pa baxar los caberos anovamientos (posiblemente tovía nun sacaos) pal "
"paquete.\n"
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Saltando'l ficheru yá descargáu '%s'\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Hai falta descargar %sB/%sB d'archivos fonte.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Hai falta descargar %sB d'archivos fonte.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Fonte descargada %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Falló la descarga de dellos archivos."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Descarga completa y en mou de sólo descarga"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Saltando'l desempaquetáu de la fonte yá desempaquetada en %s\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Falló la orde de desempaquetáu '%s'.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Falló la orde build '%s'.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Falló el procesu fíu"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Hai que conseñar polo menos un paquete pa verificar les dependencies de "
"construcción"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Fallu al procesar les dependencies de construcción"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nun pudo algamase información de dependencies de construcción pa %s"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nun tien dependencies de construcción.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -477,7 +477,7 @@ msgstr ""
"La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
"paquete %s"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -486,14 +486,14 @@ msgstr ""
"La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
"paquete %s"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Nun se pudo satisfacer la dependencia %s pa %s: El paquete instaláu %s ye "
"enforma nuevu"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -502,7 +502,7 @@ msgstr ""
"La dependencia %s en %s nun puede satisfacese porque denguna versión "
"disponible del paquete %s satisfaz los requisitos de versión"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -511,25 +511,25 @@ msgstr ""
"La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
"paquete %s"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Fallu pa satisfacer la dependencia %s pa %s: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Les dependencies de construcción de %s nun pudieron satisfacese."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "Fallu al procesar les dependencies de construcción"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Módulos sofitaos:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -629,21 +629,16 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Has de conseñar polo menos un paquete p'algamar so fonte"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "Has de conseñar polo menos un paquete p'algamar so fonte"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -784,12 +779,12 @@ msgstr "Nun s'atopa'l discu."
msgid "File not found"
msgstr "Nun s'atopa'l ficheru."
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "Falló al lleer"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "Nun se pudo afitar la hora de modificación"
@@ -880,7 +875,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:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Falló"
@@ -953,64 +948,64 @@ msgstr "Consulta"
msgid "Unable to invoke "
msgstr "Nun se pudo invocar "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Coneutando a %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Nun se pudo crear un socket pa %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Nun se pudo coneutar a %s:%s (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Nun se pudo coneutar a %s:%s (%s); expiró'l tiempu de conexón"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Nun se pudo coneutar a %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Coneutando a %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nun se pudo resolver '%s'"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Fallu temporal al resolver '%s'"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, fuzzy, c-format
msgid "System error resolving '%s:%s'"
msgstr "Daqué raro asocedió resolviendo '%s:%s' (%i - %s)"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Daqué raro asocedió resolviendo '%s:%s' (%i - %s)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Nun pudo coneutase a %s:%s:"
@@ -1031,7 +1026,7 @@ msgstr ""
"Nun pudo executase 'apt-key' pa verificar la robla (¿ta instaláu gnupg?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1133,227 +1128,6 @@ msgstr ""
msgid "Internal error"
msgstr "Fallu internu"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Iguando dependencies..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " falló."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Nun pudieron iguase les dependencies"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "Nun pue amenorgase'l conxuntu d'actualización"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Fecho"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Habríes d'executar 'apt-get -f install' para igualo."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependencies incumplíes. Téntalo usando -f."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instaláu]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instaláu]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instaláu]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instaláu]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "pero %s ta instaláu"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "pero %s ta pa instalar"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "pero nun ye instalable"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "pero ye un paquete virtual"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "pero nun ta instaláu"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "pero nun va instalase"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " o"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "Los siguientes paquetes nun cumplen dependencies:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "Van instalase los siguientes paquetes NUEVOS:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Los siguientes paquetes van DESANICIASE:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "Los siguientes paquetes tan reteníos:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "Los siguientes paquetes van actualizase:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Los siguientes paquetes van DESACTUALIZASE:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "Van camudase los siguientes paquetes reteníos:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (por %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu actualizaos, %lu nuevos instalaos, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstalaos, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu desactualizaos, "
-
-#: apt-private/private-output.cc:641
-#, 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:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu nun instalaos dafechu o desaniciaos.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[S/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-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:684
-msgid "Y"
-msgstr "S"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Error de compilación d'espresión regular - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "La orde update nun lleva argumentos"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1432,18 +1206,6 @@ msgstr "El paquete %s nun ta instalau, nun va desaniciase\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Nota, escoyendo %s nel llugar de %s\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Error internu, ¡InstallPackages llamose con paquetes frañaos!"
@@ -1452,7 +1214,7 @@ msgstr "Error internu, ¡InstallPackages llamose con paquetes frañaos!"
msgid "Packages need to be removed but remove is disabled."
msgstr "Fai falta desaniciar los paquetes pero desaniciar ta torgáu."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1713,6 +1475,239 @@ msgstr "Esbillada la versión %s (%s) pa %s\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Esbillada la versión %s (%s) pa %s\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Iguando dependencies..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " falló."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Nun pudieron iguase les dependencies"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Nun pue amenorgase'l conxuntu d'actualización"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Fecho"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Habríes d'executar 'apt-get -f install' para igualo."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependencies incumplíes. Téntalo usando -f."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instaláu]"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instaláu]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instaláu]"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instaláu]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "pero %s ta instaláu"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "pero %s ta pa instalar"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "pero nun ye instalable"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "pero ye un paquete virtual"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "pero nun ta instaláu"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "pero nun va instalase"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " o"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Los siguientes paquetes nun cumplen dependencies:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Van instalase los siguientes paquetes NUEVOS:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Los siguientes paquetes van DESANICIASE:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "Los siguientes paquetes tan reteníos:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "Los siguientes paquetes van actualizase:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Los siguientes paquetes van DESACTUALIZASE:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "Van camudase los siguientes paquetes reteníos:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (por %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu actualizaos, %lu nuevos instalaos, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstalaos, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu desactualizaos, "
+
+#: apt-private/private-output.cc:641
+#, 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:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu nun instalaos dafechu o desaniciaos.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[S/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+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:684
+msgid "Y"
+msgstr "S"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Error de compilación d'espresión regular - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "La orde update nun lleva argumentos"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1726,47 +1721,40 @@ msgstr ""
" asina que nun dependen de la pertinencia de la verdadera situación "
"actual!"
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "AVISU: ¡Nun pudieron autenticase los siguientes paquetes!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "Avisu d'autenticación saltáu.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "Dellos paquetes nun pudieron autenticase"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "¿Instalar esos paquetes ensin verificación?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Hai problemes y utilizose -y ensin --force-yes"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falló algamar %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nun pue determinase l'espaciu llibre de %s"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Nun tienes espaciu libre bastante en %s."
@@ -1835,16 +1823,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Nun ye a lleer %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -1986,27 +1974,6 @@ msgstr "Has d'executar apt-get update pa iguar estos problemes"
msgid "The list of sources could not be read."
msgstr "Nun pudo lleese la llista de fontes."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Nun pudo alncontrase'l controlador de métodu %s."
-
-#: apt-pkg/acquire-worker.cc:113
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "El métodu %s nun entamó correchamente"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr "Por favor, introduz el discu '%s' nel preséu '%s' y calca Intro."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Caché de paquetes balera."
@@ -2094,101 +2061,81 @@ msgstr "extra"
msgid "Calculating upgrade"
msgstr "Calculando l'anovamientu"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "La triba de ficheru d'indiz '%s' nun ta sofitada"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "La caché tien un sistema de versiones incompatible"
+msgid "The method driver %s could not be found."
+msgstr "Nun pudo alncontrase'l controlador de métodu %s."
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Hebo un error al procesar %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Coime, perpasaste'l númberu de nomes de paquete qu'esti APT ye a remanar."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Vaya, perpasaste'l númberu de versiones coles que puede esti APT."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Coime, perpasaste'l númberu de descripciones qu'esti APT ye a remanar."
+msgid "Is the package %s installed?"
+msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Vaya, perpasaste'l númberu de dependencies coles que puede esti APT."
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "El métodu %s nun entamó correchamente"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Lleendo llista de paquetes"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr "Por favor, introduz el discu '%s' nel preséu '%s' y calca Intro."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "Fallu de E/S al grabar caché d'oríxenes"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Creando árbol de dependencies"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Versiones candidates"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Xeneración de dependencies"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Lleendo información d'estáu"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Nun se pudo abrir el ficheru d'estáu %s"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falló la escritura del ficheru temporal d'estáu %s"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "falló'l cambiu de nome, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "La suma hash nun concasa"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "El tamañu nun concasa"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
#, fuzzy
msgid "Invalid file format"
msgstr "Operación incorreuta: %s"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Fallu d'escritura"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, fuzzy, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2198,63 +2145,63 @@ 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:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr "Fallu GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, 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:1026
+#: apt-pkg/acquire-item.cc:1122
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"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, 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:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "El direutorio %s ta desviáu"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2263,12 +2210,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:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2277,43 +2224,115 @@ msgstr ""
"paquete %s."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Coneutando a %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "La caché tien un sistema de versiones incompatible"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Hebo un error al procesar %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Coime, perpasaste'l númberu de nomes de paquete qu'esti APT ye a remanar."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Vaya, perpasaste'l númberu de versiones coles que puede esti APT."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Coime, perpasaste'l númberu de descripciones qu'esti APT ye a remanar."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Vaya, perpasaste'l númberu de dependencies coles que puede esti APT."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Lleendo llista de paquetes"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "Fallu de E/S al grabar caché d'oríxenes"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr "Falta'l direutoriu de llistes %spartial."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Falta'l direutoriu d'archivos %spartial."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, c-format
msgid "Unable to lock directory %s"
msgstr "Nun pudo bloquiase'l direutoriu %s"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, fuzzy, c-format
msgid "Clean of %s is not supported"
msgstr "La triba de ficheru d'indiz '%s' nun ta sofitada"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Descargando ficheru %li de %li (falten %s)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Descargando ficheru %li de %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Falló algamar %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Nun pudieron descargase dellos ficheros d'índiz; inoráronse o usáronse los "
+"antiguos nel so llugar."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Has de poner delles URIs 'fonte' nel ficheru sources.list"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Nun pudo lleese %s."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2341,29 +2360,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "Nun hai prioridá (o ye cero) conseñada pa pin"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Falló algamar %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Nun pudieron descargase dellos ficheros d'índiz; inoráronse o usáronse los "
-"antiguos nel so llugar."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Has de poner delles URIs 'fonte' nel ficheru sources.list"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Nun pudo lleese %s."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2490,31 +2486,30 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nun pueden iguase los problemes; tienes paquetes frañaos reteníos."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Creando árbol de dependencies"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Versiones candidates"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Xeneración de dependencies"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr ""
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Lleendo información d'estáu"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr ""
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nun se pudo abrir el ficheru d'estáu %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr ""
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falló la escritura del ficheru temporal d'estáu %s"
+msgid "Index file type '%s' is not supported"
+msgstr "La triba de ficheru d'indiz '%s' nun ta sofitada"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2526,58 +2521,96 @@ msgstr "Nun se pudo tratar el ficheru de paquetes %s (%d)"
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Saltu mal formáu %s llinia %lu #1"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "Abriendo %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, 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:405
+#, 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:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Llinia %u mal formada na llista d'oríxenes %s (triba)"
+
+#: apt-pkg/sourcelist.cc:441
+#, 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/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Nun s'alcontró la distribución '%s' pa '%s'"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Nun s'alcontró la versión '%s' pa '%s'"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Nun pudo alcontrase la xera '%s'"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Nun pueden seleicionase versiones pal paquete'%s' como puramente virtual"
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Nun puede seleicionase la versión más nueva pal paquete'%s' como puramente "
"virtual"
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Nun puede seleicionase versión candidata pal paquete %s que nun tien "
"candidata"
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Nun puede seleicionase versión instalada pal paquete %s que nun ta instalada"
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -2586,78 +2619,56 @@ msgstr ""
"Nun puede seleicionase l'instalador o versión candidata pal paquete '%s' "
"como non tien nengún d'ellos"
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Saltu mal formáu %s llinia %lu #1"
-
-#: apt-pkg/sourcelist.cc:355
-#, c-format
-msgid "Opening %s"
-msgstr "Abriendo %s"
-
-#: apt-pkg/sourcelist.cc:389
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Llinia %u mal formada na llista d'oríxenes %s (triba)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:393
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, 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:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "Llinia %u mal formada na llista d'oríxenes %s (triba)"
-
-#: apt-pkg/sourcelist.cc:429
-#, 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"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Nun se pudo parchear el ficheru release %s"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr "Ensin seiciones nel ficheru release %s"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Ensin entrada Hash nel ficheru release %s"
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Entrada inválida pa 'Date' nel ficheru release %s"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Entrada inválida pa 'Valid-Until' nel ficheru release %s"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2833,35 +2844,6 @@ msgstr ""
msgid "Not locked"
msgstr "Non bloquiáu"
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "Escoyeta %s que nun s'atopa"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2938,7 +2920,7 @@ msgstr "Nun se pudo abrir el ficheru %s"
msgid "Could not open file descriptor %d"
msgstr "Nun pudo abrise un ficheru descriptor %d"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "Nun pudo criase'l soprocesu IPC"
@@ -2975,12 +2957,12 @@ msgstr "Hai problemes desvenceyando'l ficheru %s"
msgid "Problem syncing the file"
msgstr "Hai problemes al sincronizar el ficheru"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Nun ye a lleer %s"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Nun se pue escribir en %s"
@@ -3005,6 +2987,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Fecho"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "Escoyeta %s que nun s'atopa"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Nun se puede facer mmap d'un ficheru baleru"
@@ -3362,87 +3373,87 @@ msgstr "L'archivu nun tien rexistru de control"
msgid "Unable to get a cursor"
msgstr "Nun pudo algamase un cursor"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Nun pudo lleese'l direutoriu %s\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: Nun pudo lleese %s\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "E: Errores aplicables al ficheru "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "Nun pudo resolvese %s"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Falló'l percorríu pol árbol"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "Nun pudo abrise %s"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Desenllazar %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "Nun pudo lleese l'enllaz %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "Nun pudo desenllazase %s"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Falló enllazar enllazr %s a %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Alcanzose'l llímite of %sB de desenllaz.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "L'archivu nun tien el campu paquetes"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nun tien la entrada saltos\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " el curiador de %s ye %s y non %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nun tien la entrada saltos de fonte\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s tampoco nun tiene una entrada binaria de saltos\n"
@@ -3730,6 +3741,10 @@ msgstr "Falló la suma de control de tar, ficheru tollíu"
msgid "Unknown TAR header type %u, member %s"
msgstr "Testera del TAR triba %u desconocida, miembru %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "Has de conseñar polo menos un paquete p'algamar so fonte"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Fallu al crear les tuberíes"
diff --git a/po/bg.po b/po/bg.po
index c5aa9af55..fe4e01131 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: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\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"
@@ -116,7 +116,7 @@ msgstr "Трябва да въведете поне един шаблон за
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr "Тази командата е остаряла. Използвайте „apt-mark showauto“ вместо нея."
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Пакетът %s не може да бъде намерен"
@@ -353,16 +353,16 @@ msgstr "Вътрешна грешка, „problem resolver“ счупи нещ
msgid "Unable to lock the download directory"
msgstr "Неуспех при заключването на директорията за изтегляне"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Неуспех при намирането на изходен код на пакет %s"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -372,7 +372,7 @@ msgstr ""
"адрес:\n"
"%s\n"
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -384,69 +384,69 @@ msgstr ""
"за да изтеглите последните промени в пакета (евентуално в процес на "
"разработка).\n"
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Пропускане на вече изтегления файл „%s“\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Изтегляне на изходен код %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Неуспех при изтеглянето на някои архиви."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Изтеглянето завърши в режим само на изтегляне"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Командата за разпакетиране „%s“ пропадна.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Командата за компилиране „%s“ пропадна.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Процесът-потомък пропадна"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Трябва да укажете поне един пакет за проверка на зависимости за компилиране"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -455,28 +455,28 @@ msgstr ""
"Липсва информация за архитектурата %s. Прегледайте информацията за APT::"
"Architectures в apt.conf(5)."
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Неуспех при обработката на зависимостите за компилиране"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"Неуспех при получаването на информация за зависимостите за компилиране на %s"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s няма зависимости за компилиране.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -485,7 +485,7 @@ msgstr ""
"Зависимост %s за пакета %s не може да бъде удовлетворена, %s не се позволява "
"за пакети „%s“"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -494,14 +494,14 @@ msgstr ""
"Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
"не може да бъде намерен"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният "
"пакет %s е твърде нов"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -510,7 +510,7 @@ msgstr ""
"Зависимост %s за пакета %s не може да бъде удовлетворена, понеже версията "
"кандидат на пакета %s не може да удовлетвори изискването за версия"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -519,25 +519,25 @@ msgstr ""
"Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
"няма подходящи версии"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "Неуспех при обработката на зависимостите за компилиране"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Поддържани модули:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -636,21 +636,16 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -811,12 +806,12 @@ msgstr "Дискът не е намерен."
msgid "File not found"
msgstr "Файлът не е намерен"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "Неуспех при получаването на атрибути"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "Неуспех при задаването на време на промяна"
@@ -909,7 +904,7 @@ msgstr ""
"Неуспех при свързването на гнездо за данни, допустимото време за свързване "
"изтече"
-#: methods/ftp.cc:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Неуспех"
@@ -982,64 +977,64 @@ msgstr "Запитване"
msgid "Unable to invoke "
msgstr "Неуспех при извикването на "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Свързване с %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Неуспех при създаването на гнездо за %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Не може да се започне свързване с %s:%s (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Неуспех при свързване с %s:%s (%s), допустимото време изтече"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Неуспех при свързване с %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Свързване с %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "Неуспех при намирането на IP адреса на „%s“"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Временен неуспех при намирането на IP адреса на „%s“"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, fuzzy, c-format
msgid "System error resolving '%s:%s'"
msgstr "Нещо лошо се случи при намирането на IP адреса на „%s:%s“ (%i - %s)"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Нещо лошо се случи при намирането на IP адреса на „%s:%s“ (%i - %s)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Неуспех при свързване с %s:%s:"
@@ -1062,7 +1057,7 @@ msgstr ""
"gnupg?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1164,229 +1159,6 @@ msgstr ""
msgid "Internal error"
msgstr "Вътрешна грешка"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Коригиране на зависимостите..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " пропадна."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Неуспех при коригирането на зависимостите"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "Неуспех при минимизирането на набора актуализации"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Готово"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Възможно е да изпълните „apt-get -f install“, за да коригирате тези "
-"неизправности."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Неудовлетворени зависимости. Опитайте с „-f“."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Инсталиран]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Инсталиран]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Инсталиран]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr " [Инсталиран]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "но е инсталиран %s"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "но ще бъде инсталиран %s"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "но той не може да бъде инсталиран"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "но той е виртуален пакет"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "но той не е инсталиран"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "но той няма да бъде инсталиран"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " или"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "Следните пакети имат неудовлетворени зависимости:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "Следните НОВИ пакети ще бъдат инсталирани:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "Следните пакети няма да бъдат променени:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "Следните пакети ще бъдат актуализирани:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "Следните задържани пакети ще бъдат променени:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (поради %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"ПРЕДУПРЕЖДЕНИЕ: Следните необходими пакети ще бъдат премахнати.\n"
-"Това НЕ би трябвало да става освен ако знаете точно какво правите!"
-
-#: apt-private/private-output.cc:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu актуализирани, %lu нови инсталирани, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu преинсталирани, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu върнати към по-стара версия, "
-
-#: apt-private/private-output.cc:641
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu за премахване и %lu без промяна.\n"
-
-#: apt-private/private-output.cc:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu не са напълно инсталирани или премахнати.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[Y/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-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:684
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Грешка при компилирането на регулярния израз - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Командата „update“ не възприема аргументи"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1467,18 +1239,6 @@ msgstr "Пакетът „%s“ не е инсталиран, така че не
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Избиране на „%s“ вместо „%s“\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Вътрешна грешка, „InstallPackages“ е предизвикано при счупени пакети!"
@@ -1487,7 +1247,7 @@ msgstr "Вътрешна грешка, „InstallPackages“ е предизви
msgid "Packages need to be removed but remove is disabled."
msgstr "Трябва да бъдат премахнати пакети, но премахването е изключено."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1750,6 +1510,241 @@ msgstr "Избрана е версия %s (%s) за %s\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Избрана е версия „%s“ (%s) за „%s“ заради „%s“\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Коригиране на зависимостите..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " пропадна."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Неуспех при коригирането на зависимостите"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Неуспех при минимизирането на набора актуализации"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Готово"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Възможно е да изпълните „apt-get -f install“, за да коригирате тези "
+"неизправности."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Неудовлетворени зависимости. Опитайте с „-f“."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Инсталиран]"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Инсталиран]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Инсталиран]"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr " [Инсталиран]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "но е инсталиран %s"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "но ще бъде инсталиран %s"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "но той не може да бъде инсталиран"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "но той е виртуален пакет"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "но той не е инсталиран"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "но той няма да бъде инсталиран"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " или"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Следните пакети имат неудовлетворени зависимости:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Следните НОВИ пакети ще бъдат инсталирани:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "Следните пакети няма да бъдат променени:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "Следните пакети ще бъдат актуализирани:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "Следните задържани пакети ще бъдат променени:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (поради %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"ПРЕДУПРЕЖДЕНИЕ: Следните необходими пакети ще бъдат премахнати.\n"
+"Това НЕ би трябвало да става освен ако знаете точно какво правите!"
+
+#: apt-private/private-output.cc:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu актуализирани, %lu нови инсталирани, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu преинсталирани, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu върнати към по-стара версия, "
+
+#: apt-private/private-output.cc:641
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu за премахване и %lu без промяна.\n"
+
+#: apt-private/private-output.cc:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu не са напълно инсталирани или премахнати.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+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:684
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Грешка при компилирането на регулярния израз - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Командата „update“ не възприема аргументи"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1762,47 +1757,40 @@ msgstr ""
" Заключването е деактивирано, така че не разчитайте\n"
" на повтаряемост в реална ситуация."
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ПРЕДУПРЕЖДЕНИЕ: Следните пакети не могат да бъдат удостоверени!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "Предупреждението за удостоверяването е пренебрегнато.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "Някои пакети не можаха да бъдат удостоверени"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "Инсталиране на тези пакети без проверка?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Има проблеми и „-y“ е използвано без „--force-yes“"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Неуспех при изтеглянето на %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Неуспех при определянето на свободното пространство в %s"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Нямате достатъчно свободно пространство в %s."
@@ -1871,16 +1859,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Неуспех при четенето на %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -2019,27 +2007,6 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr "Списъкът с източници не можа да бъде прочетен."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Неуспех при намирането на драйвер за метод %s."
-
-#: apt-pkg/acquire-worker.cc:113
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Методът %s не стартира правилно"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Празен кеш на пакети"
@@ -2126,106 +2093,81 @@ msgstr "допълнителен"
msgid "Calculating upgrade"
msgstr "Изчисляване на актуализацията"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Не се поддържа индексен файл от типа „%s“"
+msgid "The method driver %s could not be found."
+msgstr "Неуспех при намирането на драйвер за метод %s."
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "Кешът има несъвместима система за версии"
+#: apt-pkg/acquire-worker.cc:113
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:164
#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Възникна грешка при обработката на %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Еха, надхвърлихте броя имена на пакети, на който е способна тази версия на "
-"APT."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Еха, надхвърлихте броя версии, на който е способна тази версия на APT."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"Еха, надхвърлихте броя описания, на който е способна тази версия на APT."
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"Еха, надхвърлихте броя зависимости, на който е способна тази версия на APT."
+msgid "Method %s did not start correctly"
+msgstr "Методът %s не стартира правилно"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Четене на списъците с пакети"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Изграждане на дървото със зависимости"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr "Изпращане на сценарий към програмата за удовлетворяване на зависимости"
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Версии кандидати"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr "Изпращане на заявка към програмата за удовлетворяване на зависимости"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Генериране на зависимости"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr "Подготовка за приемане на решение"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Четене на информацията за състоянието"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr ""
-"Външната програма за удовлетворяване на зависимости се провали без да изведе "
-"съобщение за грешка"
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Неуспех при отварянето на StateFile %s"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr "Изпълняване на външна програма за удовлетворяване на зависимости"
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Неуспех при запис на временен StateFile %s"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "преименуването се провали, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "Несъответствие на контролната сума"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "Несъответствие на размера"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
#, fuzzy
msgid "Invalid file format"
msgstr "Невалидна операция %s"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Грешка при запис"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, fuzzy, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2235,12 +2177,12 @@ msgstr ""
"използват старите индексни файлове. Грешка от GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr "Грешка от GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2249,14 +2191,14 @@ msgstr ""
"Не може да се открие елемент „%s“ във файла Release (объркан ред в sources."
"list или повреден файл)"
-#: apt-pkg/acquire-item.cc:1026
+#: apt-pkg/acquire-item.cc:1122
msgid "There is no public key available for the following key IDs:\n"
msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2265,37 +2207,37 @@ msgstr ""
"Файлът със служебна информация за „%s“ е остарял (валиден до %s). Няма да се "
"прилагат обновявания от това хранилище."
-#: apt-pkg/acquire-item.cc:1107
+#: apt-pkg/acquire-item.cc:1203
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Конфликт в дистрибуцията: %s (очаквана: %s, намерена: %s)"
-#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "Директорията %s е отклонена"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2304,12 +2246,12 @@ msgstr ""
"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
"ръчно да оправите този пакет (поради пропусната архитектура)."
-#: apt-pkg/acquire-item.cc:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Не е открит източник, от който да се изтегли версия „%s“ на „%s“"
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2317,43 +2259,117 @@ msgstr ""
"Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Журнал на промените в %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "Кешът има несъвместима система за версии"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Възникна грешка при обработката на %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Еха, надхвърлихте броя имена на пакети, на който е способна тази версия на "
+"APT."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Еха, надхвърлихте броя версии, на който е способна тази версия на APT."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+"Еха, надхвърлихте броя описания, на който е способна тази версия на APT."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Еха, надхвърлихте броя зависимости, на който е способна тази версия на APT."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Четене на списъците с пакети"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr "Директорията със списъци %spartial липсва."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Директорията за архиви %spartial липсва."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, c-format
msgid "Unable to lock directory %s"
msgstr "Неуспех при заключване на директорията %s"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, fuzzy, c-format
msgid "Clean of %s is not supported"
msgstr "Не се поддържа индексен файл от типа „%s“"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Изтегляне на файл %li от %li (остават %s)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Изтегляне на файл %li от %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Неуспех при изтеглянето на %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Някои индексни файлове не можаха да бъдат изтеглени. Те са пренебрегнати или "
+"са използвани по-стари."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Трябва да добавите адреси-URI от тип „source“ в sources.list"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Неуспех при получаването на атрибути на %s."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2382,28 +2398,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "Няма указан приоритет (или е нула) на отбиването"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Неуспех при изтеглянето на %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Някои индексни файлове не можаха да бъдат изтеглени. Те са пренебрегнати или "
-"са използвани по-стари."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Трябва да добавите адреси-URI от тип „source“ в sources.list"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Неуспех при получаването на атрибути на %s."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2533,31 +2527,32 @@ msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Неуспех при коригирането на проблемите, имате задържани счупени пакети."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Изграждане на дървото със зависимости"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr "Изпращане на сценарий към програмата за удовлетворяване на зависимости"
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Версии кандидати"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr "Изпращане на заявка към програмата за удовлетворяване на зависимости"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Генериране на зависимости"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr "Подготовка за приемане на решение"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Четене на информацията за състоянието"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr ""
+"Външната програма за удовлетворяване на зависимости се провали без да изведе "
+"съобщение за грешка"
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Неуспех при отварянето на StateFile %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr "Изпълняване на външна програма за удовлетворяване на зависимости"
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Неуспех при запис на временен StateFile %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Не се поддържа индексен файл от типа „%s“"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2569,58 +2564,96 @@ msgstr "Неуспех при анализирането на пакетен ф
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Неправилно форматиран override %s, ред %llu #1"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "Отваряне на %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)"
+
+#: apt-pkg/sourcelist.cc:405
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен."
+
+#: apt-pkg/sourcelist.cc:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)"
+
+#: apt-pkg/sourcelist.cc:441
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен."
+
+#: apt-pkg/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Не е намерено издание „%s“ на „%s“"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Не е намерена версия „%s“ на „%s“"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Неуспех при намиране на задача „%s“"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Не е възможно избиране на версия за пакета „%s“ понеже е виртуален"
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Не е възможно избиране на на последната версия за пакета „%s“, защото е "
"виртуален"
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Не е възможно избиране на кандидат-версия за пакета „%s“, защото няма "
"подходящ кандидати"
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Не е възможно избиране на инсталирана версия на пакета „%s“, защото не е "
"инсталиран"
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -2629,78 +2662,56 @@ msgstr ""
"Не е възможно избиране на инсталирана или кандидат версия за пакета „%s“ "
"понеже той няма нито едната"
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Неправилно форматиран override %s, ред %llu #1"
-
-#: apt-pkg/sourcelist.cc:355
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Opening %s"
-msgstr "Отваряне на %s"
-
-#: apt-pkg/sourcelist.cc:389
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:393
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен."
-
-#: apt-pkg/sourcelist.cc:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)"
-
-#: apt-pkg/sourcelist.cc:429
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен."
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Неуспех при анализиране на файл Release %s"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr "Във файла Release %s липсват раздели"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Във файла Release %s липсва контролна сума"
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Неправилна стойност за „Date“ във файла Release %s"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Неправилна стойност за „Valid-Until“ във файла Release %s"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2879,35 +2890,6 @@ msgstr ""
msgid "Not locked"
msgstr "Без заключване"
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%liд %liч %liм %liс"
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%liч %liм %liс"
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr "%liм %liс"
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr "%liс"
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "Изборът %s не е намерен"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2987,7 +2969,7 @@ msgstr "Неуспех при отварянето на файла %s"
msgid "Could not open file descriptor %d"
msgstr "Неуспех при отварянето на файлов манипулатор %d"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "Неуспех при създаването на подпроцес IPC"
@@ -3025,12 +3007,12 @@ msgstr "Проблем при изтриване на файла %s"
msgid "Problem syncing the file"
msgstr "Проблем при синхронизиране на файла"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Неуспех при получаването на атрибути за %s"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Неуспех при записа на %s"
@@ -3055,6 +3037,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Готово"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%liд %liч %liм %liс"
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%liч %liм %liс"
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr "%liм %liс"
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr "%liс"
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "Изборът %s не е намерен"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Невъзможно е да се прехвърли в паметта празен файл"
@@ -3418,87 +3429,87 @@ msgstr "В архива няма поле „control“"
msgid "Unable to get a cursor"
msgstr "Неуспех при получаването на курсор"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Неуспех при четенето на директория %s\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Неуспех при четенето на %s\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "E: Грешките се отнасят за файла "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "Неуспех при превръщането на %s"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Неуспех при обхода на дървото"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "Неуспех при отварянето на %s"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr "DeLink %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "Неуспех при прочитането на връзка %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "Неуспех при премахването на връзка %s"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Неуспех при създаването на връзка %s към %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr "Превишен лимит на DeLink от %sB.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "Архивът няма поле „package“"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s няма запис „override“\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " поддържащия пакета %s е %s, а не %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s няма запис „source override“\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s няма също и запис „binary override“\n"
@@ -3784,6 +3795,10 @@ msgstr "Невярна контролна сума на tar, развален а
msgid "Unknown TAR header type %u, member %s"
msgstr "Непозната заглавна част на TAR тип %u, елемент %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Неуспех при създаването на програмни канали"
diff --git a/po/bs.po b/po/bs.po
index b586c5f92..4641443b2 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: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\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"
@@ -114,7 +114,7 @@ msgstr ""
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Ne mogu pronaći paket %s"
@@ -312,23 +312,23 @@ msgstr ""
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -336,145 +336,145 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr ""
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr ""
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
"package %s can't satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr ""
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Podržani moduli:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -528,20 +528,16 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr ""
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-msgid "Must specifc at least one srv record"
-msgstr ""
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -682,12 +678,12 @@ msgstr "Datoteka nije pronađena"
msgid "File not found"
msgstr "Datoteka nije pronađena"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr ""
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr ""
@@ -777,7 +773,7 @@ msgstr ""
msgid "Could not connect data socket, connection timed out"
msgstr ""
-#: methods/ftp.cc:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Neuspješno"
@@ -850,64 +846,64 @@ msgstr ""
msgid "Unable to invoke "
msgstr ""
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr ""
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr ""
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr ""
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr ""
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr ""
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr ""
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Povezujem se sa %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr ""
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr ""
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, c-format
msgid "System error resolving '%s:%s'"
msgstr ""
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr ""
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Ne mogu se povezati sa %s %s:"
@@ -926,7 +922,7 @@ msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1027,226 +1023,6 @@ msgstr ""
msgid "Internal error"
msgstr "Unutrašnja greška"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Ispravljam zavisnosti..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Ne mogu ispraviti zavisnosti"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Urađeno"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[Instalirano]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr "[Instalirano]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr "[Instalirano]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr "[Instalirano]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "ali je %s instaliran"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ali se %s treba instalirati"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "ali se ne može instalirati"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "ali je virtuelni paket"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "ali nije instaliran"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "ali se neće instalirati"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " ili"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "Slijedeći NOVI paketi će biti instalirani:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Slijedeći paketi će biti UKLONJENI:"
-
-#: apt-private/private-output.cc:481
-#, fuzzy
-msgid "The following packages have been kept back:"
-msgstr "Slijedeći paketi su zadržani:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "Slijedeći paketi će biti nadograđeni:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr ""
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr ""
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr ""
-
-#: apt-private/private-output.cc:602
-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:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr ""
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr ""
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr ""
-
-#: apt-private/private-output.cc:641
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr ""
-
-#: apt-private/private-output.cc:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:684
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr ""
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr ""
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1323,18 +1099,6 @@ msgstr ""
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr ""
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
@@ -1343,7 +1107,7 @@ msgstr ""
msgid "Packages need to be removed but remove is disabled."
msgstr ""
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1581,6 +1345,238 @@ msgstr ""
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr ""
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Ispravljam zavisnosti..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Ne mogu ispraviti zavisnosti"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Urađeno"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[Instalirano]"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr "[Instalirano]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr "[Instalirano]"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr "[Instalirano]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "ali je %s instaliran"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ali se %s treba instalirati"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "ali se ne može instalirati"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "ali je virtuelni paket"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "ali nije instaliran"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "ali se neće instalirati"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " ili"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Slijedeći NOVI paketi će biti instalirani:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Slijedeći paketi će biti UKLONJENI:"
+
+#: apt-private/private-output.cc:481
+#, fuzzy
+msgid "The following packages have been kept back:"
+msgstr "Slijedeći paketi su zadržani:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "Slijedeći paketi će biti nadograđeni:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr ""
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr ""
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr ""
+
+#: apt-private/private-output.cc:602
+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:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr ""
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr ""
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr ""
+
+#: apt-private/private-output.cc:641
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr ""
+
+#: apt-private/private-output.cc:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:684
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr ""
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr ""
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1589,47 +1585,40 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
#, fuzzy
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "Slijedeći paketi će biti nadograđeni:"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr ""
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr ""
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr ""
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr ""
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr ""
@@ -1695,16 +1684,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Ne mogu čitati %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -1838,27 +1827,6 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr ""
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "Is the package %s installed?"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:537
-#, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr ""
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr ""
@@ -1946,99 +1914,81 @@ msgstr "extra"
msgid "Calculating upgrade"
msgstr "Računam nadogradnju"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
+msgid "The method driver %s could not be found."
msgstr ""
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgid "Is the package %s installed?"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/acquire-worker.cc:543
+#, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Čitam spiskove paketa"
-
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr ""
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Gradim stablo zavisnosti"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Verzije kandidata"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Stvaranje zavisnosti"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "Sastavljam dostupne informacije"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:252
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Ne mogu otvoriti %s"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:257
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Ne mogu ukloniti %s"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
msgid "Invalid file format"
msgstr ""
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Greška pri pisanju"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2046,118 +1996,186 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, 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:1026
+#: apt-pkg/acquire-item.cc:1122
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, c-format
msgid "The repository '%s' is no longer signed."
msgstr ""
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, 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:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, c-format
msgid "Changelog unavailable for %s=%s"
msgstr ""
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr ""
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Čitam spiskove paketa"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr ""
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, fuzzy, c-format
msgid "Unable to lock directory %s"
msgstr "Ne mogu kreirati %s"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, c-format
msgid "Clean of %s is not supported"
msgstr ""
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, fuzzy, c-format
msgid "Retrieving file %li of %li"
msgstr "Čitam spisak datoteke"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Ne mogu otvoriti %s"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr ""
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2184,26 +2202,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr ""
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Ne mogu otvoriti %s"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr ""
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2319,32 +2317,30 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Gradim stablo zavisnosti"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Verzije kandidata"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Stvaranje zavisnosti"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr ""
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "Sastavljam dostupne informacije"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr ""
-#: apt-pkg/depcache.cc:252
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Ne mogu otvoriti %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr ""
-#: apt-pkg/depcache.cc:257
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Ne mogu ukloniti %s"
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr ""
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2356,130 +2352,146 @@ msgstr ""
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "Otvaram %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:405
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:425 apt-pkg/sourcelist.cc:431
+#, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:441
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr ""
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr ""
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Ne mogu otvoriti %s"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr ""
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Ne mogu otvoriti %s"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:355
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, c-format
-msgid "Opening %s"
-msgstr "Otvaram %s"
-
-#: apt-pkg/sourcelist.cc:389
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:393
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:413 apt-pkg/sourcelist.cc:419
-#, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:429
-#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr ""
-
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Ne mogu otvoriti DB datoteku %s"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ne mogu otvoriti DB datoteku %s"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr ""
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2640,35 +2652,6 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr ""
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2745,7 +2728,7 @@ msgstr ""
msgid "Could not open file descriptor %d"
msgstr "Ne mogu otvoriti %s"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr ""
@@ -2782,12 +2765,12 @@ msgstr ""
msgid "Problem syncing the file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Ne mogu kreirati %s"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Ne mogu zapisati na %s"
@@ -2812,6 +2795,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr ""
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr ""
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr ""
@@ -3113,87 +3125,87 @@ msgstr "Arhiva nema kontrolnog zapisa"
msgid "Unable to get a cursor"
msgstr ""
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr ""
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr ""
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr ""
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr ""
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr ""
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr ""
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr ""
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "Ne mogu otvoriti %s"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr ""
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr ""
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr ""
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr ""
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 9db4ba49f..b1d0841f6 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: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\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"
@@ -114,7 +114,7 @@ msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
"Aquesta ordre és desaconsellada. Empreu «apt-mark showauto» en el seu lloc."
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "No s'ha trobat el paquet %s"
@@ -354,16 +354,16 @@ msgstr ""
msgid "Unable to lock the download directory"
msgstr "No és possible blocar el directori de descàrrega"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "Haureu d'especificar un paquet de codi font per a baixar"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "No es pot trobar un paquet de fonts per a %s"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -373,7 +373,7 @@ msgstr ""
"versions «%s» a:\n"
"%s\n"
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -385,70 +385,70 @@ msgstr ""
"per obtenir les últimes actualitzacions (possiblement no publicades) del "
"paquet.\n"
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "S'està ometent el fitxer ja baixat «%s»\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Es necessita baixar %sB/%sB d'arxius font.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Es necessita baixar %sB d'arxius font.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Obtén el font %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "No s'ha pogut baixar alguns arxius."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Baixada completa i en mode de només baixada"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "L'ordre de desempaquetar «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "L'ordre de construir «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Ha fallat el procés fill"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"S'ha d'especificar un paquet per a verificar les dependències de construcció "
"per a"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -457,28 +457,28 @@ msgstr ""
"No hi ha informació d'arquitectura disponible per a %s. Vegeu apt.conf(5) "
"APT::Architectures per a configurar-ho"
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "No es poden processar les dependències de construcció"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"No es pot obtenir informació sobre les dependències de construcció per a %s"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no té dependències de construcció.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -487,7 +487,7 @@ msgstr ""
"La dependència %s en %s no es pot satisfer perquè %s no és permès als "
"paquets «%s»"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -496,14 +496,14 @@ msgstr ""
"La dependència %s en %s no es pot satisfer perquè no es pot trobar el paquet "
"%s"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"No s'ha pogut satisfer la dependència %s per a %s: El paquet instaŀlat %s és "
"massa nou"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -512,7 +512,7 @@ msgstr ""
"La dependència %s per a %s no es pot satisfer perquè la versió candidata del "
"paquet %s no pot satisfer els requeriments de versions"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -521,25 +521,25 @@ msgstr ""
"La dependència %s en %s no es pot satisfer perquè el paquet %s no té versió "
"candidata"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "No s'han pogut satisfer les dependències de construcció per a %s"
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "No es poden processar les dependències de construcció"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Mòduls suportats:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -640,21 +640,16 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Haureu d'especificar un paquet de codi font per a baixar"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "Haureu d'especificar un paquet de codi font per a baixar"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -795,12 +790,12 @@ msgstr "No s'ha trobat el disc"
msgid "File not found"
msgstr "Fitxer no trobat"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "L'estat ha fallat"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "No s'ha pogut establir el temps de modificació"
@@ -891,7 +886,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:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Ha fallat"
@@ -965,64 +960,64 @@ msgstr "Consulta"
msgid "Unable to invoke "
msgstr "No es pot invocar"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "S'està connectant amb %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "No s'ha pogut crear un sòcol per a %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "No es pot iniciar la connexió amb %s:%s (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "No s'ha pogut connectar amb %s:%s (%s), temps de connexió excedit"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "No s'ha pogut connectar amb %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "S'està connectant amb %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "No s'ha pogut resoldre «%s»"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "S'ha produït un error temporal en resoldre «%s»"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, fuzzy, c-format
msgid "System error resolving '%s:%s'"
msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i - %s)"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i - %s)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "No es pot connectar amb %s:%s:"
@@ -1045,7 +1040,7 @@ msgstr ""
"instaŀlat el gnupg?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1148,227 +1143,6 @@ msgstr ""
msgid "Internal error"
msgstr "Error intern"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "S'estan corregint les dependències…"
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " ha fallat."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "No es poden corregir les dependències"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "No es pot minimitzar el joc de versions revisades"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Fet"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Potser voldreu executar «apt-get -f install» per a corregir-ho."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependències sense satisfer. Proveu-ho emprant -f."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instaŀlat]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instaŀlat]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instaŀlat]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instaŀlat]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "però està instaŀlat %s"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "però s'instaŀlarà %s"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "però no és instaŀlable"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "però és un paquet virtual"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "però no està instaŀlat"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "però no serà instaŀlat"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " o"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "Els següents paquets tenen dependències sense satisfer:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "S'instaŀlaran els paquets NOUS següents:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Es SUPRIMIRAN els paquets següents:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "S'han mantingut els paquets següents:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "S'actualitzaran els paquets següents:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Es DESACTUALITZARAN els paquets següents:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "Es canviaran els paquets retinguts següents:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (per %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu actualitzats, %lu nous a instaŀlar, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstaŀlats, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu desactualitzats, "
-
-#: apt-private/private-output.cc:641
-#, 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:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu no instaŀlats o suprimits completament.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[S/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-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:684
-msgid "Y"
-msgstr "S"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "S'ha produït un error de compilació de l'expressió regular - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "L'ordre update no pren arguments"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1449,18 +1223,6 @@ msgstr "El paquet «%s» no està instaŀlat, així doncs no es suprimirà\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Nota: s'està seleccionant «%s» en lloc de «%s»\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
@@ -1472,7 +1234,7 @@ msgid "Packages need to be removed but remove is disabled."
msgstr ""
"Els paquets necessiten ser suprimits però s'ha inhabilitat la supressió."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1738,6 +1500,239 @@ msgstr "Versió seleccionada «%s» (%s) per a «%s»\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Versió seleccionada «%s» (%s) per a «%s» degut a «%s»\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "S'estan corregint les dependències…"
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " ha fallat."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "No es poden corregir les dependències"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "No es pot minimitzar el joc de versions revisades"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Fet"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Potser voldreu executar «apt-get -f install» per a corregir-ho."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependències sense satisfer. Proveu-ho emprant -f."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instaŀlat]"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instaŀlat]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instaŀlat]"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instaŀlat]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "però està instaŀlat %s"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "però s'instaŀlarà %s"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "però no és instaŀlable"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "però és un paquet virtual"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "però no està instaŀlat"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "però no serà instaŀlat"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " o"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Els següents paquets tenen dependències sense satisfer:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "S'instaŀlaran els paquets NOUS següents:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Es SUPRIMIRAN els paquets següents:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "S'han mantingut els paquets següents:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "S'actualitzaran els paquets següents:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Es DESACTUALITZARAN els paquets següents:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "Es canviaran els paquets retinguts següents:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (per %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu actualitzats, %lu nous a instaŀlar, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstaŀlats, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu desactualitzats, "
+
+#: apt-private/private-output.cc:641
+#, 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:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu no instaŀlats o suprimits completament.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[S/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+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:684
+msgid "Y"
+msgstr "S"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "S'ha produït un error de compilació de l'expressió regular - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "L'ordre update no pren arguments"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1750,47 +1745,40 @@ msgstr ""
" Tingueu en ment que el bloqueig està desactivat,\n"
" per tant, no es depèn de la situació actual real."
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "AVÍS: No es poden autenticar els següents paquets!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "S'ha descartat l'avís d'autenticació.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "No s'ha pogut autenticar alguns paquets"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "Voleu instaŀlar aquests paquets sense verificar-los?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Hi ha problemes i s'ha emprat -y sense --force-yes"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "No s'ha pogut obtenir %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "No s'ha pogut determinar l'espai lliure en %s"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "No teniu prou espai lliure en %s."
@@ -1859,16 +1847,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "No es pot llegir %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -2011,27 +1999,6 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr "No s'ha pogut llegir la llista de les fonts."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "No s'ha pogut trobar el mètode de control %s."
-
-#: apt-pkg/acquire-worker.cc:113
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "El mètode %s no s'ha iniciat correctament"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr "Inseriu el disc amb l'etiqueta: «%s» en la unitat «%s» i premeu Intro."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Memòria cau de paquets és buida"
@@ -2118,106 +2085,81 @@ msgstr "extra"
msgid "Calculating upgrade"
msgstr "S'està calculant l'actualització"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "El tipus de fitxer índex «%s» no està suportat"
+msgid "The method driver %s could not be found."
+msgstr "No s'ha pogut trobar el mètode de control %s."
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "La memòria cau té un sistema de versions incompatible"
+#: apt-pkg/acquire-worker.cc:113
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n"
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:164
#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "S'ha produït un error en processar %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Uau, heu excedit el nombre de paquets que aquest APT és capaç de gestionar."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"Uau, heu excedit el nombre de versions que aquest APT és capaç de gestionar."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"Uau, heu excedit el nombre de descripcions que aquest APT és capaç de "
-"gestionar. "
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"Uau, heu excedit el nombre de dependències que aquest APT és capaç de "
-"gestionar."
+msgid "Method %s did not start correctly"
+msgstr "El mètode %s no s'ha iniciat correctament"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "S'està llegint la llista de paquets"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr "Inseriu el disc amb l'etiqueta: «%s» en la unitat «%s» i premeu Intro."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "Error d'E/S en desar la memòria cau de la font"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "S'està construint l'arbre de dependències"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr "Envia l'escenari al resoledor"
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Versions candidates"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr "Envia la petició al resoledor"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Dependències que genera"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr "Prepara per a rebre una solució"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "S'està llegint la informació de l'estat"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr "El resoledor extern ha fallat sense un missatge d'error adient"
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "No s'ha pogut obrir el fitxer d'estat %s"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr "Executa un resoledor extern"
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "No s'ha pogut escriure el fitxer d'estat temporal %s"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "La suma resum no concorda"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "La mida no concorda"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
#, fuzzy
msgid "Invalid file format"
msgstr "Operació no vàlida %s"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Error d'escriptura"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, fuzzy, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2228,12 +2170,12 @@ msgstr ""
"%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr "S'ha produït un error amb el GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2242,14 +2184,14 @@ 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:1026
+#: apt-pkg/acquire-item.cc:1122
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"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2258,37 +2200,37 @@ 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, 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:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "El directori %s està desviat"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2298,12 +2240,12 @@ msgstr ""
"significar que haureu d'arreglar aquest paquet manualment (segons "
"arquitectura)."
-#: apt-pkg/acquire-item.cc:2677
+#: apt-pkg/acquire-item.cc:2751
#, 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:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2312,43 +2254,119 @@ msgstr ""
"per al paquet %s."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Registre de canvis per a %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "La memòria cau té un sistema de versions incompatible"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "S'ha produït un error en processar %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Uau, heu excedit el nombre de paquets que aquest APT és capaç de gestionar."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+"Uau, heu excedit el nombre de versions que aquest APT és capaç de gestionar."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+"Uau, heu excedit el nombre de descripcions que aquest APT és capaç de "
+"gestionar. "
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Uau, heu excedit el nombre de dependències que aquest APT és capaç de "
+"gestionar."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "S'està llegint la llista de paquets"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "Error d'E/S en desar la memòria cau de la font"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr "Falta el directori de llistes %spartial."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Falta el directori d'arxius %spartial."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, c-format
msgid "Unable to lock directory %s"
msgstr "No es pot blocar el directori %s"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, fuzzy, c-format
msgid "Clean of %s is not supported"
msgstr "El tipus de fitxer índex «%s» no està suportat"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "S'està obtenint el fitxer %li de %li (falten %s)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "S'està obtenint el fitxer %li de %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "No s'ha pogut obtenir %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Alguns índex no s'han pogut baixar. S'han descartat, o en el seu lloc s'han "
+"emprat els antics."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Heu de posar algunes URI 'font' en el vostre sources.list"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "No es pot veure l'estat de %s."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2377,28 +2395,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "No hi ha prioritat especificada per al pin (o és zero)"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "No s'ha pogut obtenir %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Alguns índex no s'han pogut baixar. S'han descartat, o en el seu lloc s'han "
-"emprat els antics."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Heu de posar algunes URI 'font' en el vostre sources.list"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "No es pot veure l'estat de %s."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2528,31 +2524,30 @@ msgstr ""
"No es poden corregir els problemes, teniu paquets retinguts que estan "
"trencats."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "S'està construint l'arbre de dependències"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr "Envia l'escenari al resoledor"
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Versions candidates"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr "Envia la petició al resoledor"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Dependències que genera"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr "Prepara per a rebre una solució"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "S'està llegint la informació de l'estat"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr "El resoledor extern ha fallat sense un missatge d'error adient"
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "No s'ha pogut obrir el fitxer d'estat %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr "Executa un resoledor extern"
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "No s'ha pogut escriure el fitxer d'estat temporal %s"
+msgid "Index file type '%s' is not supported"
+msgstr "El tipus de fitxer índex «%s» no està suportat"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2564,60 +2559,98 @@ msgstr "No es pot analitzar el fitxer del paquet %s (%d)"
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Línia predominant %s malformada %llu núm 1"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "S'està obrint %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, 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:405
+#, 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:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "La línia %u és malformada en la llista de fonts %s (tipus)"
+
+#: apt-pkg/sourcelist.cc:441
+#, 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/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "No s'ha trobat la versió puntual «%s» per a «%s»"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "No s'ha trobat la versió «%s» per a «%s»"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, c-format
msgid "Couldn't find task '%s'"
msgstr "No s'ha pogut trobar la tasca «%s»"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"No s'han pogut seleccionar les versions del paquet «%s» ja que és purament "
"virtual"
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"No s'ha pogut seleccionar la versió més nova del paquet «%s» ja que és "
"purament virtual"
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"No s'ha pogut seleccionar la versió candidata del paquet %s ja que no té "
"candidata"
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"No s'ha pogut seleccionar la versió instaŀlada del paquet %s ja que no està "
"instaŀlada"
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -2626,78 +2659,56 @@ msgstr ""
"No s'han pogut seleccionar la versió instaŀlada ni la candidata del paquet "
"«%s» ja que no estan disponibles cap de les dues"
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Línia predominant %s malformada %llu núm 1"
-
-#: apt-pkg/sourcelist.cc:355
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Opening %s"
-msgstr "S'està obrint %s"
-
-#: apt-pkg/sourcelist.cc:389
-#, 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)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:393
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, 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:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "La línia %u és malformada en la llista de fonts %s (tipus)"
-
-#: apt-pkg/sourcelist.cc:429
-#, 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"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, c-format
msgid "Unable to parse Release file %s"
msgstr "No es pot analitzar el fitxer Release %s"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr "No hi ha seccions al fitxer Release %s"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "No hi ha una entrada Hash al fitxer Release %s"
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "El camp «Date» al fitxer Release %s és invàlid"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "El camp «Valid-Until» al fitxer Release %s és invàlid"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2873,35 +2884,6 @@ msgstr ""
msgid "Not locked"
msgstr "No blocat"
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "No s'ha trobat la selecció %s"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2983,7 +2965,7 @@ msgstr "No s'ha pogut obrir el fitxer %s"
msgid "Could not open file descriptor %d"
msgstr "No s'ha pogut obrir el descriptor del fitxer %d"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "No s'ha pogut crear el subprocés IPC"
@@ -3020,12 +3002,12 @@ msgstr "Ha hagut un problema en desenllaçar el fitxer %s"
msgid "Problem syncing the file"
msgstr "Ha hagut un problema en sincronitzar el fitxer"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "No es pot veure l'estat de %s"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "No es pot escriure en %s"
@@ -3050,6 +3032,35 @@ msgstr "…"
msgid "%c%s... %u%%"
msgstr "%c%s… %u%%"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "No s'ha trobat la selecció %s"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "No es pot transferir un fitxer buit a memòria"
@@ -3406,87 +3417,87 @@ msgstr "Arxiu sense registre de control"
msgid "Unable to get a cursor"
msgstr "No es pot aconseguir un cursor"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: No es pot llegir el directori %s\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: No es pot veure l'estat %s\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "E: Els errors s'apliquen al fitxer "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "No s'ha pogut resoldre %s"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "L'arbre està fallant"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "No s'ha pogut obrir %s"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "No s'ha pogut llegir l'enllaç %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "No s'ha pogut alliberar %s"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** No s'ha pogut enllaçar %s a %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink s'ha arribat al límit de %sB.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "Arxiu sense el camp paquet"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s no té una entrada dominant\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " el mantenidor de %s és %s, no %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s no té una entrada dominant de font\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s no té una entrada dominant de binari\n"
@@ -3772,6 +3783,10 @@ msgstr "La suma de comprovació de tar ha fallat, arxiu corromput"
msgid "Unknown TAR header type %u, member %s"
msgstr "Capçalera TAR desconeguda del tipus %u, membre %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "Haureu d'especificar un paquet de codi font per a baixar"
+
#~ msgid "Failed to create pipes"
#~ msgstr "No es poden crear els conductes"
diff --git a/po/cs.po b/po/cs.po
index 30a62bcfa..27f41486a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\n"
"PO-Revision-Date: 2015-08-29 15:24+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -111,7 +111,7 @@ msgstr "Musíte zadat alespoň jeden vyhledávací vzor"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr "Tento příkaz je zastaralý, použijte místo něj „apt-mark showauto“."
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Nelze najít balík %s"
@@ -346,16 +346,16 @@ msgstr "Vnitřní chyba, řešitel problémů pokazil věci"
msgid "Unable to lock the download directory"
msgstr "Nelze zamknout adresář pro stahování"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nelze najít zdrojový balík pro %s"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -364,7 +364,7 @@ msgstr ""
"INFO: Balík „%s“ je spravován v systému pro správu verzí „%s“ na:\n"
"%s\n"
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -375,69 +375,69 @@ msgstr ""
"použijte:\n"
"bzr branch %s\n"
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Přeskakuje se dříve stažený soubor „%s“\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Nutno stáhnout %sB/%sB zdrojových archivů.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Nutno stáhnout %sB zdrojových archivů.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Stažení zdroje %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Stažení některých archivů selhalo."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Stahování dokončeno v režimu pouze stáhnout"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Přeskakuje se rozbalení již rozbaleného zdroje v %s\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Příkaz pro rozbalení „%s“ selhal.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Zkontrolujte, zda je nainstalován balík „dpkg-dev“.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Příkaz pro sestavení „%s“ selhal.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Synovský proces selhal"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti "
"pro sestavení"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -446,27 +446,27 @@ msgstr ""
"O architektuře %s nejsou známy žádné informace. Pro nastavení si přečtěte "
"část APT::Architectures v manuálové stránce apt.conf(5)"
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr "Pro získání závislostí pro sestavení se používá adresář „%s“\n"
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Pro získání závislostí pro sestavení se používá soubor „%s“\n"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nelze získat závislosti pro sestavení %s"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žádné závislosti pro sestavení.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -475,20 +475,20 @@ msgstr ""
"závislost %s pro %s nemůže být splněna, protože %s není na balících „%s“ "
"dovolena"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "závislost %s pro %s nemůže být splněna, protože balík %s nebyl nalezen"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Selhalo splnění závislosti %s pro %s: Instalovaný balík %s je příliš nový"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -497,7 +497,7 @@ msgstr ""
"závislost %s pro %s nemůže být splněna, protože kandidátská verze balíku %s "
"nesplňuje požadavek na verzi"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -506,25 +506,25 @@ msgstr ""
"závislost %s pro %s nemůže být splněna, protože balík %s nemá kandidátskou "
"verzi"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Selhalo splnění závislosti %s pro %s: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Závislosti pro sestavení %s nemohly být splněny."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "Chyba při zpracování závislostí pro sestavení"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -619,20 +619,16 @@ msgstr "Jako argument vyžaduje jedno URL"
msgid "Must specify at least one pair url/filename"
msgstr "Musíte zadat aspoň jeden pár url/jméno souboru"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr "Stažení selhalo"
-#: cmdline/apt-helper.cc:88
-msgid "Must specifc at least one srv record"
-msgstr "Musíte zadat aspoň jeden SRV záznam"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr "GetSrvRec %s selhalo"
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -825,12 +821,12 @@ msgstr "Disk nebyl nalezen."
msgid "File not found"
msgstr "Soubor nebyl nalezen"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "Selhalo vyhodnocení"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "Nelze nastavit čas modifikace"
@@ -921,7 +917,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:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Selhalo"
@@ -994,64 +990,64 @@ msgstr "Dotaz"
msgid "Unable to invoke "
msgstr "Nelze vyvolat "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Připojování k %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Nelze vytvořit socket pro %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Nelze navázat spojení na %s:%s (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Nelze se připojit k %s:%s (%s), čas spojení vypršel"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Nelze se připojit k %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Připojování k %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nelze přeložit „%s“"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Dočasné selhání při zjišťování „%s“"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, c-format
msgid "System error resolving '%s:%s'"
msgstr "Systémová chyba při překladu „%s:%s“"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Něco hodně ošklivého se přihodilo při překladu „%s:%s“ (%i - %s)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Nelze se připojit k %s:%s:"
@@ -1070,7 +1066,7 @@ msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr "Nelze spustit „apt-key“ pro ověření podpisu (je gnupg nainstalováno?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1169,236 +1165,13 @@ msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-"Automaticky zakázáno %s kvůli chybné odpovědi od serveru/proxy. (man 5 "
-"apt.conf)"
+"Automaticky zakázáno %s kvůli chybné odpovědi od serveru/proxy. (man 5 apt."
+"conf)"
#: methods/server.cc:741
msgid "Internal error"
msgstr "Vnitřní chyba"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr "Vypisuje se"
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] "Existuje %i další verze. Zobrazíte ji přepínačem „-a“."
-msgstr[1] "Existují %i další verze. Zobrazíte je přepínačem „-a“."
-msgstr[2] "Existuje %i dalších verzí. Zobrazíte je přepínačem „-a“."
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Opravují se závislosti…"
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " selhalo."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Nelze opravit závislosti"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "Nelze minimalizovat sadu pro aktualizaci"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Hotovo"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Pro opravení můžete spustit „apt-get -f install“."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nesplněné závislosti. Zkuste použít -f."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr "neznámá"
-
-#: apt-private/private-output.cc:272
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[instalovaný,aktualizovatelný na: %s]"
-
-#: apt-private/private-output.cc:275
-msgid "[installed,local]"
-msgstr "[instalovaný,lokální]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr "[instalovaný,automaticky-odstranitelný]"
-
-#: apt-private/private-output.cc:279
-msgid "[installed,automatic]"
-msgstr "[instalovaný,automaticky]"
-
-#: apt-private/private-output.cc:281
-msgid "[installed]"
-msgstr "[instalovaný]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr "[aktualizovatelný z: %s]"
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr "[zbytkové-konfigurační-coubory]"
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "ale %s je nainstalován"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ale %s se bude instalovat"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "ale nedá se nainstalovat"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "ale je to virtuální balík"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "ale není nainstalovaný"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "ale nebude se instalovat"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " nebo"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "Následující balíky mají nesplněné závislosti:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "Následující NOVÉ balíky budou nainstalovány:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Následující balíky budou ODSTRANĚNY:"
-
-#: apt-private/private-output.cc:481
-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:497
-msgid "The following packages will be upgraded:"
-msgstr "Následující balíky budou aktualizovány:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Následující balíky budou DEGRADOVÁNY:"
-
-#: apt-private/private-output.cc:525
-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:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (kvůli %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu aktualizováno, %lu nově instalováno, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu přeinstalováno, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu degradováno, "
-
-#: apt-private/private-output.cc:641
-#, 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:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu instalováno nebo odstraněno pouze částečně.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[Y/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-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:684
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Chyba při kompilaci regulárního výrazu - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Příkaz update neakceptuje žádné argumenty"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-"%i balík může být aktualizován. Zobrazíte jej „apt list --upgradable“.\n"
-msgstr[1] ""
-"%i balíky mohou být aktualizovány. Zobrazíte je „apt list --upgradable“.\n"
-msgstr[2] ""
-"%i balíků může být aktualizováno. Zobrazíte je „apt list --upgradable“.\n"
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr "Všechny balíky jsou aktuální."
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr "Řadí se"
@@ -1477,19 +1250,6 @@ msgstr "Balík „%s“ není nainstalován, nelze tedy odstranit\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Pozn: Vybírám „%s“ místo „%s“\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] "Existuje %i další záznam. Zobrazíte jej přepínačem „-a“."
-msgstr[1] "Existují %i další záznamy. Zobrazíte je přepínačem „-a“."
-msgstr[2] "Existuje %i dalších záznamů. Zobrazíte je přepínačem „-a“."
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr "není skutečný balík (virtuální)"
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Vnitřní chyba, InstallPackages byl zavolán s porušenými balíky!"
@@ -1498,7 +1258,7 @@ msgstr "Vnitřní chyba, InstallPackages byl zavolán s porušenými balíky!"
msgid "Packages need to be removed but remove is disabled."
msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1766,6 +1526,242 @@ msgstr "Vybraná verze „%s“ (%s) pro „%s“\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Vybraná verze „%s“ (%s) pro „%s“ kvůli „%s“\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "Vypisuje se"
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] "Existuje %i další verze. Zobrazíte ji přepínačem „-a“."
+msgstr[1] "Existují %i další verze. Zobrazíte je přepínačem „-a“."
+msgstr[2] "Existuje %i dalších verzí. Zobrazíte je přepínačem „-a“."
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Opravují se závislosti…"
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " selhalo."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Nelze opravit závislosti"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Nelze minimalizovat sadu pro aktualizaci"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Hotovo"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Pro opravení můžete spustit „apt-get -f install“."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Nesplněné závislosti. Zkuste použít -f."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "neznámá"
+
+#: apt-private/private-output.cc:272
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[instalovaný,aktualizovatelný na: %s]"
+
+#: apt-private/private-output.cc:275
+msgid "[installed,local]"
+msgstr "[instalovaný,lokální]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr "[instalovaný,automaticky-odstranitelný]"
+
+#: apt-private/private-output.cc:279
+msgid "[installed,automatic]"
+msgstr "[instalovaný,automaticky]"
+
+#: apt-private/private-output.cc:281
+msgid "[installed]"
+msgstr "[instalovaný]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[aktualizovatelný z: %s]"
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr "[zbytkové-konfigurační-coubory]"
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "ale %s je nainstalován"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ale %s se bude instalovat"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "ale nedá se nainstalovat"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "ale je to virtuální balík"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "ale není nainstalovaný"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "ale nebude se instalovat"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " nebo"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Následující balíky mají nesplněné závislosti:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Následující NOVÉ balíky budou nainstalovány:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Následující balíky budou ODSTRANĚNY:"
+
+#: apt-private/private-output.cc:481
+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:497
+msgid "The following packages will be upgraded:"
+msgstr "Následující balíky budou aktualizovány:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Následující balíky budou DEGRADOVÁNY:"
+
+#: apt-private/private-output.cc:525
+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:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (kvůli %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu aktualizováno, %lu nově instalováno, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu přeinstalováno, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu degradováno, "
+
+#: apt-private/private-output.cc:641
+#, 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:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu instalováno nebo odstraněno pouze částečně.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+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:684
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Chyba při kompilaci regulárního výrazu - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Příkaz update neakceptuje žádné argumenty"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"%i balík může být aktualizován. Zobrazíte jej „apt list --upgradable“.\n"
+msgstr[1] ""
+"%i balíky mohou být aktualizovány. Zobrazíte je „apt list --upgradable“.\n"
+msgstr[2] ""
+"%i balíků může být aktualizováno. Zobrazíte je „apt list --upgradable“.\n"
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr "Všechny balíky jsou aktuální."
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] "Existuje %i další záznam. Zobrazíte jej přepínačem „-a“."
+msgstr[1] "Existují %i další záznamy. Zobrazíte je přepínačem „-a“."
+msgstr[2] "Existuje %i dalších záznamů. Zobrazíte je přepínačem „-a“."
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr "není skutečný balík (virtuální)"
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1778,50 +1774,40 @@ 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-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-"Pro stažení nelze zahodit oprávnění, jelikož soubor „%s“ by nebyl "
-"přístupný uživateli „%s“."
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "VAROVÁNÍ: Následující balíky nemohou být autentizovány!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "Autentizační varování potlačeno.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "Některé balíky nemohly být autentizovány"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "Instalovat tyto balíky bez ověření?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr ""
-"Vyskytly se neověřené balíky a -y bylo použito bez --allow-"
-"unauthenticated."
+"Vyskytly se neověřené balíky a -y bylo použito bez --allow-unauthenticated."
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Selhalo stažení %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nelze určit volné místo v %s"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "V %s nemáte dostatek volného místa."
@@ -1890,16 +1876,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Nelze číst %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -1947,7 +1933,7 @@ msgstr "Chybné standardní nastavení!"
msgid "Press [Enter] to continue."
msgstr "Pro pokračování stiskněte [Enter]."
-#: Dselect/install:92
+#: dselect/install:92
msgid "Do you want to erase any previously downloaded .deb files?"
msgstr "Chcete smazat všechny dříve stažené .deb soubory?"
@@ -2033,28 +2019,6 @@ msgstr "Pro nápravu těchto problémů můžete zkusit spustit apt-get update"
msgid "The list of sources could not be read."
msgstr "Nelze přečíst seznam zdrojů."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Ovladač metody %s nemohl být nalezen."
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "Is the package %s installed?"
-msgstr "Je balík %s nainstalován?"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoda %s nebyla spuštěna správně"
-
-#: apt-pkg/acquire-worker.cc:537
-#, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr ""
-"Vložte prosím disk nazvaný „%s“ do mechaniky „%s“ a stiskněte [Enter]."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Cache balíků je prázdná"
@@ -2141,98 +2105,79 @@ msgstr "extra"
msgid "Calculating upgrade"
msgstr "Propočítává se aktualizace"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indexový typ souboru „%s“ není podporován"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "Cache má nekompatibilní systém správy verzí"
+msgid "The method driver %s could not be found."
+msgstr "Ovladač metody %s nemohl být nalezen."
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Chyba při zpracování %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Wow, překročili jste počet jmen balíků, které tato APT umí zpracovat."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Wow, překročili jste počet verzí, které tato APT umí zpracovat."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Wow, překročili jste počet popisů, které tato APT umí zpracovat."
+msgid "Is the package %s installed?"
+msgstr "Je balík %s nainstalován?"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Wow, překročili jste počet závislostí, které tato APT umí zpracovat."
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Metoda %s nebyla spuštěna správně"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Načítají se seznamy balíků"
+#: apt-pkg/acquire-worker.cc:543
+#, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr "Vložte prosím disk nazvaný „%s“ do mechaniky „%s“ a stiskněte [Enter]."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "Chyba IO při ukládání zdrojové cache"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Vytváří se strom závislostí"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr "Scénář odeslán řešiteli"
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Kandidátské verze"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr "Požadavek odeslán řešiteli"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generování závislostí"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr "Příprava na obdržení řešení"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Načítají se stavové informace"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr "Externí řešitel selhal, aniž by zanechal rozumnou chybovou hlášku"
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Nelze otevřít stavový soubor %s"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr "Spuštění externího řešitele"
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Nelze zapsat dočasný stavový soubor %s"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr "Pro vynucení aktualizace použijte --allow-insecure-repositories"
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "přejmenování selhalo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "Neshoda kontrolních součtů"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "Velikosti nesouhlasí"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
msgid "Invalid file format"
msgstr "Neplatná formát souboru"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
msgid "Signature error"
msgstr "Chyba podpisu"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2242,12 +2187,12 @@ msgstr ""
"se použijí předchozí indexové soubory. Chyba GPG: %s: %s"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr "Chyba GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2256,14 +2201,14 @@ 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:1026
+#: apt-pkg/acquire-item.cc:1122
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"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2272,21 +2217,20 @@ msgstr ""
"Soubor Release pro %s již expiroval (neplatný od %s). Aktualizace z tohoto "
"repositáře se nepoužijí."
-#: apt-pkg/acquire-item.cc:1107
+#: apt-pkg/acquire-item.cc:1203
#, 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:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-"Data z „%s“ nejsou podepsaná. Balíky z tohoto repositáře nemohou být "
-"ověřeny."
+"Data z „%s“ nejsou podepsaná. Balíky z tohoto repositáře nemohou být ověřeny."
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
@@ -2295,12 +2239,12 @@ msgstr ""
"Repositář „%s“ neobsahuje soubor Release. To již není podporováno, "
"kontaktujte prosím správce repositáře."
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, c-format
msgid "The repository '%s' is no longer signed."
msgstr "Repositář „%s“ není podepsán."
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
@@ -2308,7 +2252,7 @@ msgstr ""
"Toto není běžně povoleno, ale bylo to vynuceno volbou Acquire::"
"AllowDowngradeToInsecureRepositories."
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2317,12 +2261,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:2677
+#: apt-pkg/acquire-item.cc:2751
#, 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:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2330,43 +2274,115 @@ msgstr ""
"Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Seznam změn pro %s=%s není dostupný"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "Cache má nekompatibilní systém správy verzí"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Chyba při zpracování %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Wow, překročili jste počet jmen balíků, které tato APT umí zpracovat."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Wow, překročili jste počet verzí, které tato APT umí zpracovat."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Wow, překročili jste počet popisů, které tato APT umí zpracovat."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Wow, překročili jste počet závislostí, které tato APT umí zpracovat."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Načítají se seznamy balíků"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "Chyba IO při ukládání zdrojové cache"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr "Adresář seznamů %spartial chybí."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Archivní adresář %spartial chybí."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, c-format
msgid "Unable to lock directory %s"
msgstr "Nelze uzamknout adresář %s"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+"Pro stažení nelze zahodit oprávnění, jelikož soubor „%s“ by nebyl přístupný "
+"uživateli „%s“."
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, c-format
msgid "Clean of %s is not supported"
msgstr "Vyčištění %s není podporováno"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Stahuje se soubor %li z %li (zbývá %s)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Stahuje se soubor %li z %li"
+#: apt-pkg/update.cc:76
+#, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Selhalo stažení %s %s"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Některé indexové soubory se nepodařilo stáhnout. Jsou ignorovány, nebo jsou "
+"použity starší verze."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Do sources.list musíte zadat „zdrojové“ URI"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Nebylo možno vyhodnotit %s."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2395,28 +2411,6 @@ msgstr "%s: Hodnota %s leží mimo rozsah platných priorit (%d až %d)"
msgid "No priority (or zero) specified for pin"
msgstr "Pro vypíchnutí nebyla zadána žádná (nebo nulová) priorita"
-#: apt-pkg/update.cc:76
-#, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Selhalo stažení %s %s"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Některé indexové soubory se nepodařilo stáhnout. Jsou ignorovány, nebo jsou "
-"použity starší verze."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Do sources.list musíte zadat „zdrojové“ URI"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Nebylo možno vyhodnotit %s."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2438,9 +2432,9 @@ msgid ""
"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
-"Tento běh instalace si vyžádá dočasné odstranění nezbytného balíku %s "
-"kvůli smyčce v Conflicts/Pre-Depends. To je často špatné, ale pokud to "
-"skutečně chcete udělat, aktivujte možnost APT::Force-LoopBreak."
+"Tento běh instalace si vyžádá dočasné odstranění nezbytného balíku %s kvůli "
+"smyčce v Conflicts/Pre-Depends. To je často špatné, ale pokud to skutečně "
+"chcete udělat, aktivujte možnost APT::Force-LoopBreak."
#: apt-pkg/cdrom.cc:498
#, c-format
@@ -2542,31 +2536,30 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nelze opravit problémy, některé balíky držíte v porouchaném stavu."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Vytváří se strom závislostí"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr "Scénář odeslán řešiteli"
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Kandidátské verze"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr "Požadavek odeslán řešiteli"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generování závislostí"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr "Příprava na obdržení řešení"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Načítají se stavové informace"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr "Externí řešitel selhal, aniž by zanechal rozumnou chybovou hlášku"
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nelze otevřít stavový soubor %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr "Spuštění externího řešitele"
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Nelze zapsat dočasný stavový soubor %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Indexový typ souboru „%s“ není podporován"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2578,52 +2571,90 @@ msgstr "Nelze zpracovat soubor %s (%d)"
msgid "Cannot convert %s to integer"
msgstr "Nelze převést %s na celé číslo (integer)"
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Zkomolený řádek %u v %s souboru %s (%s)"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "Otevírá se %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)"
+
+#: apt-pkg/sourcelist.cc:405
+#, 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:425 apt-pkg/sourcelist.cc:431
+#, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Zkomolená část %u v seznamu zdrojů %s (typ)"
+
+#: apt-pkg/sourcelist.cc:441
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typ „%s“ v části %u v seznamu zdrojů %s není známý"
+
+#: apt-pkg/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Vydání „%s“ pro „%s“ nebylo nalezeno"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Verze „%s“ pro „%s“ nebyla nalezena"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Nelze najít úlohu „%s“"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Nelze najít balík vyhovující regulárnímu výrazu „%s“"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Nelze najít balík vyhovující masce „%s“"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Nelze vybrat verze balíku „%s“, protože je čistě virtuální"
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr "Nelze vybrat nejnovější verzi balíku „%s“, protože je čistě virtuální"
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr "Nelze vybrat kandidátskou verzi balíku %s, protože žádnou nemá"
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr "Nelze vybrat nainstalované verze balíku %s, protože není nainstalován"
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -2632,78 +2663,56 @@ msgstr ""
"Nelze vybrat nainstalovanou ani kandidátskou verzi balíku „%s“, protože "
"žádné takové verze nemá"
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Zkomolený řádek %u v %s souboru %s (%s)"
-
-#: apt-pkg/sourcelist.cc:355
-#, c-format
-msgid "Opening %s"
-msgstr "Otevírá se %s"
-
-#: apt-pkg/sourcelist.cc:389
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)"
-
-#: apt-pkg/sourcelist.cc:393
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, 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:413 apt-pkg/sourcelist.cc:419
-#, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "Zkomolená část %u v seznamu zdrojů %s (typ)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:429
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Typ „%s“ v části %u v seznamu zdrojů %s není známý"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Nelze zpracovat Release soubor %s"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr "Release soubor %s neobsahuje žádné sekce"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Release soubor %s neobsahuje Hash záznam"
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Neplatná položka „Date“ v Release souboru %s"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Neplatná položka „Valid-Until“ v Release souboru %s"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr "Pro volbu %s byly nastaveny kolidující hodnoty zdroje %s %s"
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr "Pro volbu %s byla nastavena kolidující hodnota zdroje %s %s (%s)"
@@ -2875,35 +2884,6 @@ msgstr "dpkg byl přerušen, pro nápravu problému musíte ručně spustit „%
msgid "Not locked"
msgstr "Není uzamčen"
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "Výběr %s nenalezen"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2980,7 +2960,7 @@ msgstr "Nelze otevřít soubor %s"
msgid "Could not open file descriptor %d"
msgstr "Nelze otevřít popisovač souboru %d"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "Nelze vytvořit podproces IPC"
@@ -3017,12 +2997,12 @@ msgstr "Problém při odstraňování souboru %s"
msgid "Problem syncing the file"
msgstr "Problém při synchronizování souboru"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, c-format
msgid "Unable to mkstemp %s"
msgstr "Nelze zavolat mkstemp %s"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Nelze zapsat do %s"
@@ -3047,6 +3027,35 @@ msgstr "…"
msgid "%c%s... %u%%"
msgstr "%c%s… %u%%"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "Výběr %s nenalezen"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Nelze provést mmap prázdného souboru"
@@ -3184,8 +3193,7 @@ msgid ""
"Command line option %s is not understood in combination with the other "
"options"
msgstr ""
-"Parametr příkazové řádky %s nedává v kombinaci s ostatními parametry "
-"smysl."
+"Parametr příkazové řádky %s nedává v kombinaci s ostatními parametry smysl."
#: apt-pkg/contrib/cmndline.cc:174
#, c-format
@@ -3403,87 +3411,87 @@ msgstr "Archiv nemá kontrolní záznam"
msgid "Unable to get a cursor"
msgstr "Nelze získat kurzor"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Nelze číst adresář %s\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Nelze vyhodnotit %s\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "E: Chyby se týkají souboru "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "Chyba při zjišťování %s"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Průchod stromem selhal"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "Nelze otevřít %s"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr "Odlinkování %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "Nelze přečíst link %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "Nelze odlinkovat %s"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Nezdařilo se slinkovat %s s %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Odlinkovací limit %sB dosažen.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "Archiv nemá pole Package"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nemá žádnou položku pro override\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " správce %s je %s, ne %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nemá žádnou zdrojovou položku pro override\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nemá ani žádnou binární položku pro override\n"
@@ -3768,6 +3776,9 @@ msgstr "Kontrolní součet taru selhal, archiv je poškozený"
msgid "Unknown TAR header type %u, member %s"
msgstr "Neznámá hlavička TARu typ %u, člen %s"
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "Musíte zadat aspoň jeden SRV záznam"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Selhalo vytvoření roury"
diff --git a/po/cy.po b/po/cy.po
index f5a2612a9..e3eb9baf0 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\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"
@@ -126,7 +126,7 @@ msgstr "Rhaid i chi ddarparu un patrwm yn union"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Ni ellir lleoli'r pecyn %s"
@@ -370,23 +370,23 @@ msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
msgid "Unable to lock the download directory"
msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -394,95 +394,95 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, fuzzy, c-format
msgid "Fetch source %s\n"
msgstr "Cyrchu Ffynhonell %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Methwyd cyrchu rhai archifau."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Methodd proses plentyn"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Methwyd prosesu dibyniaethau adeiladu"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -491,7 +491,7 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
"%s"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -500,14 +500,14 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
"%s"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
"newydd"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -516,7 +516,7 @@ msgstr ""
"Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd "
"ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -525,27 +525,27 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
"%s"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "Methwyd prosesu dibyniaethau adeiladu"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
#, fuzzy
msgid "Supported modules:"
msgstr "Modylau a Gynhelir:"
# FIXME: split
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -641,21 +641,16 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -800,12 +795,12 @@ msgstr "Ffeil heb ei ganfod"
msgid "File not found"
msgstr "Ffeil heb ei ganfod"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "Methwyd stat()"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "Methwyd gosod amser newid"
@@ -897,7 +892,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:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Methwyd"
@@ -973,64 +968,64 @@ msgstr "Ymholiad"
msgid "Unable to invoke "
msgstr "Methwyd gweithredu "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Yn cysylltu i %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Methwyd cysylltu i %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Yn cysylltu i %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "Methwyd datrys '%s'"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Methiant dros dro yn datrys '%s'"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, fuzzy, c-format
msgid "System error resolving '%s:%s'"
msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Methwyd cysylltu i %s %s:"
@@ -1049,7 +1044,7 @@ msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1156,232 +1151,6 @@ msgstr ""
msgid "Internal error"
msgstr "Gwall mewnol"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Yn cywiro dibyniaethau..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " wedi methu."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Ni ellir cywiro dibyniaethau"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "Ni ellir bychanu y set uwchraddio"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Wedi Gorffen"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Sefydliwyd]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Sefydliwyd]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Sefydliwyd]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr " [Sefydliwyd]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "ond mae %s wedi ei sefydlu"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "ond ni ellir ei sefydlu"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "ond mae'n becyn rhithwir"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "ond nid yw wedi ei sefydlu"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "ond nid yw'n mynd i gael ei sefydlu"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " neu"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Caiff y pecynnau canlynol eu TYNNU:"
-
-#: apt-private/private-output.cc:481
-#, fuzzy
-msgid "The following packages have been kept back:"
-msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
-
-#: apt-private/private-output.cc:497
-#, fuzzy
-msgid "The following packages will be upgraded:"
-msgstr "Caiff y pecynnau canlynol eu uwchraddio"
-
-#: apt-private/private-output.cc:512
-#, fuzzy
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (oherwydd %s)"
-
-#: apt-private/private-output.cc:602
-#, fuzzy
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n"
-"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
-"ei wneud!"
-
-#: apt-private/private-output.cc:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu wedi ailsefydlu, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu wedi eu israddio, "
-
-#: apt-private/private-output.cc:641
-#, 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:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:684
-msgid "Y"
-msgstr "I"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Gwall crynhoi patrwm - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1463,18 +1232,6 @@ msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
@@ -1484,7 +1241,7 @@ msgstr ""
msgid "Packages need to be removed but remove is disabled."
msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1740,6 +1497,244 @@ msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Yn cywiro dibyniaethau..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " wedi methu."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Ni ellir cywiro dibyniaethau"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Ni ellir bychanu y set uwchraddio"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Wedi Gorffen"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "ond mae %s wedi ei sefydlu"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "ond ni ellir ei sefydlu"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "ond mae'n becyn rhithwir"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "ond nid yw wedi ei sefydlu"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "ond nid yw'n mynd i gael ei sefydlu"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " neu"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Caiff y pecynnau canlynol eu TYNNU:"
+
+#: apt-private/private-output.cc:481
+#, fuzzy
+msgid "The following packages have been kept back:"
+msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
+
+#: apt-private/private-output.cc:497
+#, fuzzy
+msgid "The following packages will be upgraded:"
+msgstr "Caiff y pecynnau canlynol eu uwchraddio"
+
+#: apt-private/private-output.cc:512
+#, fuzzy
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (oherwydd %s)"
+
+#: apt-private/private-output.cc:602
+#, fuzzy
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n"
+"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
+"ei wneud!"
+
+#: apt-private/private-output.cc:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu wedi ailsefydlu, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu wedi eu israddio, "
+
+#: apt-private/private-output.cc:641
+#, 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:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:684
+msgid "Y"
+msgstr "I"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Gwall crynhoi patrwm - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1748,49 +1743,42 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
#, fuzzy
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr ""
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
#, fuzzy
msgid "Some packages could not be authenticated"
msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr ""
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Methwyd cyrchu %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Does dim digon o le rhydd yn %s gennych"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Does dim digon o le rhydd gennych yn %s."
@@ -1859,16 +1847,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Ni ellir darllen %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -2008,30 +1996,6 @@ msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn."
msgid "The list of sources could not be read."
msgstr "Methwyd darllen y rhestr ffynhonellau."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Methwyd canfod y gyrrydd dull %s."
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "Is the package %s installed?"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Ni gychwynodd y dull %s yn gywir"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr ""
-"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
-" '%s'\n"
-"yn y gyrriant '%s' a gwasgwch Enter\n"
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Storfa pecyn gwag"
@@ -2121,105 +2085,89 @@ msgstr "ychwanegol"
msgid "Calculating upgrade"
msgstr "Yn Cyfrifo'r Uwchraddiad"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Ni chynhelir y math ffeil mynegai '%s'"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "Mae can y storfa system fersiwn anghyfaddas"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
+msgid "The method driver %s could not be found."
+msgstr "Methwyd canfod y gyrrydd dull %s."
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
+#: apt-pkg/acquire-worker.cc:113
+#, c-format
+msgid "Is the package %s installed?"
msgstr ""
-"Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei drin."
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
-
-#: apt-pkg/pkgcachegen.cc:263
-#, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Ni gychwynodd y dull %s yn gywir"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
msgstr ""
-"Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin."
+"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
+" '%s'\n"
+"yn y gyrriant '%s' a gwasgwch Enter\n"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
#, fuzzy
-msgid "Reading package lists"
-msgstr "Yn Darllen Rhestrau Pecynnau"
-
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
+msgid "Building dependency tree"
+msgstr "Yn Aideladu Coeden Dibyniaeth"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:140
+#, fuzzy
+msgid "Candidate versions"
+msgstr "Fersiynau Posib"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+#, fuzzy
+msgid "Dependency generation"
+msgstr "Cynhyrchaid Dibyniaeth"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "Yn cyfuno manylion Ar Gael"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:252
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Methwyd agor %s"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:257
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Methwyd ysgrifennu ffeil %s"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "methwyd ailenwi, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "Camgyfatebiaeth maint"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
#, fuzzy
msgid "Invalid file format"
msgstr "Gweithred annilys %s"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Gwall ysgrifennu"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2227,64 +2175,64 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, 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:1026
+#: apt-pkg/acquire-item.cc:1122
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
# FIXME: case
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2293,12 +2241,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:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2306,43 +2254,119 @@ msgstr ""
"Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Yn cysylltu i %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "Mae can y storfa system fersiwn anghyfaddas"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei drin."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
+
+#: apt-pkg/pkgcachegen.cc:263
+#, fuzzy
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+#, fuzzy
+msgid "Reading package lists"
+msgstr "Yn Darllen Rhestrau Pecynnau"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, fuzzy, c-format
msgid "Unable to lock directory %s"
msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, fuzzy, c-format
msgid "Clean of %s is not supported"
msgstr "Ni chynhelir y math ffeil mynegai '%s'"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, fuzzy, c-format
msgid "Retrieving file %li of %li"
msgstr "Yn Darllen Rhestr Ffeiliau"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Methwyd cyrchu %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
+"rai eu defnyddio yn lle."
+
+# FIXME: ...file
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Ni ellir gwneud stat() o %s."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2371,30 +2395,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Methwyd cyrchu %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
-"rai eu defnyddio yn lle."
-
-# FIXME: ...file
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Ni ellir gwneud stat() o %s."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2520,35 +2520,30 @@ msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-#, fuzzy
-msgid "Building dependency tree"
-msgstr "Yn Aideladu Coeden Dibyniaeth"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:140
-#, fuzzy
-msgid "Candidate versions"
-msgstr "Fersiynau Posib"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:168
-#, fuzzy
-msgid "Dependency generation"
-msgstr "Cynhyrchaid Dibyniaeth"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr ""
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "Yn cyfuno manylion Ar Gael"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr ""
-#: apt-pkg/depcache.cc:252
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Methwyd agor %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr ""
-#: apt-pkg/depcache.cc:257
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Methwyd ysgrifennu ffeil %s"
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Ni chynhelir y math ffeil mynegai '%s'"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2560,132 +2555,148 @@ msgstr "Ni ellir gramadegu ffeil becynnau %s (%d)"
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "Yn agor %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, 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:405
+#, 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:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
+
+#: apt-pkg/sourcelist.cc:441
+#, 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/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
-
-#: apt-pkg/sourcelist.cc:355
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Opening %s"
-msgstr "Yn agor %s"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:389
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, 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:393
-#, 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:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
-
-#: apt-pkg/sourcelist.cc:429
-#, 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"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
# FIXME: number?
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
# FIXME: number?
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2846,35 +2857,6 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "Ni chanfuwyd y dewis %s"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2951,7 +2933,7 @@ msgstr "Methwyd agor ffeil %s"
msgid "Could not open file descriptor %d"
msgstr "Methwyd agor pibell ar gyfer %s"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "Methwyd creu isbroses IPC"
@@ -2990,12 +2972,12 @@ msgstr "Gwall wrth dadgysylltu'r ffeil"
msgid "Problem syncing the file"
msgstr "Gwall wrth gyfamseru'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Ni ellir gwneud stat() o %s"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Ni ellir ysgrifennu i %s"
@@ -3020,6 +3002,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Wedi Gorffen"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "Ni chanfuwyd y dewis %s"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
@@ -3379,88 +3390,88 @@ msgstr "Does dim cofnod rheoli gan yr archif"
msgid "Unable to get a cursor"
msgstr "Ni ellir cael cyrchydd"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "Rh: Ni ellir gwneud stat() o %s\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "G: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "Rh: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "Methwyd datrys %s"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Methwyd cerdded y goeden"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "Methwyd agor %s"
# FIXME
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DatGysylltu %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "Methwyd darllen y cyswllt %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "Methwyd datgysylltu %s"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Methwyd cysylltu %s at %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Tarwyd y terfyn cyswllt %sB.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "Doedd dim maes pecyn gan yr archif"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Cynaliwr %s yw %s nid %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
@@ -3755,6 +3766,10 @@ msgstr "Methodd swm gwirio Tar, archif llygredig"
msgid "Unknown TAR header type %u, member %s"
msgstr "Math pennawd TAR anhysbys %u, aelod %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Methwyd creu pibau"
diff --git a/po/da.po b/po/da.po
index 7416fab93..2672994b0 100644
--- a/po/da.po
+++ b/po/da.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\n"
"PO-Revision-Date: 2014-07-06 23:51+0200\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -116,7 +116,7 @@ msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
"Denne kommando er forældet. Brug venligst »apt-mark showauto« i stedet for."
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Kunne ikke lokalisere pakken %s"
@@ -357,16 +357,16 @@ msgstr "Intern fejl. Problemløseren ødelagde noget"
msgid "Unable to lock the download directory"
msgstr "Kunne ikke låse nedhentningsmappen"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "Du skal angive mindst én pakke at hente kildeteksten til"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kunne ikke finde kildetekstpakken for %s"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -375,7 +375,7 @@ msgstr ""
"BEMÆRK: Pakning af »%s« vedligeholdes i versionskontrolsystemet »%s« på:\n"
"%s\n"
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -386,67 +386,67 @@ msgstr ""
"bzr branch %s\n"
"for at hente de seneste (muligvis ikke udgivet) opdateringer til pakken.\n"
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Overspringer allerede hentet fil »%s«\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB skal hentes fra kildetekst-arkiverne.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Henter kildetekst %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Nogle arkiver kunne ikke hentes."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Nedhentning afsluttet i »hent-kun«-tilstand"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Udpakningskommandoen »%s« fejlede.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Tjek om pakken »dpkg-dev« er installeret.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Opbygningskommandoen »%s« fejlede.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Barneprocessen fejlede"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr "Skal angive mindst én pakke at tjekke opbygningsafhængigheder for"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -455,27 +455,27 @@ msgstr ""
"Ingen arkitekturinformation tilgængelig for %s. Se apt.conf(5) APT::"
"Architectures for opsætning"
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Kunne ikke behandler opbygningsafhængighederne"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kunne ikke hente oplysninger om opbygningsafhængigheder for %s"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen opbygningsafhængigheder.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -483,7 +483,7 @@ msgid ""
msgstr ""
"Afhængigheden %s for %s kan ikke opfyldes, da %s ikke er tilladt på »%s«"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -491,14 +491,14 @@ msgid ""
msgstr ""
"Afhængigheden %s for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Kunne ikke opfylde %s-afhængigheden for %s: Den installerede pakke %s er for "
"ny"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -507,7 +507,7 @@ msgstr ""
"Afhængigheden %s for %s kan ikke opfyldes, da ingen af de tilgængelige "
"kandidater for pakken %s kan tilfredsstille versionskravene"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -516,25 +516,25 @@ msgstr ""
"%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke har en "
"kandidatversion"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Kunne ikke opfylde %s-afhængigheden for %s: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "Kunne ikke behandler opbygningsafhængighederne"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Understøttede moduler:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -630,21 +630,16 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Du skal angive mindst et par i form af adresse/filnavn"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr "Kunne ikke hente pakkerne"
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "Du skal angive mindst et par i form af adresse/filnavn"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
#, fuzzy
msgid ""
"Usage: apt-helper [options] command\n"
@@ -839,12 +834,12 @@ msgstr "Disk blev ikke fundet."
msgid "File not found"
msgstr "Fil blev ikke fundet"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "Kunne ikke finde"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "Kunne ikke angive ændringstidspunkt"
@@ -935,7 +930,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:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Mislykkedes"
@@ -1008,64 +1003,64 @@ msgstr "Forespørgsel"
msgid "Unable to invoke "
msgstr "Kunne ikke udføre "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Forbinder til %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Kunne ikke oprette sokkel til %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Kan ikke oprette forbindelse til %s:%s (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Kunne ikke forbinde til %s:%s (%s) grundet tidsudløb"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Kunne ikke forbinde til %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Forbinder til %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "Kunne ikke omsætte navnet »%s«"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Midlertidig fejl ved omsætning af navnet »%s«"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, c-format
msgid "System error resolving '%s:%s'"
msgstr "Systemfejl under opløsning af »%s:%s«"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Der skete noget underligt under opløsning af »%s:%s« (%i - %s)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Kunne ikke forbinde til %s:%s:"
@@ -1087,7 +1082,7 @@ msgstr ""
"installeret?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1192,229 +1187,6 @@ msgstr ""
msgid "Internal error"
msgstr "Intern fejl"
-# måske visning, kategorisering
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr "Listing"
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-"Der er %i yderlig version. Brug venligst kontakten »-a« til at se den."
-msgstr[1] ""
-"Der er %i yderligere versioner. Brug venligst kontakten »-a« til at se dem."
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Retter afhængigheder ..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " mislykkedes."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Kunne ikke rette afhængigheder"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "Kunne ikke minimere opgraderingssættet"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Færdig"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Du kan muligvis rette dette ved at køre »apt-get -f install«."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Uopfyldte afhængigheder. Prøv med -f."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr "ukendt"
-
-#: apt-private/private-output.cc:272
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[installeret,kan opgraderes til: %s]"
-
-#: apt-private/private-output.cc:275
-msgid "[installed,local]"
-msgstr "[Installeret,lokalt]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr "[installeret,kan auto-fjernes]"
-
-#: apt-private/private-output.cc:279
-msgid "[installed,automatic]"
-msgstr "[Installeret,automatisk]"
-
-#: apt-private/private-output.cc:281
-msgid "[installed]"
-msgstr "[Installeret]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr "[kan opgraderes fra: %s]"
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr "[residual-konfig]"
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "men %s er installeret"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "men %s forventes installeret"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "men den kan ikke installeres"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "men det er en virtuel pakke"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "men den er ikke installeret"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "men den bliver ikke installeret"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " eller"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "Følgende pakker har uopfyldte afhængigheder:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "Følgende NYE pakker vil blive installeret:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Følgende pakker vil blive AFINSTALLERET:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "Følgende pakker er blevet holdt tilbage:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "Følgende pakker vil blive opgraderet:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Følgende pakker vil blive NEDGRADERET:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "Følgende tilbageholdte pakker vil blive ændret:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (grundet %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu opgraderes, %lu nyinstalleres, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu geninstalleres, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu nedgraderes, "
-
-#: apt-private/private-output.cc:641
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu afinstalleres og %lu opgraderes ikke.\n"
-
-#: apt-private/private-output.cc:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[J/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-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:684
-msgid "Y"
-msgstr "J"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Fejl ved tolkning af regulært udtryk - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "»update«-kommandoen benytter ingen parametre"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-"%i pakke kan opgraderes. Kør »apt list --upgradable« for at se den.\n"
-msgstr[1] ""
-"%i pakker kan opgraderes. Kør »apt list --upgradable« for at se dem.\n"
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr "Alle pakker er opdateret."
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr "Sortering"
@@ -1492,20 +1264,6 @@ msgstr "Pakke »%s« er ikke installeret, så blev ikke fjernet\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Vælger »%s« som kildepakke fremfor »%s«\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-"Der er %i yderligere post. Brug venligst kontakten »-a« for at se den."
-msgstr[1] ""
-"Der er %i yderligere poster. Brug venligst kontakten »-a« for at se dem."
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr "ikke en reel pakke (virtuel)"
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Intern fejl. InstallPackages blev kaldt med ødelagte pakker!"
@@ -1514,7 +1272,7 @@ msgstr "Intern fejl. InstallPackages blev kaldt med ødelagte pakker!"
msgid "Packages need to be removed but remove is disabled."
msgstr "Pakker skal afinstalleres, men Remove er deaktiveret."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1779,6 +1537,243 @@ msgstr "Valgt version »%s« (%s) for »%s«\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Valgt version »%s« (%s) for »%s« på grund af »%s«\n"
+# måske visning, kategorisering
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "Listing"
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+"Der er %i yderlig version. Brug venligst kontakten »-a« til at se den."
+msgstr[1] ""
+"Der er %i yderligere versioner. Brug venligst kontakten »-a« til at se dem."
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Retter afhængigheder ..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " mislykkedes."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Kunne ikke rette afhængigheder"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Kunne ikke minimere opgraderingssættet"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Færdig"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Du kan muligvis rette dette ved at køre »apt-get -f install«."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Uopfyldte afhængigheder. Prøv med -f."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "ukendt"
+
+#: apt-private/private-output.cc:272
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[installeret,kan opgraderes til: %s]"
+
+#: apt-private/private-output.cc:275
+msgid "[installed,local]"
+msgstr "[Installeret,lokalt]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr "[installeret,kan auto-fjernes]"
+
+#: apt-private/private-output.cc:279
+msgid "[installed,automatic]"
+msgstr "[Installeret,automatisk]"
+
+#: apt-private/private-output.cc:281
+msgid "[installed]"
+msgstr "[Installeret]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[kan opgraderes fra: %s]"
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr "[residual-konfig]"
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "men %s er installeret"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "men %s forventes installeret"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "men den kan ikke installeres"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "men det er en virtuel pakke"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "men den er ikke installeret"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "men den bliver ikke installeret"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " eller"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Følgende pakker har uopfyldte afhængigheder:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Følgende NYE pakker vil blive installeret:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Følgende pakker vil blive AFINSTALLERET:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "Følgende pakker er blevet holdt tilbage:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "Følgende pakker vil blive opgraderet:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Følgende pakker vil blive NEDGRADERET:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "Følgende tilbageholdte pakker vil blive ændret:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (grundet %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu opgraderes, %lu nyinstalleres, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu geninstalleres, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu nedgraderes, "
+
+#: apt-private/private-output.cc:641
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu afinstalleres og %lu opgraderes ikke.\n"
+
+#: apt-private/private-output.cc:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[J/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+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:684
+msgid "Y"
+msgstr "J"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Fejl ved tolkning af regulært udtryk - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "»update«-kommandoen benytter ingen parametre"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"%i pakke kan opgraderes. Kør »apt list --upgradable« for at se den.\n"
+msgstr[1] ""
+"%i pakker kan opgraderes. Kør »apt list --upgradable« for at se dem.\n"
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr "Alle pakker er opdateret."
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+"Der er %i yderligere post. Brug venligst kontakten »-a« for at se den."
+msgstr[1] ""
+"Der er %i yderligere poster. Brug venligst kontakten »-a« for at se dem."
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr "ikke en reel pakke (virtuel)"
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1791,47 +1786,40 @@ msgstr ""
" Husk også at låsning er deaktiveret,\n"
" så stol ikke på relevansen for den reelle aktuelle situation!"
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ADVARSEL: Følgende pakkers autenticitet kunne ikke verificeres!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "Autentifikationsadvarsel tilsidesat.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "Nogle pakker kunne ikke autentificeres"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "Installér disse pakker uden verifikation?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Der er problemer og -y blev brugt uden --force-yes"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Kunne ikke hente %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kunne ikke bestemme ledig plads i %s"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Du har ikke nok ledig plads i %s."
@@ -1900,16 +1888,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Kunne ikke læse %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -2048,27 +2036,6 @@ msgstr "Du kan muligvis rette problemet ved at køre »apt-get update«"
msgid "The list of sources could not be read."
msgstr "Listen med kilder kunne ikke læses."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Metodedriveren %s blev ikke fundet."
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "Is the package %s installed?"
-msgstr "Er pakken %s installeret?"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoden %s startede ikke korrekt"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr "Indsæt disken med navnet: »%s« i drevet »%s« og tryk retur."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Tomt pakke-mellemlager"
@@ -2155,101 +2122,80 @@ msgstr "ekstra"
msgid "Calculating upgrade"
msgstr "Beregner opgraderingen"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indeksfiler af typen »%s« understøttes ikke"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "Mellemlageret benytter en inkompatibel versionsstyring"
+msgid "The method driver %s could not be found."
+msgstr "Metodedriveren %s blev ikke fundet."
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Der opstod en fejl under behandlingen af %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Hold da op! Du nåede over det antal pakkenavne, denne APT kan håndtere."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Hold da op! Du nåede over det antal versioner, denne APT kan håndtere."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Hold da op! Du nåede over det antal versioner, denne APT kan håndtere."
+msgid "Is the package %s installed?"
+msgstr "Er pakken %s installeret?"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"Hold da op! Du nåede over det antal afhængigheder, denne APT kan håndtere."
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Metoden %s startede ikke korrekt"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Indlæser pakkelisterne"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr "Indsæt disken med navnet: »%s« i drevet »%s« og tryk retur."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "IO-fejl ved gemning af kilde-mellemlageret"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Opbygger afhængighedstræ"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr "Send scenarie til problemløser"
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Kandidatversioner"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr "Send forespørgsel til problemløser"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Afhængighedsgenerering"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr "Forbered for modtagelse af løsning"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Læser tilstandsoplysninger"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr "Ekstern problemløser fejlede uden en korrekt fejlbesked"
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Kunne ikke åbne StateFile %s"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr "Kør ekstern problemløser"
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Kunne ikke skrive den midlertidige StateFile %s"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "omdøbning mislykkedes, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "Hashsum stemmer ikke"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "Størrelsen stemmer ikke"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
msgid "Invalid file format"
msgstr "Ugyldigt filformat"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Skrivefejl"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, fuzzy, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2259,12 +2205,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:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-fejl: %s: %s"
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2273,7 +2219,7 @@ msgstr ""
"Kunne ikke finde uventet punkt »%s« i udgivelsesfil (forkert sources.list-"
"punkt eller forkert udformet fil)"
-#: apt-pkg/acquire-item.cc:1026
+#: apt-pkg/acquire-item.cc:1122
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"
@@ -2281,7 +2227,7 @@ msgstr ""
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2290,37 +2236,37 @@ msgstr ""
"Udgivelsesfil for %s er udløbet (ugyldig siden %s). Opdateringer for dette "
"arkiv vil ikke blive anvendt."
-#: apt-pkg/acquire-item.cc:1107
+#: apt-pkg/acquire-item.cc:1203
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konfliktdistribution: %s (forventede %s men fik %s)"
-#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "Mappen %s er omrokeret"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2329,55 +2275,127 @@ 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:2677
+#: apt-pkg/acquire-item.cc:2751
#, 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:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Pakkeindeksfilerne er i stykker. Intet »Filename:«-felt for pakken %s."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Ændringslog for %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "Mellemlageret benytter en inkompatibel versionsstyring"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Der opstod en fejl under behandlingen af %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Hold da op! Du nåede over det antal pakkenavne, denne APT kan håndtere."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Hold da op! Du nåede over det antal versioner, denne APT kan håndtere."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Hold da op! Du nåede over det antal versioner, denne APT kan håndtere."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Hold da op! Du nåede over det antal afhængigheder, denne APT kan håndtere."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Indlæser pakkelisterne"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "IO-fejl ved gemning af kilde-mellemlageret"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr "Listemappen %spartial mangler."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Arkivmappen %spartial mangler."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, c-format
msgid "Unable to lock directory %s"
msgstr "Kunne ikke låse mappen %s"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, fuzzy, c-format
msgid "Clean of %s is not supported"
msgstr "Indeksfiler af typen »%s« understøttes ikke"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Henter fil %li ud af %li (%s tilbage)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Henter fil %li ud af %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Kunne ikke hente %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Nogle indeksfiler kunne ikke hentes. De er blevet ignoreret eller de gamle "
+"bruges i stedet."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Du skal have nogle »source«-URI'er i din sources.list"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Kunne ikke finde %s."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2406,28 +2424,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "Ingen prioritet (eller prioritet nul) angivet ved pin"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Kunne ikke hente %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Nogle indeksfiler kunne ikke hentes. De er blevet ignoreret eller de gamle "
-"bruges i stedet."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Du skal have nogle »source«-URI'er i din sources.list"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Kunne ikke finde %s."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2556,31 +2552,30 @@ msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Kunne ikke korrigere problemerne, da du har tilbageholdt ødelagte pakker."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Opbygger afhængighedstræ"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr "Send scenarie til problemløser"
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Kandidatversioner"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr "Send forespørgsel til problemløser"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Afhængighedsgenerering"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr "Forbered for modtagelse af løsning"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Læser tilstandsoplysninger"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr "Ekstern problemløser fejlede uden en korrekt fejlbesked"
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Kunne ikke åbne StateFile %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr "Kør ekstern problemløser"
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Kunne ikke skrive den midlertidige StateFile %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Indeksfiler af typen »%s« understøttes ikke"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2592,54 +2587,92 @@ msgstr "Kunne ikke tolke pakkefilen %s (%d)"
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Ugyldig overskrivning af %s-linjen %llu (%s)"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "Åbner %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Ugyldig linje %u i kildelisten %s (type)"
+
+#: apt-pkg/sourcelist.cc:405
+#, 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:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Ugyldig linje %u i kildelisten %s (type)"
+
+#: apt-pkg/sourcelist.cc:441
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typen »%s« er ukendt på stanza %u i kildelisten %s"
+
+#: apt-pkg/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Udgaven »%s« for »%s« blev ikke fundet"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versionen »%s« for »%s« blev ikke fundet"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Kunne ikke finde opgaven »%s«"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Kunne ikke finde nogle pakker med regulært udtryk »%s«"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Kunne ikke finde nogle pakker med glob »%s«"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Kan ikke vælge versioner fra pakke »%s« som er vitalt"
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr "Kan ikke vælge nyeste version fra pakke »%s« som er vital"
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Kan ikke vælge kandidatversion fra pakke %s da den ikke har nogen kandidat"
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Kan ikke vælge installeret version fra pakke %s da den ikke er installeret"
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -2648,78 +2681,56 @@ msgstr ""
"Kan ikke vælge installeret eller kandidatversion fra pakke »%s« da den ikke "
"har nogen af dem"
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Ugyldig overskrivning af %s-linjen %llu (%s)"
-
-#: apt-pkg/sourcelist.cc:355
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Opening %s"
-msgstr "Åbner %s"
-
-#: apt-pkg/sourcelist.cc:389
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Ugyldig linje %u i kildelisten %s (type)"
-
-#: apt-pkg/sourcelist.cc:393
-#, 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:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "Ugyldig linje %u i kildelisten %s (type)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:429
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Typen »%s« er ukendt på stanza %u i kildelisten %s"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Kunne ikke fortolke udgivelsesfil %s"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr "Ingen afsnit i udgivelsesfil %s"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Intet hashpunkt i udgivelsesfil %s"
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ugyldigt punkt »Date« i udgivelsesfil %s"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Ugyldigt punkt »Valid-Until« i udgivelsesfil %s"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2889,35 +2900,6 @@ msgstr "dpkg blev afbrudt, du skal manuelt køre »%s« for at rette problemet."
msgid "Not locked"
msgstr "Ikke låst"
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "Det valgte %s blev ikke fundet"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2994,7 +2976,7 @@ msgstr "Kunne ikke åbne filen %s"
msgid "Could not open file descriptor %d"
msgstr "Kunne ikke åbne filbeskrivelse %d"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "Kunne ikke oprette underproces IPC"
@@ -3031,12 +3013,12 @@ msgstr "Fejl ved frigivelse af filen %s"
msgid "Problem syncing the file"
msgstr "Problem under synkronisering af fil"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, c-format
msgid "Unable to mkstemp %s"
msgstr "Kunne ikke mkstemp %s"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Kunne ikke skrive til %s"
@@ -3061,6 +3043,35 @@ msgstr "..."
msgid "%c%s... %u%%"
msgstr "%c%s... %u%%"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "Det valgte %s blev ikke fundet"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Kan ikke udføre mmap for en tom fil"
@@ -3413,87 +3424,87 @@ msgstr "Arkivet har ingen kontrolindgang"
msgid "Unable to get a cursor"
msgstr "Kunne skaffe en markør"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Kunne ikke læse mappen %s\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Kunne ikke finde %s\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "F: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "F: Fejlene vedrører filen "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "Kunne ikke omsætte navnet %s"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Trævandring mislykkedes"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "Kunne ikke åbne %s"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "Kunne ikke »readlink« %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "Kunne ikke frigøre %s"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Kunne ikke lænke %s til %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Nåede DeLink-begrænsningen på %sB.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "Arkivet havde intet package-felt"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har ingen tvangs-post\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " pakkeansvarlig for %s er %s, ikke %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s har ingen linje med tilsidesættelse af standard for kildefiler\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -3780,6 +3791,10 @@ msgstr "Tar-tjeksum fejlede, arkivet er ødelagt"
msgid "Unknown TAR header type %u, member %s"
msgstr "Ukendt TAR-hovedtype %u, element %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "Du skal angive mindst et par i form af adresse/filnavn"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Kunne ikke oprette videreførsler"
diff --git a/po/de.po b/po/de.po
index aebab9e11..fdfabac1a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.8\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\n"
"PO-Revision-Date: 2014-09-19 13:04+0100\n"
"Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
"Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -117,7 +117,7 @@ msgstr ""
"Dieser Befehl ist überholt. Bitte verwenden Sie stattdessen »apt-mark "
"showauto«."
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Paket %s kann nicht gefunden werden."
@@ -367,18 +367,18 @@ msgstr "Interner Fehler, der Problemlöser hat etwas beschädigt."
msgid "Unable to lock the download directory"
msgstr "Das Downloadverzeichnis konnte nicht gesperrt werden."
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden "
"sollen."
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Quellpaket für %s kann nicht gefunden werden."
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -388,7 +388,7 @@ msgstr ""
"auf:\n"
"%s\n"
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -400,69 +400,69 @@ msgstr ""
"um die neuesten (möglicherweise noch unveröffentlichten) Aktualisierungen\n"
"für das Paket abzurufen.\n"
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Bereits heruntergeladene Datei »%s« wird übersprungen.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Es müssen noch %sB von %sB an Quellarchiven heruntergeladen werden.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Es müssen %sB an Quellarchiven heruntergeladen werden.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Quelle %s wird heruntergeladen.\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Einige Archive konnten nicht heruntergeladen werden."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Das Entpacken der bereits entpackten Quelle in %s wird übersprungen.\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Entpackbefehl »%s« fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Überprüfen Sie, ob das Paket »dpkg-dev« installiert ist.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build-Befehl »%s« fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Kindprozess fehlgeschlagen"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Es muss mindestens ein Paket angegeben werden, dessen Bauabhängigkeiten "
"überprüft werden sollen."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -471,28 +471,28 @@ msgstr ""
"Keine Architekturinformation für %s verfügbar. Weiteres zur Einrichtung "
"finden Sie unter apt.conf(5) APT::Architectures."
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"Informationen zu Bauabhängigkeiten für %s konnten nicht gefunden werden."
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s hat keine Bauabhängigkeiten.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -501,7 +501,7 @@ msgstr ""
"»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da %s bei »%s«-Paketen "
"nicht erlaubt ist."
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -510,14 +510,14 @@ msgstr ""
"»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht "
"gefunden werden kann."
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"»%s«-Abhängigkeit für %s kann nicht erfüllt werden: Installiertes Paket %s "
"ist zu neu."
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -527,7 +527,7 @@ msgstr ""
"Installationskandidaten für das Paket %s die Versionsanforderungen nicht "
"erfüllen kann."
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -536,25 +536,25 @@ msgstr ""
"»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da für Paket %s kein "
"Installationskandidat existiert."
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "»%s«-Abhängigkeit für %s konnte nicht erfüllt werden: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Bauabhängigkeiten für %s konnten nicht erfüllt werden."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Unterstützte Module:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -657,21 +657,16 @@ msgstr "Eine URL als Argument wird benötigt"
msgid "Must specify at least one pair url/filename"
msgstr "Es muss mindestens ein URL/Dateinamen-Paar angegeben werden"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr "Herunterladen fehlgeschlagen"
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "Es muss mindestens ein URL/Dateinamen-Paar angegeben werden"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
#, fuzzy
msgid ""
"Usage: apt-helper [options] command\n"
@@ -873,12 +868,12 @@ msgid "File not found"
msgstr "Datei nicht gefunden"
# looks like someone hardcoded English grammar
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "Abfrage mit »stat« fehlgeschlagen"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "Änderungszeitpunkt kann nicht gesetzt werden."
@@ -969,7 +964,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:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Fehlgeschlagen"
@@ -1044,66 +1039,66 @@ msgstr "Abfrage"
msgid "Unable to invoke "
msgstr "Aufruf nicht möglich: "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Verbindung mit %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Socket für %s konnte nicht erzeugt werden (f=%u t=%u p=%u)."
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Verbindung mit %s:%s kann nicht aufgebaut werden (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr ""
"Verbindung mit %s:%s konnte nicht aufgebaut werden (%s), eine "
"Zeitüberschreitung trat auf."
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Verbindung mit %s:%s nicht möglich (%s)"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Verbindung mit %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "»%s« konnte nicht aufgelöst werden."
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Temporärer Fehlschlag beim Auflösen von »%s«"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, c-format
msgid "System error resolving '%s:%s'"
msgstr "Systemfehler bei der Auflösung von »%s:%s«"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i - %s)."
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Verbindung mit %s:%s nicht möglich:"
@@ -1126,7 +1121,7 @@ msgstr ""
"gnupg installiert?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1236,233 +1231,6 @@ msgstr ""
msgid "Internal error"
msgstr "Interner Fehler"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr "Auflistung"
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-"Es gibt %i zusätzliche Version. Bitte verwenden Sie die Option »-a«, um sie "
-"anzuzeigen."
-msgstr[1] ""
-"Es gibt %i zusätzliche Versionen. Bitte verwenden Sie die Option »-a«, um "
-"sie anzuzeigen."
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Abhängigkeiten werden korrigiert ..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " fehlgeschlagen."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Abhängigkeiten konnten nicht korrigiert werden."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "Menge der zu aktualisierenden Pakete konnte nicht minimiert werden."
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Fertig"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Unerfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr "unbekannt"
-
-#: apt-private/private-output.cc:272
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Installiert,aktualisierbar auf: %s]"
-
-#: apt-private/private-output.cc:275
-msgid "[installed,local]"
-msgstr " [Installiert,lokal]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr "[installiert,automatisch-entfernbar]"
-
-#: apt-private/private-output.cc:279
-msgid "[installed,automatic]"
-msgstr " [Installiert,automatisch]"
-
-#: apt-private/private-output.cc:281
-msgid "[installed]"
-msgstr " [installiert]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr "[aktualisierbar von: %s]"
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr "[Konfiguration-verbleibend]"
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "aber %s ist installiert"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "aber %s soll installiert werden"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "ist aber nicht installierbar"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "ist aber ein virtuelles Paket"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "ist aber nicht installiert"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "soll aber nicht installiert werden"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " oder"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "Die folgenden Pakete haben unerfüllte Abhängigkeiten:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "Die folgenden NEUEN Pakete werden installiert:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Die folgenden Pakete werden ENTFERNT:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "Die folgenden Pakete sind zurückgehalten worden:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "Die folgenden Pakete werden aktualisiert (Upgrade):"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr ""
-"Die folgenden Pakete werden durch eine ÄLTERE VERSION ERSETZT (Downgrade):"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "Die folgenden zurückgehaltenen Pakete werden verändert:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (wegen %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu aktualisiert, %lu neu installiert, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu erneut installiert, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu durch eine ältere Version ersetzt, "
-
-#: apt-private/private-output.cc:641
-#, 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:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu nicht vollständig installiert oder entfernt.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[J/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-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:684
-msgid "Y"
-msgstr "J"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Der Befehl »update« akzeptiert keine Argumente."
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-"Aktualisierung für %i Paket verfügbar. Führen Sie »apt list --upgradable« "
-"aus, um es anzuzeigen.\n"
-msgstr[1] ""
-"Aktualisierung für %i Pakete verfügbar. Führen Sie »apt list --upgradable« "
-"aus, um sie anzuzeigen.\n"
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr "Alle Pakete sind aktuell."
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr "Sortierung"
@@ -1543,22 +1311,6 @@ msgstr "Paket »%s« ist nicht installiert, wird also auch nicht entfernt.\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Hinweis: »%s« wird an Stelle von »%s« gewählt.\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-"Es gibt %i zusätzlichen Eintrag. Bitte verwenden Sie die Option »-a«, um ihn "
-"anzuzeigen."
-msgstr[1] ""
-"Es gibt %i zusätzliche Einträge. Bitte verwenden Sie die Option »-a«, um sie "
-"anzuzeigen."
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr "kein reales Paket (virtuell)"
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Interner Fehler, InstallPackages mit defekten Paketen aufgerufen!"
@@ -1567,7 +1319,7 @@ msgstr "Interner Fehler, InstallPackages mit defekten Paketen aufgerufen!"
msgid "Packages need to be removed but remove is disabled."
msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1840,6 +1592,249 @@ msgstr "Version »%s« (%s) für »%s« gewählt.\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Version »%s« (%s) für »%s« gewählt aufgrund von »%s«.\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "Auflistung"
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+"Es gibt %i zusätzliche Version. Bitte verwenden Sie die Option »-a«, um sie "
+"anzuzeigen."
+msgstr[1] ""
+"Es gibt %i zusätzliche Versionen. Bitte verwenden Sie die Option »-a«, um "
+"sie anzuzeigen."
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Abhängigkeiten werden korrigiert ..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " fehlgeschlagen."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Abhängigkeiten konnten nicht korrigiert werden."
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Menge der zu aktualisierenden Pakete konnte nicht minimiert werden."
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Fertig"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Unerfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "unbekannt"
+
+#: apt-private/private-output.cc:272
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Installiert,aktualisierbar auf: %s]"
+
+#: apt-private/private-output.cc:275
+msgid "[installed,local]"
+msgstr " [Installiert,lokal]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr "[installiert,automatisch-entfernbar]"
+
+#: apt-private/private-output.cc:279
+msgid "[installed,automatic]"
+msgstr " [Installiert,automatisch]"
+
+#: apt-private/private-output.cc:281
+msgid "[installed]"
+msgstr " [installiert]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[aktualisierbar von: %s]"
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr "[Konfiguration-verbleibend]"
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "aber %s ist installiert"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "aber %s soll installiert werden"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "ist aber nicht installierbar"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "ist aber ein virtuelles Paket"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "ist aber nicht installiert"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "soll aber nicht installiert werden"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " oder"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Die folgenden Pakete haben unerfüllte Abhängigkeiten:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Die folgenden NEUEN Pakete werden installiert:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Die folgenden Pakete werden ENTFERNT:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "Die folgenden Pakete sind zurückgehalten worden:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "Die folgenden Pakete werden aktualisiert (Upgrade):"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr ""
+"Die folgenden Pakete werden durch eine ÄLTERE VERSION ERSETZT (Downgrade):"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "Die folgenden zurückgehaltenen Pakete werden verändert:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (wegen %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu aktualisiert, %lu neu installiert, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu erneut installiert, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu durch eine ältere Version ersetzt, "
+
+#: apt-private/private-output.cc:641
+#, 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:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu nicht vollständig installiert oder entfernt.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[J/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+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:684
+msgid "Y"
+msgstr "J"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Der Befehl »update« akzeptiert keine Argumente."
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"Aktualisierung für %i Paket verfügbar. Führen Sie »apt list --upgradable« "
+"aus, um es anzuzeigen.\n"
+msgstr[1] ""
+"Aktualisierung für %i Pakete verfügbar. Führen Sie »apt list --upgradable« "
+"aus, um sie anzuzeigen.\n"
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr "Alle Pakete sind aktuell."
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+"Es gibt %i zusätzlichen Eintrag. Bitte verwenden Sie die Option »-a«, um ihn "
+"anzuzeigen."
+msgstr[1] ""
+"Es gibt %i zusätzliche Einträge. Bitte verwenden Sie die Option »-a«, um sie "
+"anzuzeigen."
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr "kein reales Paket (virtuell)"
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1853,47 +1848,40 @@ msgstr ""
" sind, verlassen Sie sich also bezüglich des reellen aktuellen\n"
" Status der Sperre nicht darauf!"
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "Authentifizierungswarnung überstimmt.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "Einige Pakete konnten nicht authentifiziert werden."
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "Diese Pakete ohne Überprüfung installieren?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet."
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Fehlschlag beim Holen von %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Freier Platz in %s konnte nicht bestimmt werden."
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Sie haben nicht genug Platz in %s."
@@ -1963,16 +1951,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "%s kann nicht gelesen werden."
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -2115,29 +2103,6 @@ msgstr "Probieren Sie »apt-get update«, um diese Probleme zu korrigieren."
msgid "The list of sources could not be read."
msgstr "Die Liste der Quellen konnte nicht gelesen werden."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Der Treiber für Methode %s konnte nicht gefunden werden."
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "Is the package %s installed?"
-msgstr "Ist das Paket %s installiert?"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Methode %s ist nicht korrekt gestartet."
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr ""
-"Bitte legen Sie das Medium mit dem Namen »%s« in Laufwerk »%s« ein und "
-"drücken Sie die Eingabetaste (Enter)."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Leerer Paketzwischenspeicher"
@@ -2225,108 +2190,82 @@ msgstr "extra"
msgid "Calculating upgrade"
msgstr "Paketaktualisierung (Upgrade) wird berechnet"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indexdateityp »%s« wird nicht unterstützt."
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "Zwischenspeicher hat ein inkompatibles Versionssystem."
+msgid "The method driver %s could not be found."
+msgstr "Der Treiber für Methode %s konnte nicht gefunden werden."
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Fehler aufgetreten beim Verarbeiten von %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Na so was, Sie haben die Anzahl an Paketen überschritten, mit denen diese "
-"APT-Version umgehen kann."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"Na so was, Sie haben die Anzahl an Versionen überschritten, mit denen diese "
-"APT-Version umgehen kann."
+msgid "Is the package %s installed?"
+msgstr "Ist das Paket %s installiert?"
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"Na so was, Sie haben die Anzahl an Beschreibungen überschritten, mit denen "
-"diese APT-Version umgehen kann."
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Methode %s ist nicht korrekt gestartet."
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
msgstr ""
-"Na so was, Sie haben die Anzahl an Abhängigkeiten überschritten, mit denen "
-"diese APT-Version umgehen kann."
-
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Paketlisten werden gelesen"
+"Bitte legen Sie das Medium mit dem Namen »%s« in Laufwerk »%s« ein und "
+"drücken Sie die Eingabetaste (Enter)."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "E/A-Fehler beim Speichern des Quell-Zwischenspeichers"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Abhängigkeitsbaum wird aufgebaut."
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr "Szenario an Problemlöser senden"
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Installationskandidat-Versionen"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr "Anfrage an Problemlöser senden"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Abhängigkeitsgenerierung"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr "Vorbereiten, eine Lösung zu erhalten"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Statusinformationen werden eingelesen."
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr ""
-"Externer Problemlöser ist ohne ordnungsgemäße Fehlermeldung fehlgeschlagen."
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "StateFile %s konnte nicht geöffnet werden."
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr "Externen Problemlöser ausführen"
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Temporäres StateFile %s konnte nicht geschrieben werden."
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "Hash-Summe stimmt nicht überein"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "Größe stimmt nicht überein"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
msgid "Invalid file format"
msgstr "Ungültiges Dateiformat"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Schreibfehler"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, fuzzy, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2337,12 +2276,12 @@ msgstr ""
"GPG-Fehler: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-Fehler: %s: %s"
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2351,7 +2290,7 @@ msgstr ""
"Erwarteter Eintrag »%s« konnte in Release-Datei nicht gefunden werden "
"(falscher Eintrag in sources.list oder missgebildete Datei)."
-#: apt-pkg/acquire-item.cc:1026
+#: apt-pkg/acquire-item.cc:1122
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"
@@ -2359,7 +2298,7 @@ msgstr ""
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2368,37 +2307,37 @@ 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, 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:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "Das Verzeichnis %s ist umgeleitet."
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2408,14 +2347,14 @@ msgstr ""
"Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender "
"Architektur)."
-#: apt-pkg/acquire-item.cc:2677
+#: apt-pkg/acquire-item.cc:2751
#, 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:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2423,43 +2362,123 @@ msgstr ""
"Die Paketindexdateien sind beschädigt: Kein Filename:-Feld für Paket %s."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Änderungsprotokoll (Changelog) für %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "Zwischenspeicher hat ein inkompatibles Versionssystem."
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Fehler aufgetreten beim Verarbeiten von %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Na so was, Sie haben die Anzahl an Paketen überschritten, mit denen diese "
+"APT-Version umgehen kann."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+"Na so was, Sie haben die Anzahl an Versionen überschritten, mit denen diese "
+"APT-Version umgehen kann."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+"Na so was, Sie haben die Anzahl an Beschreibungen überschritten, mit denen "
+"diese APT-Version umgehen kann."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Na so was, Sie haben die Anzahl an Abhängigkeiten überschritten, mit denen "
+"diese APT-Version umgehen kann."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Paketlisten werden gelesen"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "E/A-Fehler beim Speichern des Quell-Zwischenspeichers"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr "Listenverzeichnis %spartial fehlt."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Archivverzeichnis %spartial fehlt."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, c-format
msgid "Unable to lock directory %s"
msgstr "Das Verzeichnis %s kann nicht gesperrt werden."
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, c-format
msgid "Clean of %s is not supported"
msgstr "Leeren von %s wird nicht unterstützt."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Holen der Datei %li von %li (noch %s)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Holen der Datei %li von %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Fehlschlag beim Holen von %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Einige Indexdateien konnten nicht heruntergeladen werden. Sie wurden "
+"ignoriert oder alte an ihrer Stelle benutzt."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
+"Sie müssen einige »source«-URIs für Quellpakete in die sources.list-Datei "
+"eintragen."
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "%s mit stat abfragen nicht möglich"
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2489,30 +2508,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "Keine Priorität (oder Null) für Pin angegeben"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Fehlschlag beim Holen von %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Einige Indexdateien konnten nicht heruntergeladen werden. Sie wurden "
-"ignoriert oder alte an ihrer Stelle benutzt."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
-"Sie müssen einige »source«-URIs für Quellpakete in die sources.list-Datei "
-"eintragen."
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s mit stat abfragen nicht möglich"
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2643,31 +2638,31 @@ msgstr ""
"Probleme können nicht korrigiert werden, Sie haben zurückgehaltene defekte "
"Pakete."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Abhängigkeitsbaum wird aufgebaut."
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr "Szenario an Problemlöser senden"
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Installationskandidat-Versionen"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr "Anfrage an Problemlöser senden"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Abhängigkeitsgenerierung"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr "Vorbereiten, eine Lösung zu erhalten"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Statusinformationen werden eingelesen."
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr ""
+"Externer Problemlöser ist ohne ordnungsgemäße Fehlermeldung fehlgeschlagen."
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "StateFile %s konnte nicht geöffnet werden."
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr "Externen Problemlöser ausführen"
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Temporäres StateFile %s konnte nicht geschrieben werden."
+msgid "Index file type '%s' is not supported"
+msgstr "Indexdateityp »%s« wird nicht unterstützt."
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2679,60 +2674,98 @@ msgstr "Paketdatei %s konnte nicht verarbeitet werden (%d)."
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Missgestaltetes Override %s Zeile %llu (%s)"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "%s wird geöffnet."
+
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)"
+
+#: apt-pkg/sourcelist.cc:405
+#, 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:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)"
+
+#: apt-pkg/sourcelist.cc:441
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typ »%s« ist in Absatz %u der Quellliste %s ist unbekannt."
+
+#: apt-pkg/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Veröffentlichung »%s« für »%s« konnte nicht gefunden werden."
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Version »%s« für »%s« konnte nicht gefunden werden."
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Task »%s« konnte nicht gefunden werden."
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden."
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Mittels des Musters »%s« konnte kein Paket gefunden werden."
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Es können keine Versionen von Paket »%s« ausgewählt werden, da es rein "
"virtuell ist."
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Die neueste Version von Paket »%s« kann nicht ausgewählt werden, da es rein "
"virtuell ist."
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Es kann kein Installationskandidat von Paket »%s« ausgewählt werden, da kein "
"solcher existiert."
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Die installierte Version von Paket »%s« kann nicht ausgewählt werden, da es "
"nicht installiert ist."
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -2741,78 +2774,56 @@ msgstr ""
"Es kann weder eine installierte Version noch ein Installationskandidat von "
"Paket »%s« ausgewählt werden, da beide nicht existieren."
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Missgestaltetes Override %s Zeile %llu (%s)"
-
-#: apt-pkg/sourcelist.cc:355
-#, c-format
-msgid "Opening %s"
-msgstr "%s wird geöffnet."
-
-#: apt-pkg/sourcelist.cc:389
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)"
-
-#: apt-pkg/sourcelist.cc:393
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, 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:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:429
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Typ »%s« ist in Absatz %u der Quellliste %s ist unbekannt."
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Release-Datei %s kann nicht verarbeitet werden."
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr "Keine Bereiche (Sections) in Release-Datei %s"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Kein Hash-Eintrag in Release-Datei %s"
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ungültiger »Date«-Eintrag in Release-Datei %s"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Ungültiger »Valid-Until«-Eintrag in Release-Datei %s"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2990,35 +3001,6 @@ msgstr ""
msgid "Not locked"
msgstr "Nicht gesperrt"
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%li d %li h %li min %li s"
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li h %li min %li s"
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr "%li min %li s"
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr "%li s"
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "Auswahl %s nicht gefunden"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -3100,7 +3082,7 @@ msgstr "Datei %s konnte nicht geöffnet werden."
msgid "Could not open file descriptor %d"
msgstr "Datei-Deskriptor %d konnte nicht geöffnet werden."
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr ""
"Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden."
@@ -3141,12 +3123,12 @@ msgstr "Problem beim Entfernen (unlink) der Datei %s"
msgid "Problem syncing the file"
msgstr "Problem beim Synchronisieren der Datei"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, c-format
msgid "Unable to mkstemp %s"
msgstr "mkstemp %s nicht möglich"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Schreiben nach %s nicht möglich"
@@ -3171,6 +3153,35 @@ msgstr "..."
msgid "%c%s... %u%%"
msgstr "%c%s... %u%%"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%li d %li h %li min %li s"
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%li h %li min %li s"
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr "%li min %li s"
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr "%li s"
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "Auswahl %s nicht gefunden"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Eine leere Datei kann nicht mit mmap abgebildet werden."
@@ -3535,87 +3546,87 @@ msgstr "Archiv hat keinen Steuerungsdatensatz."
msgid "Unable to get a cursor"
msgstr "Unmöglich, einen Cursor zu bekommen"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Verzeichnis %s kann nicht gelesen werden.\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: %s mit »stat« abfragen nicht möglich.\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "F: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "F: Fehler gehören zu Datei "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "%s konnte nicht aufgelöst werden."
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Durchlaufen des Verzeichnisbaums fehlgeschlagen"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "Öffnen von %s fehlgeschlagen"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "readlink von %s fehlgeschlagen"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "Entfernen (unlink) von %s fehlgeschlagen"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Erzeugen einer Verknüpfung von %s zu %s fehlgeschlagen"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-Limit von %sB erreicht\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "Archiv hatte kein Feld »package«"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s hat keinen Eintrag in der Override-Liste.\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s-Betreuer ist %s und nicht %s.\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s hat keinen Eintrag in der Source-Override-Liste.\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s hat keinen Eintrag in der Binary-Override-Liste.\n"
@@ -3902,6 +3913,10 @@ msgstr "Tar-Prüfsumme fehlgeschlagen, Archiv beschädigt"
msgid "Unknown TAR header type %u, member %s"
msgstr "Unbekannter Tar-Kopfzeilen-Typ %u, Bestandteil %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "Es muss mindestens ein URL/Dateinamen-Paar angegeben werden"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Pipes (Weiterleitungen) konnten nicht erzeugt werden."
diff --git a/po/dz.po b/po/dz.po
index 0c6ac3b22..2b697175a 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\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"
@@ -118,7 +118,7 @@ msgstr "ཁྱོད་ཀྱིས་ཏག་ཏག་སྦེ་དཔེ་
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "%sཐུམ་སྒྲིལ་འདི་ག་ཡོད་ཟཚོལ་མ་ཐོབ།"
@@ -357,23 +357,23 @@ msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མ
msgid "Unable to lock the download directory"
msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབས་མ་ཚུགས་པས།"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s་གི་དོན་ལུ་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འཐོབ"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -381,115 +381,115 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB་ལེན་དགོཔ་འདུག་ འབྱུང་ཁུངས་ཡིག་མཛོད་ཀྱི་%sB།\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "འབྱུང་ཁུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས།\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "%s་འབྱུང་ཁུངས་ལེན།\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ།\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོད།\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འཐུས་ཤོར་བྱུང་ནུག"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས།"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་སྐོང་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན་ གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་"
"སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས།"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -498,32 +498,32 @@ msgstr ""
"%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སྐོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་ཐུམ་སྒརིལ་%s་གི་འཐོན་རིམ་"
"ཚུ་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་འཐོན་རིམ་དགོས་མཁོ་ཚུ་གི་རེ་བ་དོ་སྐོང་མ་ཚུགས་པས།"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འཐུས་ཤོར་བྱུང་ནུག"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།"
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -621,21 +621,16 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -777,12 +772,12 @@ msgstr "ཌིཀསི་དེ་འཚོལ་མ་ཐོབ།"
msgid "File not found"
msgstr "ཡིག་སྣོད་འཚོལ་མ་ཐོབ།"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབཐ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
@@ -873,7 +868,7 @@ msgstr "སོ་ཀེཊི་ཅིག་གསར་བསྐྲུན་འ
msgid "Could not connect data socket, connection timed out"
msgstr "གནད་སྡུད་སོ་ཀེཊི་མཐུད་མ་ཚུགས་པར་ཡོདཔ་ཨིན་ མཐུད་ལམ་ངལ་མཚམས།"
-#: methods/ftp.cc:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
@@ -946,64 +941,64 @@ msgstr "འདྲི་དཔྱད།"
msgid "Unable to invoke "
msgstr "ལས་བཀོལ་འབད་མ་ཚུགས།"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "%s (%s)་ལུ་མཐུད་དོ།"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "%s (f=%u t=%u p=%u)གི་དོན་ལུ་སོ་ཀེཊི་ཅིག་གསར་བསྐྲུན་འབད་མ་ཚུགས།"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "%s:%s (%s)ལུ་མཐུད་ལམ་དེ་འགོ་འབྱེད་འབད་མ་ཚུགས།"
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr " %s:%s (%s)ལུ་མཐུད་མ་ཚུགས་ མཐུད་ལམ་ངལ་མཚམས།"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr " %s:%s (%s)ལུ་མཐུད་མ་ཚུགས།"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "%s་ལུ་མཐུད་དོ།"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "'%s'མོས་མཐུན་འབད་མ་ཚུགས།"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "'%s'མོས་མཐུན་འབད་ནི་ལུ་གནས་སྐབས་ཀྱི་འཐུས་ཤོར།"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, fuzzy, c-format
msgid "System error resolving '%s:%s'"
msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་པ་ཅིག་བྱུང་ཡི།"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་པ་ཅིག་བྱུང་ཡི།"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "%s %s:ལུ་མཐུད་མ་ཚུགས།"
@@ -1027,7 +1022,7 @@ msgstr ""
"ན།?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1128,227 +1123,6 @@ msgstr ""
msgid "Internal error"
msgstr "ནང་འཁོད་འཛོལ་བ།"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "རྟེན་འབྲེལ་ནོར་བཅོས་འབད་དོ།"
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "རྟེན་འབྲེལ་འདི་ནོར་བཅོས་འབད་མི་ཚུགས་པས།"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "ཡར་བསྐྱེད་འབད་ཡོད་པའི་ཆ་ཚན་འདི་ཆུང་ཀུ་བཟོ་མི་ཚུགས་པས།"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr "འབད་ཚར་ཡི།"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "འ་ནི་འདི་ཚུ་ནོར་བཅོས་འབད་ནི་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་།"
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "མ་ཚང་པའི་རྟེན་འབྲེལ་ཚུ། -f ལག་ལེན་འཐབ་སྟེ་འབད་རྩོལ་བསྐྱེད།"
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "འདི་འབདཝ་ད་%s་འདི་གཞི་བཙུགས་འབད་ཡོད།"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "འདི་འབདཝ་ད་%s་འདི་གཟི་བཙུགས་འབད་མི་བཏུབ་པས།"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "འདི་འབདཝ་ད་ འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན་པས།"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་པས།"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr "ཡང་ན།"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་རྩ བསྐྲད་གཏང་འོང་:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ལོག་སྟེ་རང་བཞག་ནུག:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ཡར་བསྐྱེད་འབད་འོང་:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "འོག་གི་ཐུམ་སྒྲལ་འདི་ཚུ་མར་ཕབ་འབད་འོང་:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "འོག་གི་འཆང་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་བསྒྱུར་བཅོས་འབད་འོང་:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s( %s་གིས་སྦེ)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"ཉེན་བརྡ:འོག་གི་ཉོ་མཁོ་བའི་ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏང་འོང་།\n"
-"ཁྱོད་ཀྱིས་ཁྱོད་རང་ག་ཅི་འབདཝ་ཨིན་ན་ངེས་སྦེ་མ་ཤེས་ཚུན་འདི་འབད་ནི་མི་འོང་།!"
-
-#: apt-private/private-output.cc:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu་ཡར་བསྐྱེད་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད།"
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོད།"
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོད།"
-
-#: apt-private/private-output.cc:641
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "རྩ་བསྐྲད་འབད་ནི་ལུ་%lu་དང་%lu་ཡར་བསྐྱེད་མ་འབད་བས།\n"
-
-#: apt-private/private-output.cc:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བསྐྲད་མ་གཏང་པས།\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:684
-msgid "Y"
-msgstr "ཝའི།"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1428,18 +1202,6 @@ msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུག
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
@@ -1450,7 +1212,7 @@ msgstr ""
msgid "Packages need to be removed but remove is disabled."
msgstr "ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་བཏང་དགོཔ་འདུག་འདི་འབདགཝ་ད་རྩ་བསྐྲད་གཏང་ནི་འདི་ལྕོགས་མིན་ཐལ་ཏེ་འདུག"
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1708,6 +1470,239 @@ msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "རྟེན་འབྲེལ་ནོར་བཅོས་འབད་དོ།"
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "རྟེན་འབྲེལ་འདི་ནོར་བཅོས་འབད་མི་ཚུགས་པས།"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "ཡར་བསྐྱེད་འབད་ཡོད་པའི་ཆ་ཚན་འདི་ཆུང་ཀུ་བཟོ་མི་ཚུགས་པས།"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr "འབད་ཚར་ཡི།"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "འ་ནི་འདི་ཚུ་ནོར་བཅོས་འབད་ནི་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་།"
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "མ་ཚང་པའི་རྟེན་འབྲེལ་ཚུ། -f ལག་ལེན་འཐབ་སྟེ་འབད་རྩོལ་བསྐྱེད།"
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "འདི་འབདཝ་ད་%s་འདི་གཞི་བཙུགས་འབད་ཡོད།"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "འདི་འབདཝ་ད་%s་འདི་གཟི་བཙུགས་འབད་མི་བཏུབ་པས།"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "འདི་འབདཝ་ད་ འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན་པས།"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་པས།"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr "ཡང་ན།"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་རྩ བསྐྲད་གཏང་འོང་:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ལོག་སྟེ་རང་བཞག་ནུག:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ཡར་བསྐྱེད་འབད་འོང་:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "འོག་གི་ཐུམ་སྒྲལ་འདི་ཚུ་མར་ཕབ་འབད་འོང་:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "འོག་གི་འཆང་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་བསྒྱུར་བཅོས་འབད་འོང་:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s( %s་གིས་སྦེ)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"ཉེན་བརྡ:འོག་གི་ཉོ་མཁོ་བའི་ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏང་འོང་།\n"
+"ཁྱོད་ཀྱིས་ཁྱོད་རང་ག་ཅི་འབདཝ་ཨིན་ན་ངེས་སྦེ་མ་ཤེས་ཚུན་འདི་འབད་ནི་མི་འོང་།!"
+
+#: apt-private/private-output.cc:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu་ཡར་བསྐྱེད་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད།"
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོད།"
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོད།"
+
+#: apt-private/private-output.cc:641
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "རྩ་བསྐྲད་འབད་ནི་ལུ་%lu་དང་%lu་ཡར་བསྐྱེད་མ་འབད་བས།\n"
+
+#: apt-private/private-output.cc:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བསྐྲད་མ་གཏང་པས།\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:684
+msgid "Y"
+msgstr "ཝའི།"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1716,48 +1711,41 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ཉེན་བརྡ:འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་བདེན་བཤད་འབད་མི་བཏུབ་པས།"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "བདེན་བཤད་ཉེན་བརྡ་འདི་ཟུར་འབད་ཡོད།\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་བདེན་བཤད་འབད་མ་ཚུགས།"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
#, fuzzy
msgid "Install these packages without verification?"
msgstr "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི་ཐུམ་སྒྲིལ་འདི་ཚུ་གཞི་བཙུགས་འབད་ནི་ཨིན་ན་"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "དཀའ་ངལ་ཚུ་ཡོདཔ་ལས་-y ་འདི་ --force-yes་མེདཐོག་ལས་ལག་ལེན་འཐབ་སྟེ་ཡོད།"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s་ནང་བར་སྟོང་"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "%s ནང་ཁྱོད་ལུ་བར་སྟོང་དལཝ་ལངམ་སྦེ་མིན་འདུག"
@@ -1826,16 +1814,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "%s་འདི་ལུ་ལྷག་མ་ཚུགས།"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -1977,27 +1965,6 @@ msgstr "འ་ནི་དཀའ་ངལ་འདི་ཚུ་སེལ་ན
msgid "The list of sources could not be read."
msgstr "འབྱུང་ཁུངས་ཚུ་ཀྱི་ཐོ་ཡིག་དེ་ལྷག་མི་ཚུགས་པས།"
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "ཐབས་ལམ་འདྲེན་བྱེད་%s་འདི་མ་འཐོབ།"
-
-#: apt-pkg/acquire-worker.cc:113
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབད།"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr "ཁ་ཡིག་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་། '%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབ།་"
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་སྟོངམ།"
@@ -2085,102 +2052,83 @@ msgstr "ཐེབས།"
msgid "Calculating upgrade"
msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཀྱི་དབྱེ་བ་ '%s' འདི་རྒྱབ་སྐྱོར་མ་འབད་བས།"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "འདྲ་མཛོད་ལུ་མཐུན་འགྱུར་མེན་པའི་འཐོན་རིམ་བཟོ་ནིའི་རིམ་ལུགས་ཅིག་འདུག"
+msgid "The method driver %s could not be found."
+msgstr "ཐབས་ལམ་འདྲེན་བྱེད་%s་འདི་མ་འཐོབ།"
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s (པི་ཀེ་ཇི་འཚོལ་ནི)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐུམ་སྒྲིལ་ཨང་གྲངས་ལས་ལྷག་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:263
-#, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
+msgid "Is the package %s installed?"
+msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་བརྟེན་པའི་ཨང་གྲངས་ལས་ལྷག་ནུག"
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབད།"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་དོ།"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr "ཁ་ཡིག་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་། '%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབ།་"
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ།"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "རྟེན་འབྲེལ་གྱི་རྩ་འབྲེལ་བཟོ་བརྩིགས་འབད་དོ།"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "མི་ངོ་འཐོན་རིམཚུ།"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "བརྟེན་པའི་བཟོ་བཏོན།"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:252
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:257
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "%s (%s -> %s)བསྐྱར་མིང་བཏགས་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "ཚད་མ་མཐུན།"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
#, fuzzy
msgid "Invalid file format"
msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "འཛོལ་བ་འབྲི།"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2188,63 +2136,63 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, 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:1026
+#: apt-pkg/acquire-item.cc:1122
msgid "There is no public key available for the following key IDs:\n"
msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འཐོབ་མི་ཚུགས་པས:\n"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "སྣོད་ཐོ་%s་འདི་ཁ་ཕྱོགས་སྒྱུར་དེ་ཡོད།"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2253,12 +2201,12 @@ msgstr ""
" %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ "
"འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)"
-#: apt-pkg/acquire-item.cc:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2266,43 +2214,116 @@ msgstr ""
"ཐུམ་སྒྲིལ་ ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་ངན་ཅན་འགྱོ་ནུག ཡིག་སྣོད་ཀྱི་མིང་མིན་འདུག: %s་ཐུམ་སྒྲིལ་གྱི་དོན་ལུ་ས་སྒོ།"
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "%s (%s)་ལུ་མཐུད་དོ།"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "འདྲ་མཛོད་ལུ་མཐུན་འགྱུར་མེན་པའི་འཐོན་རིམ་བཟོ་ནིའི་རིམ་ལུགས་ཅིག་འདུག"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "%s (པི་ཀེ་ཇི་འཚོལ་ནི)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐུམ་སྒྲིལ་ཨང་གྲངས་ལས་ལྷག་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:263
+#, fuzzy
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་བརྟེན་པའི་ཨང་གྲངས་ལས་ལྷག་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་དོ།"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ།"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག"
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "ཡིག་མཛོད་སྣོད་ཐོ་ %s་ ཆ་ཤས་འདི་བརླག་སྟོར་ཞུགས་ཏེ་འདུག"
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, fuzzy, c-format
msgid "Unable to lock directory %s"
msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, fuzzy, c-format
msgid "Clean of %s is not supported"
msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཀྱི་དབྱེ་བ་ '%s' འདི་རྒྱབ་སྐྱོར་མ་འབད་བས།"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "%li་ གི་བརླག་སྟོར་ཞུགས་པའི་ཡིག་སྣོད་%li (%s ལྷག་ལུས་དོ།)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr " %li་གི་བརླག་སྟོར་ཟུགསཔའི་ཡིག་སྣོད་ %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"ཟུར་ཐོ་ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ནུག་ འདི་ཚུ་སྣང་མེད་སྦེ་བཞགཔ་མ་ཚད་ ཚབ་ལུ་"
+"རྙིངམ་འདི་ཚུ་ལག་ལེན་འཐབ་ནུག"
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
+"ཁྱོད་རའི་sources.listགི་ཐོ་ཡིག་ནང་ལུ་ཁྱོད་ཀྱི་ 'འབྱུང་ཁུངས་' ཡུ་ཨར་ཨའི་ཚུ་་ལ་ལུ་ཅིག་བཙུགས་དགོ"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "%s་ ངོ་བཤུས་འབད་མ་ཚུགས།"
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2329,30 +2350,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "གོ་རྟགས་ཨང་གི་དོན་ལུ་ གཙོ་རིམ་(ཡང་ན་ ཀླད་ཀོར་)ཚུ་གསལ་བཀོད་མ་འབད་བས།"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"ཟུར་ཐོ་ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ནུག་ འདི་ཚུ་སྣང་མེད་སྦེ་བཞགཔ་མ་ཚད་ ཚབ་ལུ་"
-"རྙིངམ་འདི་ཚུ་ལག་ལེན་འཐབ་ནུག"
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
-"ཁྱོད་རའི་sources.listགི་ཐོ་ཡིག་ནང་ལུ་ཁྱོད་ཀྱི་ 'འབྱུང་ཁུངས་' ཡུ་ཨར་ཨའི་ཚུ་་ལ་ལུ་ཅིག་བཙུགས་དགོ"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s་ ངོ་བཤུས་འབད་མ་ཚུགས།"
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2476,32 +2473,30 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "དཀའ་ངལ་འདི་ནོར་བཅོས་འབད་མ་ཚུགས་ ཁྱོད་ཀྱི་ཐུམ་སྒྲིལ་ཆད་པ་ཚུ་འཆང་འདི་འདུག"
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "རྟེན་འབྲེལ་གྱི་རྩ་འབྲེལ་བཟོ་བརྩིགས་འབད་དོ།"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "མི་ངོ་འཐོན་རིམཚུ།"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "བརྟེན་པའི་བཟོ་བཏོན།"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr ""
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr ""
-#: apt-pkg/depcache.cc:252
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr ""
-#: apt-pkg/depcache.cc:257
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཀྱི་དབྱེ་བ་ '%s' འདི་རྒྱབ་སྐྱོར་མ་འབད་བས།"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2513,130 +2508,146 @@ msgstr "%s (%d)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འ
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%s གྲལ་ཐིག་%lu #1"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "%s་ཁ་ཕྱེ་དོ།"
+
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (དབྱེ་བ)་ནང་ན།"
+
+#: apt-pkg/sourcelist.cc:405
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།"
+
+#: apt-pkg/sourcelist.cc:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (དབྱེ་བ)་ནང་ན།"
+
+#: apt-pkg/sourcelist.cc:441
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།"
+
+#: apt-pkg/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "%sགི་དོན་ལུ་འཛིན་གྲོལ་'%s'་དེ་མ་འཐོབ་པས།"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "'%s'་གི་དོན་ལུ་འཐོན་རིམ་'%s'་དེ་མ་འཐོབ་པས།"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%s གྲལ་ཐིག་%lu #1"
-
-#: apt-pkg/sourcelist.cc:355
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Opening %s"
-msgstr "%s་ཁ་ཕྱེ་དོ།"
-
-#: apt-pkg/sourcelist.cc:389
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (དབྱེ་བ)་ནང་ན།"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:393
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།"
-
-#: apt-pkg/sourcelist.cc:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (དབྱེ་བ)་ནང་ན།"
-
-#: apt-pkg/sourcelist.cc:429
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "%s་ཁ་ཕྱོགས་ཡིག་སྣོད་ནང་ནུས་མེད་གྲལ་ཐིག"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2797,35 +2808,6 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2903,7 +2885,7 @@ msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚ
msgid "Could not open file descriptor %d"
msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "ཡན་ལག་ལས་སྦྱོར་ ཨའི་པི་སི་ གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
@@ -2940,12 +2922,12 @@ msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེད
msgid "Problem syncing the file"
msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "%s་འདི་ལུ་ངོ་བཤུས་འབད་མ་ཚུགས།"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr " %sལུ་འབྲི་མ་ཚུགས།"
@@ -2970,6 +2952,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... འབད་ཚར་ཡོད།"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "ཡིག་སྣོད་སྟོངམ་འདི་mmap་འབད་མ་ཚུགས།"
@@ -3325,87 +3336,87 @@ msgstr "ཡིག་མཛོད་འདི་ལུ་ཚད་འཛིན་
msgid "Unable to get a cursor"
msgstr "འོད་རྟགས་ལེན་མ་ཚུགས།"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "ཌབ་ལུ:%sསྣོད་ཐོ་འདི་ལྷག་མ་ཚུགས།\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "ཌབ་ལུ་ %s སིཊེཊི་འབད་མ་ཚུགས།\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "ཨི:"
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "ཌབ་ལུ:"
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "ཨི:འཛོལ་བ་ཚུ་ཡིག་སྣོད་ལུ་འཇུག་སྤྱོད་འབད།"
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "%s་མོས་མཐུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "རྩ་འབྲེལ་ཕྱིར་བགྲོད་འབད་ནི་ལུ་འཐུ་ཤོར་བྱུང་ཡོདཔ།"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "%s་འབྲེལ་ལམ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "%s་འབྲེལ་ལམ་མེད་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** %s་ལས་%sལུ་འབྲེལ་འཐུད་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr "%sB་ཧེང་བཀལ་བཀྲམ་ནིའི་འབྲེལ་མེད་བཅད་མཚམས།\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "ཡིག་མཛོད་ལུ་ཐུམ་སྒྲིལ་ཅི་ཡང་འཐུས་ཤོར་མ་བྱུང་།"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %sལུ་ཟུར་བཞག་ཐོ་བཀོད་མེད།\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s ་རྒྱུན་སྐྱོང་པ་འདི་ %s ཨིན་ %s མེན།\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s ལུ་འབྱུང་ཁུངས་མེདཔ་གཏང་ནིའི་ཐོ་བཀོད་འདི་མེད།\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %sལུ་ཟུང་ལྡན་མེདཔ་གཏང་ནིའི་་ཐོ་བཀོད་གང་རུང་ཡང་མིན་འདུག།\n"
@@ -3693,6 +3704,10 @@ msgstr "ཊར་ཅེག་སམ་དེ་འཐུས་ཤོར་བྱ
msgid "Unknown TAR header type %u, member %s"
msgstr "མ་ཤེས་པའི་ ཊཱར་་མགོ་ཡིག་་དབྱེ་བ་ %u་ འཐུས་མི་ %s།"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ"
+
#~ msgid "Failed to create pipes"
#~ msgstr "རྒྱུད་དུང་ཚུ་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
diff --git a/po/el.po b/po/el.po
index 3ccf71a20..2a66769e4 100644
--- a/po/el.po
+++ b/po/el.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\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"
@@ -122,7 +122,7 @@ msgstr "Πρέπει να δώσετε τουλάχιστον ένα μοτίβ
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Αδυναμία εντοπισμού του πακέτου %s"
@@ -364,25 +364,25 @@ msgstr ""
msgid "Unable to lock the download directory"
msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
"κωδικάτου"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -390,95 +390,95 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Μεταφόρτωση Κωδικα %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Απέτυχε η εντολή χτισίματος %s.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Η απογονική διεργασία απέτυχε"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -487,7 +487,7 @@ msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το %s δεν επιτρέπεται στο "
"πακέτο %s"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -495,14 +495,14 @@ msgid ""
msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s "
"είναι νεώτερο"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -511,7 +511,7 @@ msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες "
"εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις της έκδοσης"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -520,25 +520,25 @@ msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν έχει "
"υποψήφιαέκδοση"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Υποστηριζόμενοι Οδηγοί:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -634,23 +634,16 @@ msgstr ""
"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
"κωδικάτου"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr ""
-"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
-"κωδικάτου"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -791,12 +784,12 @@ msgstr "Ο δίσκος δεν βρέθηκε."
msgid "File not found"
msgstr "Το αρχείο Δε Βρέθηκε"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "Αποτυχία εύρεσης της κατάστασης"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης"
@@ -887,7 +880,7 @@ msgstr "Αδύνατη η δημιουργία μιας υποδοχής (socket
msgid "Could not connect data socket, connection timed out"
msgstr "Αδύνατη η σύνδεση υποδοχής δεδομένων, λήξη χρόνου σύνδεσης"
-#: methods/ftp.cc:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Απέτυχε"
@@ -960,64 +953,64 @@ msgstr "Επερώτηση"
msgid "Unable to invoke "
msgstr "Αδύνατη η εκτέλεση"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Σύνδεση στο %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Αδύνατη η δημιουργία υποδοχής για το %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Αδύνατη η αρχικοποίηση της σύνδεσης στο %s:%s (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Αδύνατη η σύνδεση στο %s:%s (%s), λήξη χρόνου σύνδεσης"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Αδύνατη η σύνδεση στο %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Σύνδεση στο %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "Αδύνατη η εύρεση του '%s'"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Προσωρινή αποτυχία στην εύρεση του '%s'"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, fuzzy, c-format
msgid "System error resolving '%s:%s'"
msgstr "Κάτι παράξενο συνέβη κατά την εύρεση του '%s:%s' (%i)"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Κάτι παράξενο συνέβη κατά την εύρεση του '%s:%s' (%i)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Αδύνατη η σύνδεση στο %s %s:"
@@ -1041,7 +1034,7 @@ msgstr ""
"εγκατεστημένο το gnupg;)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1144,229 +1137,6 @@ msgstr ""
msgid "Internal error"
msgstr "Εσωτερικό Σφάλμα"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Διόρθωση εξαρτήσεων..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " απέτυχε."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Αδύνατη η διόρθωση των εξαρτήσεων"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "Αδύνατη η ελαχιστοποίηση του συνόλου αναβαθμίσεων"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Ετοιμο"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα "
-"προβλήματα."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε με το -f."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Εγκατεστημένα]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Εγκατεστημένα]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Εγκατεστημένα]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr " [Εγκατεστημένα]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "αλλά το %s είναι εγκατεστημένο"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "αλλά το %s πρόκειται να εγκατασταθεί"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "αλλά δεν είναι εγκαταστάσημο"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "αλλά είναι ένα εικονικό πακέτο"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "αλλά δεν είναι εγκατεστημένο"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "αλλά δεν πρόκειται να εγκατασταθεί"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " η"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (λόγω του %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n"
-"Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!"
-
-#: apt-private/private-output.cc:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu επανεγκατεστημένα,"
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu υποβαθμισμένα, "
-
-#: apt-private/private-output.cc:641
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n"
-
-#: apt-private/private-output.cc:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[Ν/ο]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-msgid "[y/N]"
-msgstr "[ν/Ο]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:684
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "σφάλμα μεταγλωτισμου - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Η εντολή update δεν παίρνει ορίσματα"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1447,18 +1217,6 @@ msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Σημείωση, επιλέχθηκε το %s αντί του %s\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Εσωτερικό σφάλμα, έγινε κλήση του Install Packages με σπασμένα πακέτα!"
@@ -1468,7 +1226,7 @@ msgid "Packages need to be removed but remove is disabled."
msgstr ""
"Μερικά πακέτα πρέπει να αφαιρεθούν αλλά η Αφαίρεση είναι απενεργοποιημένη."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1732,6 +1490,241 @@ msgstr "Επιλέχθηκε η έκδοση %s (%s) για το %s\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Επιλέχθηκε η έκδοση %s (%s) για το %s λόγω του %s\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Διόρθωση εξαρτήσεων..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " απέτυχε."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Αδύνατη η διόρθωση των εξαρτήσεων"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Αδύνατη η ελαχιστοποίηση του συνόλου αναβαθμίσεων"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Ετοιμο"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα "
+"προβλήματα."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε με το -f."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Εγκατεστημένα]"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Εγκατεστημένα]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Εγκατεστημένα]"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr " [Εγκατεστημένα]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "αλλά το %s είναι εγκατεστημένο"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "αλλά το %s πρόκειται να εγκατασταθεί"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "αλλά δεν είναι εγκαταστάσημο"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "αλλά είναι ένα εικονικό πακέτο"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "αλλά δεν είναι εγκατεστημένο"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "αλλά δεν πρόκειται να εγκατασταθεί"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " η"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (λόγω του %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n"
+"Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!"
+
+#: apt-private/private-output.cc:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu επανεγκατεστημένα,"
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu υποβαθμισμένα, "
+
+#: apt-private/private-output.cc:641
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n"
+
+#: apt-private/private-output.cc:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[Ν/ο]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+msgid "[y/N]"
+msgstr "[ν/Ο]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:684
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "σφάλμα μεταγλωτισμου - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Η εντολή update δεν παίρνει ορίσματα"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1740,47 +1733,40 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακριβώθηκαν!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "Παράκαμψη προειδοποίησης ταυτοποίησης.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "Μερικά πακέτα δεν εξαακριβώθηκαν"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευση;"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Υπάρχουν προβλήματα και δώσατε -y χωρίς το --force-yes"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Αποτυχία ανάκτησης του %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s."
@@ -1849,16 +1835,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Αδύνατη η ανάγνωση του %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -2000,29 +1986,6 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr "Αδύνατη η ανάγνωση της λίστας πηγών."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπιστεί."
-
-#: apt-pkg/acquire-worker.cc:113
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr ""
-"Παρακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε "
-"enter."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Άδειο cache πακέτων"
@@ -2110,104 +2073,83 @@ msgstr "επιπλέον"
msgid "Calculating upgrade"
msgstr "Υπολογισμός της αναβάθμισης"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Ο τύπος αρχείου ευρετηρίου '%s' δεν υποστηρίζεται"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκδοσης"
+msgid "The method driver %s could not be found."
+msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπιστεί."
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Εκπληκτικό, υπερβήκατε τον αριθμό των ονομάτων πακέτων που υποστηρίζει το "
-"APT."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Εκπληκτικό, υπερβήκατε τον αριθμό των εκδόσεων που υποστηρίζει το APT."
+msgid "Is the package %s installed?"
+msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"Εκπληκτικό, υπερβήκατε τον αριθμό των περιγραφών που υποστηρίζει το APT."
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
msgstr ""
-"Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT."
-
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Ανάγνωση Λιστών Πακέτων"
+"Παρακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε "
+"enter."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Κατασκευή Δένδρου Εξαρτήσεων"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Υποψήφιες Εκδόσεις"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Παραγωγή Εξαρτήσεων"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Ανάγνωση περιγραφής της τρέχουσας κατάσταση"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Αποτυχία ανοίγματος του αρχείου κατάστασης %s"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Αποτυχία εγγραφής του αρχείου κατάστασης %s"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "απέτυχε η μετονομασία, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "Ανόμοιο MD5Sum"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "Ανόμοιο μέγεθος"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
#, fuzzy
msgid "Invalid file format"
msgstr "Μη έγκυρη λειτουργία %s"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Σφάλμα εγγραφής"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2215,63 +2157,63 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, 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:1026
+#: apt-pkg/acquire-item.cc:1122
msgid "There is no public key available for the following key IDs:\n"
msgstr "Δεν υπάρχει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "Ο φάκελος %s έχει εκτραπεί"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2280,12 +2222,12 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
-#: apt-pkg/acquire-item.cc:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2294,43 +2236,118 @@ msgstr ""
"πακέτο %s."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Changelog για %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκδοσης"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Εκπληκτικό, υπερβήκατε τον αριθμό των ονομάτων πακέτων που υποστηρίζει το "
+"APT."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Εκπληκτικό, υπερβήκατε τον αριθμό των εκδόσεων που υποστηρίζει το APT."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+"Εκπληκτικό, υπερβήκατε τον αριθμό των περιγραφών που υποστηρίζει το APT."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Ανάγνωση Λιστών Πακέτων"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Ο φάκελος λιστών %spartial αγνοείται."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "Ο φάκελος αρχειοθηκών %spartial αγνοείται."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, fuzzy, c-format
msgid "Unable to lock directory %s"
msgstr "Αδύνατο το κλείδωμα του καταλόγου"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, fuzzy, c-format
msgid "Clean of %s is not supported"
msgstr "Ο τύπος αρχείου ευρετηρίου '%s' δεν υποστηρίζεται"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Κατέβασμα του αρχείου %li του %li (απομένουν %s)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Λήψη αρχείου %li του %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Αποτυχία ανάκτησης του %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Μερικά αρχεία δεν μεταφορτώθηκαν, αγνοήθηκαν ή χρησιμοποιήθηκαν παλαιότερα "
+"στη θέση τους."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Πρέπει να τοποθετήσετε μερικά URI 'πηγών' στο sources.list"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Αδύνατη η εύρεση της κατάστασης του %s."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2358,29 +2375,6 @@ msgid "No priority (or zero) specified for pin"
msgstr ""
"Δεν έχει οριστεί προτεραιότητα (ή έχει οριστεί μηδενική) για την καθήλωση"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Αποτυχία ανάκτησης του %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Μερικά αρχεία δεν μεταφορτώθηκαν, αγνοήθηκαν ή χρησιμοποιήθηκαν παλαιότερα "
-"στη θέση τους."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Πρέπει να τοποθετήσετε μερικά URI 'πηγών' στο sources.list"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Αδύνατη η εύρεση της κατάστασης του %s."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2505,31 +2499,30 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Κατασκευή Δένδρου Εξαρτήσεων"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Υποψήφιες Εκδόσεις"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Παραγωγή Εξαρτήσεων"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr ""
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Ανάγνωση περιγραφής της τρέχουσας κατάσταση"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr ""
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Αποτυχία ανοίγματος του αρχείου κατάστασης %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr ""
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Αποτυχία εγγραφής του αρχείου κατάστασης %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Ο τύπος αρχείου ευρετηρίου '%s' δεν υποστηρίζεται"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, fuzzy, c-format
@@ -2541,130 +2534,146 @@ msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #1"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "Άνοιγμα του %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)"
+
+#: apt-pkg/sourcelist.cc:405
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος "
+
+#: apt-pkg/sourcelist.cc:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)"
+
+#: apt-pkg/sourcelist.cc:441
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος "
+
+#: apt-pkg/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Αδύνατη η εύρεση του συνόλου πακέτων %s"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Αδύνατη η εύρεση του πακέτου %s"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Αδύνατη η εύρεση του πακέτου %s"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #1"
-
-#: apt-pkg/sourcelist.cc:355
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Opening %s"
-msgstr "Άνοιγμα του %s"
-
-#: apt-pkg/sourcelist.cc:389
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:393
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος "
-
-#: apt-pkg/sourcelist.cc:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)"
-
-#: apt-pkg/sourcelist.cc:429
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος "
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Μη έγκυρη γραμμή στο αρχείο παρακάμψεων: %s"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2825,35 +2834,6 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "Η επιλογή %s δε βρέθηκε"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2933,7 +2913,7 @@ msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
msgid "Could not open file descriptor %d"
msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το %s"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "Αποτυχία δημιουργίας IPC στην υποδιεργασία"
@@ -2970,12 +2950,12 @@ msgstr "Πρόβλημα κατά την διαγραφή του αρχείου"
msgid "Problem syncing the file"
msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Αδύνατη η εύρεση της κατάστασης του %s"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Αδύνατη η εγγραφή στο %s"
@@ -3000,6 +2980,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Ολοκληρώθηκε"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "Η επιλογή %s δε βρέθηκε"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Αδύνατη η απεικόνιση mmap ενός άδειου αρχείου"
@@ -3358,87 +3367,87 @@ msgstr "Η αρχειοθήκη δεν περιέχει πεδίο ελέγχο
msgid "Unable to get a cursor"
msgstr "Αδύνατη η πρόσβαση σε δείκτη"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Αδύνατη η ανάγνωση του καταλόγου %s\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Αδύνατη η εύρεση της κατάστασης του %s\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "E: Σφάλματα στο αρχείο"
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "Αδύνατη η εύρεση του %s"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Αποτυχία ανεύρεσης"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "Αποτυχία ανοίγματος του %s"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr "Αποσύνδεση %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "Αποτυχία ανάγνωσης του %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "Αποτυχία αποσύνδεσης του %s"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr " Αποτυχία σύνδεσης του %s με το %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Αποσύνδεση ορίου του %sB hit.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτων"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s συντηρητής είναι ο %s όχι ο %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s δεν έχει εγγραφή πηγαίας παράκαμψης\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s δεν έχει ούτε εγγραφή δυαδικής παράκαμψης\n"
@@ -3725,6 +3734,12 @@ msgstr "Το Checksum του tar απέτυχε, η αρχείοθήκη είν
msgid "Unknown TAR header type %u, member %s"
msgstr "Άγνωστη επικεφαλίδα TAR τύπος %u, μέλος %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr ""
+#~ "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
+#~ "κωδικάτου"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Αποτυχία κατά τη δημιουργία διασωληνώσεων"
diff --git a/po/es.po b/po/es.po
index 06f576674..a0cf24636 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: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\n"
"PO-Revision-Date: 2014-11-20 02:25+0100\n"
"Last-Translator: Manuel \"Venturi\" Porras Peralta <venturi@openmailbox."
"org>\n"
@@ -170,7 +170,7 @@ msgstr "Debe proporcionar al menos un patrón de búsqueda"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr "Esta orden está desfasada. Utilice «apt-mark showauto» en su lugar."
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "No se ha podido localizar el paquete %s"
@@ -418,16 +418,16 @@ msgstr ""
msgid "Unable to lock the download directory"
msgstr "No se puede bloquear el directorio de descarga"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "Debe especificar al menos un paquete para obtener su código fuente"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "No se pudo encontrar el paquete de fuentes para %s"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -437,7 +437,7 @@ msgstr ""
"versiones «%s» en:\n"
"%s\n"
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -449,70 +449,70 @@ msgstr ""
"para obtener las últimas actualizaciones (posiblemente no publicadas aún) "
"del paquete.\n"
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Omitiendo el fichero ya descargado «%s»\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Se necesita descargar %sB/%sB de archivos fuente.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Se necesita descargar %sB de archivos fuente.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Fuente obtenida %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "No se pudieron obtener algunos archivos."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Descarga completa y en modo de solo descarga"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"Omitiendo desempaquetamiento de paquetes fuente ya desempaquetados en %s\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Falló la orden de desempaquetamiento «%s».\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Compruebe que el paquete «dpkg-dev» esté instalado.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Falló la orden de construcción «%s».\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Falló el proceso hijo"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Debe especificar al menos un paquete para verificar sus dependencias de "
"construcción"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -521,27 +521,27 @@ msgstr ""
"No hay información disponible de arquitectura para %s. Vea apt.conf(5) APT::"
"Arquitecturas para la configuración"
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "No se pudieron procesar las dependencias de construcción"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "No se pudo obtener información de dependencias de construcción para %s"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no tiene dependencias de construcción.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -550,7 +550,7 @@ msgstr ""
"La dependencia %s para %s no puede satisfacerse porque no se permite %s en "
"los paquetes «%s»"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -559,14 +559,14 @@ msgstr ""
"La dependencia %s para %s no puede satisfacerse porque no se puede encontrar "
"el paquete %s"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es "
"demasiado nuevo"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -575,7 +575,7 @@ msgstr ""
"La dependencia %s para %s no puede satisfacerse porque la versión presentada "
"del paquete %s no puede satisfacer los requisitos de versión"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -584,25 +584,25 @@ msgstr ""
"La dependencia %s para %s no puede satisfacerse porque el paquete %s no "
"tiene ninguna versión presentada"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "No se pudo satisfacer la dependencia %s para %s: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "No se pudieron satisfacer las dependencias de construcción de %s."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "No se pudieron procesar las dependencias de construcción"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Módulos admitidos:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -702,21 +702,16 @@ msgstr "Se necesita una URL como argumento"
msgid "Must specify at least one pair url/filename"
msgstr "Debe especificar al menos una pareja url/nombre-fichero"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr "Falló la descarga"
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "Debe especificar al menos una pareja url/nombre-fichero"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
#, fuzzy
msgid ""
"Usage: apt-helper [options] command\n"
@@ -912,12 +907,12 @@ msgstr "Disco no encontrado."
msgid "File not found"
msgstr "Fichero no encontrado"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "Fallo al leer"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "Fallo al establecer el tiempo de modificación"
@@ -1008,7 +1003,7 @@ msgstr "No se pudo crear el socket"
msgid "Could not connect data socket, connection timed out"
msgstr "No se pudo conectar el socket de datos, caducó el tiempo de conexión"
-#: methods/ftp.cc:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Falló"
@@ -1081,64 +1076,64 @@ msgstr "Consulta"
msgid "Unable to invoke "
msgstr "No se pudo invocar "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Conectando a %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "No se pudo crear un socket para %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "No se puede iniciar la conexión a %s:%s (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "No se pudo conectar a %s:%s (%s), caducó el tiempo para conexión"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "No se pudo conectar a %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Conectando a %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "No se pudo resolver «%s»"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Fallo temporal al resolver «%s»"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, c-format
msgid "System error resolving '%s:%s'"
msgstr "Error de sistema al resolver «%s:%s»"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Algo raro pasó al resolver «%s:%s» (%i - %s)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "No se pudo conectar a %s:%s:"
@@ -1161,7 +1156,7 @@ msgstr ""
"gnupg?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1265,227 +1260,6 @@ msgstr ""
msgid "Internal error"
msgstr "Error interno"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr "Listando"
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] "Hay %i versión adicional. Utilice la opción «-a» para verla"
-msgstr[1] "Hay %i versiones adicionales. Utilice la opción «-a» para verlas"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Corrigiendo dependencias..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " falló."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "No se pueden corregir las dependencias"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "No se puede minimizar el conjunto de actualización"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Listo"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Tal vez quiera ejecutar «apt-get -f install» para corregirlo."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependencias incumplidas. Pruebe de nuevo utilizando -f."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr "desconocido"
-
-#: apt-private/private-output.cc:272
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[instalado, actualizable a: %s]"
-
-#: apt-private/private-output.cc:275
-msgid "[installed,local]"
-msgstr "[instalado, local]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr "[instalado, autodesinstalable]"
-
-#: apt-private/private-output.cc:279
-msgid "[installed,automatic]"
-msgstr "[instalado, automático]"
-
-#: apt-private/private-output.cc:281
-msgid "[installed]"
-msgstr "[instalado]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr "[actualizable desde: %s]"
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr "[configuración-residual]"
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "pero %s está instalado"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "pero %s va a ser instalado"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "pero no es instalable"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "pero es un paquete virtual"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "pero no está instalado"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "pero no va a instalarse"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " o"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "Los siguientes paquetes tienen dependencias incumplidas:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "Se instalarán los siguientes paquetes NUEVOS:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Los siguientes paquetes se ELIMINARÁN:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "Los siguientes paquetes se han retenido:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "Se actualizarán los siguientes paquetes:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Se DESACTUALIZARÁN los siguientes paquetes:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "Se cambiarán los siguientes paquetes retenidos:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (por %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"ATENCIÓN: 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:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu actualizados, %lu nuevos se instalarán, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstalados, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu desactualizados, "
-
-#: apt-private/private-output.cc:641
-#, 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:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu no instalados del todo o eliminados.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[S/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-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:684
-msgid "Y"
-msgstr "S"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Error de compilación de expresiones regulares - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "La orden de actualización no necesita argumentos"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-"Se puede actualizar %i paquete. Ejecute «apt list --upgradable» para verlo.\n"
-msgstr[1] ""
-"Se pueden actualizar %i paquetes. Ejecute «apt list --upgradable» para "
-"verlos.\n"
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr "Todos los paquetes están actualizados."
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr "Ordenando"
@@ -1565,18 +1339,6 @@ msgstr "El paquete «%s» no está instalado, no se eliminará\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Nota, seleccionando «%s» en lugar de «%s»\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] "Hay %i registro adicional. Utilice la opción «-a» para verlo."
-msgstr[1] "Hay %i registros adicionales. Utilice la opción «-a» para verlos."
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr "no es un paquete real (virtual)"
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Error interno, ¡se llamó a «InstallPackages» con paquetes rotos!"
@@ -1587,7 +1349,7 @@ msgstr ""
"Se necesita eliminar paquetes, pero está desactivada la posibilidad de "
"eliminar."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1852,6 +1614,239 @@ msgstr "Versión seleccionada «%s» (%s) para «%s»\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Versión seleccionada «%s» (%s) para «%s» debido a «%s»\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "Listando"
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] "Hay %i versión adicional. Utilice la opción «-a» para verla"
+msgstr[1] "Hay %i versiones adicionales. Utilice la opción «-a» para verlas"
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Corrigiendo dependencias..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " falló."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "No se pueden corregir las dependencias"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "No se puede minimizar el conjunto de actualización"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Listo"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Tal vez quiera ejecutar «apt-get -f install» para corregirlo."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependencias incumplidas. Pruebe de nuevo utilizando -f."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "desconocido"
+
+#: apt-private/private-output.cc:272
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[instalado, actualizable a: %s]"
+
+#: apt-private/private-output.cc:275
+msgid "[installed,local]"
+msgstr "[instalado, local]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr "[instalado, autodesinstalable]"
+
+#: apt-private/private-output.cc:279
+msgid "[installed,automatic]"
+msgstr "[instalado, automático]"
+
+#: apt-private/private-output.cc:281
+msgid "[installed]"
+msgstr "[instalado]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[actualizable desde: %s]"
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr "[configuración-residual]"
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "pero %s está instalado"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "pero %s va a ser instalado"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "pero no es instalable"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "pero es un paquete virtual"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "pero no está instalado"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "pero no va a instalarse"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " o"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Los siguientes paquetes tienen dependencias incumplidas:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Se instalarán los siguientes paquetes NUEVOS:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Los siguientes paquetes se ELIMINARÁN:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "Los siguientes paquetes se han retenido:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "Se actualizarán los siguientes paquetes:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Se DESACTUALIZARÁN los siguientes paquetes:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "Se cambiarán los siguientes paquetes retenidos:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (por %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"ATENCIÓN: 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:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu actualizados, %lu nuevos se instalarán, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstalados, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu desactualizados, "
+
+#: apt-private/private-output.cc:641
+#, 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:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu no instalados del todo o eliminados.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[S/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+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:684
+msgid "Y"
+msgstr "S"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Error de compilación de expresiones regulares - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "La orden de actualización no necesita argumentos"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"Se puede actualizar %i paquete. Ejecute «apt list --upgradable» para verlo.\n"
+msgstr[1] ""
+"Se pueden actualizar %i paquetes. Ejecute «apt list --upgradable» para "
+"verlos.\n"
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr "Todos los paquetes están actualizados."
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] "Hay %i registro adicional. Utilice la opción «-a» para verlo."
+msgstr[1] "Hay %i registros adicionales. Utilice la opción «-a» para verlos."
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr "no es un paquete real (virtual)"
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1864,47 +1859,40 @@ msgstr ""
" Tenga también en cuenta que se han desactivado los bloqueos,\n"
" ¡no dependa la situación real actual de la relevancia de esto!"
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ATENCIÓN: ¡No se han podido autenticar los siguientes paquetes!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "Aviso de autenticación ignorado.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "Algunos paquetes no se pueden autenticar"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "¿Instalar estos paquetes sin verificación?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Hay problemas y se utilizó -y sin --force-yes"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Fallo al obtener %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "No se pudo determinar el espacio libre en %s"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "No tiene suficiente espacio libre en %s."
@@ -1973,16 +1961,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "No se pudo leer %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -2125,27 +2113,6 @@ msgstr "Tal vez deba ejecutar «apt-get update» para corregir estos problemas"
msgid "The list of sources could not be read."
msgstr "No se pudieron leer las listas de fuentes."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "No se pudo encontrar el método %s."
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "Is the package %s installed?"
-msgstr "¿Está instalado el paquete %s?"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "El método %s no se inició correctamente"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr "Inserte el disco con etiqueta «%s» en la unidad «%s» y pulse Intro."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Caché de paquetes vacía."
@@ -2232,99 +2199,80 @@ msgstr "extra"
msgid "Calculating upgrade"
msgstr "Calculando la actualización"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "El tipo de fichero de índice «%s» no se admite"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "La caché tiene una versión incompatible de sistema de versiones"
+msgid "The method driver %s could not be found."
+msgstr "No se pudo encontrar el método %s."
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Se produjo un error mientras se procesaba %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Excedió la cantidad de nombres de paquetes que admite este APT."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Excedió la cantidad de versiones que admite este APT."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Excedió la cantidad de descripciones que admite este APT."
+msgid "Is the package %s installed?"
+msgstr "¿Está instalado el paquete %s?"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Excedió la cantidad de dependencias que admite este APT."
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "El método %s no se inició correctamente"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Leyendo lista de paquetes"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr "Inserte el disco con etiqueta «%s» en la unidad «%s» y pulse Intro."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "Error de E/S al guardar la caché fuente"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Creando árbol de dependencias"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr "Enviar situación al solucionador"
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Versiones candidatas"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr "Enviar petición al solucionador"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generación de dependencias"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr "Preparar para recibir una solución"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Leyendo la información de estado"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr "Falló solucionador externo sin un mensaje de error apropiado"
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "No se pudo abrir el fichero de estado %s"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr "Ejecutar solucionador externo"
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falló la escritura del fichero de estado temporal %s"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "falló el cambio de nombre, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "La suma hash difiere"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "El tamaño difiere"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
msgid "Invalid file format"
msgstr "Formato inválido de fichero"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Error de escritura"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, fuzzy, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2335,12 +2283,12 @@ msgstr ""
"GPG es: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr "Error de GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2349,7 +2297,7 @@ msgstr ""
"No se pudo encontrar la entrada esperada «%s» en el archivo "
"«Release» (entrada incorrecta en «sources.list» o fichero mal formado)"
-#: apt-pkg/acquire-item.cc:1026
+#: apt-pkg/acquire-item.cc:1122
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"No existe ninguna clave pública disponible para los siguientes "
@@ -2358,7 +2306,7 @@ msgstr ""
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2367,37 +2315,37 @@ msgstr ""
"El archivo «Release» para %s está caducado (inválido desde %s). No se "
"aplicará ninguna actualización de este repositorio."
-#: apt-pkg/acquire-item.cc:1107
+#: apt-pkg/acquire-item.cc:1203
#, 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:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "El directorio %s está desviado"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2407,13 +2355,13 @@ msgstr ""
"que necesita arreglar manualmente este paquete (debido a que falta una "
"arquitectura)"
-#: apt-pkg/acquire-item.cc:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
"No se puede encontrar una fuente para descargar la versión «%s» de «%s»"
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2422,43 +2370,113 @@ msgstr ""
"«Filename:» para el paquete %s."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Informe de cambios para %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "La caché tiene una versión incompatible de sistema de versiones"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Se produjo un error mientras se procesaba %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Excedió la cantidad de nombres de paquetes que admite este APT."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Excedió la cantidad de versiones que admite este APT."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Excedió la cantidad de descripciones que admite este APT."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Excedió la cantidad de dependencias que admite este APT."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Leyendo lista de paquetes"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "Error de E/S al guardar la caché fuente"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr "Falta el directorio de listas %spartial."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Falta el directorio de archivos %spartial."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, c-format
msgid "Unable to lock directory %s"
msgstr "No se pudo bloquear el directorio %s"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, c-format
msgid "Clean of %s is not supported"
msgstr "No se admite la limpieza de «%s»"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Descargando fichero %li de %li (falta %s)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Descargando fichero %li de %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Fallo al obtener %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"No se han podido descargar algunos archivos de índice, se han omitido, o se "
+"han utilizado unos antiguos en su lugar."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Debe poner algunos URIs fuente («source») en su sources.list"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "No se pudo leer %s."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2489,28 +2507,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "No hay prioridad especificada para pin (o es cero)"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Fallo al obtener %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"No se han podido descargar algunos archivos de índice, se han omitido, o se "
-"han utilizado unos antiguos en su lugar."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Debe poner algunos URIs fuente («source») en su sources.list"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "No se pudo leer %s."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2641,31 +2637,30 @@ msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"No se pudieron corregir los problemas, usted ha retenido paquetes rotos."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Creando árbol de dependencias"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr "Enviar situación al solucionador"
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Versiones candidatas"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr "Enviar petición al solucionador"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generación de dependencias"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr "Preparar para recibir una solución"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Leyendo la información de estado"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr "Falló solucionador externo sin un mensaje de error apropiado"
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "No se pudo abrir el fichero de estado %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr "Ejecutar solucionador externo"
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falló la escritura del fichero de estado temporal %s"
+msgid "Index file type '%s' is not supported"
+msgstr "El tipo de fichero de índice «%s» no se admite"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2677,60 +2672,98 @@ msgstr "No se pudo tratar el archivo de paquetes %s (%d)"
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Predominio mal formado %s línea %llu (%s)"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "Abriendo %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, 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:405
+#, 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 la lista de fuentes %s"
+
+#: apt-pkg/sourcelist.cc:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Línea %u mal formada en la lista de fuentes %s (tipo)"
+
+#: apt-pkg/sourcelist.cc:441
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Tipo «%s» desconocido en el bloque %u de la lista de fuentes %s"
+
+#: apt-pkg/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "No se encontró la distribución «%s» para «%s»"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "No se encontró la versión «%s» para «%s»"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, c-format
msgid "Couldn't find task '%s'"
msgstr "No se pudo encontrar la tarea «%s»"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "No se pudo encontrar ningún paquete con la expresión regular «%s»"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "No se pudo encontrar ningún paquete usando «*» con «%s»"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"No se pueden seleccionar distintas versiones del paquete «%s» porque es "
"puramente virtual"
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"No se puede seleccionar la última versión del paquete «%s» dado que es "
"puramente virtual"
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"No se puede seleccionar la versión candidata del paquete %s dado que no "
"tiene candidatos"
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"No se puede seleccionar la versión instalada del paquete «%s» puesto que no "
"está instalado"
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -2739,78 +2772,56 @@ msgstr ""
"No se puede seleccionar una versión instalada o candidata para el paquete "
"«%s» dado que éste no tiene ninguna de éstas"
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Predominio mal formado %s línea %llu (%s)"
-
-#: apt-pkg/sourcelist.cc:355
-#, c-format
-msgid "Opening %s"
-msgstr "Abriendo %s"
-
-#: apt-pkg/sourcelist.cc:389
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, 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:393
-#, 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 la lista de fuentes %s"
-
-#: apt-pkg/sourcelist.cc:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "Línea %u mal formada en la lista de fuentes %s (tipo)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:429
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Tipo «%s» desconocido en el bloque %u de la lista de fuentes %s"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, c-format
msgid "Unable to parse Release file %s"
msgstr "No se pudo leer el archivo «Release» %s"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr "No se encontraron secciones en el archivo «Release» %s"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "No existe una entrada «Hash» en el archivo «Release» %s"
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Entrada «Date» inválida en el archivo «Release» %s"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Entrada «Valid-Until» inválida en el archivo «Release» %s"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2989,35 +3000,6 @@ msgstr ""
msgid "Not locked"
msgstr "No bloqueado"
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "Selección %s no encontrada"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -3099,7 +3081,7 @@ msgstr "No pude abrir el fichero %s"
msgid "Could not open file descriptor %d"
msgstr "No se pudo abrir el descriptor de fichero %d"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "No se pudo crear el subproceso IPC"
@@ -3136,12 +3118,12 @@ msgstr "Se produjo un problema al desligar el fichero %s"
msgid "Problem syncing the file"
msgstr "Se produjo un problema al sincronizar el fichero"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, c-format
msgid "Unable to mkstemp %s"
msgstr "No pude leer %s"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "No se pudo escribir en %s"
@@ -3166,6 +3148,35 @@ msgstr "..."
msgid "%c%s... %u%%"
msgstr "%c%s... %u%%"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "Selección %s no encontrada"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "No puedo hacer mmap de un fichero vacío"
@@ -3530,87 +3541,87 @@ msgstr "No hay registro de control del archivo"
msgid "Unable to get a cursor"
msgstr "No se pudo obtener un cursor"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: No se pudo leer directorio %s\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: No se pudo leer %s\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "E: Errores aplicables al archivo "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "No se pudo resolver %s"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Falló el recorrido por el árbol."
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "No se pudo abrir %s"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "No se pudo leer el enlace %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "No se pudo desligar %s"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** No pude enlazar %s con %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink se ha llegado al límite de %sB.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "Archivo no tiene campo de paquetes"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s no tiene entrada de predominio\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " el encargado de %s es %s y no %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s no tiene una entrada fuente predominante\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s tampoco tiene una entrada binaria predominante\n"
@@ -3898,6 +3909,10 @@ msgstr ""
msgid "Unknown TAR header type %u, member %s"
msgstr "Cabecera del TAR tipo %u desconocida, miembro %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "Debe especificar al menos una pareja url/nombre-fichero"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Fallo al crear las tuberías"
diff --git a/po/eu.po b/po/eu.po
index 017c9b322..285b96c60 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\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"
@@ -115,7 +115,7 @@ msgstr "Zehazki eredu bat eman behar duzu."
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Ezin da %s paketea lokalizatu"
@@ -353,23 +353,23 @@ msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
msgid "Unable to lock the download directory"
msgstr "Ezin da deskarga direktorioa blokeatu"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -377,96 +377,96 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Iturburu artxiboetako %sB/%sB eskuratu behar dira.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Eskuratu %s iturburua\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Huts egin du zenbat artxibo lortzean."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Deskarga amaituta eta deskarga soileko moduan"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Eraikitzeko '%s' komandoak huts egin du.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Prozesu umeak huts egin du"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Gutxienez pakete bat zehaztu behar duzu eraikitze mendekotasunak egiaztatzeko"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Huts egin du eraikitze mendekotasunak prozesatzean"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ezin izan da %s(r)en eraikitze mendekotasunen informazioa eskuratu"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s: ez du eraikitze mendekotasunik.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -474,7 +474,7 @@ msgid ""
msgstr ""
"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -482,14 +482,14 @@ msgid ""
msgstr ""
"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s "
"paketea berriegia da"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -498,7 +498,7 @@ msgstr ""
"%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak "
"betetzen dituen %3$s paketearen bertsio erabilgarririk"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -506,25 +506,25 @@ msgid ""
msgstr ""
"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s(r)en eraikitze mendekotasunak ezin izan dira bete."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "Huts egin du eraikitze mendekotasunak prozesatzean"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Onartutako Moduluak:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -620,21 +620,16 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -776,12 +771,12 @@ msgstr "Ez da diska aurkitu"
msgid "File not found"
msgstr "Ez da fitxategia aurkitu"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "Huts egin du atzitzean"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "Huts egin du aldaketa ordua ezartzean"
@@ -875,7 +870,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:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Huts egin du"
@@ -948,65 +943,65 @@ msgstr "Kontsulta"
msgid "Unable to invoke "
msgstr "Ezin da deitu "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Konektatzen -> %s.(%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Ezin izan da socket-ik sortu honentzat: %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Ezin izan da konexioa hasi -> %s:%s (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr ""
"Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora muga gainditu du"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Ezin izan da konektatu -> %s:%s (%s)"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Konektatzen -> %s..."
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "Ezin izan da '%s' ebatzi"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Aldi baterako akatsa '%s' ebaztean"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, fuzzy, c-format
msgid "System error resolving '%s:%s'"
msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Ezin da konektatu -> %s %s:"
@@ -1027,7 +1022,7 @@ msgstr ""
"Ezin da %s abiarazi sinadura egiaztatzeko (gnupg instalaturik al dago?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1129,227 +1124,6 @@ msgstr ""
msgid "Internal error"
msgstr "Barne errorea"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Mendekotasunak zuzentzen..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " : huts egin du."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Ezin dira mendekotasunak zuzendu"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "Ezin da bertsio berritzeko multzoa minimizatu"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Eginda"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu zuzentzeko."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instalatuta]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instalatuta]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instalatuta]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instalatuta]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "baina %s instalatuta dago"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "baina %s instalatzeko dago"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "baina ez da instalagarria"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "baina pakete birtuala da"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "baina ez dago instalatuta"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "baina ez da instalatuko"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " edo"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "Ondorengo pakete BERRIAK instalatuko dira:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Ondorengo paketeak KENDUKO dira:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "Ondorengo paketeak mantendu egin dira:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "Ondorengo paketeak bertsio-berrituko dira:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "Ondorengo pakete atxikiak aldatu egingo dira:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (arrazoia: %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n"
-"EZ ezazu horrelakorik egin, ez badakizu ondo zertan ari zaren!"
-
-#: apt-private/private-output.cc:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu bertsio berritua(k), %lu berriki instalatuta, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu berrinstalatuta, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu aurreko bertsiora itzulita, "
-
-#: apt-private/private-output.cc:641
-#, 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:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu ez erabat instalatuta edo kenduta.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[B/e]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-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:684
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Adierazpen erregularren konpilazio errorea - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Eguneratzeko komandoak ez du argumenturik hartzen"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1429,18 +1203,6 @@ msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!"
@@ -1449,7 +1211,7 @@ msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!"
msgid "Packages need to be removed but remove is disabled."
msgstr "Paketeak ezabatu beharra dute baina Ezabatzea ezgaiturik dago."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1713,6 +1475,239 @@ msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Mendekotasunak zuzentzen..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " : huts egin du."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Ezin dira mendekotasunak zuzendu"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Ezin da bertsio berritzeko multzoa minimizatu"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Eginda"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu zuzentzeko."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instalatuta]"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instalatuta]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instalatuta]"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instalatuta]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "baina %s instalatuta dago"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "baina %s instalatzeko dago"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "baina ez da instalagarria"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "baina pakete birtuala da"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "baina ez dago instalatuta"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "baina ez da instalatuko"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " edo"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Ondorengo pakete BERRIAK instalatuko dira:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Ondorengo paketeak KENDUKO dira:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "Ondorengo paketeak mantendu egin dira:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "Ondorengo paketeak bertsio-berrituko dira:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "Ondorengo pakete atxikiak aldatu egingo dira:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (arrazoia: %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n"
+"EZ ezazu horrelakorik egin, ez badakizu ondo zertan ari zaren!"
+
+#: apt-private/private-output.cc:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu bertsio berritua(k), %lu berriki instalatuta, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu berrinstalatuta, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu aurreko bertsiora itzulita, "
+
+#: apt-private/private-output.cc:641
+#, 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:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu ez erabat instalatuta edo kenduta.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[B/e]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+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:684
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Adierazpen erregularren konpilazio errorea - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Eguneratzeko komandoak ez du argumenturik hartzen"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1721,47 +1716,40 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "KONTUZ: Hurrengo paketeak ezin dira egiaztatu!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "Egiaztapen abisua gainidazten.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "Zenbait pakete ezin dira egiaztatu"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "Paketeak egiaztapen gabe instalatu?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Arazoak daude, eta -y erabili da --force-yes gabe"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ezin da lortu %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Ezin da %s(e)n duzun leku librea atzeman."
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Ez daukazu nahikoa leku libre %s(e)n."
@@ -1830,16 +1818,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Ezin da %s irakurri"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -1978,27 +1966,6 @@ msgstr "Beharbada 'apt-get update' exekutatu nahiko duzu arazoak konpontzeko"
msgid "The list of sources could not be read."
msgstr "Ezin izan da Iturburu zerrenda irakurri."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Ezin izan da %s metodo kontrolatzailea aurkitu."
-
-#: apt-pkg/acquire-worker.cc:113
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "%s metodoa ez da behar bezala abiarazi"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr "Mesedez sa ''%s' izeneko diska '%s' gailuan eta enter sakatu"
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Paketeen katxea hutsik"
@@ -2086,100 +2053,81 @@ msgstr "estra"
msgid "Calculating upgrade"
msgstr "Berriketak kalkulatzen"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "'%s' motako indize fitxategirik ez da onartzen"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "Katxearen bertsio sistema ez da bateragarria"
+msgid "The method driver %s could not be found."
+msgstr "Ezin izan da %s metodo kontrolatzailea aurkitu."
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Errorea gertatu da %s prozesatzean (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "APT honek maneia dezakeen pakete izenen kopurua gainditu duzu."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "APT honek maneia dezakeen bertsio kopurua gainditu duzu."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "APT honek maneia dezakeen azalpen kopurua gainditu duzu."
+msgid "Is the package %s installed?"
+msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "APT honek maneia dezakeen mendekotasun muga gainditu duzu."
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "%s metodoa ez da behar bezala abiarazi"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Pakete Zerrenda irakurtzen"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr "Mesedez sa ''%s' izeneko diska '%s' gailuan eta enter sakatu"
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "S/I errorea iturburu katxea gordetzean"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Dependentzia zuhaitza eraikitzen"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Hautagaien bertsioak"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Dependentzi Sormena"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Egoera argibideak irakurtzen"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Huts egin du %s EgoeraFitxategia irekitzean"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Ezin izan da %s aldiroko EgoeraFitrxategia idatzi"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "huts egin du izen-aldaketak, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "Egiaztapena ez dator bat"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "Tamaina ez dator bat"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
#, fuzzy
msgid "Invalid file format"
msgstr "Eragiketa baliogabea: %s"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Idazketa errorea"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2187,63 +2135,63 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, 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:1026
+#: apt-pkg/acquire-item.cc:1122
msgid "There is no public key available for the following key IDs:\n"
msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "%s direktorioa desbideratuta dago"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2252,12 +2200,12 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea. (arkitektura falta delako)"
-#: apt-pkg/acquire-item.cc:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2266,43 +2214,114 @@ msgstr ""
"paketearentzat."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Konektatzen -> %s.(%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "Katxearen bertsio sistema ez da bateragarria"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Errorea gertatu da %s prozesatzean (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "APT honek maneia dezakeen pakete izenen kopurua gainditu duzu."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "APT honek maneia dezakeen bertsio kopurua gainditu duzu."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "APT honek maneia dezakeen azalpen kopurua gainditu duzu."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "APT honek maneia dezakeen mendekotasun muga gainditu duzu."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Pakete Zerrenda irakurtzen"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "S/I errorea iturburu katxea gordetzean"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "%spartial zerrenda-direktorioa falta da."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "%spartial artxibo direktorioa falta da."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, fuzzy, c-format
msgid "Unable to lock directory %s"
msgstr "Ezin da zerrenda direktorioa blokeatu"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, fuzzy, c-format
msgid "Clean of %s is not supported"
msgstr "'%s' motako indize fitxategirik ez da onartzen"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "%li fitxategi deskargatzen %li -tik (%s falta da)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "%li fitxategia jasotzen %li-tik"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Ezin da lortu %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Indize fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo "
+"zaharrak erabili dira haien ordez."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "'Iturburu' URI batzuk jarri behar dituzu sources.list-en"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Ezin da %s atzitu."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2329,29 +2348,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "Ez da lehentasunik zehaztu orratzarentzat (pin) (edo zero da)"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Ezin da lortu %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Indize fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo "
-"zaharrak erabili dira haien ordez."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "'Iturburu' URI batzuk jarri behar dituzu sources.list-en"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Ezin da %s atzitu."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2475,31 +2471,30 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Dependentzia zuhaitza eraikitzen"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Hautagaien bertsioak"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Dependentzi Sormena"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr ""
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Egoera argibideak irakurtzen"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr ""
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Huts egin du %s EgoeraFitxategia irekitzean"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr ""
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Ezin izan da %s aldiroko EgoeraFitrxategia idatzi"
+msgid "Index file type '%s' is not supported"
+msgstr "'%s' motako indize fitxategirik ez da onartzen"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2511,130 +2506,146 @@ msgstr "Ezin da %s pakete fitxategia analizatu (%d)"
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Gaizki osatutako override %s, lerroa: %lu #1"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "%s irekitzen"
+
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)"
+
+#: apt-pkg/sourcelist.cc:405
+#, 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:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)"
+
+#: apt-pkg/sourcelist.cc:441
+#, 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/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "'%2$s'(r)en '%1$s' banaketa ez da aurkitu"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Ezin izan da %s zeregina aurkitu"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Ezin izan da %s paketea aurkitu"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Ezin izan da %s paketea aurkitu"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Gaizki osatutako override %s, lerroa: %lu #1"
-
-#: apt-pkg/sourcelist.cc:355
-#, c-format
-msgid "Opening %s"
-msgstr "%s irekitzen"
-
-#: apt-pkg/sourcelist.cc:389
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:393
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, 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:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)"
-
-#: apt-pkg/sourcelist.cc:429
-#, 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"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Ezin da %s pakete fitxategia analizatu (1)"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ezin da %s pakete fitxategia analizatu (1)"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Lerro baliogabea desbideratze fitxategian: %s"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2795,35 +2806,6 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "%s hautapena ez da aurkitu"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2903,7 +2885,7 @@ msgstr "%s fitxategia ezin izan da ireki"
msgid "Could not open file descriptor %d"
msgstr "Ezin izan da %s(r)en kanalizazioa ireki"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "Huts egin du IPC azpiprozesua sortzean"
@@ -2940,12 +2922,12 @@ msgstr "Arazoa fitxategia desestekatzean"
msgid "Problem syncing the file"
msgstr "Arazoa fitxategia sinkronizatzean"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Ezin da daturik lortu %s(e)tik"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "%s : ezin da idatzi"
@@ -2970,6 +2952,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Eginda"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "%s hautapena ez da aurkitu"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Ezin da fitxategi huts baten mmap egin"
@@ -3322,87 +3333,87 @@ msgstr "Artxiboak ez du kontrol erregistrorik"
msgid "Unable to get a cursor"
msgstr "Ezin da kurtsorerik eskuratu"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Ezin da %s direktorioa irakurri\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: Ezin da %s atzitu\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "E: Erroreak fitxategiari dagozkio "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "Huts egin du %s ebaztean"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Huts egin dute zuhaitz-urratsek"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "Huts egin du %s irekitzean"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "Huts egin du %s esteka irakurtzean"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "Huts egin du %s desestekatzean"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Ezin izan da %s %s(r)ekin estekatu"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-en mugara (%sB) heldu da.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "Artxiboak ez du pakete eremurik"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s: ez du override sarrerarik\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s mantentzailea %s da, eta ez %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s: ez du jatorri gainidazketa sarrerarik\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s: ez du bitar gainidazketa sarrerarik\n"
@@ -3688,6 +3699,10 @@ msgstr "Tar egiaztapenak huts egin, hondatutakofitxategia"
msgid "Unknown TAR header type %u, member %s"
msgstr "%u TAR goiburu mota ezezaguna, %s kidea"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Huts egin du kanalizazioak sortzean"
diff --git a/po/fi.po b/po/fi.po
index e08439606..bf8d9a98a 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: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\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"
@@ -115,7 +115,7 @@ msgstr "On annettava täsmälleen yksi lauseke"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Pakettia %s ei löydy"
@@ -350,23 +350,23 @@ msgstr "Sisäinen virhe, resolver rikkoi jotain"
msgid "Unable to lock the download directory"
msgstr "Noutokansiota ei saatu lukittua"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Paketin %s lähdekoodipakettia ei löytynyt"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -374,95 +374,95 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "On noudettava %st lähdekoodiarkistoja.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Nouda lähdekoodi %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Nouto on valmis ja määrätty vain nouto"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Purkukomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Lapsiprosessi kaatui"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Paketille %s ei ole saatavilla riippuvuustietoja"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -470,7 +470,7 @@ msgid ""
msgstr ""
"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -478,14 +478,14 @@ msgid ""
msgstr ""
"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian "
"uusi"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -494,7 +494,7 @@ msgstr ""
"%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio "
"ei vastaa versioriippuvuuksia"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -502,25 +502,25 @@ msgid ""
msgstr ""
"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Tuetut moduulit:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -615,21 +615,16 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -770,12 +765,12 @@ msgstr "Levyä ei löydy"
msgid "File not found"
msgstr "Tiedostoa ei löydy"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "Komento stat ei toiminut"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua"
@@ -866,7 +861,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:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Ei onnistunut"
@@ -939,64 +934,64 @@ msgstr "Kysely"
msgid "Unable to invoke "
msgstr "Käynnistys ei onnistu"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Avataan yhteys %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Pistokeen luonti ei onnistu %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Yhteyden %s avaus ei onnistu: %s (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s), yhteys aikakatkaistiin"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s)"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Avataan yhteys %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nimeä \"%s\" ei voitu selvittää"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Tilapäinen häiriö selvitettäessä \"%s\""
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, fuzzy, c-format
msgid "System error resolving '%s:%s'"
msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Ei ole mahdollista muodostaa yhteyttä %s %s:"
@@ -1018,7 +1013,7 @@ msgstr ""
"Ei käynnistynyt \"%s\" allekirjoitusta tarkistamaan (onko gnupg asennettu?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1120,227 +1115,6 @@ msgstr ""
msgid "Internal error"
msgstr "Sisäinen virhe"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Korjataan riippuvuuksia..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " ei onnistunut."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Riippuvuuksien korjaus ei onnistu"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "Päivitysjoukon minimointi ei onnistu"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Valmis"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nämä."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -f."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Asennettu]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Asennettu]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Asennettu]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr " [Asennettu]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "mutta %s on asennettu"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "mutta %s on merkitty asennettavaksi"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "mutta ei ole asennuskelpoinen"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "mutta on näennäispaketti"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "mutta ei ole asennettu"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "mutta ei ole merkitty asennettavaksi"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " tai"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "Seuraavat UUDET paketit asennetaan:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Seuraavat paketit POISTETAAN:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "Nämä paketit on jätetty odottamaan:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "Nämä paketit päivitetään:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Nämä paketit VARHENNETAAN:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "Seuraavat pysytetyt paketit muutetaan:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (syynä %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu päivitetty, %lu uutta asennusta, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu uudelleen asennettua, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu varhennettua, "
-
-#: apt-private/private-output.cc:641
-#, 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:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu ei asennettu kokonaan tai poistettiin.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[K/e]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:684
-msgid "Y"
-msgstr "K"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Käännösvirhe lausekkeessa - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Komento update ei käytä parametreja"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1420,18 +1194,6 @@ msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Huomautus, valitaan %s eikä %s\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Sisäinen virhe, InstallPackages kutsuttiin rikkinäisille paketeille!"
@@ -1440,7 +1202,7 @@ msgstr "Sisäinen virhe, InstallPackages kutsuttiin rikkinäisille paketeille!"
msgid "Packages need to be removed but remove is disabled."
msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1704,6 +1466,239 @@ msgstr "Valittiin versio %s (%s) paketille %s\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Valittiin versio %s (%s) paketille %s\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Korjataan riippuvuuksia..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " ei onnistunut."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Riippuvuuksien korjaus ei onnistu"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Päivitysjoukon minimointi ei onnistu"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Valmis"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nämä."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -f."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Asennettu]"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Asennettu]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Asennettu]"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr " [Asennettu]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "mutta %s on asennettu"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "mutta %s on merkitty asennettavaksi"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "mutta ei ole asennuskelpoinen"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "mutta on näennäispaketti"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "mutta ei ole asennettu"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "mutta ei ole merkitty asennettavaksi"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " tai"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Seuraavat UUDET paketit asennetaan:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Seuraavat paketit POISTETAAN:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "Nämä paketit on jätetty odottamaan:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "Nämä paketit päivitetään:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Nämä paketit VARHENNETAAN:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "Seuraavat pysytetyt paketit muutetaan:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (syynä %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu päivitetty, %lu uutta asennusta, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu uudelleen asennettua, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu varhennettua, "
+
+#: apt-private/private-output.cc:641
+#, 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:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu ei asennettu kokonaan tai poistettiin.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[K/e]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:684
+msgid "Y"
+msgstr "K"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Käännösvirhe lausekkeessa - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Komento update ei käytä parametreja"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1712,47 +1707,40 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "VAROITUS: Seuraavian pakettien alkuperää ei voi varmistaa!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "Varoitus varmistamisesta on ohitettu.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "Joidenkin pakettien alkuperästä ei voitu varmistua"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "Asennetaanko nämä paketit ilman todennusta?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Tiedoston %s nouto ei onnistunut %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kansion %s vapaan tilan määrä ei selvinnyt"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa."
@@ -1821,16 +1809,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Tiedostoa %s ei voi lukea"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -1972,27 +1960,6 @@ msgstr "Voit haluta suorittaa apt-get update näiden pulmien korjaamiseksi"
msgid "The list of sources could not be read."
msgstr "Lähteiden luetteloa ei pystynyt lukemaan."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Menetelmän ajuria %s ei löytynyt"
-
-#: apt-pkg/acquire-worker.cc:113
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Menetelmä %s ei käynnistynyt oikein"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr "Pistä levy nimeltään: \"%s\" asemaan \"%s\" ja paina Enter."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Pakettivarasto on tyhjä"
@@ -2080,101 +2047,81 @@ msgstr "ylimääräinen"
msgid "Calculating upgrade"
msgstr "Käsitellään päivitystä"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "Pakettivaraston versionhallintajärjestelmä ei ole yhteensopiva"
+msgid "The method driver %s could not be found."
+msgstr "Menetelmän ajuria %s ei löytynyt"
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Jummijammi, annoit enemmän pakettien nimiä kuin tämä APT osaa käsitellä."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Jummijammi, annoit enemmän versioita kuin tämä APT osaa käsitellä."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Jummijammi, tämä APT ei osaa käsitellä noin montaa kuvausta."
+msgid "Is the package %s installed?"
+msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Jummijammi, annoit enemmän riippuvuuksia kuin tämä APT osaa käsitellä."
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Menetelmä %s ei käynnistynyt oikein"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Luetaan pakettiluetteloita"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr "Pistä levy nimeltään: \"%s\" asemaan \"%s\" ja paina Enter."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Muodostetaan riippuvuussuhteiden puu"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Mahdolliset versiot"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Luodaan riippuvuudet"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Luetaan tilatiedot"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Tilatiedoston %s avaaminen ei onnistunut"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Tilapäisen tilatiedoston %s kirjoittaminen ei onnistunut"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "Tarkistussumma ei täsmää"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "Koko ei täsmää"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
#, fuzzy
msgid "Invalid file format"
msgstr "Virheellinen toiminto %s"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Virhe kirjoitettaessa"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2182,63 +2129,63 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, 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:1026
+#: apt-pkg/acquire-item.cc:1122
msgid "There is no public key available for the following key IDs:\n"
msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "Kansio %s on korvautunut"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2247,12 +2194,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:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2261,43 +2208,115 @@ msgstr ""
"kenttää."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Avataan yhteys %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "Pakettivaraston versionhallintajärjestelmä ei ole yhteensopiva"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Jummijammi, annoit enemmän pakettien nimiä kuin tämä APT osaa käsitellä."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Jummijammi, annoit enemmän versioita kuin tämä APT osaa käsitellä."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Jummijammi, tämä APT ei osaa käsitellä noin montaa kuvausta."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Jummijammi, annoit enemmän riippuvuuksia kuin tämä APT osaa käsitellä."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Luetaan pakettiluetteloita"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Luettelokansio %spartial puuttuu."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "Arkistokansio %spartial puuttuu."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, fuzzy, c-format
msgid "Unable to lock directory %s"
msgstr "Luettelokansiota ei voitu lukita"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, fuzzy, c-format
msgid "Clean of %s is not supported"
msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Noudetaan tiedosto %li / %li (jäljellä %s)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Noudetaan tiedosto %li / %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Tiedoston %s nouto ei onnistunut %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai "
+"käytetty vanhoja. "
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Tiedostossa sources.list on oltava rivejä joissa \"lähde\"-URI"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "stat %s ei onnistu."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2324,29 +2343,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "Tärkeysjärjestystä ei määritetty tunnisteelle (tai se on nolla)"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Tiedoston %s nouto ei onnistunut %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai "
-"käytetty vanhoja. "
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Tiedostossa sources.list on oltava rivejä joissa \"lähde\"-URI"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "stat %s ei onnistu."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2468,31 +2464,30 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Muodostetaan riippuvuussuhteiden puu"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Mahdolliset versiot"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Luodaan riippuvuudet"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr ""
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Luetaan tilatiedot"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr ""
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Tilatiedoston %s avaaminen ei onnistunut"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr ""
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Tilapäisen tilatiedoston %s kirjoittaminen ei onnistunut"
+msgid "Index file type '%s' is not supported"
+msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2504,130 +2499,146 @@ msgstr "Pakettitiedostoa %s ei voi jäsentää (%d)"
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 1"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "Avataan %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, 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:405
+#, 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:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)"
+
+#: apt-pkg/sourcelist.cc:441
+#, 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/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Tehtävää %s ei löytynyt"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Pakettia %s ei löytynyt"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Pakettia %s ei löytynyt"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 1"
-
-#: apt-pkg/sourcelist.cc:355
-#, c-format
-msgid "Opening %s"
-msgstr "Avataan %s"
-
-#: apt-pkg/sourcelist.cc:389
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:393
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, 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:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)"
-
-#: apt-pkg/sourcelist.cc:429
-#, 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"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Huomautus, valitaan %s eikä %s\n"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Virheellinen rivi korvautustiedostossa: %s"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2788,35 +2799,6 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "Valintaa %s ei löydy"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2893,7 +2875,7 @@ msgstr "Tiedostoa %s ei voitu avata"
msgid "Could not open file descriptor %d"
msgstr "Putkea %s ei voitu avata"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "Prosessien välistä kommunikaatiota aliprosessiin ei saatu luotua"
@@ -2930,12 +2912,12 @@ msgstr "Pulmia tehtäessä tiedostolle unlink"
msgid "Problem syncing the file"
msgstr "Pulmia tehtäessä tiedostolle sync"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Tiedostolle %s ei toimi stat"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
@@ -2960,6 +2942,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Valmis"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "Valintaa %s ei löydy"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Tyhjälle tiedostolle ei voi tehdä mmap:ia"
@@ -3313,87 +3324,87 @@ msgstr "Arkistolla ei ole ohjaustietuetta"
msgid "Unable to get a cursor"
msgstr "Kohdistinta ei saada"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Kansiota %s ei voi lukea\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Tdstolle %s ei toimi stat\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "E: Tiedostossa virheitä "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "Osoitteen %s selvitys ei onnistunut"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Puun läpikäynti ei onnistunut"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "Tiedoston %s avaaminen ei onnistunut"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "readlink %s ei onnistunut"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "unlink %s ei onnistunut"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Linkin %s -> %s luonti ei onnistunut"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLinkin yläraja %st saavutettu.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "Arkistossa ei ollut pakettikenttää"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s:llä ei ole poikkeustietuetta\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s ylläpitäjä on %s eikä %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s:llä ei ole poikkeustietuetta\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s:llä ei ole binääristäkään poikkeustietuetta\n"
@@ -3679,6 +3690,10 @@ msgstr "Tar-ohjelman laskema tarkistussumma ei täsmää, arkisto on turmeltunut
msgid "Unknown TAR header type %u, member %s"
msgstr "Tuntematon TAR-otsikon tyyppi %u, tiedosto %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Putkien luonti ei onnistunut"
diff --git a/po/fr.po b/po/fr.po
index 7134f65e8..00e259aa3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\n"
"PO-Revision-Date: 2013-12-15 16:45+0100\n"
"Last-Translator: Julien Patriarca <leatherface@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -115,7 +115,7 @@ msgstr "Vous devez fournir au moins un motif de recherche"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr "Cette commande est obsolète. Veuillez utiliser « apt-mark showauto »."
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Impossible de trouver le paquet %s"
@@ -366,16 +366,16 @@ msgstr ""
msgid "Unable to lock the download directory"
msgstr "Impossible de verrouiller le répertoire de téléchargement"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "Vous devez spécifier au moins un paquet source"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossible de trouver une source de paquet pour %s"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -385,7 +385,7 @@ msgstr ""
"suivi de versions « %s » à l'adresse :\n"
"%s\n"
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -397,69 +397,69 @@ msgstr ""
"pour récupérer les dernières mises à jour (éventuellement non encore "
"publiées) du paquet.\n"
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Saut du téléchargement du fichier « %s », déjà téléchargé\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Nécessité de prendre %so/%so dans les sources.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Nécessité de prendre %so dans les sources.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Récupération des sources %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Échec lors de la récupération de quelques archives."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Téléchargement achevé et dans le mode téléchargement uniquement"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Saut du décompactage des paquets sources déjà décompactés dans %s\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "La commande de décompactage « %s » a échoué.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "La commande de construction « %s » a échoué.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Échec du processus fils"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Il faut spécifier au moins un paquet pour vérifier les dépendances de "
"construction"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -469,27 +469,27 @@ msgstr ""
"consulter la section à propos de APT::Architectures dans la page de manuel "
"apt.conf(5)."
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Impossible d'activer les dépendances de construction"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossible d'obtenir les dépendances de construction pour %s"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s n'a pas de dépendance de construction.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -498,7 +498,7 @@ msgstr ""
"La dépendance %s vis-à-vis de %s ne peut être satisfaite car %s n'est pas "
"autorisé avec les paquets « %s »."
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -507,14 +507,14 @@ msgstr ""
"La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne "
"peut être trouvé"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Impossible de satisfaire la dépendance %s pour %s : le paquet installé %s "
"est trop récent"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -523,7 +523,7 @@ msgstr ""
"La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version "
"disponible du paquet %s ne peut satisfaire les prérequis de version."
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -532,26 +532,26 @@ msgstr ""
"La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s "
"n'a pas de version disponible."
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Impossible de satisfaire les dépendances %s pour %s : %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
"Les dépendances de compilation pour %s ne peuvent pas être satisfaites."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "Impossible d'activer les dépendances de construction"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Modules reconnus :"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -650,21 +650,16 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Vous devez spécifier au moins un paquet source"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "Vous devez spécifier au moins un paquet source"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -846,12 +841,12 @@ msgstr "Disque non trouvé."
msgid "File not found"
msgstr "Fichier non trouvé"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "Impossible de statuer"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "Impossible de modifier l'heure "
@@ -944,7 +939,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:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Échec"
@@ -1017,66 +1012,66 @@ msgstr "Requête"
msgid "Unable to invoke "
msgstr "Impossible d'invoquer "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Connexion à %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP : %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Impossible de créer de connexion pour %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Impossible d'initialiser la connexion à %s: %s (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Connexion à %s: %s (%s) impossible, délai de connexion dépassé"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Connexion à %s: %s (%s) impossible."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Connexion à %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "Ne parvient pas à résoudre « %s »"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Erreur temporaire de résolution de « %s »"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, c-format
msgid "System error resolving '%s:%s'"
msgstr "Erreur système lors de la résolution de « %s:%s »"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr ""
"Quelque chose d'imprévisible est survenu lors de la détermination de « %s:"
"%s » (%i - %s)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Impossible de se connecter à %s:%s :"
@@ -1099,7 +1094,7 @@ msgstr ""
"vérifier si gnupg est installé)."
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1203,225 +1198,6 @@ msgstr ""
msgid "Internal error"
msgstr "Erreur interne"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr "En train de lister"
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Correction des dépendances..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " a échoué."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Impossible de corriger les dépendances"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "Impossible de minimiser le nombre des paquets mis à jour"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Fait"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dépendances manquantes. Essayez d'utiliser l'option -f."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "installé, pouvant être mis à jour vers :"
-
-#: apt-private/private-output.cc:275
-msgid "[installed,local]"
-msgstr " [installé, local]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr "[installé, pouvant être supprimé automatiquement]"
-
-#: apt-private/private-output.cc:279
-msgid "[installed,automatic]"
-msgstr " [installé, automatique]"
-
-#: apt-private/private-output.cc:281
-msgid "[installed]"
-msgstr " [installé]"
-
-#: apt-private/private-output.cc:284
-#, fuzzy, c-format
-msgid "[upgradable from: %s]"
-msgstr "[pouvant être mis à jour depuis :"
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr "[configuration restante]"
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "mais %s est installé"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "mais %s devra être installé"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "mais il n'est pas installable"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "mais c'est un paquet virtuel"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "mais il n'est pas installé"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "mais ne sera pas installé"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " ou"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "Les paquets suivants contiennent des dépendances non satisfaites :"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "Les NOUVEAUX paquets suivants seront installés :"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Les paquets suivants seront ENLEVÉS :"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "Les paquets suivants ont été conservés :"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "Les paquets suivants seront mis à jour :"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "Les paquets retenus suivants seront changés :"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (en raison de %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"ATTENTION : Les paquets essentiels suivants vont être enlevés.\n"
-"Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n"
-"que vous êtes en train de faire."
-
-#: apt-private/private-output.cc:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu mis à jour, %lu nouvellement installés, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu réinstallés, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu remis à une version inférieure, "
-
-#: apt-private/private-output.cc:641
-#, 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:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu partiellement installés ou enlevés.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[O/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-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:684
-msgid "Y"
-msgstr "O"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Erreur de compilation de l'expression rationnelle - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "La commande de mise à jour ne prend pas de paramètre"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr "En train de trier"
@@ -1503,18 +1279,6 @@ msgstr "Le paquet « %s » n'est pas installé, et ne peut donc être supprim
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Note : sélection de « %s » au lieu de « %s »\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr "pas un véritable paquet (virtuel)"
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés."
@@ -1524,7 +1288,7 @@ msgid "Packages need to be removed but remove is disabled."
msgstr ""
"Les paquets doivent être enlevés mais la désinstallation est désactivée."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1803,6 +1567,237 @@ msgstr "Version choisie « %s » (%s) pour « %s »\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Version choisie « %s » (%s) pour « %s » à cause de « %s »\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "En train de lister"
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Correction des dépendances..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " a échoué."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Impossible de corriger les dépendances"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Impossible de minimiser le nombre des paquets mis à jour"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Fait"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dépendances manquantes. Essayez d'utiliser l'option -f."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "installé, pouvant être mis à jour vers :"
+
+#: apt-private/private-output.cc:275
+msgid "[installed,local]"
+msgstr " [installé, local]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr "[installé, pouvant être supprimé automatiquement]"
+
+#: apt-private/private-output.cc:279
+msgid "[installed,automatic]"
+msgstr " [installé, automatique]"
+
+#: apt-private/private-output.cc:281
+msgid "[installed]"
+msgstr " [installé]"
+
+#: apt-private/private-output.cc:284
+#, fuzzy, c-format
+msgid "[upgradable from: %s]"
+msgstr "[pouvant être mis à jour depuis :"
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr "[configuration restante]"
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "mais %s est installé"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "mais %s devra être installé"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "mais il n'est pas installable"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "mais c'est un paquet virtuel"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "mais il n'est pas installé"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "mais ne sera pas installé"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " ou"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Les paquets suivants contiennent des dépendances non satisfaites :"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Les NOUVEAUX paquets suivants seront installés :"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Les paquets suivants seront ENLEVÉS :"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "Les paquets suivants ont été conservés :"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "Les paquets suivants seront mis à jour :"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "Les paquets retenus suivants seront changés :"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (en raison de %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"ATTENTION : Les paquets essentiels suivants vont être enlevés.\n"
+"Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n"
+"que vous êtes en train de faire."
+
+#: apt-private/private-output.cc:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu mis à jour, %lu nouvellement installés, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu réinstallés, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu remis à une version inférieure, "
+
+#: apt-private/private-output.cc:641
+#, 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:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu partiellement installés ou enlevés.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[O/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+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:684
+msgid "Y"
+msgstr "O"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Erreur de compilation de l'expression rationnelle - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "La commande de mise à jour ne prend pas de paramètre"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr "pas un véritable paquet (virtuel)"
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1817,47 +1812,40 @@ msgstr ""
" et la situation n'est donc pas forcément représentative\n"
" de la réalité !"
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés."
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "Avertissement d'authentification ignoré.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "Certains paquets n'ont pas pu être authentifiés"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "Faut-il installer ces paquets sans vérification ?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Il y a des problèmes et -y a été employé sans --force-yes"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Impossible de récupérer %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Impossible de déterminer l'espace disponible sur %s"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Pas assez d'espace disponible sur %s"
@@ -1926,16 +1914,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Impossible de lire %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -2078,29 +2066,6 @@ msgstr "Vous pouvez lancer « apt-get update » pour corriger ces problèmes."
msgid "The list of sources could not be read."
msgstr "La liste des sources ne peut être lue."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Le pilote pour la méthode %s n'a pu être trouvé."
-
-#: apt-pkg/acquire-worker.cc:113
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "La méthode %s n'a pas démarré correctement"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr ""
-"Veuillez insérer le disque « %s » dans le lecteur « %s » et appuyez sur la "
-"touche Entrée."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Cache des paquets vide"
@@ -2187,108 +2152,82 @@ msgstr "supplémentaire"
msgid "Calculating upgrade"
msgstr "Calcul de la mise à jour"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Le type de fichier d'index « %s » n'est pas accepté"
+msgid "The method driver %s could not be found."
+msgstr "Le pilote pour la méthode %s n'a pu être trouvé."
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "Le cache possède un système de version incompatible"
+#: apt-pkg/acquire-worker.cc:113
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n"
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:164
#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Erreur apparue lors du traitement de %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Vous avez dépassé le nombre de noms de paquets que cette version d'APT est "
-"capable de traiter."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"Vous avez dépassé le nombre de versions que cette version d'APT est capable "
-"de traiter."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"Vous avez dépassé le nombre de descriptions que cette version d'APT est "
-"capable de traiter."
+msgid "Method %s did not start correctly"
+msgstr "La méthode %s n'a pas démarré correctement"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
msgstr ""
-"Vous avez dépassé le nombre de dépendances que cette version d'APT est "
-"capable de traiter."
-
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Lecture des listes de paquets"
+"Veuillez insérer le disque « %s » dans le lecteur « %s » et appuyez sur la "
+"touche Entrée."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr ""
-"Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Construction de l'arbre des dépendances"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr "Envoi du scénario au solveur"
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Versions possibles"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr "Envoi d'une requête au solveur"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Génération des dépendances"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr "Préparation à la réception de la solution"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Lecture des informations d'état"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr "Échec du solveur externe sans message d'erreur adapté"
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Impossible d'ouvrir le fichier d'état %s"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr "Exécution du solveur externe"
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Erreur d'écriture du fichier d'état temporaire %s"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "impossible de changer le nom, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "Somme de contrôle de hachage incohérente"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "Taille incohérente"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
msgid "Invalid file format"
msgstr "Format de fichier invalide"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Erreur d'écriture"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, fuzzy, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2299,12 +2238,12 @@ msgstr ""
"GPG : %s : %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr "Erreur de GPG : %s : %s"
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2313,7 +2252,7 @@ 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:1026
+#: apt-pkg/acquire-item.cc:1122
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"
@@ -2321,7 +2260,7 @@ msgstr ""
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2330,37 +2269,37 @@ 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, 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:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "Le répertoire %s est détourné"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2369,14 +2308,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:2677
+#: apt-pkg/acquire-item.cc:2751
#, 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:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2385,43 +2324,123 @@ msgstr ""
"pour le paquet %s."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Journal des modifications pour %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "Le cache possède un système de version incompatible"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Erreur apparue lors du traitement de %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Vous avez dépassé le nombre de noms de paquets que cette version d'APT est "
+"capable de traiter."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+"Vous avez dépassé le nombre de versions que cette version d'APT est capable "
+"de traiter."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+"Vous avez dépassé le nombre de descriptions que cette version d'APT est "
+"capable de traiter."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Vous avez dépassé le nombre de dépendances que cette version d'APT est "
+"capable de traiter."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Lecture des listes de paquets"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr ""
+"Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr "Le répertoire %spartial pour les listes n'existe pas."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Le répertoire d'archive %spartial n'existe pas."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, c-format
msgid "Unable to lock directory %s"
msgstr "Impossible de verrouiller le répertoire %s"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, fuzzy, c-format
msgid "Clean of %s is not supported"
msgstr "Le type de fichier d'index « %s » n'est pas accepté"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Téléchargement du fichier %li sur %li (%s restant)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Téléchargement du fichier %li sur %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Impossible de récupérer %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Le téléchargement de quelques fichiers d'index a échoué, ils ont été "
+"ignorés, ou les anciens ont été utilisés à la place."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
+"Vous devez insérer quelques adresses « sources » dans votre sources.list"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Impossible de localiser %s."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2452,29 +2471,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "Aucune priorité (ou zéro) n'a été spécifiée pour l'épinglage"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Impossible de récupérer %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Le téléchargement de quelques fichiers d'index a échoué, ils ont été "
-"ignorés, ou les anciens ont été utilisés à la place."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
-"Vous devez insérer quelques adresses « sources » dans votre sources.list"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Impossible de localiser %s."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2608,31 +2604,30 @@ msgstr ""
"Impossible de corriger les problèmes, des paquets défectueux sont en mode "
"« garder en l'état »."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Construction de l'arbre des dépendances"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr "Envoi du scénario au solveur"
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Versions possibles"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr "Envoi d'une requête au solveur"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Génération des dépendances"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr "Préparation à la réception de la solution"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Lecture des informations d'état"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr "Échec du solveur externe sans message d'erreur adapté"
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Impossible d'ouvrir le fichier d'état %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr "Exécution du solveur externe"
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Erreur d'écriture du fichier d'état temporaire %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Le type de fichier d'index « %s » n'est pas accepté"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2644,63 +2639,103 @@ msgstr "Impossible de traiter le fichier %s (%d)"
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Entrée « override » %s mal formée ligne %llu n° 1"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "Ouverture de %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, 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:405
+#, 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:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Ligne %u mal formée dans la liste des sources %s (type)"
+
+#: apt-pkg/sourcelist.cc:441
+#, 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/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "La version « %s » de « %s » est introuvable"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "La version « %s » de « %s » n'a pu être trouvée"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Impossible de trouver la tâche « %s »"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr ""
"Impossible de trouver de paquet correspondant à l'expression rationnelle "
"« %s »"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr ""
"Impossible de trouver de paquet correspondant à l'expression rationnelle "
"« %s »"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Impossible de choisir les versions du paquet « %s » qui n'est qu'un paquet "
"virtuel"
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Impossible de choisir une nouvelle version du paquet « %s » qui n'est qu'un "
"paquet virtuel"
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Impossible de choisir une version candidate du paquet « %s » qui n'en n'a pas"
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Impossible de choisir la version installée du paquet « %s » qui n'est pas "
"installé"
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -2709,80 +2744,56 @@ msgstr ""
"Impossible de choisir une version installée ou candidate du paquet « %s » "
"qui n'en n'a aucune"
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Entrée « override » %s mal formée ligne %llu n° 1"
-
-#: apt-pkg/sourcelist.cc:355
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Opening %s"
-msgstr "Ouverture de %s"
-
-#: apt-pkg/sourcelist.cc:389
-#, 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:393
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
msgstr ""
-"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
-
-#: apt-pkg/sourcelist.cc:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "Ligne %u mal formée dans la liste des sources %s (type)"
-#: apt-pkg/sourcelist.cc:429
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
+#, c-format
+msgid "Target %s (%s) is configured multiple times in %s and %s"
msgstr ""
-"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Impossible d'analyser le fichier Release %s"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr "Pas de sections dans le fichier Release %s"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Pas d'entrée de hachage dans le fichier Release %s"
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Entrée « Date » non valable dans le fichier Release %s"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Entrée « Valid-Until » non valable dans le fichier Release %s"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2958,35 +2969,6 @@ msgstr ""
msgid "Not locked"
msgstr "Non verrouillé"
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "La sélection %s n'a pu être trouvée"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -3071,7 +3053,7 @@ msgstr "Impossible d'ouvrir le fichier %s"
msgid "Could not open file descriptor %d"
msgstr "Impossible d'ouvrir le descripteur de fichier %d"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "Impossible de créer un sous-processus IPC"
@@ -3108,12 +3090,12 @@ msgstr "Problème de suppression du lien %s"
msgid "Problem syncing the file"
msgstr "Problème de synchronisation du fichier"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Impossible de statuer pour %s."
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Impossible d'écrire sur %s"
@@ -3138,6 +3120,35 @@ msgstr "…"
msgid "%c%s... %u%%"
msgstr "%c%s… %u%%"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "La sélection %s n'a pu être trouvée"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Impossible de mapper un fichier vide en mémoire"
@@ -3502,87 +3513,87 @@ msgstr "L'archive n'a pas d'enregistrement de contrôle"
msgid "Unable to get a cursor"
msgstr "Impossible d'obtenir un curseur"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A : Impossible de lire le contenu du répertoire %s\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A : Impossible de statuer %s\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "E : "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "A : "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "E : des erreurs sont survenues sur le fichier "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "Impossible de résoudre %s"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Échec du parcours de l'arbre"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "Impossible d'ouvrir %s"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Délier %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "Impossible de lire le lien %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "Impossible de délier %s"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Impossible de lier %s à %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Seuil de delink de %so atteint.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "L'archive ne possède pas de champ de paquet"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr "%s ne possède pas d'entrée « override »\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " le responsable de %s est %s et non %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s ne possède pas d'entrée « source override »\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s ne possède pas également pas d'entrée « binary override »\n"
@@ -3871,6 +3882,10 @@ msgstr "Échec dans la somme de contrôle de tar, l'archive est corrompue"
msgid "Unknown TAR header type %u, member %s"
msgstr "Type d'en-tête %u inconnu pour TAR, partie %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "Vous devez spécifier au moins un paquet source"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Échec de création de tubes"
diff --git a/po/gl.po b/po/gl.po
index 7b32e622c..0ccb0f5af 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\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"
@@ -117,7 +117,7 @@ msgstr "Debe fornecer cando menos un patrón de busca"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Non foi posíbel atopar o paquete %s"
@@ -356,16 +356,16 @@ msgstr "Produciuse un erro interno, o solucionador interno estragou cousas"
msgid "Unable to lock the download directory"
msgstr "Non é posíbel bloquear o directorio de descargas"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "Ten que especificar polo menos un paquete para obter o código fonte"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Non sé posíbel atopar un paquete fonte para %s"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -374,7 +374,7 @@ msgstr ""
"AVISO: o paquete «%s» mantense no sistema de control de versións «%s» en:\n"
"%s\n"
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -386,96 +386,96 @@ msgstr ""
"para obter as últimas actualizacións (posibelmente non publicadas) do "
"paquete.\n"
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Omítese o ficheiro xa descargado «%s»\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Ten que recibir %sB/%sB de arquivos de fonte.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Ten que recibir %sB de arquivos de fonte.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter fonte %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Non se puideron obter algúns arquivos."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Completouse a descarga no modo de só descargas"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Omítese o desempaquetado do código fonte xa desempaquetado en %s\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Fallou a orde de desempaquetado «%s».\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Comprobe que o paquete «dpkg-dev» estea instalado.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Fallou a orde de construción de «%s».\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "O proceso fillo fallou"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Ten que especificar polo menos un paquete para comprobarlle as dependencias "
"de compilación"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Non se puideron procesar as dependencias de construción"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Non é posíbel obter a información de dependencias de compilación de %s"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s non ten dependencias de compilación.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -484,7 +484,7 @@ msgstr ""
"A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
"paquete %s"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -493,14 +493,14 @@ msgstr ""
"A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
"paquete %s"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Non foi posíbel satisfacer a dependencia «%s» de %s: O paquete instalado %s "
"é novo de máis"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -509,7 +509,7 @@ msgstr ""
"A dependencia «%s» de %s non se pode satisfacer porque ningunha versión "
"dispoñíbel do paquete %s satisfai os requirimentos de versión"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -518,25 +518,25 @@ msgstr ""
"A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
"paquete %s"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Non foi posíbel satisfacer a dependencia «%s» de %s: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Non se puideron satisfacer as dependencias de construción de %s."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "Non se puideron procesar as dependencias de construción"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Módulos admitidos:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -638,21 +638,16 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Ten que especificar polo menos un paquete para obter o código fonte"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "Ten que especificar polo menos un paquete para obter o código fonte"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -793,12 +788,12 @@ msgstr "Non se atopou o disco"
msgid "File not found"
msgstr "Non se atopou o ficheiro"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "Non foi posíbel determinar o estado"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "Non foi posíbel estabelecer a hora de modificación"
@@ -890,7 +885,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:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Fallou"
@@ -963,64 +958,64 @@ msgstr "Petición"
msgid "Unable to invoke "
msgstr "Non é posíbel chamar a "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Conectando a %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Non foi posíbel crear un socket para %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Non é posíbel iniciar a conexión a %s:%s (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Non foi posíbel conectar a %s:%s (%s), a conexión esgotou o tempo"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Non foi posíbel conectar a %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Conectando a %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "Non foi posíbel atopar «%s»"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Produciuse un fallo temporal ao buscar «%s»"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, fuzzy, c-format
msgid "System error resolving '%s:%s'"
msgstr "Aconteceu algo malo, buscando «%s:%s» (%i - %s)"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Aconteceu algo malo, buscando «%s:%s» (%i - %s)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Non é posíbel conectar %s:%s:"
@@ -1043,7 +1038,7 @@ msgstr ""
"gnupg?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1147,227 +1142,6 @@ msgstr ""
msgid "Internal error"
msgstr "Produciuse un erro interno"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Corrixindo as dependencias..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " fallou."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Non foi posíbel corrixir as dependencias."
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "Non foi posíbel minimizar o conxunto de anovacións"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Feito"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Pode querer executar «apt-get -f install» para corrixilos."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependencias incumpridas. Probe a empregar -f."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "mais %s está instalado"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "mais vaise instalar %s"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "mais non é instalábel"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "mais é un paquete virtual"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "mais non está instalado"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "mais non se vai a instalar"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " ou"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "Os seguintes paquetes teñen dependencias sen cumprir:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "Os seguintes paquetes NOVOS hanse instalar:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Vanse RETIRAR os paquetes seguintes:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "Consérvanse os seguintes paquetes:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "Vanse anovar os paquetes seguintes:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Vanse REVERTER os seguintes paquetes :"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "Vanse modificar os paquetes retidos seguintes:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (por mor de %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu anovados, %lu instalados, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstalados, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu revertidos, "
-
-#: apt-private/private-output.cc:641
-#, 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:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu non instalados ou retirados de todo.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[S/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-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:684
-msgid "Y"
-msgstr "S"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Produciuse un erro na compilación da expresión regular - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "A orde «update» non toma argumentos"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1446,18 +1220,6 @@ msgstr "O paquete %s non está instalado, así que non foi retirado\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Nota, seleccione «%s» no canto de «%s»\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
@@ -1468,7 +1230,7 @@ msgstr ""
msgid "Packages need to be removed but remove is disabled."
msgstr "Hai que retirar paquetes mais o retirado está desactivado."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1735,6 +1497,239 @@ msgstr "Versión seleccionada «%s» (%s) para «%s»\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Versión seleccionada «%s» (%s) para «%s» xa que «%s»\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Corrixindo as dependencias..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " fallou."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Non foi posíbel corrixir as dependencias."
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Non foi posíbel minimizar o conxunto de anovacións"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Feito"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Pode querer executar «apt-get -f install» para corrixilos."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependencias incumpridas. Probe a empregar -f."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "mais %s está instalado"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "mais vaise instalar %s"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "mais non é instalábel"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "mais é un paquete virtual"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "mais non está instalado"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "mais non se vai a instalar"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " ou"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Os seguintes paquetes teñen dependencias sen cumprir:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Os seguintes paquetes NOVOS hanse instalar:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Vanse RETIRAR os paquetes seguintes:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "Consérvanse os seguintes paquetes:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "Vanse anovar os paquetes seguintes:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Vanse REVERTER os seguintes paquetes :"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "Vanse modificar os paquetes retidos seguintes:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (por mor de %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu anovados, %lu instalados, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstalados, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu revertidos, "
+
+#: apt-private/private-output.cc:641
+#, 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:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu non instalados ou retirados de todo.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[S/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+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:684
+msgid "Y"
+msgstr "S"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Produciuse un erro na compilación da expresión regular - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "A orde «update» non toma argumentos"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1748,47 +1743,40 @@ 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-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "AVISO: Non se poden autenticar os seguintes paquetes!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "Ignórase o aviso de autenticación.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "Non foi posíbel autenticar algúns paquetes"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "Instalar estes paquetes sen verificación?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Xurdiron problemas e empregouse -y sen --force-yes"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Non foi posíbel obter %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Non foi posíbel determinar o espazo libre en %s"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Non hai espazo libre abondo en %s."
@@ -1857,16 +1845,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Non é posíbel ler %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -2007,27 +1995,6 @@ msgstr "Pode querer executar «apt-get update» para corrixir estes problemas"
msgid "The list of sources could not be read."
msgstr "Non foi posíbel ler a lista de orixes."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Non foi posíbel atopar o controlador de métodos %s."
-
-#: apt-pkg/acquire-worker.cc:113
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Comprobe que o paquete «dpkg-dev» estea instalado.\n"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "O método %s non se iniciou correctamente"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr "Insira o disco etiquetado: «%s» na unidade «%s» e prema Intro."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Caché de paquetes baleira"
@@ -2115,101 +2082,81 @@ msgstr "extra"
msgid "Calculating upgrade"
msgstr "Calculando a anovación"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "O tipo de ficheiros de índices «%s» non está admitido"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "A caché ten un sistema de versionado incompatíbel"
+msgid "The method driver %s could not be found."
+msgstr "Non foi posíbel atopar o controlador de métodos %s."
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Produciuse un erro ao procesar %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Vaites!, superou o número de nomes de paquetes que este APT pode manexar."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Vaites!, superou o número de versións que este APT pode manexar."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Vaites!, superou o número de descricións que este APT pode manexar."
+msgid "Is the package %s installed?"
+msgstr "Comprobe que o paquete «dpkg-dev» estea instalado.\n"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Vaites!, superou o número de dependencias que este APT pode manexar."
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "O método %s non se iniciou correctamente"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Lendo as listas de paquetes"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr "Insira o disco etiquetado: «%s» na unidade «%s» e prema Intro."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "Produciuse un erro de E/S ao gravar a caché de fontes"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Construindo a árbore de dependencias"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Versións candidatas"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Xeración de dependencias"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Lendo a información do estado"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Non foi posíbel abrir o ficheiro de estado %s"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Non foi posíbel gravar o ficheiro de estado temporal %s"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "non foi posíbel cambiar o nome, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "A sumas «hash» non coinciden"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "Os tamaños non coinciden"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
#, fuzzy
msgid "Invalid file format"
msgstr "Operación incorrecta: %s"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Produciuse un erro de escritura"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, fuzzy, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2220,12 +2167,12 @@ msgstr ""
"%s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr "Produciuse un erro de GPG: %s %s"
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2234,51 +2181,51 @@ 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:1026
+#: apt-pkg/acquire-item.cc:1122
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"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, 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:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "O directorio %s está desviado"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2287,12 +2234,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:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2301,43 +2248,115 @@ msgstr ""
"Filename: para o paquete %s."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Rexistro de cambios de %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "A caché ten un sistema de versionado incompatíbel"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Produciuse un erro ao procesar %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Vaites!, superou o número de nomes de paquetes que este APT pode manexar."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Vaites!, superou o número de versións que este APT pode manexar."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Vaites!, superou o número de descricións que este APT pode manexar."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Vaites!, superou o número de dependencias que este APT pode manexar."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Lendo as listas de paquetes"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "Produciuse un erro de E/S ao gravar a caché de fontes"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr "Non se atopa a lista de directorios %sparcial."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Non se atopa a lista de arquivos %sparcial."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, c-format
msgid "Unable to lock directory %s"
msgstr "Non é posíbel bloquear o directorio %s"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, fuzzy, c-format
msgid "Clean of %s is not supported"
msgstr "O tipo de ficheiros de índices «%s» non está admitido"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Obtendo o ficheiro %li de %li (restan %s)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Obtendo o ficheiro %li de %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Non foi posíbel obter %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Algúns ficheiros de índice fallaron durante a descarga. Ignoráronse, ou "
+"foron utilizados algúns antigos no seu lugar"
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Debe introducir algúns URI «orixe» no seu ficheiro sources.list"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Non é posíbel analizar %s."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2366,29 +2385,6 @@ msgid "No priority (or zero) specified for pin"
msgstr ""
"Non se indicou unha prioridade (ou indicouse cero) para a inmobilización"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Non foi posíbel obter %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Algúns ficheiros de índice fallaron durante a descarga. Ignoráronse, ou "
-"foron utilizados algúns antigos no seu lugar"
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Debe introducir algúns URI «orixe» no seu ficheiro sources.list"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Non é posíbel analizar %s."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2516,31 +2512,30 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Non é posíbel solucionar os problemas, ten retidos paquetes rotos."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Construindo a árbore de dependencias"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Versións candidatas"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Xeración de dependencias"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr ""
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Lendo a información do estado"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr ""
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Non foi posíbel abrir o ficheiro de estado %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr ""
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Non foi posíbel gravar o ficheiro de estado temporal %s"
+msgid "Index file type '%s' is not supported"
+msgstr "O tipo de ficheiros de índices «%s» non está admitido"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2552,60 +2547,98 @@ msgstr "Non é posíbel analizar o ficheiro de paquetes %s (%d)"
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "«Override» %s liña %lu incorrecta (1)"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "Abrindo %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, 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:405
+#, 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:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Liña %u mal construída na lista de orixes %s (tipo)"
+
+#: apt-pkg/sourcelist.cc:441
+#, 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/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Non se atopou a publicación «%s» de «%s»"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Non se atopou a versión «%s» de «%s»"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Non foi posíbel atopar a tarefa «%s»"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Non é posíbel seleccionar distintas versións do paquete «%s» xa que é "
"puramente virtual"
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Non é posíbel seleccionar a versión máis recente do paquete «%s» xa que é "
"puramente virtual"
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Non é posíbel seleccionar a versión candidata do paquete %s xa que non ten "
"candidata"
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Non é posíbel seleccionar a versión instalada do paquete %s xa que non está "
"instalado"
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -2614,78 +2647,56 @@ msgstr ""
"Non é posíbel seleccionar nin a versión instalada nin a candidata do paquete "
"«%s» xa que non ten ningunha delas"
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "«Override» %s liña %lu incorrecta (1)"
-
-#: apt-pkg/sourcelist.cc:355
-#, c-format
-msgid "Opening %s"
-msgstr "Abrindo %s"
-
-#: apt-pkg/sourcelist.cc:389
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Liña %u mal construída na lista de orixes %s (tipo)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:393
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, 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:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "Liña %u mal construída na lista de orixes %s (tipo)"
-
-#: apt-pkg/sourcelist.cc:429
-#, 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"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Non se puido analizar o ficheiro de publicación %s"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr "Non hai seccións no ficheiro de publicación %s"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Non hai entrada de Hash no ficheiro de publicación %s"
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "A entrada «Date» no ficheiro de publicación %s non é válida"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "A entrada «Valid-Until» no ficheiro de publicación %s non é válida"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2864,35 +2875,6 @@ msgstr ""
msgid "Not locked"
msgstr "Non está bloqueado"
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "Non se atopou a selección %s"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2972,7 +2954,7 @@ msgstr "Non foi posíbel abrir o ficheiro %s"
msgid "Could not open file descriptor %d"
msgstr "Non foi posíbel abrir o descritor de ficheiro %d"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "Non foi posíbel crear o IPC do subproceso"
@@ -3009,12 +2991,12 @@ msgstr "Produciuse un problema ao desligar o ficheiro %s"
msgid "Problem syncing the file"
msgstr "Produciuse un problema ao sincronizar o ficheiro"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Non é posíbel determinar o estado %s"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Non é posíbel escribir en %s"
@@ -3039,6 +3021,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Feito"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "Non se atopou a selección %s"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Non é posíbel facer mmap sobre un ficheiro baleiro"
@@ -3401,87 +3412,87 @@ msgstr "O arquivo non ten un rexistro de control"
msgid "Unable to get a cursor"
msgstr "Non é posíbel obter un cursor"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: non é posíbel ler o directorio %s\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: non é posíbel atopar %s\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "E: os erros aplícanse ao ficheiro "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "Non foi posíbel solucionar %s"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Fallou o percorrido da árbore"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "Non foi posíbel abrir %s"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DesLig %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "Non foi posíbel ler a ligazón %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "Non foi posíbel desligar %s"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Non foi posíbel ligar %s con %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Acadouse o límite de desligado de %sB.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "O arquivo non tiña un campo Package"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s non ten unha entrada de «override»\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " O mantedor de %s é %s, non %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s non ten unha entrada de «override» de código fonte\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s tampouco ten unha entrada de «override» de binarios\n"
@@ -3769,6 +3780,10 @@ msgstr "A suma de comprobación do arquivo tar non coincide, está danado"
msgid "Unknown TAR header type %u, member %s"
msgstr "Tipo de cabeceira TAR %u descoñecido, membro %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "Ten que especificar polo menos un paquete para obter o código fonte"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Non foi posíbel crear as canles"
diff --git a/po/hu.po b/po/hu.po
index c86535787..0f3a63ea6 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\n"
"PO-Revision-Date: 2012-06-25 17:09+0200\n"
"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
"Language-Team: Hungarian <gnome-hu-list@gnome.org>\n"
@@ -116,7 +116,7 @@ msgstr "Legalább egy keresési mintát meg kell adnia"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr "Ez a parancs elavult. Használja helyette az „apt-mark showauto”-t."
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Ez a csomag nem található: %s"
@@ -352,17 +352,17 @@ msgstr "Belső hiba, a problémamegoldó hibát okozott"
msgid "Unable to lock the download directory"
msgstr "Nem lehet zárolni a letöltési könyvtárat"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Legalább egy csomagot meg kell adni, amelynek a forrását le kell tölteni"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nem található forráscsomag ehhez: %s"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -372,7 +372,7 @@ msgstr ""
"karbantartva:\n"
"%s\n"
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -383,69 +383,69 @@ msgstr ""
"bzr branch %s\n"
"a csomag legújabb (esetleg kiadatlan) frissítéseinek letöltéséhez.\n"
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "A már letöltött „%s” fájl kihagyása\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Letöltendő forrásadat-mennyiség: %sB/%sB.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Letöltendő forrásadat-mennyiség: %sB.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Forrás letöltése: %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Nem sikerült néhány archívumot letölteni."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "A letöltés befejeződött a „csak letöltés” módban"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "„%s” kibontási parancs nem sikerült.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Ellenőrizze, hogy a „dpkg-dev” csomag telepítve van-e.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "„%s” elkészítési parancs nem sikerült.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Hiba a gyermekfolyamatnál"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Legalább egy csomagot adjon meg, amelynek fordítási függőségeit ellenőrizni "
"kell"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -454,27 +454,27 @@ msgstr ""
"Nem érhetők el architektúrainformációk ehhez: %s. A beállításokkal "
"kapcsolatban lásd az apt.conf(5) APT::Architectures részét."
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Nem sikerült az építési függőségeket feldolgozni"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nem lehet %s fordítási függőségeinek információit letölteni"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nincs fordítási függősége a következőnek: %s.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -483,7 +483,7 @@ msgstr ""
"%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s nem "
"engedélyezett a(z) „%4$s” csomagokon"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -492,14 +492,14 @@ msgstr ""
"%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomag nem "
"található"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%2$s csomag %1$s függősége nem elégíthető ki: a telepített %3$s csomag túl "
"friss"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -508,7 +508,7 @@ msgstr ""
"%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomag elérhető "
"verziója nem elégíti ki a verziókövetelményeket"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -517,25 +517,25 @@ msgstr ""
"%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomagnak nincs "
"jelölt verziója"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s csomag %1$s függősége nem elégíthető ki: %3$s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s építési függőségei nem elégíthetők ki."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "Nem sikerült az építési függőségeket feldolgozni"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Támogatott modulok:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -634,22 +634,16 @@ msgid "Must specify at least one pair url/filename"
msgstr ""
"Legalább egy csomagot meg kell adni, amelynek a forrását le kell tölteni"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr ""
-"Legalább egy csomagot meg kell adni, amelynek a forrását le kell tölteni"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -812,12 +806,12 @@ msgstr "A lemez nem található."
msgid "File not found"
msgstr "A fájl nem található"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "Nem érhető el"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "A módosítási idő beállítása sikertelen"
@@ -911,7 +905,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:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Sikertelen"
@@ -984,64 +978,64 @@ msgstr "Lekérdezés"
msgid "Unable to invoke "
msgstr "Nem lehet meghívni "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Csatlakozás: %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Foglalat létrehozása sikertelen ehhez: %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Kapcsolat létrehozása sikertelen ehhez: %s: %s (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Időtúllépés miatt nem lehet kapcsolódni a következőhöz: %s: %s (%s)"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Nem lehet kapcsolódni ehhez: %s: %s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Kapcsolódás: %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nem lehet feloldani a következőt: „%s”"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Átmeneti hiba „%s” feloldása közben"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, fuzzy, c-format
msgid "System error resolving '%s:%s'"
msgstr "Hiba történt „%s:%s” feloldásakor (%i - %s)"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Hiba történt „%s:%s” feloldásakor (%i - %s)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Nem lehet csatlakozni ehhez: %s:%s:"
@@ -1062,7 +1056,7 @@ msgstr ""
"gnupg?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1164,227 +1158,6 @@ msgstr ""
msgid "Internal error"
msgstr "Belső hiba"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Függőségek javítása..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " sikertelen."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Nem lehet javítani a függőségeket"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "Nem lehet minimalizálni a frissítendő csomagok mennyiségét"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Kész"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Próbálja futtatni az „apt-get -f install” parancsot ezek javításához."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Teljesítetlen függőségek. Próbálja a -f használatával."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Telepítve]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Telepítve]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Telepítve]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr " [Telepítve]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "de %s van telepítve"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "de csak %s telepíthető"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "de az nem telepíthető"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "de az egy virtuális csomag"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "de az nincs telepítve"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "de az nincs telepítésre megjelölve"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " vagy"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "Az alábbi ÚJ csomagok lesznek telepítve:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Az alábbi csomagok el lesznek TÁVOLÍTVA:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "Az alábbi csomagok vissza lesznek tartva:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "Az alábbi csomagok frissítve lesznek:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Az alábbi csomagok VISSZAFEJLESZTÉSRE kerülnek:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "Az alábbi visszafogott csomagokat cserélem:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (%s miatt)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu frissített, %lu újonnan telepített, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu újratelepítendő, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu visszafejlesztendő, "
-
-#: apt-private/private-output.cc:641
-#, 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:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu nincs teljesen telepítve/eltávolítva.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[I/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-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:684
-msgid "Y"
-msgstr "I"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Regex fordítási hiba - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Az update parancsnak nincsenek argumentumai"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1463,18 +1236,6 @@ msgstr "A(z) „%s” csomag nincs telepítve, így nem lett törölve\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Megjegyzés: „%s” kijelölése „%s” helyett\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Belső hiba, az InstallPackages törött csomagokkal lett meghívva!"
@@ -1483,7 +1244,7 @@ msgstr "Belső hiba, az InstallPackages törött csomagokkal lett meghívva!"
msgid "Packages need to be removed but remove is disabled."
msgstr "Csomagokat kellene eltávolítani, de az eltávolítás nem engedélyezett."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1744,6 +1505,239 @@ msgstr "„%s” (%s) verzió lett kijelölve ehhez: „%s”\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "„%s” (%s) verzió lett kijelölve ehhez: „%s”, a(z) „%s” miatt\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Függőségek javítása..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " sikertelen."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Nem lehet javítani a függőségeket"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Nem lehet minimalizálni a frissítendő csomagok mennyiségét"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Kész"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Próbálja futtatni az „apt-get -f install” parancsot ezek javításához."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Teljesítetlen függőségek. Próbálja a -f használatával."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Telepítve]"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Telepítve]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Telepítve]"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr " [Telepítve]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "de %s van telepítve"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "de csak %s telepíthető"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "de az nem telepíthető"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "de az egy virtuális csomag"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "de az nincs telepítve"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "de az nincs telepítésre megjelölve"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " vagy"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Az alábbi ÚJ csomagok lesznek telepítve:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Az alábbi csomagok el lesznek TÁVOLÍTVA:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "Az alábbi csomagok vissza lesznek tartva:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "Az alábbi csomagok frissítve lesznek:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Az alábbi csomagok VISSZAFEJLESZTÉSRE kerülnek:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "Az alábbi visszafogott csomagokat cserélem:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (%s miatt)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu frissített, %lu újonnan telepített, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu újratelepítendő, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu visszafejlesztendő, "
+
+#: apt-private/private-output.cc:641
+#, 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:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu nincs teljesen telepítve/eltávolítva.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[I/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+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:684
+msgid "Y"
+msgstr "I"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Regex fordítási hiba - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Az update parancsnak nincsenek argumentumai"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1756,47 +1750,40 @@ 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-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "FIGYELMEZTETÉS: Az alábbi csomagok nem hitelesíthetők!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "A hitelesítési figyelmeztetés felülbírálva.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "Néhány csomag nem hitelesíthető"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "Valóban ellenőrzés nélkül telepíti a csomagokat?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Problémák vannak, és a -y kapcsolót használta --force-yes nélkül"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Sikertelen letöltés: %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nem határozható meg a szabad hely mennyisége itt: %s"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Nincs elég szabad hely itt: %s."
@@ -1865,16 +1852,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "%s nem olvasható"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -2012,29 +1999,6 @@ msgstr "Próbálja futtatni az „apt-get update” parancsot ezen hibák javít
msgid "The list of sources could not be read."
msgstr "A források listája olvashatatlan."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "A(z) %s metódusvezérlő nem található."
-
-#: apt-pkg/acquire-worker.cc:113
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Ellenőrizze, hogy a „dpkg-dev” csomag telepítve van-e.\n"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "A(z) %s metódus nem indult el megfelelően"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr ""
-"Helyezze be a(z) „%s” címkéjű lemezt a(z) „%s” meghajtóba, és nyomja meg az "
-"Entert."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Üres csomaggyorsítótár"
@@ -2121,100 +2085,83 @@ msgstr "extra"
msgid "Calculating upgrade"
msgstr "Frissítés kiszámítása"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "A(z) „%s” indexfájltípus nem támogatott"
+msgid "The method driver %s could not be found."
+msgstr "A(z) %s metódusvezérlő nem található."
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "A gyorsítótárnak inkompatibilis verziórendszere van"
+#: apt-pkg/acquire-worker.cc:113
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Ellenőrizze, hogy a „dpkg-dev” csomag telepítve van-e.\n"
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:164
#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Hiba történt a(z) %s feldolgozása során (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Az APT által kezelhető csomagnevek száma túllépve."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Az APT által kezelhető csomagverziók száma túllépve."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Az APT által kezelhető csomagleírások száma túllépve."
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Az APT által kezelhető függőségek száma túllépve."
+msgid "Method %s did not start correctly"
+msgstr "A(z) %s metódus nem indult el megfelelően"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Csomaglisták olvasása"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr ""
+"Helyezze be a(z) „%s” címkéjű lemezt a(z) „%s” meghajtóba, és nyomja meg az "
+"Entert."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "IO hiba a forrás-gyorsítótár mentésekor"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Függőségi fa építése"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr "A helyzet elküldése a solvernek"
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Lehetséges verziók"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr "Kérés küldése a solvernek"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Függőséggenerálás"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr "Felkészülés megoldás fogadására"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Állapotinformációk olvasása"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr "A külső solver megfelelő hibaüzenet nélkül hibázott"
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "%s állapotfájl megnyitása sikertelen"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr "Külső solver végrehajtása"
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s átmeneti állapotfájl írása sikertelen"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "sikertelen átnevezés, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "A Hash Sum nem megfelelő"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "A méret nem megfelelő"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
#, fuzzy
msgid "Invalid file format"
msgstr "%s érvénytelen művelet"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Írási hiba"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, fuzzy, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2224,12 +2171,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:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG hiba: %s: %s"
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2238,14 +2185,14 @@ 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:1026
+#: apt-pkg/acquire-item.cc:1122
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"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2254,37 +2201,37 @@ 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, 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:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "A(z) %s könyvtár eltérítve"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2293,12 +2240,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:2677
+#: apt-pkg/acquire-item.cc:2751
#, 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:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2306,43 +2253,113 @@ msgstr ""
"A csomagindexfájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Változási napló ehhez: %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "A gyorsítótárnak inkompatibilis verziórendszere van"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Hiba történt a(z) %s feldolgozása során (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Az APT által kezelhető csomagnevek száma túllépve."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Az APT által kezelhető csomagverziók száma túllépve."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Az APT által kezelhető csomagleírások száma túllépve."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Az APT által kezelhető függőségek száma túllépve."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Csomaglisták olvasása"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "IO hiba a forrás-gyorsítótár mentésekor"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr "A(z) %spartial listakönyvtár hiányzik."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "A(z) %spartial archívumkönyvtár hiányzik."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, c-format
msgid "Unable to lock directory %s"
msgstr "%s könyvtár zárolása sikertelen"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, fuzzy, c-format
msgid "Clean of %s is not supported"
msgstr "A(z) „%s” indexfájltípus nem támogatott"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "%li/%li fájl letöltése (%s marad)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "%li/%li fájl letöltése"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Sikertelen letöltés: %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Néhány indexfájlt nem sikerült letölteni. Figyelmen kívül lettek hagyva, "
+"vagy régebbiek lettek felhasználva."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Néhány „source” URI-t el kell helyezni a sources.list fájlban"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "%s nem érhető el."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2371,28 +2388,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "Nincs prioritás (vagy nulla) megadva a rögzítéshez"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Sikertelen letöltés: %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Néhány indexfájlt nem sikerült letölteni. Figyelmen kívül lettek hagyva, "
-"vagy régebbiek lettek felhasználva."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Néhány „source” URI-t el kell helyezni a sources.list fájlban"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s nem érhető el."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2519,31 +2514,30 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "A problémák nem javíthatók, sérült csomagokat fogott vissza."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Függőségi fa építése"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr "A helyzet elküldése a solvernek"
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Lehetséges verziók"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr "Kérés küldése a solvernek"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Függőséggenerálás"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr "Felkészülés megoldás fogadására"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Állapotinformációk olvasása"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr "A külső solver megfelelő hibaüzenet nélkül hibázott"
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s állapotfájl megnyitása sikertelen"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr "Külső solver végrehajtása"
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s átmeneti állapotfájl írása sikertelen"
+msgid "Index file type '%s' is not supported"
+msgstr "A(z) „%s” indexfájltípus nem támogatott"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2555,55 +2549,93 @@ msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (%d)"
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "%s felülbírálás deformált a(z) %llu. sorában #1"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "%s megnyitása"
+
+#: apt-pkg/sourcelist.cc:401
+#, 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:405
+#, 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:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %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:441
+#, 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/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "„%s” kiadás nem található ehhez: „%s”"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "„%s” verzió nem található ehhez: „%s”"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, c-format
msgid "Couldn't find task '%s'"
msgstr "„%s” feladat nem található"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Nem található csomag a(z) „%s” reguláris kifejezéssel"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Nem található csomag a(z) „%s” reguláris kifejezéssel"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "„%s” csomagból nem választható verzió, mert teljesen virtuális"
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"„%s” csomag legújabb verziója nem választható ki, mert teljesen virtuális"
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"„%s” csomag kiadásra jelölt verziója nem választható ki, mert nincs jelöltje"
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"„%s” csomag telepített verziója nem választható ki, mert nincs telepítve"
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -2612,78 +2644,56 @@ msgstr ""
"„%s” csomagból nem választható sem telepített, sem kiadásra jelölt verzió, "
"mert egyikkel sem rendelkezik"
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "%s felülbírálás deformált a(z) %llu. sorában #1"
-
-#: apt-pkg/sourcelist.cc:355
-#, c-format
-msgid "Opening %s"
-msgstr "%s megnyitása"
-
-#: apt-pkg/sourcelist.cc:389
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, 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)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:393
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, 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:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %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:429
-#, 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"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, c-format
msgid "Unable to parse Release file %s"
msgstr "A(z) %s Release fájl nem dolgozható fel"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr "A(z) %s Release fájl nem tartalmaz szakaszokat"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Nincs Hash bejegyzés a(z) %s Release fájlban"
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Érvénytelen „Date” bejegyzés a(z) %s Release fájlban"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Érvénytelen „Valid-Until” bejegyzés a(z) %s Release fájlban"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2858,35 +2868,6 @@ msgstr ""
msgid "Not locked"
msgstr "Nincs zárolva"
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lin %lió %lip %limp"
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lió %lip %limp"
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr "%lip %limp"
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr "%limp"
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "%s kiválasztás nem található"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2968,7 +2949,7 @@ msgstr "Nem lehet megnyitni a(z) %s fájlt"
msgid "Could not open file descriptor %d"
msgstr "Nem lehet megnyitni a(z) %d fájlleírót"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "Nem sikerült az alfolyamat IPC-t létrehozni"
@@ -3005,12 +2986,12 @@ msgstr "Hiba a(z) %s fájl törlésekor"
msgid "Problem syncing the file"
msgstr "Hiba a fájl szinkronizálásakor"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "%s nem érhető el"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Nem lehet írni ebbe: %s"
@@ -3035,6 +3016,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Kész"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lin %lió %lip %limp"
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lió %lip %limp"
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr "%lip %limp"
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr "%limp"
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "%s kiválasztás nem található"
+
# FIXME
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
@@ -3394,87 +3404,87 @@ msgstr "Az archívumnak nincs vezérlő rekordja"
msgid "Unable to get a cursor"
msgstr "Nem sikerült egy mutatóhoz jutni"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "F: nem lehet a(z) %s könyvtárat olvasni\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "F: %s nem érhető el\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "H: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "F: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "H: Hibás a fájl "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "Nem sikerült feloldani ezt: %s"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Fabejárás nem sikerült"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "%s megnyitása sikertelen"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "readlink nem hajtható végre erre: %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "%s törlése sikertelen"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** %s linkelése sikertelen ehhez: %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " a DeLink korlátja (%sB) elérve.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "Az archívumnak nem volt csomag mezője"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nem rendelkezik felülbíráló bejegyzéssel\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s karbantartója %s, nem %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nem rendelkezik forrás-felülbíráló bejegyzéssel\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nem rendelkezik bináris-felülbíráló bejegyzéssel sem\n"
@@ -3761,6 +3771,11 @@ msgstr "Tar ellenőrzőösszeg nem egyezik, az archívum megsérült"
msgid "Unknown TAR header type %u, member %s"
msgstr "Ismeretlen a(z) %u TAR fejléctípus, %s tag"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr ""
+#~ "Legalább egy csomagot meg kell adni, amelynek a forrását le kell tölteni"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Nem sikerült adatcsatornákat létrehozni"
diff --git a/po/it.po b/po/it.po
index 5b3e17307..1928e0095 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\n"
"PO-Revision-Date: 2015-04-07 16:51+0100\n"
"Last-Translator: Milo Casagrande <milo@milo.name>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -115,7 +115,7 @@ msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
"Questo comando è deprecato. Utilizzare \"apt-mark showauto\" al suo posto."
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Impossibile trovare il pacchetto %s"
@@ -359,17 +359,17 @@ msgstr "Errore interno, \"problem resolver\" ha rovinato qualcosa"
msgid "Unable to lock the download directory"
msgstr "Impossibile bloccare la directory di scaricamento"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr ""
"È necessario specificare almeno un pacchetto di cui recuperare il sorgente"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossibile trovare un pacchetto sorgente per %s"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -379,7 +379,7 @@ msgstr ""
"all'interno del sistema di controllo della versione \"%s\" presso:\n"
"%s\n"
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -391,69 +391,69 @@ msgstr ""
"per recuperare gli ultimi (forse non rilasciati) aggiornamenti del "
"pacchetto.\n"
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "È necessario recuperare %sB/%sB di sorgenti.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "È necessario scaricare %sB di sorgenti.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Recupero sorgente %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Recupero di alcuni archivi non riuscito."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Scaricamento completato e in modalità solo scaricamento"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Estrazione del pacchetto sorgente già estratto in %s saltata\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando di estrazione \"%s\" non riuscito.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comando \"%s\" di generazione non riuscito.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Creazione processo figlio non riuscita"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"È necessario specificare almeno un pacchetto di cui controllare le "
"dipendenze di generazione"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -462,27 +462,27 @@ msgstr ""
"Informazioni sull'architettura non disponibili per %s. Consultare apt."
"conf(5) APT::Architectures per l'impostazione"
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Elaborazione delle dipendenze di generazione non riuscita"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossibile ottenere informazioni di dipendenza di generazione per %s"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s non ha dipendenze di generazione.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -491,7 +491,7 @@ msgstr ""
"La dipendenza %s per %s non può essere soddisfatta perché %s non è "
"consentito su pacchetti \"%s\""
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -500,14 +500,14 @@ msgstr ""
"%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s "
"non può essere trovato"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"La dipendenza %s per %s non è stata soddisfatta: il pacchetto installato %s "
"è troppo recente"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -516,7 +516,7 @@ msgstr ""
"La dipendenza %s per %s non può essere soddisfatta perché la versione "
"candidata del pacchetto %s non può soddisfare i requisiti di versione"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -525,25 +525,25 @@ msgstr ""
"La dipendenza %s per %s non può essere soddisfatta perché il pacchetto %s "
"non ha una versione candidata"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "La dipendenza %s per %s non è stata soddisfatta: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Le dipendenze di generazione per %s non sono state soddisfatte."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "Elaborazione delle dipendenze di generazione non riuscita"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Moduli supportati:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -641,21 +641,16 @@ msgstr "Necessario un URL come argomento"
msgid "Must specify at least one pair url/filename"
msgstr "È necessario specificare almeno una coppia URL/nome file"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr "Scaricamento non riuscito"
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "È necessario specificare almeno una coppia URL/nome file"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
#, fuzzy
msgid ""
"Usage: apt-helper [options] command\n"
@@ -853,12 +848,12 @@ msgstr "Disco non trovato"
msgid "File not found"
msgstr "File non trovato"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "Esecuzione di stat non riuscita"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "Impostazione della data di modifica non riuscita"
@@ -951,7 +946,7 @@ msgid "Could not connect data socket, connection timed out"
msgstr ""
"Impossibile connettersi al socket dati, tempo esaurito per la connessione"
-#: methods/ftp.cc:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Non riuscito"
@@ -1024,65 +1019,65 @@ msgstr "Interrogazione"
msgid "Unable to invoke "
msgstr "Impossibile invocare "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Connessione a %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Impossibile creare un socket per %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Impossibile iniziare la connessione a %s:%s (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Impossibile connettersi a %s:%s (%s), connessione terminata"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Impossibile connettersi a %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Connessione a %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "Impossibile risolvere \"%s\""
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Risoluzione di \"%s\" temporaneamente non riuscita"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, c-format
msgid "System error resolving '%s:%s'"
msgstr "Errore di sistema nella risoluzione di \"%s:%s\""
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr ""
"Si è verificato qualcosa di anormale nella risoluzione di \"%s:%s\" (%i - %s)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Impossibile connettersi a %s:%s:"
@@ -1105,7 +1100,7 @@ msgstr ""
"installato)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1209,229 +1204,6 @@ msgstr ""
msgid "Internal error"
msgstr "Errore interno"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr "Elencazione"
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] "C'è %i versione aggiuntiva: usare \"-a\" per visualizzarla"
-msgstr[1] "Ci sono %i versioni aggiuntive: usare \"-a\" per visualizzarle"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Correzione delle dipendenze..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " non riuscita."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Impossibile correggere le dipendenze"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "Impossibile minimizzare l'insieme da aggiornare"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Fatto"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "È utile eseguire \"apt-get -f install\" per correggere ciò."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dipendenze non trovate. Riprovare usando -f."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr "sconosciuto"
-
-#: apt-private/private-output.cc:272
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[installato, aggiornabile a: %s]"
-
-#: apt-private/private-output.cc:275
-msgid "[installed,local]"
-msgstr "[installato, locale]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr "[installato, auto-rimovibile]"
-
-#: apt-private/private-output.cc:279
-msgid "[installed,automatic]"
-msgstr "[installato, automatico]"
-
-#: apt-private/private-output.cc:281
-msgid "[installed]"
-msgstr "[installato]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr "[aggiornabile da: %s]"
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr "[configurazione residua]"
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "ma la versione %s è installata"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ma la versione %s sta per essere installata"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "ma non è installabile"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "ma è un pacchetto virtuale"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "ma non è installato"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "ma non sta per essere installato"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " oppure"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "I seguenti pacchetti NUOVI saranno installati:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "I seguenti pacchetti saranno RIMOSSI:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "I seguenti pacchetti saranno aggiornati:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "I seguenti pacchetti saranno RETROCESSI:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "I seguenti pacchetti bloccati saranno cambiati:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (a causa di %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"ATTENZIONE: i seguenti pacchetti essenziali stanno per essere rimossi.\n"
-"Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa "
-"si sta facendo."
-
-#: apt-private/private-output.cc:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu aggiornati, %lu installati, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstallati, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu retrocessi, "
-
-#: apt-private/private-output.cc:641
-#, 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:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu non completamente installati o rimossi.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[S/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-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:684
-msgid "Y"
-msgstr "S"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Errore di compilazione dell'espressione regolare - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Il comando update non accetta argomenti"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-"%i pacchetto può essere aggiornato: eseguire \"apt list --upgradable\" per "
-"vederlo.\n"
-msgstr[1] ""
-"%i pacchetti possono essere aggiornati: eseguire \"apt list --upgradable\" "
-"per vederli.\n"
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr "Tutti i pacchetti sono aggiornati."
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr "Ordinamento"
@@ -1512,18 +1284,6 @@ msgstr "Il pacchetto \"%s\" non è installato e quindi non è stato rimosso\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Nota, viene selezionato \"%s\" al posto di \"%s\"\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] "C'è %i record aggiuntivo: usare \"-a\" per visualizzarlo"
-msgstr[1] "Ci sono %i record aggiuntivi: usare \"-a\" per visualizzarli"
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr "non un vero pacchetto (virtuale)"
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
@@ -1535,7 +1295,7 @@ msgid "Packages need to be removed but remove is disabled."
msgstr ""
"I pacchetti devono essere rimossi, ma l'azione di rimozione è disabilitata."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1806,6 +1566,241 @@ msgstr "Versione \"%s\" (%s) selezionata per \"%s\"\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Versione \"%s\" (%s) selezionata per \"%s\" per via di \"%s\"\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "Elencazione"
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] "C'è %i versione aggiuntiva: usare \"-a\" per visualizzarla"
+msgstr[1] "Ci sono %i versioni aggiuntive: usare \"-a\" per visualizzarle"
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Correzione delle dipendenze..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " non riuscita."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Impossibile correggere le dipendenze"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Impossibile minimizzare l'insieme da aggiornare"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Fatto"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "È utile eseguire \"apt-get -f install\" per correggere ciò."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dipendenze non trovate. Riprovare usando -f."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "sconosciuto"
+
+#: apt-private/private-output.cc:272
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[installato, aggiornabile a: %s]"
+
+#: apt-private/private-output.cc:275
+msgid "[installed,local]"
+msgstr "[installato, locale]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr "[installato, auto-rimovibile]"
+
+#: apt-private/private-output.cc:279
+msgid "[installed,automatic]"
+msgstr "[installato, automatico]"
+
+#: apt-private/private-output.cc:281
+msgid "[installed]"
+msgstr "[installato]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[aggiornabile da: %s]"
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr "[configurazione residua]"
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "ma la versione %s è installata"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ma la versione %s sta per essere installata"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "ma non è installabile"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "ma è un pacchetto virtuale"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "ma non è installato"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "ma non sta per essere installato"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " oppure"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "I seguenti pacchetti NUOVI saranno installati:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "I seguenti pacchetti saranno RIMOSSI:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "I seguenti pacchetti saranno aggiornati:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "I seguenti pacchetti saranno RETROCESSI:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "I seguenti pacchetti bloccati saranno cambiati:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (a causa di %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"ATTENZIONE: i seguenti pacchetti essenziali stanno per essere rimossi.\n"
+"Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa "
+"si sta facendo."
+
+#: apt-private/private-output.cc:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu aggiornati, %lu installati, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstallati, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu retrocessi, "
+
+#: apt-private/private-output.cc:641
+#, 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:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu non completamente installati o rimossi.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[S/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+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:684
+msgid "Y"
+msgstr "S"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Errore di compilazione dell'espressione regolare - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Il comando update non accetta argomenti"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"%i pacchetto può essere aggiornato: eseguire \"apt list --upgradable\" per "
+"vederlo.\n"
+msgstr[1] ""
+"%i pacchetti possono essere aggiornati: eseguire \"apt list --upgradable\" "
+"per vederli.\n"
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr "Tutti i pacchetti sono aggiornati."
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] "C'è %i record aggiuntivo: usare \"-a\" per visualizzarlo"
+msgstr[1] "Ci sono %i record aggiuntivi: usare \"-a\" per visualizzarli"
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr "non un vero pacchetto (virtuale)"
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1818,47 +1813,40 @@ 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-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati."
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "Avviso di autenticazione disabilitato.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "Alcuni pacchetti non possono essere autenticati"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "Installare questi pacchetti senza verificarli?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Si sono verificati dei problemi ed è stata usata -y senza --force-yes"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Impossibile recuperare %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Impossibile determinare lo spazio libero in %s"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Spazio libero in %s insufficiente."
@@ -1928,16 +1916,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Impossibile leggere %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -2081,27 +2069,6 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr "Impossibile leggere l'elenco dei sorgenti."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Impossibile trovare un driver per il metodo %s."
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "Is the package %s installed?"
-msgstr "Il pacchetto %s è installato?"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Il metodo %s non si è avviato correttamente"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr "Inserire il disco chiamato \"%s\" nell'unità \"%s\" e premere Invio."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Cache dei pacchetti vuota"
@@ -2189,100 +2156,80 @@ msgstr "extra"
msgid "Calculating upgrade"
msgstr "Calcolo dell'aggiornamento"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Il file indice di tipo \"%s\" non è supportato"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "La cache ha un sistema di gestione delle versioni incompatibile"
+msgid "The method driver %s could not be found."
+msgstr "Impossibile trovare un driver per il metodo %s."
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Si è verificato un errore nell'elaborare %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"È stato superato il numero di nomi di pacchetti che questo APT può gestire."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "È stato superato il numero di versioni che questo APT può gestire."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "È stato superato il numero di descrizioni che questo APT può gestire."
+msgid "Is the package %s installed?"
+msgstr "Il pacchetto %s è installato?"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "È stato superato il numero di dipendenze che questo APT può gestire."
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Il metodo %s non si è avviato correttamente"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Lettura elenco dei pacchetti"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr "Inserire il disco chiamato \"%s\" nell'unità \"%s\" e premere Invio."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "Errore di I/O nel salvare la cache sorgente"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Generazione albero delle dipendenze"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr "Invia lo scenario al solver"
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Versioni candidate"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr "Invia la richiesta al solver"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generazione delle dipendenze"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr "Preparazione alla ricezione della soluzione"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Lettura informazioni sullo stato"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr "Il solver esterno è terminato senza un errore di messaggio"
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Apertura del file di stato %s non riuscita"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr "Esecuzione solver esterno"
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Scrittura del file temporaneo di stato %s non riuscita"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "rename() non riuscita: %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "Somma hash non corrispondente"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "Le dimensioni non corrispondono"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
msgid "Invalid file format"
msgstr "Formato file non valido"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Errore di scrittura"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, fuzzy, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2292,12 +2239,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:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr "Errore GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2306,7 +2253,7 @@ msgstr ""
"Impossibile trovare la voce \"%s\" nel file Release (voce in sources.list "
"errata o file danneggiato)"
-#: apt-pkg/acquire-item.cc:1026
+#: apt-pkg/acquire-item.cc:1122
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"
@@ -2314,7 +2261,7 @@ msgstr ""
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2323,37 +2270,37 @@ msgstr ""
"Il file Release per %s è scaduto (non valido dal %s). Gli aggiornamenti per "
"questo repository non verranno applicati."
-#: apt-pkg/acquire-item.cc:1107
+#: apt-pkg/acquire-item.cc:1203
#, 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:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "La directory %s è deviata"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2362,14 +2309,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:2677
+#: apt-pkg/acquire-item.cc:2751
#, 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:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2378,44 +2325,116 @@ msgstr ""
"per il pacchetto %s."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Changelog per %s (%s)"
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "La cache ha un sistema di gestione delle versioni incompatibile"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Si è verificato un errore nell'elaborare %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"È stato superato il numero di nomi di pacchetti che questo APT può gestire."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "È stato superato il numero di versioni che questo APT può gestire."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "È stato superato il numero di descrizioni che questo APT può gestire."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "È stato superato il numero di dipendenze che questo APT può gestire."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Lettura elenco dei pacchetti"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "Errore di I/O nel salvare la cache sorgente"
+
# (ndt) sarebbe da controllare meglio assieme a quella dopo
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr "Manca la directory di liste %spartial."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Manca la directory di archivio %spartial."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, c-format
msgid "Unable to lock directory %s"
msgstr "Impossibile bloccare la directory %s"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, c-format
msgid "Clean of %s is not supported"
msgstr "La pulizia di %s non è supportata"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Scaricamento file %li di %li (%s rimanente)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Scaricamento file %li di %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Impossibile recuperare %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Impossibile scaricare alcuni file di indice: saranno ignorati o verranno "
+"usati quelli vecchi."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
+"È necessario inserire alcuni URI di tipo \"source\" nel file sources.list"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Impossibile eseguire stat su %s."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2446,29 +2465,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "Priorità per il gancio non specificata (o zero)"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Impossibile recuperare %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Impossibile scaricare alcuni file di indice: saranno ignorati o verranno "
-"usati quelli vecchi."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
-"È necessario inserire alcuni URI di tipo \"source\" nel file sources.list"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Impossibile eseguire stat su %s."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2599,31 +2595,30 @@ msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Impossibile correggere i problemi, ci sono pacchetti danneggiati bloccati."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Generazione albero delle dipendenze"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr "Invia lo scenario al solver"
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Versioni candidate"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr "Invia la richiesta al solver"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generazione delle dipendenze"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr "Preparazione alla ricezione della soluzione"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Lettura informazioni sullo stato"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr "Il solver esterno è terminato senza un errore di messaggio"
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Apertura del file di stato %s non riuscita"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr "Esecuzione solver esterno"
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Scrittura del file temporaneo di stato %s non riuscita"
+msgid "Index file type '%s' is not supported"
+msgstr "Il file indice di tipo \"%s\" non è supportato"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2635,62 +2630,101 @@ msgstr "Impossibile analizzare il file di pacchetto %s (%d)"
msgid "Cannot convert %s to integer"
msgstr ""
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Override %s riga %llu malformato (%s)"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "Apertura di %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, 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:405
+#, 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 delle sorgenti %s"
+
+#: apt-pkg/sourcelist.cc:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "La riga %u nel file %s non è corretta (type)"
+
+#: apt-pkg/sourcelist.cc:441
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr ""
+"Tipo \"%s\" non riconosciuto nella stanza %u nel file delle sorgenti %s"
+
# (ndt) dovrebbe essere inteso il file Release
-#: apt-pkg/cacheset.cc:500
+#: apt-pkg/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release \"%s\" per \"%s\" non trovato."
# (ndt) dovrebbe essere inteso il Version
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Version \"%s\" per \"%s\" non trovato"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Impossibile trovare il task \"%s\""
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr ""
"Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\""
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Impossibile trovare alcun pacchetto tramite il glob \"%s\""
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Impossibile selezionare le versioni dal pacchetto \"%s\" poiché è virtuale"
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Impossibile selezionare la versione più recente dal pacchetto \"%s\" poiché "
"è virtuale"
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Impossibile selezionare la versione candidata dal pacchetto %s poiché non ha "
"alcun candidato"
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Impossibile selezionare la versione installata dal pacchetto %s poiché non è "
"installato"
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -2699,79 +2733,56 @@ msgstr ""
"Impossibile selezionare la versione installata o la candidata dal pacchetto "
"\"%s\" poiché non sono presenti"
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Override %s riga %llu malformato (%s)"
-
-#: apt-pkg/sourcelist.cc:355
-#, c-format
-msgid "Opening %s"
-msgstr "Apertura di %s"
-
-#: apt-pkg/sourcelist.cc:389
-#, 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:393
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, 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 delle sorgenti %s"
-
-#: apt-pkg/sourcelist.cc:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "La riga %u nel file %s non è corretta (type)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:429
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
msgstr ""
-"Tipo \"%s\" non riconosciuto nella stanza %u nel file delle sorgenti %s"
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Impossibile analizzare il file Release %s"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr "Nessuna sezione nel file Release %s"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Nessuna voce Hash nel file Release %s"
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Voce \"Date\" nel file Release %s non valida"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Voce \"Valid-Until\" nel file Release %s non valida"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2950,35 +2961,6 @@ msgstr ""
msgid "Not locked"
msgstr "Non bloccato"
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lig %lih %limin %lis"
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "Selezione %s non trovata"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -3061,7 +3043,7 @@ msgstr "Impossibile aprire il file %s"
msgid "Could not open file descriptor %d"
msgstr "Impossibile aprire il descrittore del file %d"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "Creazione di un sottoprocesso IPC non riuscita"
@@ -3098,12 +3080,12 @@ msgstr "Si è verificato un problema nell'eseguire l'unlink del file %s"
msgid "Problem syncing the file"
msgstr "Si è verificato un problema nel sincronizzare il file"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, c-format
msgid "Unable to mkstemp %s"
msgstr "Impossibile eseguire mkstemp %s"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Impossibile scrivere in %s"
@@ -3128,6 +3110,35 @@ msgstr "..."
msgid "%c%s... %u%%"
msgstr "%c%s... %u%%"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lig %lih %limin %lis"
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "Selezione %s non trovata"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Impossibile eseguire mmap su un file vuoto"
@@ -3492,87 +3503,87 @@ msgstr "Impossibile ottenere un cursore"
# (ndt) messo A per Avviso
# Inizio con la maiuscola dopo i : perché mi sa che in molti
# casi molte stringhe sono così
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Impossibile leggere la directory %s\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: Impossibile eseguire stat su %s\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "E: Gli errori si applicano al file "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "Risoluzione di %s non riuscita"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Visita dell'albero non riuscita"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "Apertura di %s non riuscita"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Delink %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "Esecuzione di readlink su %s non riuscita"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "Esecuzione di unlink su %s non riuscita"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Collegamento di %s a %s non riuscito"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Raggiunto il limite di DeLink di %sB.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "L'archivio non ha un campo \"package\""
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s non ha un campo override\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " il responsabile di %s è %s non %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s non ha un campo source override\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s non ha neppure un campo binario override\n"
@@ -3858,6 +3869,10 @@ msgstr "Checksum di tar non riuscito, archivio danneggiato"
msgid "Unknown TAR header type %u, member %s"
msgstr "Intestazione TAR di tipo %u sconosciuta, member %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "È necessario specificare almeno una coppia URL/nome file"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Creazione delle pipe non riuscita"
diff --git a/po/ja.po b/po/ja.po
index b651dbda3..c76bea125 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.9.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\n"
"PO-Revision-Date: 2014-12-12 22:33+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -114,7 +114,7 @@ msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
"このコマンドは時代遅れです。'apt-mark showauto' を代わりに使用してください。"
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "パッケージ %s が見つかりません"
@@ -355,17 +355,17 @@ msgstr "内部エラー、問題リゾルバが何かを破壊しました"
msgid "Unable to lock the download directory"
msgstr "ダウンロードディレクトリをロックできません"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr ""
"ソースを取得するには少なくとも 1 つのパッケージ名を指定する必要があります"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s のソースパッケージが見つかりません"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -375,7 +375,7 @@ msgstr ""
"ます:\n"
"%s\n"
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -387,69 +387,69 @@ msgstr ""
"bzr branch %s\n"
"を使用してください。\n"
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "すでにダウンロードされたファイル '%s' をスキップします\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB のソースアーカイブを取得する必要があります。\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "ソース %s を取得\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "いくつかのアーカイブの取得に失敗しました。"
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "展開コマンド '%s' が失敗しました。\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
"'dpkg-dev' パッケージがインストールされていることを確認してください。\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "ビルドコマンド '%s' が失敗しました。\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "子プロセスが失敗しました"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -458,27 +458,27 @@ msgstr ""
"%s に利用可能なアーキテクチャ情報がありません。セットアップのために apt."
"conf(5) の APT::Architectures を参照してください。"
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "ビルド依存関係の処理に失敗しました"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s のビルド依存情報を取得できません"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s にはビルド依存情報が指定されていません。\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -487,7 +487,7 @@ msgstr ""
"パッケージ %3$s が '%4$s' パッケージで許されていないため、%2$s に対する %1$s "
"の依存関係を満たすことができません"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -496,14 +496,14 @@ msgstr ""
"パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと"
"ができません"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%2$s の依存関係 %1$s を満たすことができません: インストールされた %3$s パッ"
"ケージは新しすぎます"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -512,7 +512,7 @@ msgstr ""
"パッケージ %3$s の候補バージョンはバージョンについての要求を満たせないた"
"め、%2$s に対する %1$s の依存関係を満たすことができません"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -521,25 +521,25 @@ msgstr ""
"パッケージ %3$s の候補バージョンが存在しないため、%2$s に対する %1$s の依存関"
"係を満たすことができません"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s のビルド依存関係を満たすことができませんでした。"
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "ビルド依存関係の処理に失敗しました"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "サポートされているモジュール:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -639,21 +639,16 @@ msgstr "引数として URL が 1 つ必要です"
msgid "Must specify at least one pair url/filename"
msgstr "少なくとも URL / ファイル名を 1 組指定する必要があります"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr "ダウンロード失敗"
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "少なくとも URL / ファイル名を 1 組指定する必要があります"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
#, fuzzy
msgid ""
"Usage: apt-helper [options] command\n"
@@ -850,12 +845,12 @@ msgstr "ディスクが見つかりません。"
msgid "File not found"
msgstr "ファイルが見つかりません"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "状態の取得に失敗しました"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "変更時刻の設定に失敗しました"
@@ -946,7 +941,7 @@ msgstr "ソケットを作成できません"
msgid "Could not connect data socket, connection timed out"
msgstr "データソケットへ接続できませんでした。接続がタイムアウトしました"
-#: methods/ftp.cc:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "失敗"
@@ -1019,64 +1014,64 @@ msgstr "問い合わせ"
msgid "Unable to invoke "
msgstr "呼び出せません"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "%s (%s) へ接続しています"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "%s (f=%u t=%u p=%u) に対するソケットを作成できません"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "%s:%s (%s) への接続を開始できません。"
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "%s:%s (%s) へ接続できませんでした。接続がタイムアウトしました"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "%s:%s (%s) へ接続できませんでした。"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "%s へ接続しています"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "'%s' を解決できませんでした"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "'%s' が一時的に解決できません"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, c-format
msgid "System error resolving '%s:%s'"
msgstr "'%s:%s' の解決中にシステムエラーが発生しました"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "'%s:%s' (%i - %s) の解決中に何か問題が起こりました"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "%s:%s へ接続できません:"
@@ -1097,7 +1092,7 @@ msgstr ""
"されていますか?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1199,227 +1194,6 @@ msgstr ""
msgid "Internal error"
msgstr "内部エラー"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr "一覧表示"
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-"追加バージョンが %i 件あります。表示するには '-a' スイッチを付けてください。"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "依存関係を解決しています ..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " 失敗しました。"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "依存関係を訂正できません"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "アップグレードセットを最小化できません"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " 完了"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"これらを直すためには 'apt-get -f install' を実行する必要があるかもしれませ"
-"ん。"
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "未解決の依存関係があります。-f オプションを試してください。"
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr "不明"
-
-#: apt-private/private-output.cc:272
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[インストール済み、%s にアップグレード可]"
-
-#: apt-private/private-output.cc:275
-msgid "[installed,local]"
-msgstr "[インストール済み、ローカル]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr "[インストール済み、自動削除可]"
-
-#: apt-private/private-output.cc:279
-msgid "[installed,automatic]"
-msgstr "[インストール済み、自動]"
-
-#: apt-private/private-output.cc:281
-msgid "[installed]"
-msgstr "[インストール済み]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr "[%s からアップグレード可]"
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr "[設定が残存]"
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "しかし、%s はインストールされています"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "しかし、%s はインストールされようとしています"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "しかし、インストールすることができません"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "しかし、これは仮想パッケージです"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "しかし、インストールされていません"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "しかし、インストールされようとしていません"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " または"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "以下のパッケージには満たせない依存関係があります:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "以下のパッケージが新たにインストールされます:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "以下のパッケージは「削除」されます:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "以下のパッケージは保留されます:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "以下のパッケージはアップグレードされます:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "以下のパッケージは「ダウングレード」されます:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "以下の変更禁止パッケージは変更されます:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (%s のため)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"警告: 以下の不可欠パッケージが削除されます。\n"
-"何をしようとしているか本当にわかっていない場合は、実行してはいけません!"
-
-#: apt-private/private-output.cc:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "アップグレード: %lu 個、新規インストール: %lu 個、"
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "再インストール: %lu 個、"
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "ダウングレード: %lu 個、"
-
-#: apt-private/private-output.cc:641
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "削除: %lu 個、保留: %lu 個。\n"
-
-#: apt-private/private-output.cc:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[Y/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-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:684
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "正規表現の展開エラー - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "update コマンドは引数をとりません"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-"アップグレードできるパッケージが %i 個あります。表示するには 'apt list --"
-"upgradable' を実行してください。\n"
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr "パッケージはすべて最新です。"
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr "ソート中"
@@ -1499,18 +1273,6 @@ msgstr "パッケージ '%s' はインストールされていないため、削
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "'%2$s' の代わりに '%1$s' をソースパッケージとして選出しています\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-"追加レコードが %i 件あります。表示するには '-a' スイッチを付けてください。"
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr "実際のパッケージではありません (仮想)"
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "内部エラー、InstallPackages が壊れたパッケージで呼び出されました!"
@@ -1519,7 +1281,7 @@ msgstr "内部エラー、InstallPackages が壊れたパッケージで呼び
msgid "Packages need to be removed but remove is disabled."
msgstr "パッケージを削除しなければなりませんが、削除が無効になっています。"
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1780,6 +1542,239 @@ msgstr "'%3$s' のバージョン '%1$s' (%2$s) を選択しました\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "'%4$s' のために '%3$s' のバージョン '%1$s' (%2$s) を選択しました\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "一覧表示"
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+"追加バージョンが %i 件あります。表示するには '-a' スイッチを付けてください。"
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "依存関係を解決しています ..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " 失敗しました。"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "依存関係を訂正できません"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "アップグレードセットを最小化できません"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " 完了"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"これらを直すためには 'apt-get -f install' を実行する必要があるかもしれませ"
+"ん。"
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "未解決の依存関係があります。-f オプションを試してください。"
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "不明"
+
+#: apt-private/private-output.cc:272
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[インストール済み、%s にアップグレード可]"
+
+#: apt-private/private-output.cc:275
+msgid "[installed,local]"
+msgstr "[インストール済み、ローカル]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr "[インストール済み、自動削除可]"
+
+#: apt-private/private-output.cc:279
+msgid "[installed,automatic]"
+msgstr "[インストール済み、自動]"
+
+#: apt-private/private-output.cc:281
+msgid "[installed]"
+msgstr "[インストール済み]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[%s からアップグレード可]"
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr "[設定が残存]"
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "しかし、%s はインストールされています"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "しかし、%s はインストールされようとしています"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "しかし、インストールすることができません"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "しかし、これは仮想パッケージです"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "しかし、インストールされていません"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "しかし、インストールされようとしていません"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " または"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "以下のパッケージには満たせない依存関係があります:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "以下のパッケージが新たにインストールされます:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "以下のパッケージは「削除」されます:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "以下のパッケージは保留されます:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "以下のパッケージはアップグレードされます:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "以下のパッケージは「ダウングレード」されます:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "以下の変更禁止パッケージは変更されます:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (%s のため)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"警告: 以下の不可欠パッケージが削除されます。\n"
+"何をしようとしているか本当にわかっていない場合は、実行してはいけません!"
+
+#: apt-private/private-output.cc:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "アップグレード: %lu 個、新規インストール: %lu 個、"
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "再インストール: %lu 個、"
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "ダウングレード: %lu 個、"
+
+#: apt-private/private-output.cc:641
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "削除: %lu 個、保留: %lu 個。\n"
+
+#: apt-private/private-output.cc:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+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:684
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "正規表現の展開エラー - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "update コマンドは引数をとりません"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"アップグレードできるパッケージが %i 個あります。表示するには 'apt list --"
+"upgradable' を実行してください。\n"
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr "パッケージはすべて最新です。"
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+"追加レコードが %i 件あります。表示するには '-a' スイッチを付けてください。"
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr "実際のパッケージではありません (仮想)"
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1792,47 +1787,40 @@ msgstr ""
" ロックが非アクティブであることから、今この時点の状態に妥当性が\n"
" あるとは言い切れないことに注意してください!"
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "警告: 以下のパッケージは認証されていません!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "認証の警告は上書きされました。\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "いくつかのパッケージを認証できませんでした"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "検証なしにこれらのパッケージをインストールしますか?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "問題が発生し、-y オプションが --force-yes なしで使用されました"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s の取得に失敗しました %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s の空き領域を測定できません"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "%s に充分な空きスペースがありません。"
@@ -1902,16 +1890,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "%s を読み込むことができません"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -2051,29 +2039,6 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr "ソースのリストを読むことができません。"
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "メソッドドライバ %s が見つかりません。"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "Is the package %s installed?"
-msgstr "パッケージ %s はインストールされていますか?"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "メソッド %s が正常に開始しませんでした"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr ""
-"'%s' とラベルの付いたディスクをドライブ '%s' に入れて Enter キーを押してくだ"
-"さい。"
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "空のパッケージキャッシュ"
@@ -2160,99 +2125,82 @@ msgstr "特別"
msgid "Calculating upgrade"
msgstr "アップグレードパッケージを検出しています"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "インデックスファイルのタイプ '%s' はサポートされていません"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "キャッシュに非互換なバージョニングシステムがあります"
+msgid "The method driver %s could not be found."
+msgstr "メソッドドライバ %s が見つかりません。"
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s を処理中にエラーが発生しました (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "この APT が対応している以上の数のパッケージが指定されました。"
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "この APT が対応している以上の数のバージョンが要求されました。"
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "この APT が対応している以上の数の説明が要求されました。"
+msgid "Is the package %s installed?"
+msgstr "パッケージ %s はインストールされていますか?"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "この APT が対応している以上の数の依存関係が発生しました。"
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "メソッド %s が正常に開始しませんでした"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "パッケージリストを読み込んでいます"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr ""
+"'%s' とラベルの付いたディスクをドライブ '%s' に入れて Enter キーを押してくだ"
+"さい。"
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "ソースキャッシュの保存中に IO エラーが発生しました"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "依存関係ツリーを作成しています"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr "ソルバにシナリオを送信"
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "候補バージョン"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr "ソルバにリクエストを送信"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "依存関係の生成"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr "解決を受け取る準備"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "状態情報を読み取っています"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr "外部ソルバが適切なエラーメッセージなしに失敗しました"
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "状態ファイル %s のオープンに失敗しました"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr "外部ソルバを実行"
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "一時状態ファイル %s の書き込みに失敗しました"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "名前の変更に失敗しました。%s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "ハッシュサムが適合しません"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "サイズが適合しません"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
msgid "Invalid file format"
msgstr "不正なファイル形式"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "書き込みエラー"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, fuzzy, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2262,12 +2210,12 @@ msgstr ""
"ファイルが使われます。GPG エラー: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG エラー: %s: %s"
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2276,14 +2224,14 @@ msgstr ""
"期待されるエントリ '%s' が Release ファイル内に見つかりません (誤った "
"sources.list エントリか、壊れたファイル)"
-#: apt-pkg/acquire-item.cc:1026
+#: apt-pkg/acquire-item.cc:1122
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2292,39 +2240,39 @@ msgstr ""
"%s の Release ファイルは期限切れ (%s 以来無効) です。このリポジトリからの更新"
"物は適用されません。"
-#: apt-pkg/acquire-item.cc:1107
+#: apt-pkg/acquire-item.cc:1203
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
"ディストリビューションが競合しています: %s (%s を期待していたのに %s を取得し"
"ました)"
-#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "ディレクトリ %s は divert されています"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2333,12 +2281,12 @@ msgstr ""
"パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
"で修正する必要があります (存在しないアーキテクチャのため)。"
-#: apt-pkg/acquire-item.cc:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "'%2$s' のバージョン '%1$s' をダウンロードするソースが見つかりません"
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2347,43 +2295,113 @@ msgstr ""
"フィールドがありません。"
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "%s (%s) の変更履歴"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "キャッシュに非互換なバージョニングシステムがあります"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "%s を処理中にエラーが発生しました (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "この APT が対応している以上の数のパッケージが指定されました。"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "この APT が対応している以上の数のバージョンが要求されました。"
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "この APT が対応している以上の数の説明が要求されました。"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "この APT が対応している以上の数の依存関係が発生しました。"
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "パッケージリストを読み込んでいます"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "ソースキャッシュの保存中に IO エラーが発生しました"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr "リストディレクトリ %spartial が見つかりません。"
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "アーカイブディレクトリ %spartial が見つかりません。"
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, c-format
msgid "Unable to lock directory %s"
msgstr "ディレクトリ %s をロックできません"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, c-format
msgid "Clean of %s is not supported"
msgstr "%s の消去はサポートされていません"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "ファイルを取得しています %li/%li (残り %s)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "ファイルを取得しています %li/%li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "%s の取得に失敗しました %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"いくつかのインデックスファイルのダウンロードに失敗しました。これらは無視され"
+"るか、古いものが代わりに使われます。"
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "sources.list に 'ソース' URI を指定する必要があります"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "%s の状態を取得できません。"
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2414,28 +2432,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "pin で優先度 (または 0) が指定されていません"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "%s の取得に失敗しました %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"いくつかのインデックスファイルのダウンロードに失敗しました。これらは無視され"
-"るか、古いものが代わりに使われます。"
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "sources.list に 'ソース' URI を指定する必要があります"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s の状態を取得できません。"
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2563,31 +2559,30 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。"
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "依存関係ツリーを作成しています"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr "ソルバにシナリオを送信"
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "候補バージョン"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr "ソルバにリクエストを送信"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "依存関係の生成"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr "解決を受け取る準備"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "状態情報を読み取っています"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr "外部ソルバが適切なエラーメッセージなしに失敗しました"
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "状態ファイル %s のオープンに失敗しました"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr "外部ソルバを実行"
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "一時状態ファイル %s の書き込みに失敗しました"
+msgid "Index file type '%s' is not supported"
+msgstr "インデックスファイルのタイプ '%s' はサポートされていません"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2599,55 +2594,93 @@ msgstr "パッケージファイル %s を解釈することができません (
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "不正な override %s %llu 行目 (%s)"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "%s をオープンしています"
+
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)"
+
+#: apt-pkg/sourcelist.cc:405
+#, 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:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)"
+
+#: apt-pkg/sourcelist.cc:441
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "ソースリスト %3$s の %2$u 個目の節 '%1$s' は不明です"
+
+#: apt-pkg/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "'%2$s' のリリース '%1$s' が見つかりませんでした"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, c-format
msgid "Couldn't find task '%s'"
msgstr "タスク '%s' が見つかりません"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "正規表現 '%s' ではパッケージは見つかりませんでした"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "'%s' に一致するパッケージは見つかりませんでした"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "純粋な仮想パッケージのため、パッケージ '%s' のバージョンを選べません"
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"純粋な仮想パッケージのため、パッケージ '%s' の最新バージョンを選べません"
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr "候補が存在しないので、パッケージ %s の候補バージョンを選べません"
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"インストールされていないので、パッケージ %s のインストール済みバージョンを選"
"べません。"
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -2656,78 +2689,56 @@ msgstr ""
"パッケージ '%s' のインストール済みまたは候補のバージョンはいずれも存在しない"
"ので選べません"
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "不正な override %s %llu 行目 (%s)"
-
-#: apt-pkg/sourcelist.cc:355
-#, c-format
-msgid "Opening %s"
-msgstr "%s をオープンしています"
-
-#: apt-pkg/sourcelist.cc:389
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)"
-
-#: apt-pkg/sourcelist.cc:393
-#, 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:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:429
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "ソースリスト %3$s の %2$u 個目の節 '%1$s' は不明です"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Release ファイル %s を解釈することができません"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr "Release ファイル %s にセクションがありません"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Release ファイル %s に Hash エントリがありません"
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Release ファイル %s に無効な 'Date' エントリがあります"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Release ファイル %s に無効な 'Valid-Until' エントリがあります"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2903,35 +2914,6 @@ msgstr ""
msgid "Not locked"
msgstr "ロックされていません"
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%li日 %li時間 %li分 %li秒"
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li時間 %li分 %li秒"
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr "%li分 %li秒"
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr "%li秒"
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "選択された %s が見つかりません"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -3011,7 +2993,7 @@ msgstr "ファイル %s をオープンできませんでした"
msgid "Could not open file descriptor %d"
msgstr "ファイルデスクリプタ %d を開けませんでした"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "子プロセス IPC の生成に失敗しました"
@@ -3048,12 +3030,12 @@ msgstr "ファイル %s の削除中に問題が発生しました"
msgid "Problem syncing the file"
msgstr "ファイルの同期中に問題が発生しました"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, c-format
msgid "Unable to mkstemp %s"
msgstr "mkstemp %s を実行できません"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "%s に書き込めません"
@@ -3078,6 +3060,35 @@ msgstr "..."
msgid "%c%s... %u%%"
msgstr "%c%s... %u%%"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%li日 %li時間 %li分 %li秒"
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%li時間 %li分 %li秒"
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr "%li分 %li秒"
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr "%li秒"
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "選択された %s が見つかりません"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "空のファイルを mmap できません"
@@ -3431,87 +3442,87 @@ msgstr "アーカイブにコントロールレコードがありません"
msgid "Unable to get a cursor"
msgstr "カーソルを取得できません"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "警告: ディレクトリ %s が読めません\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "警告: %s の状態を取得できません\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "エラー: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "警告: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "エラー: エラーが適用されるファイルは "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "%s の解決に失敗しました"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "ツリー内での移動に失敗しました"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "%s のオープンに失敗しました"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " リンク %s [%s] を外します\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "%s のリンク読み取りに失敗しました"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "%s のリンク解除に失敗しました"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** %s を %s にリンクするのに失敗しました"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " リンクを外す制限の %sB に到達しました。\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "アーカイブにパッケージフィールドがありませんでした"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s に override エントリがありません\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %1$s メンテナは %3$s ではなく %2$s です\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s にソース override エントリがありません\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s にバイナリ override エントリがありません\n"
@@ -3797,6 +3808,10 @@ msgstr "tar チェックサム検証が失敗しました。アーカイブが
msgid "Unknown TAR header type %u, member %s"
msgstr "未知の TAR ヘッダタイプ %u、メンバー %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "少なくとも URL / ファイル名を 1 組指定する必要があります"
+
#~ msgid "Failed to create pipes"
#~ msgstr "パイプの生成に失敗しました"
diff --git a/po/km.po b/po/km.po
index 327e7b380..d62cfe381 100644
--- a/po/km.po
+++ b/po/km.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\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"
@@ -120,7 +120,7 @@ msgstr "អ្នក​ត្រូវ​តែ​ផ្ដល់​លំនា
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "មិន​អាច​កំណត់​ទីតាំង​កញ្ចប់ %s បានឡើយ"
@@ -356,23 +356,23 @@ msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស
msgid "Unable to lock the download directory"
msgstr "មិន​អាច​ចាក់​សោ​ថត​ទាញ​យក​បាន​ឡើយ"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "មិន​អាច​រក​កញ្ចប់ប្រភព​​សម្រាប់ %s បានឡើយ"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -380,113 +380,113 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "ត្រូវការ​យក​ %sB/%sB នៃ​ប័ណ្ណសារ​ប្រភព ។\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "ត្រូវការ​យក​ %sB នៃ​ប័ណ្ណសារ​ប្រភព​ ។\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "ទៅប្រមូល​ប្រភព​ %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "បរាជ័យ​ក្នុងការទៅប្រមូលយក​ប័ណ្ណសារ​មួយចំនួន ។"
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​តែ​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជ័យ​ ។\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជ័យ​ ។\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "ដំណើរ​ការ​កូន​បាន​បរាជ័យ​"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr "ត្រូវតែ​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិត្យ builddeps សម្រាប់"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើត​ភាព​អាស្រ័យ"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "មិន​អាច​សាងសង់​​ព័ត៌មាន​ភាពអស្រ័យ​សម្រាប់ %s"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s មិនមានភាពអាស្រ័យ​ស្ថាបនាឡើយ​ ។\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ "
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ "
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺថ្មីពេក"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -495,32 +495,32 @@ msgstr ""
"ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាច​តម្រូវចិត្តបានទេ ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​តម្រូវចិត្ត​"
"តម្រូវការ​កំណែបានឡើយ"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ "
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "ភាពអាស្រ័យ​ដែល​បង្កើត​ %s មិន​អាច​បំពេញ​សេចក្ដី​ត្រូវការ​បាន​ទេ ។"
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើត​ភាព​អាស្រ័យ"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ "
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -614,21 +614,16 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -769,12 +764,12 @@ msgstr "រក​ថាសមិ​ន​ឃើញ​ ។"
msgid "File not found"
msgstr "រកឯកសារ​មិន​ឃើញ​"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "បរាជ័យ​ក្នុងការថ្លែង"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "បរាជ័យក្នុងការកំណត់​ពេលវេលា​ការកែប្រែ​"
@@ -864,7 +859,7 @@ msgstr "មិន​អាច​បង្កើត​រន្ធបានឡើ
msgid "Could not connect data socket, connection timed out"
msgstr "មិន​អាច​តភ្ជាប់​​រន្ធទិន្នន័យ​បានឡើយ អស់​ពេល​ក្នុងការតភ្ជាប់​"
-#: methods/ftp.cc:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "បាន​បរាជ័យ"
@@ -937,64 +932,64 @@ msgstr "សំណួរ​"
msgid "Unable to invoke "
msgstr "មិន​អាច​ហៅ​ "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "កំពុង​តភ្ជាប់​ទៅ​កាន់​ %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP ៖ %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "មិន​អាច​បង្កើត​រន្ធ​សម្រាប់ %s (f=%u t=%u p=%u) បានឡើយ"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "មិនអាច​ចាប់ផ្ដើម​ការតភ្ជាប់​​ទៅ​កាន់​ %s:%s (%s) បានឡើយ ។"
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "មិន​អាច​តភ្ជាប់​ទៅ​កាន់​ %s:%s (%s) បានឡើយ ការ​តភ្ជាប់​បានអស់​ពេល​"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​ %s:%s (%s) បានឡើយ ។"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "កំពុង​តភ្ជាប់​ទៅកាន់ %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "មិន​អាច​ដោះស្រាយ​ '%s' បានឡើយ"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "ការ​ដោះស្រាយ​ភាព​បរាជ័យ​​បណ្តោះអាសន្ន '%s'"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, fuzzy, c-format
msgid "System error resolving '%s:%s'"
msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក់ដែល​បាន​កើត​ឡើង​ '%s:%s' (%i)"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក់ដែល​បាន​កើត​ឡើង​ '%s:%s' (%i)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​​ %s %s ៖"
@@ -1014,7 +1009,7 @@ msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr "មិន​អាច​ប្រតិបត្តិ '%s' ដើម្បី​ផ្ទៀងផ្ទាត់​ហត្ថលេខា (តើ gnupg ត្រូវ​បាន​ដំឡើង​ឬនៅ ?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1114,227 +1109,6 @@ msgstr ""
msgid "Internal error"
msgstr "កំហុស​ខាង​ក្នុង​"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "កំពុង​កែ​ភាពអាស្រ័យ​..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " បាន​បរាជ័យ ។"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "មិន​អាច​កែ​ភាព​អាស្រ័យ​បានឡើយ​"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "មិនអាច​បង្រួម​ការ​កំណត់​ភាព​ប្រសើរ​​បាន​ឡើយ​"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " ធ្វើ​រួច"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "អ្នក​ប្រហែល​ជា​ចង់រត់ 'apt-get -f install' ដើម្បី​កែ​វា​​ទាំងនេះ​ហើយ ។"
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "ភាព​អាស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ការ​ប្រើ -f ។"
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [បានដំឡើង​]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [បានដំឡើង​]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [បានដំឡើង​]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr " [បានដំឡើង​]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "ប៉ុន្តែ​ %s ត្រូវ​បាន​ដំឡើង​"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "ប៉ុន្តែ​​វា​មិន​អាច​ដំឡើង​បាន​ទេ​"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "ប៉ុន្តែ​​វា​ជា​កញ្ចប់​និម្មិត​"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "ប៉ុន្តែ​វា​មិន​បាន​ដំឡើង​ទេ​"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "ប៉ុន្តែ វា​នឹង​មិន​ត្រូវ​បាន​ដំឡើង​ទេ"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " ឬ"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "កញ្ចប់​ខាងក្រោម​មាន​ភាពអាស្រ័យ​ដែល​ខុស​គ្នា ៖"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "កញ្ចប់​ខាងក្រោម​នឹងត្រូវ​បាន​យកចេញ ៖"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "​កញ្ចប់​ខាង​ក្រោម​ត្រូវ​បាន​យក​ត្រឡប់​មក​វិញ ៖"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​​ធ្វើ​ឲ្យប្រសើ​ឡើង ៖"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​បន្ទាប ៖"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "កញ្ចប់​រង់ចាំ​ខាងក្រោម​នឹង​ត្រូវ​​បានផ្លាស់​​ប្តូរ​ ៖"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (ដោយ​សារតែ​ %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"ព្រមាន​ ៖ កញ្ចប់ដែល​ចាំបាច់​ខាងក្រោម​នឹង​ត្រូវ​បាន​យកចេញ ។\n"
-"ការយកចេញ​នេះ​មិន​ត្រូវ​បានធ្វើ​ទេ​លុះត្រា​តែ​អ្នកដឹង​ថា​​អ្នក​កំពុង​ធ្វើ​អ្វីឲ្យប្រាកដ !"
-
-#: apt-private/private-output.cc:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu ត្រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ %lu ត្រូវ​បានដំឡើង​ថ្មី "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu ត្រូវ​បាន​ដំឡើង​ឡើង​វិញ "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu ​ត្រូវបានបន្ទាប់ "
-
-#: apt-private/private-output.cc:641
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu ដែលត្រូវ​យក​ចេញ​ ហើយ​ %lu មិន​​បាន​ធ្វើ​ឲ្យ​ប្រសើរឡើយ ។\n"
-
-#: apt-private/private-output.cc:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញបានគ្រប់ជ្រុងជ្រោយ​ឡើយ​ ។\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:684
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Regex កំហុស​ការចងក្រង​ - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម័យ​គ្មាន​អាគុយម៉ង់​ទេ"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1414,18 +1188,6 @@ msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "កំហុស​ខាងក្នុង កញ្ចប់​ដំឡើង​ត្រូវ​បាន​ហៅ​​ជាមួយ​កញ្ចប់​ដែល​ខូច !"
@@ -1434,7 +1196,7 @@ msgstr "កំហុស​ខាងក្នុង កញ្ចប់​ដំ
msgid "Packages need to be removed but remove is disabled."
msgstr "កញ្ចប់ ​ត្រូវការឲ្យ​យក​ចេញ​​ ប៉ុន្តែមិនអនុញ្ញាត​ឲ្យយកចេញឡើយ ។"
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1686,6 +1448,239 @@ msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "កំពុង​កែ​ភាពអាស្រ័យ​..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " បាន​បរាជ័យ ។"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "មិន​អាច​កែ​ភាព​អាស្រ័យ​បានឡើយ​"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "មិនអាច​បង្រួម​ការ​កំណត់​ភាព​ប្រសើរ​​បាន​ឡើយ​"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " ធ្វើ​រួច"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "អ្នក​ប្រហែល​ជា​ចង់រត់ 'apt-get -f install' ដើម្បី​កែ​វា​​ទាំងនេះ​ហើយ ។"
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "ភាព​អាស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ការ​ប្រើ -f ។"
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [បានដំឡើង​]"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [បានដំឡើង​]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [បានដំឡើង​]"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr " [បានដំឡើង​]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "ប៉ុន្តែ​ %s ត្រូវ​បាន​ដំឡើង​"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "ប៉ុន្តែ​​វា​មិន​អាច​ដំឡើង​បាន​ទេ​"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "ប៉ុន្តែ​​វា​ជា​កញ្ចប់​និម្មិត​"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "ប៉ុន្តែ​វា​មិន​បាន​ដំឡើង​ទេ​"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "ប៉ុន្តែ វា​នឹង​មិន​ត្រូវ​បាន​ដំឡើង​ទេ"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " ឬ"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "កញ្ចប់​ខាងក្រោម​មាន​ភាពអាស្រ័យ​ដែល​ខុស​គ្នា ៖"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "កញ្ចប់​ខាងក្រោម​នឹងត្រូវ​បាន​យកចេញ ៖"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "​កញ្ចប់​ខាង​ក្រោម​ត្រូវ​បាន​យក​ត្រឡប់​មក​វិញ ៖"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​​ធ្វើ​ឲ្យប្រសើ​ឡើង ៖"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​បន្ទាប ៖"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "កញ្ចប់​រង់ចាំ​ខាងក្រោម​នឹង​ត្រូវ​​បានផ្លាស់​​ប្តូរ​ ៖"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (ដោយ​សារតែ​ %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"ព្រមាន​ ៖ កញ្ចប់ដែល​ចាំបាច់​ខាងក្រោម​នឹង​ត្រូវ​បាន​យកចេញ ។\n"
+"ការយកចេញ​នេះ​មិន​ត្រូវ​បានធ្វើ​ទេ​លុះត្រា​តែ​អ្នកដឹង​ថា​​អ្នក​កំពុង​ធ្វើ​អ្វីឲ្យប្រាកដ !"
+
+#: apt-private/private-output.cc:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu ត្រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ %lu ត្រូវ​បានដំឡើង​ថ្មី "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu ត្រូវ​បាន​ដំឡើង​ឡើង​វិញ "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu ​ត្រូវបានបន្ទាប់ "
+
+#: apt-private/private-output.cc:641
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu ដែលត្រូវ​យក​ចេញ​ ហើយ​ %lu មិន​​បាន​ធ្វើ​ឲ្យ​ប្រសើរឡើយ ។\n"
+
+#: apt-private/private-output.cc:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញបានគ្រប់ជ្រុងជ្រោយ​ឡើយ​ ។\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:684
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Regex កំហុស​ការចងក្រង​ - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម័យ​គ្មាន​អាគុយម៉ង់​ទេ"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1694,48 +1689,41 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ព្រមាន​ ៖ មិនអាច​ធ្វើការផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់ខាងក្រោមបានឡើយ !"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "បានបដិសេធ​ការព្រមាន​ការផ្ទៀងផ្ទាត់ភាព​ត្រឹមត្រូវ ។\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "មិនអាច​ផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់​មួយចំនួន​បានឡើយ​"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
#, fuzzy
msgid "Install these packages without verification?"
msgstr "ដំឡើង​កញ្ចប់​ទាំងនេះ ​ដោយគ្មានការពិនិត្យ​បញ្ជាក់ [y/N] ? "
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "មាន​បញ្ហា​ ហើយ -y ត្រូវ​បាន​ប្រើ​ដោយគ្មាន​​ --force​-yes"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "មិន​អាច​កំណត់​ទំហំ​ទំនេរ​ក្នុង​ %s បានឡើយ"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "អ្នក​គ្មាន​ទំហំ​​ទំនេរ​គ្រប់គ្រាន់​ក្នុង​​ %s ឡើយ ។"
@@ -1804,16 +1792,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "មិន​អាច​អាន​ %s បានឡើយ"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -1949,27 +1937,6 @@ msgstr "អ្នកប្រហែលជា​ចង់ភាពទាន់ស
msgid "The list of sources could not be read."
msgstr "មិន​អាច​អាន​បញ្ជី​ប្រភព​បាន​ឡើយ​ ។"
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "មិនអាច​រកឃើញ​កម្មវិធី​បញ្ជា​វិធីសាស្ត្រ %s ឡើយ ។"
-
-#: apt-pkg/acquire-worker.cc:113
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចាប់​ផ្តើម​ត្រឹមត្រូវ​ទេ​"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្កត់​ចូល ។"
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "ឃ្លាំង​កញ្ចប់​ទទេ​"
@@ -2057,102 +2024,83 @@ msgstr "បន្ថែម"
msgid "Calculating upgrade"
msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "ប្រភេទ​ឯកសារ​លិបិក្រម​ '%s' មិនត្រូវ​បាន​គាំទ្រ​"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "ឃ្លាំងសម្ងាត់​មិន​ត្រូវ​គ្នា​នឹង ប្រព័ន្ធ ធ្វើកំណែ"
+msgid "The method driver %s could not be found."
+msgstr "មិនអាច​រកឃើញ​កម្មវិធី​បញ្ជា​វិធីសាស្ត្រ %s ឡើយ ។"
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​ %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "អស្ចារ្យ អ្នក​មាន​ឈ្មោះ​កញ្ចប់​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​​  ។"
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។"
-
-#: apt-pkg/pkgcachegen.cc:263
-#, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។"
+msgid "Is the package %s installed?"
+msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "អស្ចារ្យ​, អ្នក​មាន​ភាពអាស្រ័យ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។"
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចាប់​ផ្តើម​ត្រឹមត្រូវ​ទេ​"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "កំពុង​អាន​បញ្ជី​កញ្ចប់"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្កត់​ចូល ។"
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងាត់​ប្រភព​"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "កំពុងស្ថាបនា​មែកធាងភាពអាស្រ័យ"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "កំណែ​សាកល្បង​"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "ការបង្កើត​ភាពអាស្រ័យ​"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:252
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:257
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "ប្តូរ​ឈ្មោះ​បានបរាជ័យ​, %s (%s -> %s) ។"
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "MD5Sum មិន​ផ្គួផ្គង​"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
#, fuzzy
msgid "Invalid file format"
msgstr "ប្រតិបត្តិការ​មិន​ត្រឹមត្រូវ​ %s"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "ការសរសេរ​មានកំហុស"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2160,63 +2108,63 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, 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:1026
+#: apt-pkg/acquire-item.cc:1122
msgid "There is no public key available for the following key IDs:\n"
msgstr "គ្មាន​កូនសោ​សាធារណៈ​អាច​រក​បាន​ក្នុងកូនសោ IDs ខាងក្រោម​នេះទេ ៖\n"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "ថត​ %s ត្រូវបាន​បង្វែរ"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2225,55 +2173,126 @@ msgstr ""
"ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។ "
"(ដោយសារ​​បាត់​ស្ថាបត្យកម្ម)"
-#: apt-pkg/acquire-item.cc:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​ត្រូវ​បាន​ខូច ។ គ្មាន​ឈ្មោះ​ឯកសារ ៖ វាល​សម្រាប់​កញ្ចប់នេះ​ទេ​ %s ។"
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "កំពុង​តភ្ជាប់​ទៅ​កាន់​ %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "ឃ្លាំងសម្ងាត់​មិន​ត្រូវ​គ្នា​នឹង ប្រព័ន្ធ ធ្វើកំណែ"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​ %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "អស្ចារ្យ អ្នក​មាន​ឈ្មោះ​កញ្ចប់​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​​  ។"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។"
+
+#: apt-pkg/pkgcachegen.cc:263
+#, fuzzy
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "អស្ចារ្យ​, អ្នក​មាន​ភាពអាស្រ័យ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។"
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "កំពុង​អាន​បញ្ជី​កញ្ចប់"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងាត់​ប្រភព​"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។"
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "ថត​ប័ណ្ណសារ​ %spartial គឺ​បាត់បង់​ ។"
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, fuzzy, c-format
msgid "Unable to lock directory %s"
msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, fuzzy, c-format
msgid "Clean of %s is not supported"
msgstr "ប្រភេទ​ឯកសារ​លិបិក្រម​ '%s' មិនត្រូវ​បាន​គាំទ្រ​"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "កំពុង​ទៅ​យក​ឯកសារ %li នៃ %li (នៅសល់ %s)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "កំពុង​ទៅយក​ឯកសារ %li នៃ %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"ឯកសារ​លិបិក្រម​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​​ទាញ​យក ​ពួកវាត្រូវបាន​មិន​អើពើ​ ឬ ប្រើ​​ឯកសារ​ចាស់​ជំនួសវិញ ​​។"
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "អ្នកត្រូវតែដាក់ 'ប្រភព' URIs មួយចំនួន​នៅក្នុង sources.list របស់អ្នក"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "មិនអាច​ថ្លែង %s បានឡើយ ។"
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2300,28 +2319,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "គ្មាន​អទិភាព (ឬ សូន្យ​) បានបញ្ជាក់​សម្រាប់​ម្ជុល​ទេ"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"ឯកសារ​លិបិក្រម​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​​ទាញ​យក ​ពួកវាត្រូវបាន​មិន​អើពើ​ ឬ ប្រើ​​ឯកសារ​ចាស់​ជំនួសវិញ ​​។"
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "អ្នកត្រូវតែដាក់ 'ប្រភព' URIs មួយចំនួន​នៅក្នុង sources.list របស់អ្នក"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "មិនអាច​ថ្លែង %s បានឡើយ ។"
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2442,32 +2439,30 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "មិន​អាច​កែ​បញ្ហាបានទេេ អ្កបានទុក​កញ្ចប់​ដែល​ខូច ។។"
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "កំពុងស្ថាបនា​មែកធាងភាពអាស្រ័យ"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "កំណែ​សាកល្បង​"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "ការបង្កើត​ភាពអាស្រ័យ​"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr ""
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr ""
-#: apt-pkg/depcache.cc:252
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr ""
-#: apt-pkg/depcache.cc:257
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "ប្រភេទ​ឯកសារ​លិបិក្រម​ '%s' មិនត្រូវ​បាន​គាំទ្រ​"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2479,130 +2474,146 @@ msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (%
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Malformed បដិសេធ %s បន្ទាត់ %lu #1"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "កំពុង​បើក​ %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "បន្ទាត់​ Malformed %u ក្នុង​បញ្ជី​ប្រភព​ %s (ប្រភេទ​)"
+
+#: apt-pkg/sourcelist.cc:405
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ"
+
+#: apt-pkg/sourcelist.cc:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "បន្ទាត់​ Malformed %u ក្នុង​បញ្ជី​ប្រភព​ %s (ប្រភេទ​)"
+
+#: apt-pkg/sourcelist.cc:441
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ"
+
+#: apt-pkg/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "រក​មិន​ឃើញ​ការ​ចេញ​ផ្សាយ​ '%s' សម្រាប់​ '%s' ឡើយ"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "រក​មិន​ឃើញ​កំណែ​ '%s' សម្រាប់ '%s'"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Malformed បដិសេធ %s បន្ទាត់ %lu #1"
-
-#: apt-pkg/sourcelist.cc:355
-#, c-format
-msgid "Opening %s"
-msgstr "កំពុង​បើក​ %s"
-
-#: apt-pkg/sourcelist.cc:389
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "បន្ទាត់​ Malformed %u ក្នុង​បញ្ជី​ប្រភព​ %s (ប្រភេទ​)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:393
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ"
-
-#: apt-pkg/sourcelist.cc:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "បន្ទាត់​ Malformed %u ក្នុង​បញ្ជី​ប្រភព​ %s (ប្រភេទ​)"
-
-#: apt-pkg/sourcelist.cc:429
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "បន្ទាត់​ដែលមិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារ​បង្វែរ ៖ %s"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2763,35 +2774,6 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2868,7 +2850,7 @@ msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡ
msgid "Could not open file descriptor %d"
msgstr "មិន​អាច​បើក​បំពុង​សម្រាប់​ %s បានឡើយ"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​ដំណើរការ​រង​ IPC"
@@ -2905,12 +2887,12 @@ msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់
msgid "Problem syncing the file"
msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "មិន​អាច​ថ្លែង %s បានឡើយ"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "មិន​អាច​សរសេរ​ទៅ %s"
@@ -2935,6 +2917,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... ធ្វើរួច​"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "មិនអាច mmap ឯកសារទទេ​បានឡើយ"
@@ -3287,87 +3298,87 @@ msgstr "ប័ណ្ណសារ​គ្មាន​កំណត់​ត្រ
msgid "Unable to get a cursor"
msgstr "មិន​អាច​យក​ទស្សន៍ទ្រនិច​"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: មិន​អាច​អាន​ថត %s បាន​ឡើយ\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W ៖ មិន​អាច​ថ្លែង %s\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "E: កំហុស​អនុវត្ត​លើ​ឯកសារ​"
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "បរាជ័យ​ក្នុង​ការ​ដោះស្រាយ %s"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "មែក​ធាង បាន​បរាជ័យ"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អាន​តំណ​ %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ផ្ដាច់ %s"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** បាន​បរាជ័យ​ក្នុង​ការ​ត​ %s ទៅ %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink កំណត់​នៃ​ការ​វាយ %sB ។\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "ប័ណ្ណសារ​គ្មាន​វាល​កញ្ចប់​"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s គ្មាន​ធាតុធាតុបញ្ចូល​​បដិសេធឡើយ\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " អ្នក​ថែទាំ %s គឺ %s មិនមែន​ %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s គ្មាន​ធាតុ​បដិសេធ​ប្រភព\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s គ្មាន​ធាតុប​ដិសេធគោល​ពីរ​ដែរ\n"
@@ -3653,6 +3664,10 @@ msgstr "Tar ឆេកសាំ​បាន​បរាជ័យ ប័ណ្ណ
msgid "Unknown TAR header type %u, member %s"
msgstr "មិន​ស្គាល់​ប្រភេទ​បឋមកថា​ TAR %u ដែលជា​សមាជិក​ %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់"
+
#~ msgid "Failed to create pipes"
#~ msgstr "បាន​បរាជ័យក្នុង​ការ​បង្កើត​បំពង់​"
diff --git a/po/ko.po b/po/ko.po
index cc9e7e04b..c7e0a2c61 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\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"
@@ -110,7 +110,7 @@ msgstr "최소 한 개의 검색어를 지정해야 합니다"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "%s 패키지를 찾을 수 없습니다"
@@ -346,16 +346,16 @@ msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸
msgid "Unable to lock the download directory"
msgstr "다운로드 디렉터리를 잠글 수 없습니다"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s의 소스 패키지를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -364,7 +364,7 @@ msgstr ""
"알림: '%s' 패키징은 다음 '%s' 버전 컨트롤 시스템에서 관리합니다:\n"
"%s\n"
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -375,94 +375,94 @@ msgstr ""
"다음과 같이 하십시오:\n"
"bzr get %s\n"
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "%s 소스를 가져옵니다\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "일부 아카이브를 가져오는데 실패했습니다."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "압축 풀기 명령 '%s' 실패.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "빌드 명령 '%s' 실패.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "하위 프로세스가 실패했습니다"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr "해당되는 빌드 의존성을 검사할 패키지를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "빌드 의존성을 처리하는데 실패했습니다"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 패키지에 빌드 의존성이 없습니다.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -471,7 +471,7 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니"
"다"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -480,14 +480,14 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니"
"다"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시키는데 실패했습니다: 설치한 %3$s 패키지가 너"
"무 최근 버전입니다"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -496,7 +496,7 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지의 사용 가능한 버"
"전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -505,25 +505,25 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니"
"다"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s에 대한 %1$s 의존성을 만족시키는데 실패했습니다: %3$s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s의 빌드 의존성을 만족시키지 못했습니다."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "빌드 의존성을 처리하는데 실패했습니다"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "지원하는 모듈:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -620,21 +620,16 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -775,12 +770,12 @@ msgstr "디스크가 없습니다."
msgid "File not found"
msgstr "파일이 없습니다"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "파일 정보를 읽는데 실패했습니다"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "파일 변경 시각을 설정하는데 실패했습니다"
@@ -871,7 +866,7 @@ msgstr "소켓을 만들 수 없습니다"
msgid "Could not connect data socket, connection timed out"
msgstr "데이터 소켓을 연결할 수 없습니다. 연결 시간이 초과되었습니다"
-#: methods/ftp.cc:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "실패"
@@ -944,64 +939,64 @@ msgstr "질의"
msgid "Unable to invoke "
msgstr "다음을 실행할 수 없습니다: "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "%s(%s)에 연결하는 중입니다"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "%s에 대한 소켓을 만들 수 없습니다 (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "%s:%s에 연결을 초기화할 수 없습니다 (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "%s:%s에 연결할 수 없습니다 (%s). 연결 제한 시간이 초과했습니다"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "%s:%s에 연결할 수 없습니다 (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "%s에 연결하는 중입니다"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "'%s'의 주소를 알아낼 수 없습니다"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "'%s'의 주소를 알아내는데 임시로 실패했습니다"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, fuzzy, c-format
msgid "System error resolving '%s:%s'"
msgstr "'%s:%s'의 주소를 알아내는데 무언가 이상한 일이 발생했습니다 (%i - %s)"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "'%s:%s'의 주소를 알아내는데 무언가 이상한 일이 발생했습니다 (%i - %s)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "%s:%s에 연결할 수 없습니다:"
@@ -1022,7 +1017,7 @@ msgstr ""
"까?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1122,226 +1117,6 @@ msgstr ""
msgid "Internal error"
msgstr "내부 오류"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "의존성을 바로잡는 중입니다..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " 실패."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "의존성을 바로잡을 수 없습니다"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "업그레이드 집합을 최소화할 수 없습니다"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " 완료"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"이 상황을 바로잡으려면 'apt-get -f install'을 실행해야 할 수도 있습니다."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "의존성이 맞지 않습니다. -f 옵션을 사용해 보십시오."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [설치함]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [설치함]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [설치함]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr " [설치함]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "하지만 %s 패키지를 설치했습니다"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "하지만 %s 패키지를 설치할 것입니다"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "하지만 설치할 수 없습니다"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "하지만 가상 패키지입니다"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "하지만 설치하지 않았습니다"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "하지만 %s 패키지를 설치하지 않을 것입니다"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " 혹은"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "다음 패키지의 의존성이 맞지 않습니다:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "다음 새 패키지를 설치할 것입니다:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "다음 패키지를 지울 것입니다:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "다음 패키지를 과거 버전으로 유지합니다:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "다음 패키지를 업그레이드할 것입니다:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "다음 패키지를 다운그레이드할 것입니다:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "고정되었던 다음 패키지를 바꿀 것입니다:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (%s때문에)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"경고: 꼭 필요한 다음 패키지를 지우게 됩니다.\n"
-"무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!"
-
-#: apt-private/private-output.cc:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu개 업그레이드, %lu개 새로 설치, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu개 다시 설치, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu개 업그레이드, "
-
-#: apt-private/private-output.cc:641
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu개 제거 및 %lu개 업그레이드 안 함.\n"
-
-#: apt-private/private-output.cc:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[Y/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-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:684
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "정규식 컴파일 오류 - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "update 명령은 인수를 받지 않습니다"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1420,17 +1195,6 @@ msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "주의, '%2$s' 대신에 '%1$s' 패키지를 선택합니다\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "내부 오류. 망가진 패키지에서 InstallPackages를 호출했습니다!"
@@ -1439,7 +1203,7 @@ msgstr "내부 오류. 망가진 패키지에서 InstallPackages를 호출했습
msgid "Packages need to be removed but remove is disabled."
msgstr "패키지를 제거해야 하지만 제거가 금지되어 있습니다."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1696,6 +1460,237 @@ msgstr "'%3$s' 패키지의 '%1$s' (%2$s) 버전을 선택합니다\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "'%3$s' 패키지의 '%1$s' (%2$s) 버전을 선택합니다\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "의존성을 바로잡는 중입니다..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " 실패."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "의존성을 바로잡을 수 없습니다"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "업그레이드 집합을 최소화할 수 없습니다"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " 완료"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"이 상황을 바로잡으려면 'apt-get -f install'을 실행해야 할 수도 있습니다."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "의존성이 맞지 않습니다. -f 옵션을 사용해 보십시오."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [설치함]"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [설치함]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [설치함]"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr " [설치함]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "하지만 %s 패키지를 설치했습니다"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "하지만 %s 패키지를 설치할 것입니다"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "하지만 설치할 수 없습니다"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "하지만 가상 패키지입니다"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "하지만 설치하지 않았습니다"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "하지만 %s 패키지를 설치하지 않을 것입니다"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " 혹은"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "다음 패키지의 의존성이 맞지 않습니다:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "다음 새 패키지를 설치할 것입니다:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "다음 패키지를 지울 것입니다:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "다음 패키지를 과거 버전으로 유지합니다:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "다음 패키지를 업그레이드할 것입니다:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "다음 패키지를 다운그레이드할 것입니다:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "고정되었던 다음 패키지를 바꿀 것입니다:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (%s때문에)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"경고: 꼭 필요한 다음 패키지를 지우게 됩니다.\n"
+"무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!"
+
+#: apt-private/private-output.cc:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu개 업그레이드, %lu개 새로 설치, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu개 다시 설치, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu개 업그레이드, "
+
+#: apt-private/private-output.cc:641
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu개 제거 및 %lu개 업그레이드 안 함.\n"
+
+#: apt-private/private-output.cc:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+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:684
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "정규식 컴파일 오류 - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "update 명령은 인수를 받지 않습니다"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1708,47 +1703,40 @@ msgstr ""
" 또 잠금 기능을 사용하지 않는 상태이므로, 현재 상황에 의존하지\n"
" 않도록 하십시오!"
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "경고: 다음 패키지를 인증할 수 없습니다!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "인증 경고를 무시합니다.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "인증할 수 없는 패키지가 있습니다"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "확인하지 않고 패키지를 설치하시겠습니까?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되었습니다"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s 파일을 받는데 실패했습니다 %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "%s 안에 충분한 여유 공간이 없습니다."
@@ -1817,16 +1805,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "%s을(를) 읽을 수 없습니다"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -1961,28 +1949,6 @@ msgstr "apt-get update를 실행하면 이 문제를 바로잡을 수도 있습
msgid "The list of sources could not be read."
msgstr "소스 목록을 읽을 수 없습니다."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "설치 방법 드라이버 %s을(를) 찾을 수 없습니다."
-
-#: apt-pkg/acquire-worker.cc:113
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr ""
-"'%2$s' 드라이브에 '%1$s'(으)로 표기된 디스크를 넣고 Enter를 누르십시오."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "패키지 캐시가 비어 있습니다"
@@ -2070,100 +2036,82 @@ msgstr "별도"
msgid "Calculating upgrade"
msgstr "업그레이드를 계산하는 중입니다"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "인덱스 파일 타입 '%s' 타입은 지원하지 않습니다"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "캐시의 버전 시스템이 호환되지 않습니다"
+msgid "The method driver %s could not be found."
+msgstr "설치 방법 드라이버 %s을(를) 찾을 수 없습니다."
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s 처리 중에 오류가 발생했습니다 (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "우와, 이 APT가 처리할 수 있는 패키지 이름 개수를 넘어갔습니다."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "우와, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "우와, 이 APT가 처리할 수 있는 설명 개수를 넘어갔습니다."
+msgid "Is the package %s installed?"
+msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "우와, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다."
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "패키지 목록을 읽는 중입니다"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr ""
+"'%2$s' 드라이브에 '%1$s'(으)로 표기된 디스크를 넣고 Enter를 누르십시오."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "소스 캐시를 저장하는데 입출력 오류가 발생했습니다"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "의존성 트리를 만드는 중입니다"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "후보 버전"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "의존성 만들기"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "상태 정보를 읽는 중입니다"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "상태파일 %s 여는데 실패했습니다"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "임시 상태파일 %s 쓰는데 실패했습니다"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "해시 합이 맞지 않습니다"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "크기가 맞지 않습니다"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
#, fuzzy
msgid "Invalid file format"
msgstr "잘못된 작업 %s"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "쓰기 오류"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, fuzzy, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2173,63 +2121,63 @@ msgstr ""
"예전의 인덱스 파일을 사용합니다. GPG 오류: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG 오류: %s: %s"
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, 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:1026
+#: apt-pkg/acquire-item.cc:1122
msgid "There is no public key available for the following key IDs:\n"
msgstr "다음 키 ID의 공개키가 없습니다:\n"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "배포판 충돌: %s (예상값 %s, 실제값 %s)"
-#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "%s 디렉터리가 전환되었습니다"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2238,12 +2186,12 @@ msgstr ""
"%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습"
"니다. (아키텍쳐가 빠졌기 때문입니다)"
-#: apt-pkg/acquire-item.cc:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2251,43 +2199,114 @@ msgstr ""
"패키지 인덱스 파일이 손상되었습니다. %s 패키지에 Filename: 필드가 없습니다."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "%s(%s)에 연결하는 중입니다"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "캐시의 버전 시스템이 호환되지 않습니다"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "%s 처리 중에 오류가 발생했습니다 (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "우와, 이 APT가 처리할 수 있는 패키지 이름 개수를 넘어갔습니다."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "우와, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "우와, 이 APT가 처리할 수 있는 설명 개수를 넘어갔습니다."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "우와, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "패키지 목록을 읽는 중입니다"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "소스 캐시를 저장하는데 입출력 오류가 발생했습니다"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr "목록 디렉터리 %spartial이 빠졌습니다."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "아카이브 디렉터리 %spartial이 빠졌습니다."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, c-format
msgid "Unable to lock directory %s"
msgstr "%s 디렉터리를 잠글 수 없습니다"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, fuzzy, c-format
msgid "Clean of %s is not supported"
msgstr "인덱스 파일 타입 '%s' 타입은 지원하지 않습니다"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "파일 받아오는 중: %2$li 중 %1$li (%3$s 남았음)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "파일 받아오는 중: %2$li 중 %1$li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "%s 파일을 받는데 실패했습니다 %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"일부 인덱스 파일을 다운로드하는데 실패했습니다. 해당 파일을 무시하거나 과거"
+"의 버전을 대신 사용합니다."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "sources.list에 '소스' URI를 써 넣어야 합니다"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "%s의 정보를 읽을 수 없습니다."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2314,29 +2333,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "핀에 우선순위(혹은 0)를 지정하지 않았습니다"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "%s 파일을 받는데 실패했습니다 %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"일부 인덱스 파일을 다운로드하는데 실패했습니다. 해당 파일을 무시하거나 과거"
-"의 버전을 대신 사용합니다."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "sources.list에 '소스' URI를 써 넣어야 합니다"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s의 정보를 읽을 수 없습니다."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2461,31 +2457,30 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "문제를 바로잡을 수 없습니다. 망가진 고정 패키지가 있습니다."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "의존성 트리를 만드는 중입니다"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "후보 버전"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "의존성 만들기"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr ""
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "상태 정보를 읽는 중입니다"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr ""
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "상태파일 %s 여는데 실패했습니다"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr ""
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "임시 상태파일 %s 쓰는데 실패했습니다"
+msgid "Index file type '%s' is not supported"
+msgstr "인덱스 파일 타입 '%s' 타입은 지원하지 않습니다"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2497,52 +2492,90 @@ msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (%d)"
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "override %s의 %lu번 줄 #1이 잘못되었습니다"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "%s 파일을 여는 중입니다"
+
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)"
+
+#: apt-pkg/sourcelist.cc:405
+#, 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:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)"
+
+#: apt-pkg/sourcelist.cc:441
+#, 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/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "%2$s 패키지의 '%1$s' 릴리즈를 찾을 수 없습니다"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "%2$s 패키지의 '%1$s' 버전을 찾을 수 없습니다"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, c-format
msgid "Couldn't find task '%s'"
msgstr "'%s' 작업을 찾을 수 없습니다"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "'%s' 정규식에 해당하는 패키지가 없습니다"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "'%s' 정규식에 해당하는 패키지가 없습니다"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "'%s' 패키지는 가상 패키지이므로 버전을 선택할 수 없습니다"
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr "'%s' 패키지에서 최신 버전을 선택할 수 없습니다. 가상 패키지입니다."
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr "'%s' 패키지에서 후보 버전을 선택할 수 없습니다. 후보가 없습니다."
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr "'%s' 패키지에서 설치한 버전을 선택할 수 없습니다. 설치하지 않았습니다."
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -2551,78 +2584,56 @@ msgstr ""
"'%s' 패키지에서 설치한 버전이나 후보 버전을 선택할 수 없습니다. 둘 다 아닙니"
"다."
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "override %s의 %lu번 줄 #1이 잘못되었습니다"
-
-#: apt-pkg/sourcelist.cc:355
-#, c-format
-msgid "Opening %s"
-msgstr "%s 파일을 여는 중입니다"
-
-#: apt-pkg/sourcelist.cc:389
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:393
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, 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:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)"
-
-#: apt-pkg/sourcelist.cc:429
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Release 파일 %s 파일을 파싱할 수 없습니다"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr "Release 파일 %s에 섹션이 없습니다"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Release 파일 %s에 Hash 항목이 없습니다"
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Release 파일 %s에 'Date' 항목이 잘못되었습니다"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Release 파일 %s에 'Valid-Until' 항목이 잘못되었습니다"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2792,35 +2803,6 @@ msgstr ""
msgid "Not locked"
msgstr "잠기지 않음"
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%li일 %li시간 %li분 %li초"
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li시간 %li분 %li초"
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr "%li분 %li초"
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr "%li초"
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "선택한 %s이(가) 없습니다"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2897,7 +2879,7 @@ msgstr "%s 파일을 열 수 없습니다"
msgid "Could not open file descriptor %d"
msgstr "%d 파일 디스크립터를 열 수 없습니다"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "하위 프로세스 IPC를 만드는데 실패했습니다"
@@ -2934,12 +2916,12 @@ msgstr "%s 파일을 삭제하는데 문제가 있습니다"
msgid "Problem syncing the file"
msgstr "파일을 동기화하는데 문제가 있습니다"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "%s의 정보를 읽을 수 없습니다"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "%s에 쓸 수 없습니다"
@@ -2964,6 +2946,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... 완료"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%li일 %li시간 %li분 %li초"
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%li시간 %li분 %li초"
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr "%li분 %li초"
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr "%li초"
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "선택한 %s이(가) 없습니다"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "빈 파일에 메모리 매핑할 수 없습니다"
@@ -3316,88 +3327,88 @@ msgstr "아카이브에 컨트롤 기록이 없습니다"
msgid "Unable to get a cursor"
msgstr "커서를 가져올 수 없습니다"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "경고: %s 디렉터리를 읽을 수 없습니다\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "경고: %s의 정보를 읽을 수 없습니다\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "오류: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "경고: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "오류: 다음 파일에 적용하는데 오류가 발생했습니다: "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "%s의 경로를 알아내는데 실패했습니다"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "트리에서 이동이 실패했습니다"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "%s 파일을 여는데 실패했습니다"
# FIXME: ??
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " 링크 %s [%s] 없애기\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "%s 파일에 readlink하는데 실패했습니다"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "%s 파일을 지우는데 실패했습니다"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** %s 파일을 %s에 링크하는데 실패했습니다"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "아카이브에 패키지 필드가 없습니다"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s에는 override 항목이 없습니다\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 관리자가 %s입니다 (%s 아님)\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s에는 source override 항목이 없습니다\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s에는 binary override 항목이 없습니다\n"
@@ -3684,6 +3695,10 @@ msgstr "tar 체크섬 실패, 아카이브가 손상되었습니다"
msgid "Unknown TAR header type %u, member %s"
msgstr "알 수 없는 TAR 헤더 타입 %u, 멤버 %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다"
+
#~ msgid "Failed to create pipes"
#~ msgstr "파이프 만들기가 실패했습니다"
diff --git a/po/ku.po b/po/ku.po
index 17f98b5de..41e7be827 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\n"
"PO-Revision-Date: 2008-05-08 12:48+0200\n"
"Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
"Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n"
@@ -117,7 +117,7 @@ msgstr "Pêwist e tu mînakekê bidî"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Pakêt nehate dîtin %s"
@@ -317,23 +317,23 @@ msgstr ""
msgid "Unable to lock the download directory"
msgstr "Pelrêça daxistinê nayê quflekirin"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -341,145 +341,145 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Çavkanîna %s bîne\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Anîna çend arşîvan biserneket."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr ""
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr ""
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
"package %s can't satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr ""
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -533,21 +533,16 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr ""
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "Pêwist e tu mînakekê bidî"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -686,13 +681,13 @@ msgstr "Dîsk nehate dîtin."
msgid "File not found"
msgstr "Pel nehate dîtin"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
#, fuzzy
msgid "Failed to stat"
msgstr "%s venebû"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr ""
@@ -781,7 +776,7 @@ msgstr ""
msgid "Could not connect data socket, connection timed out"
msgstr ""
-#: methods/ftp.cc:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Serneket"
@@ -855,64 +850,64 @@ msgstr "Lêpirsîn"
msgid "Unable to invoke "
msgstr "%s venebû"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Girêdan bi %s (%s) re pêk tê"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr ""
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr ""
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr ""
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr ""
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Bi %s re tê girêdan"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nikarî '%s' çareser bike"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr ""
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, c-format
msgid "System error resolving '%s:%s'"
msgstr ""
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr ""
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Nikare bi %s re girêdan pêk bîne %s:"
@@ -931,7 +926,7 @@ msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1033,226 +1028,6 @@ msgstr ""
msgid "Internal error"
msgstr "Çewtiya hundirîn"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Bindestî tên serrastkirin..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " neserketî."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Nikare bindestiyan rast kirin"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Temam"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr ""
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Sazkirî]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Sazkirî]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Sazkirî]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr " [Sazkirî]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "lê %s sazkirî ye"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "lê %s dê were sazkirin"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "lê sazkirina wê ne gengaz e"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "lê paketeke farazî ye"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "lê ne sazkirî ye"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "lê dê neyê sazkirin"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " û"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "Ev pakêtên NÛ dê werine sazkirin:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Ev pakêt dê werine RAKIRIN:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr ""
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "Ev paket dê werine bilindkirin:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr ""
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr ""
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (ji ber %s)"
-
-#: apt-private/private-output.cc:602
-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:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu hatine bilindkirin, %lu nû hatine sazkirin."
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu ji nû ve sazkirî,"
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu hatine nizmkirin."
-
-#: apt-private/private-output.cc:641
-#, 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:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-#, fuzzy
-msgid "[Y/n]"
-msgstr "[E/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:684
-msgid "Y"
-msgstr "E"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr ""
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr ""
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1330,18 +1105,6 @@ msgstr ""
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr ""
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
@@ -1350,7 +1113,7 @@ msgstr ""
msgid "Packages need to be removed but remove is disabled."
msgstr ""
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1588,6 +1351,238 @@ msgstr ""
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr ""
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Bindestî tên serrastkirin..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " neserketî."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Nikare bindestiyan rast kirin"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Temam"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr ""
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Sazkirî]"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Sazkirî]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Sazkirî]"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr " [Sazkirî]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "lê %s sazkirî ye"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "lê %s dê were sazkirin"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "lê sazkirina wê ne gengaz e"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "lê paketeke farazî ye"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "lê ne sazkirî ye"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "lê dê neyê sazkirin"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " û"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Ev pakêtên NÛ dê werine sazkirin:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Ev pakêt dê werine RAKIRIN:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr ""
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "Ev paket dê werine bilindkirin:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr ""
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr ""
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (ji ber %s)"
+
+#: apt-private/private-output.cc:602
+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:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu hatine bilindkirin, %lu nû hatine sazkirin."
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu ji nû ve sazkirî,"
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu hatine nizmkirin."
+
+#: apt-private/private-output.cc:641
+#, 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:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+#, fuzzy
+msgid "[Y/n]"
+msgstr "[E/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:684
+msgid "Y"
+msgstr "E"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr ""
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr ""
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1596,46 +1591,39 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr ""
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr ""
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr ""
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr ""
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr ""
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Anîna %s %s biserneket\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nikarî cihê vala li %s tesbît bike"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Cihê vala li %s têre nake."
@@ -1701,16 +1689,16 @@ msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Nikare %s bixwîne"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -1844,27 +1832,6 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr ""
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "Is the package %s installed?"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne"
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr ""
@@ -1951,99 +1918,80 @@ msgstr "ekstra"
msgid "Calculating upgrade"
msgstr "Bilindkirin tê hesibandin"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr ""
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Dema şixulandina naveroka %s çewtî"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgid "The method driver %s could not be found."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#: apt-pkg/acquire-worker.cc:113
+#, c-format
+msgid "Is the package %s installed?"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Lîsteya pakêtan tê xwendin"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne"
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
msgstr ""
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Guhartoyên berendam"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
msgstr ""
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
msgstr ""
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Vekirina StateFile %s biserneket"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:257
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s ji hev nehate veçirandin"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "nav guherandin biserneket, %s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "Hash Sum li hev nayên"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "Mezinahî li hev nayên"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
msgid "Invalid file format"
msgstr ""
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Çewtiya nivîsînê"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2051,118 +1999,186 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, 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:1026
+#: apt-pkg/acquire-item.cc:1122
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "Rêça %s zêde dirêj e"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, 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:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Girêdan bi %s (%s) re pêk tê"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr ""
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Dema şixulandina naveroka %s çewtî"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Lîsteya pakêtan tê xwendin"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr ""
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Peldanka '%s' kêm e"
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "Peldanka '%s' kêm e"
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, fuzzy, c-format
msgid "Unable to lock directory %s"
msgstr "W: pelrêça %s nayê xwendin\n"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, c-format
msgid "Clean of %s is not supported"
msgstr ""
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Pel tê anîn %li ji %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Anîna %s %s biserneket\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
+
+#: apt-pkg/clean.cc:64
+#, fuzzy, c-format
+msgid "Unable to stat %s."
+msgstr "Nivîsandin ji bo %s ne pêkane"
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2189,26 +2205,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr ""
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Anîna %s %s biserneket\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
-
-#: apt-pkg/clean.cc:64
-#, fuzzy, c-format
-msgid "Unable to stat %s."
-msgstr "Nivîsandin ji bo %s ne pêkane"
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2323,31 +2319,30 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Guhartoyên berendam"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Vekirina StateFile %s biserneket"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr ""
-#: apt-pkg/depcache.cc:257
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s ji hev nehate veçirandin"
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr ""
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, fuzzy, c-format
@@ -2359,130 +2354,146 @@ msgstr "Pakêt nehate dîtin %s"
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "%s tê vekirin"
+
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:405
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:425 apt-pkg/sourcelist.cc:431
+#, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:441
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr ""
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr ""
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Peywira %s nehate dîtin"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Nikarî pakêta %s bibîne"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Nikarî pakêta %s bibîne"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:355
-#, c-format
-msgid "Opening %s"
-msgstr "%s tê vekirin"
-
-#: apt-pkg/sourcelist.cc:389
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:393
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:413 apt-pkg/sourcelist.cc:419
-#, c-format
-msgid "Malformed stanza %u in source list %s (type)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:429
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Pakêt nehate dîtin %s"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Pakêt nehate dîtin %s"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr ""
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2643,35 +2654,6 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "Hilbijartina %s nehatiye dîtin"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2748,7 +2730,7 @@ msgstr "Nikarî pelê %s veke"
msgid "Could not open file descriptor %d"
msgstr "Nikarî pelê %s veke"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr ""
@@ -2785,12 +2767,12 @@ msgstr "Di girtina pelî de pirsgirêkek derket"
msgid "Problem syncing the file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Nivîsandin ji bo %s ne pêkane"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Nivîsandin ji bo %s ne pêkane"
@@ -2815,6 +2797,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Çêbû"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "Hilbijartina %s nehatiye dîtin"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr ""
@@ -3115,87 +3126,87 @@ msgstr "Tomara kontrola arşîvê tuneye"
msgid "Unable to get a cursor"
msgstr ""
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: pelrêça %s nayê xwendin\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr ""
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr ""
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "%s ji hev nehate veçirandin"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr ""
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "%s venebû"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr ""
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr ""
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr ""
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr ""
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "Di arşîvê de qada pakêtê tuneye"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -3476,6 +3487,10 @@ msgid "Unknown TAR header type %u, member %s"
msgstr ""
#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "Pêwist e tu mînakekê bidî"
+
+#, fuzzy
#~ msgid "Failed to create pipes"
#~ msgstr "%s ji hev nehate veçirandin"
diff --git a/po/lt.po b/po/lt.po
index d09bb3906..afacc8d58 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\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"
@@ -118,7 +118,7 @@ msgstr ""
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Nepavyko rasti paketo %s"
@@ -317,23 +317,23 @@ msgstr "Vidinė klaida, problemos sprendimas kažką sugadino"
msgid "Unable to lock the download directory"
msgstr "Nepavyko užrakinti parsiuntimų aplanko"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "Būtina nurodyti bent vieną paketą, kad parsiųsti jo išeities tekstą"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nepavyko surasti išeities teksto paketo, skirto %s"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -341,94 +341,94 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Praleidžiama jau parsiųsta byla „%s“\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Reikia parsiųsti %sB/%sB išeities archyvų.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Reikia parsiųsti %sB išeities archyvų.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Parsiunčiamas archyvas %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Nepavyko gauti kai kurių arhcyvų."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Pavyko parsiųsti tik parsiuntimo režime"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Jau išpakuotas archyvas %s praleidžiama\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Nepavyko įvykdyti išpakavimo komandos „%s“\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Nepavyko įvykdyti paketo kompiliavimo komandos „%s“\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Klaida procese-palikuonyje"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr "Būtina nurodyti bent vieną paketą, kuriam norite įvykdyti builddeps"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nepavyko gauti kūrimo-priklausomybių informacijos paketui %s"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -436,7 +436,7 @@ msgid ""
msgstr ""
"%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -444,14 +444,14 @@ msgid ""
msgstr ""
"%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Nepavyko patenkinti %s priklausomybės %s paketui: Įdiegtas paketas %s yra "
"per naujas"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -460,7 +460,7 @@ msgstr ""
"%s priklausomybė %s paketui negali būti patenkinama, nes nėra tinkamos "
"versijos %s paketo"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -468,25 +468,25 @@ msgid ""
msgstr ""
"%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Nepavyko patenkinti %s priklausomybės %s: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Palaikomi moduliai:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -541,21 +541,16 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Būtina nurodyti bent vieną paketą, kad parsiųsti jo išeities tekstą"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "Būtina nurodyti bent vieną paketą, kad parsiųsti jo išeities tekstą"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -694,12 +689,12 @@ msgstr "Diskas nerastas."
msgid "File not found"
msgstr "Failas nerastas"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr ""
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr ""
@@ -788,7 +783,7 @@ msgstr ""
msgid "Could not connect data socket, connection timed out"
msgstr ""
-#: methods/ftp.cc:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Nepavyko"
@@ -861,64 +856,64 @@ msgstr "Užklausti"
msgid "Unable to invoke "
msgstr ""
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Jungiamasi prie %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr ""
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr ""
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Nepavyko prisijungti prie %s:%s (%s), prisijungimas per ilgai užtruko"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Nepavyko prisijungti prie %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Jungiamasi prie %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nepavyko surasti vardo „%s“"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Laikinas sutrikimas ieškant vardo „%s“"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, fuzzy, c-format
msgid "System error resolving '%s:%s'"
msgstr "Laikinas sutrikimas ieškant vardo „%s“"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr ""
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Nepavyko prisijungti prie %s %s:"
@@ -937,7 +932,7 @@ msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1037,228 +1032,6 @@ msgstr ""
msgid "Internal error"
msgstr "Vidinė klaida"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Taisomos priklausomybės..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " nepavyko."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Nepavyko patenkinti priklausomybių"
-
-#: apt-private/private-cachefile.cc:105
-#, fuzzy
-msgid "Unable to minimize the upgrade set"
-msgstr "Nepavyko minimizuoti atnaujinimo rinkinio"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Įvykdyta"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Įvykdykite „apt-get -f install“, jei norite ištaisyti šias klaidas."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nepatenkintos priklausomybės. Bandykit naudoti -f."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Įdiegtas]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Įdiegtas]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Įdiegtas]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr " [Įdiegtas]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "bet %s yra įdiegtas"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "bet %s bus įdiegtas"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "tačiau jis negali būti įdiegtas"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "bet tai yra virtualus paketas"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "bet jis nėra įdiegtas"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "bet jis nebus įdiegtas"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " arba"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "Šie paketai turi neįdiegtų priklausomybių:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "Bus įdiegti šie NAUJI paketai:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Bus PAŠALINTI šie paketai:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "Šių paketų atnaujinimas sulaikomas:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "Bus atnaujinti šie paketai:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Bus PAKEISTI SENESNIAIS šie paketai:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "Bus pakeisti šie sulaikyti paketai:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (dėl %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu atnaujinti, %lu naujai įdiegti, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu įdiegti iš naujo, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu pasendinti, "
-
-#: apt-private/private-output.cc:641
-#, 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:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu nepilnai įdiegti ar pašalinti.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[T/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-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:684
-msgid "Y"
-msgstr "T"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr ""
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Atnaujinimo komandai argumentų nereikia"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1338,18 +1111,6 @@ msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Pastaba: pažymimas %s vietoje %s\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
@@ -1358,7 +1119,7 @@ msgstr ""
msgid "Packages need to be removed but remove is disabled."
msgstr "Reikia pašalinti paketus, tačiau šalinimas išjungtas."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1612,6 +1373,240 @@ msgstr "Pažymėta versija %s (%s) paketui %s\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Pažymėta versija %s (%s) paketui %s\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Taisomos priklausomybės..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " nepavyko."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Nepavyko patenkinti priklausomybių"
+
+#: apt-private/private-cachefile.cc:105
+#, fuzzy
+msgid "Unable to minimize the upgrade set"
+msgstr "Nepavyko minimizuoti atnaujinimo rinkinio"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Įvykdyta"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Įvykdykite „apt-get -f install“, jei norite ištaisyti šias klaidas."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Nepatenkintos priklausomybės. Bandykit naudoti -f."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Įdiegtas]"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Įdiegtas]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Įdiegtas]"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr " [Įdiegtas]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "bet %s yra įdiegtas"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "bet %s bus įdiegtas"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "tačiau jis negali būti įdiegtas"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "bet tai yra virtualus paketas"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "bet jis nėra įdiegtas"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "bet jis nebus įdiegtas"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " arba"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Šie paketai turi neįdiegtų priklausomybių:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Bus įdiegti šie NAUJI paketai:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Bus PAŠALINTI šie paketai:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "Šių paketų atnaujinimas sulaikomas:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "Bus atnaujinti šie paketai:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Bus PAKEISTI SENESNIAIS šie paketai:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "Bus pakeisti šie sulaikyti paketai:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (dėl %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu atnaujinti, %lu naujai įdiegti, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu įdiegti iš naujo, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu pasendinti, "
+
+#: apt-private/private-output.cc:641
+#, 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:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu nepilnai įdiegti ar pašalinti.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[T/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+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:684
+msgid "Y"
+msgstr "T"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr ""
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Atnaujinimo komandai argumentų nereikia"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1620,47 +1615,40 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "DĖMESIO: Šie paketai negali būti autentifikuoti!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr ""
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "Nepavyko autentikuoti kai kurių paketų"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "Įdiegti šiuos paketus be patvirtinimo?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Atsirado problemų ir -y buvo panaudotas be --force-yes"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Nepavyko parsiųsti %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nepavyko nustatyti %s laisvos vietos"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "%s nėra pakankamai laisvos vietos."
@@ -1729,16 +1717,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Nepavyko perskaityti %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -1880,27 +1868,6 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr "Nepavyko perskaityti šaltinių sąrašo."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:113
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr "Įdėkite diską „%s“ į įrenginį „%s“ ir paspauskite Enter."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr ""
@@ -1987,100 +1954,81 @@ msgstr "papildomas"
msgid "Calculating upgrade"
msgstr "Skaičiuojami atnaujinimai"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
+msgid "The method driver %s could not be found."
msgstr ""
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Klaida apdorojant turinį %s"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
+msgid "Is the package %s installed?"
+msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Skaitomi paketų sąrašai"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr "Įdėkite diską „%s“ į įrenginį „%s“ ir paspauskite Enter."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr ""
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Konstruojamas priklausomybių medis"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Galimos versijos"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Priklausomybių generavimas"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Skaitoma būsenos informacija"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
msgstr ""
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "Maišos sumos nesutapimas"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "Neatitinka dydžiai"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
#, fuzzy
msgid "Invalid file format"
msgstr "Klaidingas veiksmas %s"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Rašymo klaida"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2088,118 +2036,189 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG klaida: %s: %s"
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, 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:1026
+#: apt-pkg/acquire-item.cc:1122
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "Kelias %s per ilgas"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, 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:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Jungiamasi prie %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr ""
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Klaida apdorojant turinį %s"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Skaitomi paketų sąrašai"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr ""
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Trūksta aplanko „%s“"
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "Trūksta aplanko „%s“"
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, fuzzy, c-format
msgid "Unable to lock directory %s"
msgstr "Nepavyko užrakinti sąrašo aplanko"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, c-format
msgid "Clean of %s is not supported"
msgstr ""
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Parsiunčiamas %li failas iš %li (liko %s)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Parsiunčiamas %li failas iš %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Nepavyko parsiųsti %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Kai kurių indeksų failų nepavyko parsiųsti, jie buvo ignoruoti arba vietoje "
+"jų panaudoti seni."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr ""
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2226,29 +2245,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr ""
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Nepavyko parsiųsti %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Kai kurių indeksų failų nepavyko parsiųsti, jie buvo ignoruoti arba vietoje "
-"jų panaudoti seni."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr ""
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2363,30 +2359,29 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Konstruojamas priklausomybių medis"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Galimos versijos"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Priklausomybių generavimas"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr ""
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Skaitoma būsenos informacija"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr ""
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
msgstr ""
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
+msgid "Index file type '%s' is not supported"
msgstr ""
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
@@ -2399,130 +2394,146 @@ msgstr ""
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Nekorektiškas perrašymas %s eilutėje %lu #1"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "Atveriama %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:405
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:425 apt-pkg/sourcelist.cc:431
+#, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:441
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Nebuvo rastas „%s“ leidimas paketui „%s“"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Nebuvo rasta „%s“ versija paketui „%s“"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Nepavyko rasti užduoties %s"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Nepavyko rasti paketo %s"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Nepavyko rasti paketo %s"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Nekorektiškas perrašymas %s eilutėje %lu #1"
-
-#: apt-pkg/sourcelist.cc:355
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Opening %s"
-msgstr "Atveriama %s"
-
-#: apt-pkg/sourcelist.cc:389
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:393
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:413 apt-pkg/sourcelist.cc:419
-#, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:429
-#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr ""
-
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Nepavyko atverti DB failo %s: %s"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Pastaba: pažymimas %s vietoje %s\n"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Nepavyko atverti DB failo %s: %s"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Pastaba: pažymimas %s vietoje %s\n"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2683,35 +2694,6 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr ""
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2788,7 +2770,7 @@ msgstr "Nepavyko atverti failo %s"
msgid "Could not open file descriptor %d"
msgstr "Nepavyko atverti failo %s"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "Nepavyko sukurti subproceso IPC"
@@ -2825,12 +2807,12 @@ msgstr "Klaida užveriant failą"
msgid "Problem syncing the file"
msgstr "Klaida sinchronizuojant failą"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Nepavyko sukurti %s"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Nepavyko įrašyti į %s"
@@ -2855,6 +2837,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Baigta"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr ""
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr ""
@@ -3213,87 +3224,87 @@ msgstr ""
msgid "Unable to get a cursor"
msgstr ""
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "Į: Nepavyko perskaityti aplanko %s\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "Į: Nepavyko patikrinti %s\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "K: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "Į: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "K: Klaidos failui "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "Nepavyko išspręsti %s"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Judesys medyje nepavyko"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "Nepavyko atverti %s"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr ""
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "Nepavyko nuskaityti nuorodos %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "Nepavyko atsieti nuorodos %s"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Nepavyko susieti %s su %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "Archyvas neturėjo paketo lauko"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s neturi perrašymo įrašo\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s prižiūrėtojas yra %s, o ne %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -3581,6 +3592,10 @@ msgstr "Tar kontrolinė suma klaidinga, archyvas sugadintas"
msgid "Unknown TAR header type %u, member %s"
msgstr "Nežinomas TAR antraštės tipas %u. narys %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "Būtina nurodyti bent vieną paketą, kad parsiųsti jo išeities tekstą"
+
#~ msgid "Failed to create FILE*"
#~ msgstr "Nepavyko sukurti FILE*"
diff --git a/po/mr.po b/po/mr.po
index a41d2d3da..1b01a9566 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\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 "
@@ -114,7 +114,7 @@ msgstr "तुम्हाला फक्त एकच नमुना द्
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "पॅकेज %s शोधण्यास असमर्थ आहे"
@@ -350,23 +350,23 @@ msgstr "अंतर्गत त्रुटी, अडचण निवार
msgid "Unable to lock the download directory"
msgstr "डाऊनलोड डिरेक्टरी कुलूपबंद करण्यास असमर्थ"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s उगम पॅकेज शोधणे शक्य नाही/शोधण्यास असमर्थ आहे"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -374,113 +374,113 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द्या\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "उगम अर्काईव्हज चा %sB/%sB घेण्याची गरज आहे.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "उगम अर्काईव्हजचा %sB घेण्याची गरज आहे.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "%s उगम घ्या\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "काही अर्काईव्हज आणण्यास असमर्थ."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "डाऊनलोड संपूर्ण आणि डाऊनलोड मध्ये फक्त पद्धती"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%s मध्ये आधीच उघडलेल्या उगमातील उघडलेल्याला सोडून द्या किंवा वगळा\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "'%s' आज्ञा सुट्या करण्यास असमर्थ.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "बांधणी करणाऱ्या आज्ञा '%s' अयशस्वी.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "चाईल्ड प्रक्रिया अयशस्वी"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr "बिल्डेपस् कशासाठी ते पडताळण्यासाठी किमान एक पॅकेज सांगणे गरजेचे आहे"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ "
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s साठी बांधणी डिपेंडन्सी माहिती मिळवण्यास असमर्थ"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s ला बांधणी डिपेंडन्स नाहीत.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "%s अवलंबित्व %s साठी पूर्ण होण्यास असमर्थ: संस्थापित पॅकेज %s खूपच नवीन आहे"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -489,32 +489,32 @@ msgstr ""
"आवृतीची मागणी पूर्ण करण्यासाठी %s पॅकेजची आवृत्ती उपलब्ध नाही,त्यामुळे %s साठी %s "
"डिपेंडन्सी पूर्ण होऊ शकत नाही"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s साठी बांधणी-डिपेंडन्सीज पूर्ण होऊ शकत नाही."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ "
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -610,21 +610,16 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -765,12 +760,12 @@ msgstr "डिस्क सापडत नाही"
msgid "File not found"
msgstr "फाईल सापडली नाही"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "स्टॅट करण्यास असमर्थ"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "बदलण्याचा वेळ निश्चित करण्यास असमर्थ"
@@ -861,7 +856,7 @@ msgstr "सॉकेट तयार करू शकत नाही"
msgid "Could not connect data socket, connection timed out"
msgstr "डेटा सॉकेट जोडू शकत नाही,जोडणी वेळेअभावी बंद केली"
-#: methods/ftp.cc:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "असमर्थ"
@@ -934,64 +929,64 @@ msgstr "प्रश्न"
msgid "Unable to invoke "
msgstr "जारी करण्यास करण्यास असमर्थ"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "%s (%s) ला जोडत आहे"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[आयपी:%s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "%s (f=%u t=%u p=%u) साठी सॉकेट तयार करू शकत नाही"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "%s:%s (%s). साठी जोडणी इनिशिएट/पुढाकारीत करू शकत नाही"
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "%s:%s (%s) ला जोडू शकत नाही,जोडणी वेळेअभावी तुटली"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "%s:%s (%s) ला जोडू शकत नाही"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "%s ला जोडत आहे"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "%s रिझॉल्व्ह होऊ शकत नाही "
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "'%s' रिझॉल्व्ह करताना तात्पुरती त्रुटी"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, fuzzy, c-format
msgid "System error resolving '%s:%s'"
msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना काहीतरी वाईट घडले"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना काहीतरी वाईट घडले"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "%s %s ला जोडण्यास असमर्थ:"
@@ -1012,7 +1007,7 @@ msgstr ""
"सहीची खात्री करण्यासाठी '%s' कार्यान्वित करू शकत नाही (gnupg संस्थापित केले आहे का?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1112,227 +1107,6 @@ msgstr ""
msgid "Internal error"
msgstr "अंतर्गत त्रुटी"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "डिपेन्डन्सीज बरोबर/दुरूस्त करत आहे..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr "अयशस्वी/चूकीचे झाले."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "डिपेन्डन्सीज बरोबर करण्यास असमर्थ आहे "
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "आवृत्तीकृत संच कमीतकमी करण्यास असमर्थ"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr "झाले"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "हे बरोबर करण्यासाठी तुम्हाला `apt-get -f संस्थापना' प्रोग्राम चालू करावा लागेल."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "अनमेट डिपेंडन्सीज.-f.वापरून प्रयत्न करा "
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[संस्थापित केले]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr "[संस्थापित केले]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr "[संस्थापित केले]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr "[संस्थापित केले]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "पण %s संस्थापित झाले"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "पण %s संस्थापित करायचे आहे"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "पण ते संस्थापित करण्याजोगे नाही"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "पण ते आभासी पॅकेज आहे"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "पण ते संस्थापित केले नाही"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "पण ते संस्थापित होणार नाही"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr "किंवा"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "खालील पॅकेजेस मध्ये नमिळणाऱ्या निर्भरता/ डिपेन्डन्सीज आहेत:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "खालील नविन पॅकेजेस संस्थापित होतील:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "खालील नविन पॅकेजेस कायमची काढून टाकली जातील:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "खालील पॅकेजेस परत ठेवली गेली:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "खालील पॅकेजेस पुढिल आवृत्तीकृत होतील:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "खालील पॅकेजेस पुढच्या आवृत्तीकृत होणार नाहीत:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "पुढिल ठेवलेली पॅकेजेस बदलतील:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (च्या मुळे %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"धोक्याची सूचना:खालील जरूरीची पॅकेजेस कायमची काढून टाकली जातील।\n"
-"तुम्हाला तुम्ही काय करत आहात हे कळेपर्यंत असं करता येणार नाही!"
-
-#: apt-private/private-output.cc:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu पुढे आवृत्तीकृत केले, %lu नव्याने संस्थापित केले,"
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu पुनर्संस्थापित केले,"
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu मागील आवृत्तीकृत केले,"
-
-#: apt-private/private-output.cc:641
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu कायमचे काढून टाकण्यासाठी आणि %lu पुढच्या आवृत्तीकृत झालेली नाही.\n"
-
-#: apt-private/private-output.cc:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu संपूर्ण संस्थापित किंवा कायमची काढून टाकलेली नाही.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:684
-msgid "Y"
-msgstr "होय"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "रिजेक्स कंपायलेशन त्रुटी -%s "
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ शकत नाही."
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1412,18 +1186,6 @@ msgstr "%s पॅकेज संस्थापित केलेले ना
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "लक्षात घ्या,%s ऐवजी %s ची निवड करत आहे \n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "अंतर्गत त्रुटी, तुटलेल्या पॅकेजेस बरोबर संस्थापित पॅकेजला आवाहन केले गेले/बोलावले गेले!"
@@ -1432,7 +1194,7 @@ msgstr "अंतर्गत त्रुटी, तुटलेल्या
msgid "Packages need to be removed but remove is disabled."
msgstr "पॅकेजेस कायमची काढायची आहेत पण रिमूव्ह अकार्यक्षम केले आहे"
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1690,6 +1452,239 @@ msgstr "%s साठी %s (%s) निवडलेली आवृत्ती.\
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "%s साठी %s (%s) निवडलेली आवृत्ती.\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "डिपेन्डन्सीज बरोबर/दुरूस्त करत आहे..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr "अयशस्वी/चूकीचे झाले."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "डिपेन्डन्सीज बरोबर करण्यास असमर्थ आहे "
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "आवृत्तीकृत संच कमीतकमी करण्यास असमर्थ"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr "झाले"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "हे बरोबर करण्यासाठी तुम्हाला `apt-get -f संस्थापना' प्रोग्राम चालू करावा लागेल."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "अनमेट डिपेंडन्सीज.-f.वापरून प्रयत्न करा "
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[संस्थापित केले]"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr "[संस्थापित केले]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr "[संस्थापित केले]"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr "[संस्थापित केले]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "पण %s संस्थापित झाले"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "पण %s संस्थापित करायचे आहे"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "पण ते संस्थापित करण्याजोगे नाही"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "पण ते आभासी पॅकेज आहे"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "पण ते संस्थापित केले नाही"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "पण ते संस्थापित होणार नाही"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr "किंवा"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "खालील पॅकेजेस मध्ये नमिळणाऱ्या निर्भरता/ डिपेन्डन्सीज आहेत:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "खालील नविन पॅकेजेस संस्थापित होतील:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "खालील नविन पॅकेजेस कायमची काढून टाकली जातील:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "खालील पॅकेजेस परत ठेवली गेली:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "खालील पॅकेजेस पुढिल आवृत्तीकृत होतील:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "खालील पॅकेजेस पुढच्या आवृत्तीकृत होणार नाहीत:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "पुढिल ठेवलेली पॅकेजेस बदलतील:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (च्या मुळे %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"धोक्याची सूचना:खालील जरूरीची पॅकेजेस कायमची काढून टाकली जातील।\n"
+"तुम्हाला तुम्ही काय करत आहात हे कळेपर्यंत असं करता येणार नाही!"
+
+#: apt-private/private-output.cc:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu पुढे आवृत्तीकृत केले, %lu नव्याने संस्थापित केले,"
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu पुनर्संस्थापित केले,"
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu मागील आवृत्तीकृत केले,"
+
+#: apt-private/private-output.cc:641
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu कायमचे काढून टाकण्यासाठी आणि %lu पुढच्या आवृत्तीकृत झालेली नाही.\n"
+
+#: apt-private/private-output.cc:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu संपूर्ण संस्थापित किंवा कायमची काढून टाकलेली नाही.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:684
+msgid "Y"
+msgstr "होय"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "रिजेक्स कंपायलेशन त्रुटी -%s "
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ शकत नाही."
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1698,48 +1693,41 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "धोक्याची सूचना:खालील पॅकेजेस् प्रमाणित करु शकत नाही! "
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "प्रमाणीकरणाची धोक्याची सूचना दुर्लक्षित करा.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "काही पॅकेजेसचे प्रमाणिकरण होऊ शकत नाही"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
#, fuzzy
msgid "Install these packages without verification?"
msgstr "पडताळून पाहिल्याशिवाय ही पॅकेजेस संस्थापित करायची का [हो/नाही]?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "काही अडचणी आहेत आणि --force-yes शिवाय -y वापरला गेला"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s %s आणणे असफल\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s मध्ये रिकामी जागा सांगू शकत नाही"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "%s मध्ये तुमच्याकडे पुरेशी जागा नाही."
@@ -1808,16 +1796,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "%s वाचण्यास असमर्थ"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -1954,27 +1942,6 @@ msgstr "तुम्ही ह्या समस्यांचे निवा
msgid "The list of sources could not be read."
msgstr "उगमांच्या याद्या वाचता येणार नाहीत."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "%s कार्यपध्दतीचा ड्राइव्हर सापडू शकला नाही. "
-
-#: apt-pkg/acquire-worker.cc:113
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "%s कार्यपध्दती योग्य रीतीने सुरु झालेली नाही"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr "कृपया '%s' लेबल असलेली डिस्क '%s' या ड्राइव्हमध्ये ठेवा आणि एन्टर कळ दाबा."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "पॅकेज अस्थाई स्मृतिकोष"
@@ -2062,105 +2029,81 @@ msgstr "अधिक"
msgid "Calculating upgrade"
msgstr "पुढिल आवृत्तीची गणती करीत आहे"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "'%s' प्रकारची निर्देशक संचिका सहाय्यकारी नाही"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "अस्थायी स्मृतिकोष मध्ये विसंगत आवृतीकरण प्रणाली आहे"
+msgid "The method driver %s could not be found."
+msgstr "%s कार्यपध्दतीचा ड्राइव्हर सापडू शकला नाही. "
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s (पॅकेज शोधतांना) प्रक्रिया करीत असतांना दोष आढळून आला"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही पॅकेज नांवांच्या संख्येची मर्यादा ओलांडली "
-"आहे."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही आवृत्त्या संख्येची मर्यादा ओलांडली आहे."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "अरेवा!, तुम्ही तर ह्या ऍप्टच्या कार्यक्षमतेपेक्षाही विवरण संख्येची मर्यादा ओलांडली आहे."
+msgid "Is the package %s installed?"
+msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही अवलंबित/विसंबून असलेल्या संख्येची मर्यादा "
-"ओलांडली आहे."
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "%s कार्यपध्दती योग्य रीतीने सुरु झालेली नाही"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "पॅकेज याद्या वाचत आहोत"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr "कृपया '%s' लेबल असलेली डिस्क '%s' या ड्राइव्हमध्ये ठेवा आणि एन्टर कळ दाबा."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "IO त्रुटी उगम निवडक संचयस्थानात संग्रहित होत आहे"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "अवलंबित रचना बांधणी करत आहे"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "कंॅडिडेट आवृत्त्या"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "अवलंबित/विसंबून असलेले उत्पादन "
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "स्थिती माहिती वाचत आहे"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "%s StateFile उघडणे असफल"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s तात्पुरत्या StateFile मध्ये लिहिणे असफल"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "पुनर्नामांकन अयशस्वी, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "हॅश बेरीज जुळत नाही"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "आकार जुळतनाही"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
#, fuzzy
msgid "Invalid file format"
msgstr "%s अवैध क्रिया"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "लिहिण्यात त्रुटी"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2168,63 +2111,63 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, 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:1026
+#: apt-pkg/acquire-item.cc:1122
msgid "There is no public key available for the following key IDs:\n"
msgstr "पुढील कळ ओळखचिन्हांसाठी सार्वजनिक कळ उपलब्ध नाही:\n"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "%s संचिका डायव्हर्ट केली आहे/वळवली आहे"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2233,12 +2176,12 @@ msgstr ""
"मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते "
"स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) "
-#: apt-pkg/acquire-item.cc:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2247,43 +2190,119 @@ msgstr ""
"ठिकाण %s."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "%s (%s) ला जोडत आहे"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "अस्थायी स्मृतिकोष मध्ये विसंगत आवृतीकरण प्रणाली आहे"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "%s (पॅकेज शोधतांना) प्रक्रिया करीत असतांना दोष आढळून आला"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही पॅकेज नांवांच्या संख्येची मर्यादा ओलांडली "
+"आहे."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही आवृत्त्या संख्येची मर्यादा ओलांडली आहे."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "अरेवा!, तुम्ही तर ह्या ऍप्टच्या कार्यक्षमतेपेक्षाही विवरण संख्येची मर्यादा ओलांडली आहे."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही अवलंबित/विसंबून असलेल्या संख्येची मर्यादा "
+"ओलांडली आहे."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "पॅकेज याद्या वाचत आहोत"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "IO त्रुटी उगम निवडक संचयस्थानात संग्रहित होत आहे"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "संचयिका यादीत %s पार्शल हरवले आहे."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "ऑर्काइव्ह संचयिका %spartial गायब आहे."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, fuzzy, c-format
msgid "Unable to lock directory %s"
msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, fuzzy, c-format
msgid "Clean of %s is not supported"
msgstr "'%s' प्रकारची निर्देशक संचिका सहाय्यकारी नाही"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "%li ची %li(%s राहिलेले) संचिका पुन:प्राप्त करीत आहे"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "%li ची %li संचिका पुन:प्राप्त करीत आहे"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "%s %s आणणे असफल\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"काही अनुक्रमणिका संचयिका डाऊनलोड करण्यास असमर्थ,त्या दुर्लक्षित झाल्या, किंवा "
+"त्याऐवजी जुन्या वापरल्या गेल्या."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "तुम्ही तुमच्या उगमस्थान यादीत URI घाला"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "%s स्टॅट करण्यात असमर्थ. "
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2310,29 +2329,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "पिन करिता प्राधान्य/अग्रक्रम (किंवा शून्य)निर्देशीत केलेला नाही"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "%s %s आणणे असफल\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"काही अनुक्रमणिका संचयिका डाऊनलोड करण्यास असमर्थ,त्या दुर्लक्षित झाल्या, किंवा "
-"त्याऐवजी जुन्या वापरल्या गेल्या."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "तुम्ही तुमच्या उगमस्थान यादीत URI घाला"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s स्टॅट करण्यात असमर्थ. "
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2455,31 +2451,30 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "अडचणी दूर करण्यास असमर्थ, तुम्ही तुटलेले पॅकेज घेतलेले आहे."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "अवलंबित रचना बांधणी करत आहे"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "कंॅडिडेट आवृत्त्या"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "अवलंबित/विसंबून असलेले उत्पादन "
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr ""
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "स्थिती माहिती वाचत आहे"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr ""
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s StateFile उघडणे असफल"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr ""
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s तात्पुरत्या StateFile मध्ये लिहिणे असफल"
+msgid "Index file type '%s' is not supported"
+msgstr "'%s' प्रकारची निर्देशक संचिका सहाय्यकारी नाही"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2491,130 +2486,146 @@ msgstr "%s पॅकेज फाईल पार्स करण्यात
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #1"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "%s उघडत आहे"
+
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "स्त्रोत सुची %2$s (प्रकार) मध्ये %1$u वाईट/व्यंग रेषा"
+
+#: apt-pkg/sourcelist.cc:405
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही "
+
+#: apt-pkg/sourcelist.cc:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "स्त्रोत सुची %2$s (प्रकार) मध्ये %1$u वाईट/व्यंग रेषा"
+
+#: apt-pkg/sourcelist.cc:441
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही "
+
+#: apt-pkg/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "%s कार्य सापडू शकले नाही"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "%s पॅकेज सापडू शकले नाही"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "%s पॅकेज सापडू शकले नाही"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #1"
-
-#: apt-pkg/sourcelist.cc:355
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Opening %s"
-msgstr "%s उघडत आहे"
-
-#: apt-pkg/sourcelist.cc:389
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "स्त्रोत सुची %2$s (प्रकार) मध्ये %1$u वाईट/व्यंग रेषा"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:393
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही "
-
-#: apt-pkg/sourcelist.cc:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "स्त्रोत सुची %2$s (प्रकार) मध्ये %1$u वाईट/व्यंग रेषा"
-
-#: apt-pkg/sourcelist.cc:429
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही "
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "लक्षात घ्या,%s ऐवजी %s ची निवड करत आहे \n"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "%s डायव्हर्जन फाईलमध्ये अवैध ओळ आहे:"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2775,35 +2786,6 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "%s निवडक भाग सापडत नाही"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2880,7 +2862,7 @@ msgstr "%s फाईल उघडता येत नाही"
msgid "Could not open file descriptor %d"
msgstr "%s साठी पाईप उघडता येत नाही"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "आयपीसी उपक्रिया तयार करण्यास असमर्थ"
@@ -2917,12 +2899,12 @@ msgstr "फाईल अनलिंकिंग करण्यात अडच
msgid "Problem syncing the file"
msgstr "संचिकेची syncing समस्या"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "%s स्टॅट करण्यास असमर्थ"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "%s मध्ये लिहिण्यास असमर्थ "
@@ -2947,6 +2929,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... झाले"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "%s निवडक भाग सापडत नाही"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "रिकामी फाईल mmap करता येणार नाही"
@@ -3298,87 +3309,87 @@ msgstr "अर्काईव्ह मध्ये नियंत्रण म
msgid "Unable to get a cursor"
msgstr "संकेतक घेण्यास असमर्थ"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "धोक्याची सूचना:%s संचयिका वाचण्यास असमर्थ \n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "धो.सू.:%s स्टेट करण्यास असमर्थ\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "E:"
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "धो.सू.:"
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "ई: संचिकेला लागू होणाऱ्या चुका"
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "%s सोडवण्यास असमर्थ"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "ट्री चालणे असमर्थ"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "%s उघडण्यास असमर्थ"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr "%s [%s] डी दुवा\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "%s वाचणारा दुवा असमर्थ"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "%s दुवा काढण्यास असमर्थ"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "%s चा %s दुवा साधण्यास असमर्थ"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr "%sB हीट ची डिलींक मर्यादा\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "अर्काईव्ह ला पॅकेज जागा नाही"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr "%s ला ओव्हरराईड/दुर्लक्षित जागा नाही\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr "%s देखभालकर्ता हा %s आणि %s नाही \n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr "%s ला उगम ओव्हरराईड/दुर्लक्षित जागा नाही\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr "%s ला द्वयंक ओव्हरराईड जागा नाही\n"
@@ -3665,6 +3676,10 @@ msgstr "टार(टेपअर्काईव्ह) चेकसम चु
msgid "Unknown TAR header type %u, member %s"
msgstr "अपरिचित TAR शीर्षक प्रकार %u, मेंबर %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे"
+
#~ msgid "Failed to create pipes"
#~ msgstr "पाईप तयार करण्यास असमर्थ"
diff --git a/po/nb.po b/po/nb.po
index 54d37563b..bd7566260 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\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"
@@ -117,7 +117,7 @@ msgstr "Du må oppgi minst ett søkemønster"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Klarer ikke å finne pakken %s"
@@ -355,16 +355,16 @@ msgstr "Intern feil, problemløser ødela noe"
msgid "Unable to lock the download directory"
msgstr "Klarer ikke å låse nedlastingsmappa"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "Du må angi minst en pakke du vil ha kildekoden til"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Klarer ikke å finne en kildekodepakke for %s"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -373,7 +373,7 @@ msgstr ""
"MERK: «%s»-pakker blir vedlikeholdt i versjonskontrollsystemet «%s» på:\n"
"%s\n"
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -384,115 +384,115 @@ msgstr ""
"bzr get %s\n"
"for å hente siste (muligens ikke utgitte) oppdateringer for pakken.\n"
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Hopper over allerede nedlastet fil «%s»\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Trenger å skaffe %sB av %sB fra kildekodearkivet.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Skaffer kildekode %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Klarte ikke å skaffe alle arkivene."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Nedlasting fullført med innstillinga «bare nedlasting»"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Omgår utpakking av allerede utpakket kilde i %s\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen «%s» mislyktes.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Sjekk om pakken «dpkg-dev» er installert.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggekommandoen «%s» mislyktes.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Barneprosessen mislyktes"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr "Du må angi minst en pakke du vil sjekke «builddeps» for"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Klarte ikke å behandle forutsetningene for bygging"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Klarer ikke å skaffe informasjon om bygge-avhengighetene for %s"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen avhengigheter.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Klarte ikke å tilfredsstille %s avhengighet for %s: den installerte pakken "
"%s er for ny"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -501,32 +501,32 @@ msgstr ""
"Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige "
"versjoner av pakken %s som oppfyller versjonskravene"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "Klarte ikke å behandle forutsetningene for bygging"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Støttede moduler:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -624,21 +624,16 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Du må angi minst en pakke du vil ha kildekoden til"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "Du må angi minst en pakke du vil ha kildekoden til"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -781,12 +776,12 @@ msgstr "Disk ikke funnet."
msgid "File not found"
msgstr "Fant ikke fila"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "Klarte ikke å få status"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "Klarte ikke å sette endringstidspunkt"
@@ -877,7 +872,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:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Mislyktes"
@@ -950,64 +945,64 @@ msgstr "Spørring"
msgid "Unable to invoke "
msgstr "Klarte ikke å starte"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Kobler til %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Klarte ikke å opprette en sokkel for %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Klarte ikke å starte forbindelsen til %s:%s (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Klarte ikke å koble til %s:%s (%s), tidsavbrudd på forbindelsen"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Klarte ikke å koble til %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Kobler til %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "Klarte ikke å slå opp «%s»"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Midlertidig feil ved oppslag av «%s»"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, fuzzy, c-format
msgid "System error resolving '%s:%s'"
msgstr "Noe galt skjedde ved oppslag av «%s:%s» (%i - %s)"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Noe galt skjedde ved oppslag av «%s:%s» (%i - %s)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Klarte ikke koble til %s:%s:"
@@ -1028,7 +1023,7 @@ msgstr ""
"installert?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1130,227 +1125,6 @@ msgstr ""
msgid "Internal error"
msgstr "Intern feil"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Retter på avhengighetsforhold ..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " mislyktes."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Klarer ikke å rette på avhengighetsforholdene"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "Klarer ikke å minimere oppgraderingsettet"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Utført"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Du vil kanskje kjøre «apt-get -f install» for å rette på dette."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Uinnfridde avhengighetsforhold - Prøv «-f»."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "men %s er installert"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "men %s skal installeres"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "men lar seg ikke installere"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "men er en virtuell pakke"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "men er ikke installert"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "men skal ikke installeres"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " eller"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "Følgende pakker har uinnfridde avhengighetsforhold:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "Følgende NYE pakker vil bli installert:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Følgende pakker vil bli FJERNET:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "Følgende pakker er holdt tilbake:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "Følgende pakker vil bli oppgradert:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Følgende pakker vil bli NEDGRADERT:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "Følgende pakker vil bli endret:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (pga. %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu oppgraderte, %lu nylig installerte, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu installert på nytt, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu nedgraderte, "
-
-#: apt-private/private-output.cc:641
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu å fjerne og %lu ikke oppgradert.\n"
-
-#: apt-private/private-output.cc:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu pakker ikke fullt installert eller fjernet.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[J/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-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:684
-msgid "Y"
-msgstr "J"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Kompileringsfeil i regulært uttrykk - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Oppdaterings-kommandoen tar ingen argumenter"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1429,18 +1203,6 @@ msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Merk, velger «%s» istedenfor «%s»\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Intern feil, InstallPackages ble kalt med ødelagte pakker!"
@@ -1449,7 +1211,7 @@ msgstr "Intern feil, InstallPackages ble kalt med ødelagte pakker!"
msgid "Packages need to be removed but remove is disabled."
msgstr "Pakker trenges å fjernes, men funksjonen er slått av."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1714,6 +1476,239 @@ msgstr "Utvalgt versjon «%s» (%s) for «%s»\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Utvalgt versjon «%s» (%s) for «%s»\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Retter på avhengighetsforhold ..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " mislyktes."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Klarer ikke å rette på avhengighetsforholdene"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Klarer ikke å minimere oppgraderingsettet"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Utført"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Du vil kanskje kjøre «apt-get -f install» for å rette på dette."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Uinnfridde avhengighetsforhold - Prøv «-f»."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "men %s er installert"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "men %s skal installeres"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "men lar seg ikke installere"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "men er en virtuell pakke"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "men er ikke installert"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "men skal ikke installeres"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " eller"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Følgende pakker har uinnfridde avhengighetsforhold:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Følgende NYE pakker vil bli installert:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Følgende pakker vil bli FJERNET:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "Følgende pakker er holdt tilbake:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "Følgende pakker vil bli oppgradert:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Følgende pakker vil bli NEDGRADERT:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "Følgende pakker vil bli endret:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (pga. %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu oppgraderte, %lu nylig installerte, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu installert på nytt, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu nedgraderte, "
+
+#: apt-private/private-output.cc:641
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu å fjerne og %lu ikke oppgradert.\n"
+
+#: apt-private/private-output.cc:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu pakker ikke fullt installert eller fjernet.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[J/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+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:684
+msgid "Y"
+msgstr "J"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Kompileringsfeil i regulært uttrykk - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Oppdaterings-kommandoen tar ingen argumenter"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1726,47 +1721,40 @@ msgstr ""
" Husk også at låsing er deaktivert, så ikke regn med \n"
" relevans i forhold til den reelle gjeldende situasjonen."
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ADVARSEL: Følgende pakker ble ikke autentisert!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "Autentiseringsadvarsel overstyrt.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "Noen pakker ble ikke autentisert"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "Installer disse pakkene uten verifikasjon?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Det oppsto problemer og «-y» ble brukt uten «--force-yes»"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikke å skaffe %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Klarte ikke bestemme ledig plass i %s"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Dessverre, ikke nok ledig plass i %s"
@@ -1835,16 +1823,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Klarer ikke å lese %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -1982,27 +1970,6 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr "Kan ikke lese kildlista."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Finner ikke metode-driveren %s."
-
-#: apt-pkg/acquire-worker.cc:113
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Sjekk om pakken «dpkg-dev» er installert.\n"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoden %s startet ikke korrekt"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr "Sett inn disken merket «%s» i lagringsenheten «%s» og trykk Enter."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Tomt pakkelager"
@@ -2090,100 +2057,81 @@ msgstr "tillegg"
msgid "Calculating upgrade"
msgstr "Beregner oppgradering"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Oversiktsfil av typen «%s» støttes ikke"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "Lageret har et uoverensstemmende versjonssystem"
+msgid "The method driver %s could not be found."
+msgstr "Finner ikke metode-driveren %s."
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Feil oppsto under behandling av %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Jøss, du har overgått antallet pakkenavn denne APT klarer."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Jøss, du har overgått antallet versjoner denne APT klarer."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Jøss, du har overgått antallet beskrivelser denne APT klarer."
+msgid "Is the package %s installed?"
+msgstr "Sjekk om pakken «dpkg-dev» er installert.\n"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Jøss, du har overgått antallet avhengighetsforhold denne APT klarer."
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Metoden %s startet ikke korrekt"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Leser pakkelister"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr "Sett inn disken merket «%s» i lagringsenheten «%s» og trykk Enter."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "IO-feil ved lagring av kildekode-lager"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Skaper oversikt over avhengighetsforhold"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Versjons-kandidater"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Oppretter avhengighetsforhold"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Leser tilstandsinformasjon"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Klarte ikke å åpne StateFile %s"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Klarte ikke å skrive midlertidig StateFile %s"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "klarte ikke å endre navnet, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "Hashsummen stemmer ikke"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "Feil størrelse"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
#, fuzzy
msgid "Invalid file format"
msgstr "Ugyldig operasjon %s"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Skrivefeil"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, fuzzy, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2193,19 +2141,19 @@ msgstr ""
"forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-feil: %s: %s"
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, 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:1026
+#: apt-pkg/acquire-item.cc:1122
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"
@@ -2213,44 +2161,44 @@ msgstr ""
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, 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:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "Katalogen %s er avledet"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2259,55 +2207,127 @@ 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:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Oversiktsfilene er ødelagte. Feltet «Filename:» mangler for pakken %s."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Kobler til %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "Lageret har et uoverensstemmende versjonssystem"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Feil oppsto under behandling av %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Jøss, du har overgått antallet pakkenavn denne APT klarer."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Jøss, du har overgått antallet versjoner denne APT klarer."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Jøss, du har overgått antallet beskrivelser denne APT klarer."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Jøss, du har overgått antallet avhengighetsforhold denne APT klarer."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Leser pakkelister"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "IO-feil ved lagring av kildekode-lager"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr "Listemappa %spartial mangler."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Arkivmappa %spartial mangler."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, c-format
msgid "Unable to lock directory %s"
msgstr "Klarte ikke låse mappa %s"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, fuzzy, c-format
msgid "Clean of %s is not supported"
msgstr "Oversiktsfil av typen «%s» støttes ikke"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Henter fil %li av %li (%s gjenværende)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Henter fil %li av %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Klarte ikke å skaffe %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Klarte ikke å laste ned alle oversiktfilene. De ble ignorerte, eller gamle "
+"ble brukt isteden. "
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
+"Beklager, du må legge inn noen kilder (nettadresser) i din «sources.list»."
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Klarer ikke finne informasjonom %s."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2334,30 +2354,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "Ingen prioritet (eller null) spesifisert for pin"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Klarte ikke å skaffe %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Klarte ikke å laste ned alle oversiktfilene. De ble ignorerte, eller gamle "
-"ble brukt isteden. "
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
-"Beklager, du må legge inn noen kilder (nettadresser) i din «sources.list»."
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Klarer ikke finne informasjonom %s."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2484,31 +2480,30 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Skaper oversikt over avhengighetsforhold"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Versjons-kandidater"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Oppretter avhengighetsforhold"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr ""
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Leser tilstandsinformasjon"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr ""
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Klarte ikke å åpne StateFile %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr ""
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Klarte ikke å skrive midlertidig StateFile %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Oversiktsfil av typen «%s» støttes ikke"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2520,57 +2515,95 @@ msgstr "Klarer ikke å fortolke pakkefila %s (%d)"
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Ugyldig overstyring %s linje %lu #1"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "Åpner %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Feil på %u i kildelista %s (type)"
+
+#: apt-pkg/sourcelist.cc:405
+#, 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:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Feil på %u i kildelista %s (type)"
+
+#: apt-pkg/sourcelist.cc:441
+#, 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/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Utgave «%s» av «%s» ble ikke funnet"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versjon «%s» av «%s» ble ikke funnet"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Klarte ikke å finne oppgave «%s»"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Klarte ikke finne noen pakken med regex «%s»"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Klarte ikke finne noen pakken med regex «%s»"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Klarte ikke velge versjoner fra pakken «%s» siden den er kun virtuell"
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Klarte ikke velge nyeste versjon fra pakken «%s» siden den er kun virtuell"
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Klarte ikke velge kandidatversjon fra pakken «%s» siden den ikke har noen "
"kandidat"
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Klarte ikke velge installert versjon fra pakken «%s» siden den ikke er "
"installert"
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -2579,78 +2612,56 @@ msgstr ""
"Klarte ikke velge installert eller kandidatversjon fra pakken «%s» siden den "
"har ingen av dem"
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Ugyldig overstyring %s linje %lu #1"
-
-#: apt-pkg/sourcelist.cc:355
-#, c-format
-msgid "Opening %s"
-msgstr "Åpner %s"
-
-#: apt-pkg/sourcelist.cc:389
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Feil på %u i kildelista %s (type)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:393
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, 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:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "Feil på %u i kildelista %s (type)"
-
-#: apt-pkg/sourcelist.cc:429
-#, 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"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Klarer ikke å fortolke Release-fila %s"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr "Ingen avsnitt i Release-fila %s"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Ingen sjekksumoppføring i Release-fila %s"
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ugyldig «Date»-oppføring i Release-fila %s"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Ugyldig «Valid-Until»-oppføring i Release-fila %s"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2822,35 +2833,6 @@ msgstr "dpkg ble avbrutt. Du må kjøre «%s» manuelt for å rette problemet,"
msgid "Not locked"
msgstr "Ikke låst"
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lit %lim %lis"
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lit %lim %lis"
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr "%lim %lis"
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "Fant ikke utvalget %s"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2927,7 +2909,7 @@ msgstr "Klarte ikke åpne fila %s"
msgid "Could not open file descriptor %d"
msgstr "Klarte ikke åpne fildeskriptor %d"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "Klarte ikke å opprette underprosessen IPC"
@@ -2964,12 +2946,12 @@ msgstr "Problem ved oppheving av lenke til fila %s"
msgid "Problem syncing the file"
msgstr "Problem ved oppdatering av fila"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Klarte ikke å få statusen på %s"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Kan ikke skrive til %s"
@@ -2994,6 +2976,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s ... Ferdig"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lit %lim %lis"
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lit %lim %lis"
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr "%lim %lis"
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "Fant ikke utvalget %s"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Kan ikke utføre mmap på en tom fil"
@@ -3350,87 +3361,87 @@ msgstr "Arkivet har ingen kontrollpost"
msgid "Unable to get a cursor"
msgstr "Klarte ikke å finne en peker"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Klarte ikke å lese katalogen %s\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: Klarte ikke å få statusen på %s\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "F:"
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "A:"
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "F: Det er feil ved fila"
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "Klarte ikke å slå opp %s"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Klarte ikke å finne fram i treet"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "Klarte ikke å åpne %s"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "Klarte ikke å lese lenken %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "Klarte ikke å oppheve lenken %s"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Klarte ikke å lenke %s til %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-grensa på %s B er nådd.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "Arkivet har ikke noe pakkefelt"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har ingen overstyringsoppføring\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s-vedlikeholderen er %s, ikke %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s har ingen kildeoverstyringsoppføring\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s har ingen binæroverstyringsoppføring heller\n"
@@ -3717,6 +3728,10 @@ msgstr "Tar-sjekksummen mislykkes, arkivet er ødelagt"
msgid "Unknown TAR header type %u, member %s"
msgstr "Ukjent TAR-hode: type %u, medlem %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "Du må angi minst en pakke du vil ha kildekoden til"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Klarte ikke å opprette rør"
diff --git a/po/ne.po b/po/ne.po
index c34184b99..849de30fb 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\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"
@@ -116,7 +116,7 @@ msgstr "तपाईँले एउटा वास्तविक बान्
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "प्याकेज %s तोक्न असक्षम भयो"
@@ -353,23 +353,23 @@ msgstr "आन्तरिक त्रुटि,समस्या हलकर
msgid "Unable to lock the download directory"
msgstr "डाउनलोड डाइरेक्ट्री ताल्चा मार्न असक्षम"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s को लागि स्रोत प्याकेज फेला पार्न असफल भयो"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -377,113 +377,113 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "स्रोत संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक छ ।\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "स्रोत फड्काउनुहोस् %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "केही संग्रह फड्काउन असफल भयो ।"
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "अनप्याक आदेश '%s' असफल भयो ।\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "निर्माण आदेश '%s' असफल भयो ।\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "शाखा प्रक्रिया असफल भयो"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s को लागि निर्माण-निर्भरता सूचना प्राप्त गर्न असक्षम भयो"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -492,32 +492,32 @@ msgstr ""
"%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण "
"आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन "
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । "
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "समर्थित मोड्युलहरू:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -611,21 +611,16 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -766,12 +761,12 @@ msgstr "डिस्क फेला परेन ।"
msgid "File not found"
msgstr "फाइल फेला परेन "
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "स्थिर गर्न असफल भयो"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "परिमार्जन समय सेट असफल भयो"
@@ -862,7 +857,7 @@ msgstr "एउटा सकेट सिर्जना गर्न सके
msgid "Could not connect data socket, connection timed out"
msgstr "डेटा सकेट जडान गर्न सकिएन, जडान समय सकियो"
-#: methods/ftp.cc:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "असफल भयो"
@@ -935,64 +930,64 @@ msgstr "क्वेरी"
msgid "Unable to invoke "
msgstr "आह्वान गर्न असक्षम भयो"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "%s (%s) मा जडान गरिदैछ"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "%s (f=%u t=%u p=%u) को लागि सकेट सिर्जना गर्न सकिएन"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr " %s:%s (%s) मा जडान सुरुवात गर्न सकेन"
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "%s:%s (%s) मा जडान गर्न सकिएन, जडान समय सकियो"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr " %s:%s (%s) मा जडान गर्न सकिएन ।"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "%s मा जडान गरिदैछ"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "'%s' हल गर्न सकिएन"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "'%s' हल गर्दा अस्थायी असफल"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, fuzzy, c-format
msgid "System error resolving '%s:%s'"
msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट्यो"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट्यो"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "%s %s मा जडान गर्न असफल भयो:"
@@ -1012,7 +1007,7 @@ msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gnupg स्थापना भयो?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1112,227 +1107,6 @@ msgstr ""
msgid "Internal error"
msgstr "आन्तरिक त्रुटि"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "निर्भरताहरू सुधार गरिदैछ..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr "असफल भयो ।"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "निर्भरताहरू सुधार गर्न असक्षम भयो"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "स्तर वृद्धि सेटलाई न्यूनतम गर्न असक्षम भयो"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr "काम भयो"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "यी सुधार गर्न तपाईँले 'apt-get -f install' चलाउन पर्छ ।"
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "नभेटिएका निर्भरताहरू । -f प्रयोग गरेर प्रयास गर्नुहोस् ।"
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [स्थापना भयो]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [स्थापना भयो]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [स्थापना भयो]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr " [स्थापना भयो]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "तर %s स्थापना भयो"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "तर %s स्थापना हुनुपर्यो"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "तर यो स्थापनायोग्य छैन"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "तर यो अवास्तविक प्याकेज होइन"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "तर यो स्थापना भएन"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "तर यो स्थापना हुन गइरहेको छैन"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr "वा"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "निम्न प्याकेजहरुले निर्भरताहरू भेटेनन्:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "निम्न प्याकेजहरू हटाइनेछन्:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "निम्न प्याकेजहरू पछाडि राखिनेछन्:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "निम्न प्याकेजहरू स्तर वृद्धि हुनेछन्:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "निम्न प्याकेजहरू स्तरकम गरिनेछन्:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "निम्न भइरहेको प्याकेजहरू परिवर्तन हुनेछैन:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (%s कारणले)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"चेतावनी: निम्न आवश्यक प्याकेजहरू हटाइनेछन् ।\n"
-"तपाईँ के गरिरहेको यकिन नभएसम्म यो काम गरिने छैन!"
-
-#: apt-private/private-output.cc:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu स्तर वृद्धि गरियो, %lu नयाँ स्थापना भयो, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu पुन: स्थापना गरियो, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu स्तर कम गरियो, "
-
-#: apt-private/private-output.cc:641
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu हटाउन र %lu स्तर वृद्धि गरिएन ।\n"
-
-#: apt-private/private-output.cc:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu पूर्णरुपले स्थापना भएन र हटाइएन ।\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:684
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1412,18 +1186,6 @@ msgstr "प्याकेज %s स्थापना भएन, त्यस
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "द्रष्टब्य, %s को सट्टा %s चयन भइरहेछ\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "आन्तरिक त्रुटि, स्थापना प्याकेजहरुलाई भाँचिएको प्याकेज भनिन्थ्यो!"
@@ -1432,7 +1194,7 @@ msgstr "आन्तरिक त्रुटि, स्थापना प्
msgid "Packages need to be removed but remove is disabled."
msgstr "प्याकेजहरू हट्न चाहदैछन् तर हटाई अक्षम भइरहेछ ।"
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1686,6 +1448,239 @@ msgstr "%s को लागि चयन भएको संस्करण %s (
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "निर्भरताहरू सुधार गरिदैछ..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr "असफल भयो ।"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "निर्भरताहरू सुधार गर्न असक्षम भयो"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "स्तर वृद्धि सेटलाई न्यूनतम गर्न असक्षम भयो"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr "काम भयो"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "यी सुधार गर्न तपाईँले 'apt-get -f install' चलाउन पर्छ ।"
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "नभेटिएका निर्भरताहरू । -f प्रयोग गरेर प्रयास गर्नुहोस् ।"
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [स्थापना भयो]"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [स्थापना भयो]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [स्थापना भयो]"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr " [स्थापना भयो]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "तर %s स्थापना भयो"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "तर %s स्थापना हुनुपर्यो"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "तर यो स्थापनायोग्य छैन"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "तर यो अवास्तविक प्याकेज होइन"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "तर यो स्थापना भएन"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "तर यो स्थापना हुन गइरहेको छैन"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr "वा"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "निम्न प्याकेजहरुले निर्भरताहरू भेटेनन्:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "निम्न प्याकेजहरू हटाइनेछन्:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "निम्न प्याकेजहरू पछाडि राखिनेछन्:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "निम्न प्याकेजहरू स्तर वृद्धि हुनेछन्:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "निम्न प्याकेजहरू स्तरकम गरिनेछन्:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "निम्न भइरहेको प्याकेजहरू परिवर्तन हुनेछैन:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (%s कारणले)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"चेतावनी: निम्न आवश्यक प्याकेजहरू हटाइनेछन् ।\n"
+"तपाईँ के गरिरहेको यकिन नभएसम्म यो काम गरिने छैन!"
+
+#: apt-private/private-output.cc:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu स्तर वृद्धि गरियो, %lu नयाँ स्थापना भयो, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu पुन: स्थापना गरियो, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu स्तर कम गरियो, "
+
+#: apt-private/private-output.cc:641
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu हटाउन र %lu स्तर वृद्धि गरिएन ।\n"
+
+#: apt-private/private-output.cc:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu पूर्णरुपले स्थापना भएन र हटाइएन ।\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:684
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1694,48 +1689,41 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "चेतावनी: निम्न प्याकलेजहरू प्रणाणीकरण हुन सक्दैन! "
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "प्रमाणिकरण चेतावनी अधिलेखन भयो ।\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "केही प्याकेजहरू प्रमाणीकरण हुन सक्दैन"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
#, fuzzy
msgid "Install these packages without verification?"
msgstr "यी प्याकेजहरू रूजू बिना स्थापना गर्नुहुन्छ [y/N]? "
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "त्यहाँ समस्याहरू छन् र हुन्छलाई जोड नगरिकन -y को प्रयोग भयो"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s %s तान्न असफल भयो\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन ।"
@@ -1804,16 +1792,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "%s पढ्न असफल भयो"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -1951,27 +1939,6 @@ msgstr "यो समस्याहरू सुधार्न तपाईँ
msgid "The list of sources could not be read."
msgstr "स्रोतहरुको सूचि पढ्न सकिएन ।"
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "विधि ड्राइभर %s फेला पार्न सकिएन ।"
-
-#: apt-pkg/acquire-worker.cc:113
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "विधि %s सही रुपले सुरू हुन सकेन"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr "कृपया डिस्क लेबुल: '%s' ड्राइभ '%s'मा घुसउनुहोस् र इन्टर थिच्नुहोस् । "
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "खाली प्याकेज क्यास"
@@ -2059,102 +2026,83 @@ msgstr "अतिरिक्त"
msgid "Calculating upgrade"
msgstr "स्तर वृद्धि गणना गरिदैछ"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "अनुक्रमणिका फाइल प्रकार '%s' समर्थित छैन"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "क्यास संग एउटा नमिल्दो संस्करण प्रणाली छ"
+msgid "The method driver %s could not be found."
+msgstr "विधि ड्राइभर %s फेला पार्न सकिएन ।"
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (pkg फेला पार्नुहोस् )"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "वाऊ, APT ले सक्षम गरेको प्याकेज नामहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
-
-#: apt-pkg/pkgcachegen.cc:263
-#, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
+msgid "Is the package %s installed?"
+msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "वाऊ, APT ले सक्षम गरेको निर्भरताहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "विधि %s सही रुपले सुरू हुन सकेन"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "प्याकेज सूचिहरू पढिदैछ"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr "कृपया डिस्क लेबुल: '%s' ड्राइभ '%s'मा घुसउनुहोस् र इन्टर थिच्नुहोस् । "
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "स्रोत क्यास बचत गर्दा IO त्रुटि"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "निर्भरता ट्री निर्माण गरिदैछ"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "उमेद्वार संस्करणहरू"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "निर्भरता सिर्जना"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "उपलब्ध सूचना गाँभिदैछ"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:252
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "%s खोल्न असफल"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:257
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "फाइल %s लेख्न असफल भयो"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "पुन:नामकरण असफल गरियो, %s (%s -> %s) ।"
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "MD5Sum मेल भएन"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "साइज मेल खाएन"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
#, fuzzy
msgid "Invalid file format"
msgstr "अवैध सञ्चालन %s"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "त्रुटि लेख्नुहोस्"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2162,63 +2110,63 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, 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:1026
+#: apt-pkg/acquire-item.cc:1122
msgid "There is no public key available for the following key IDs:\n"
msgstr "निम्न कुञ्जी IDs को लागि कुनै सार्वजनिक कुञ्जी उपलब्ध छैन:\n"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "डाइरेक्ट्री %s फेरियो "
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2227,55 +2175,127 @@ msgstr ""
"%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज "
"निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) "
-#: apt-pkg/acquire-item.cc:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "प्याकेज अनुक्रमणिका फाइलहरू दूषित भए । प्याकेज %s को लागि कुनै फाइलनाम: फाँट छैन ।"
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "%s (%s) मा जडान गरिदैछ"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "क्यास संग एउटा नमिल्दो संस्करण प्रणाली छ"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (pkg फेला पार्नुहोस् )"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "वाऊ, APT ले सक्षम गरेको प्याकेज नामहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
+
+#: apt-pkg/pkgcachegen.cc:263
+#, fuzzy
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "वाऊ, APT ले सक्षम गरेको निर्भरताहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "प्याकेज सूचिहरू पढिदैछ"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "स्रोत क्यास बचत गर्दा IO त्रुटि"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।"
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "आंशिक संग्रह डाइरेक्ट्री %s हराइरहेछ ।"
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, fuzzy, c-format
msgid "Unable to lock directory %s"
msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, fuzzy, c-format
msgid "Clean of %s is not supported"
msgstr "अनुक्रमणिका फाइल प्रकार '%s' समर्थित छैन"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "%li को %li फाइल पुन:प्राप्त गरिदैछ (%s बाँकी छ)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "%li को %li फाइल पुन:प्राप्त गरिदैछ"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "%s %s तान्न असफल भयो\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"केही अनुक्रमणिका फाइलहरू डाउनलोड गर्न असफल भयो, तिनीहरू उपेक्षित भए, वा सट्टामा पुरानो "
+"एउटा प्रयोग गरियो ।"
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "तपाईँको स्रोत सूचिमा केही 'source' URIs राख्नुहोस्"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "%s स्थिर गर्न असक्षम भयो ।"
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2302,29 +2322,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "पिनको लागि कुनै प्राथमिकता (वा शून्य) निर्दिष्ट छैन"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "%s %s तान्न असफल भयो\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"केही अनुक्रमणिका फाइलहरू डाउनलोड गर्न असफल भयो, तिनीहरू उपेक्षित भए, वा सट्टामा पुरानो "
-"एउटा प्रयोग गरियो ।"
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "तपाईँको स्रोत सूचिमा केही 'source' URIs राख्नुहोस्"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s स्थिर गर्न असक्षम भयो ।"
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2445,32 +2442,30 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "समस्याहरू सुधार्न असक्षम भयो, तपाईँले प्याकेजहरु भाँच्नुभयो ।"
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "निर्भरता ट्री निर्माण गरिदैछ"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "उमेद्वार संस्करणहरू"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "निर्भरता सिर्जना"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr ""
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "उपलब्ध सूचना गाँभिदैछ"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr ""
-#: apt-pkg/depcache.cc:252
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s खोल्न असफल"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr ""
-#: apt-pkg/depcache.cc:257
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "फाइल %s लेख्न असफल भयो"
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "अनुक्रमणिका फाइल प्रकार '%s' समर्थित छैन"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2482,130 +2477,146 @@ msgstr "प्याकेज फाइल पद वर्णन गर्न
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "वैरुप्य गरिएको अधिलेखन %s रेखा %lu #१"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "%s खोलिदैछ"
+
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (प्रकार)"
+
+#: apt-pkg/sourcelist.cc:405
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन"
+
+#: apt-pkg/sourcelist.cc:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (प्रकार)"
+
+#: apt-pkg/sourcelist.cc:441
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन"
+
+#: apt-pkg/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr " '%s' को लागि '%s' निष्काशन फेला पार्न सकिएन"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr " '%s' को लागि '%s' संस्करण फेला पार्न सकिएन"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "प्याकेज फेला पार्न सकिएन %s"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "प्याकेज फेला पार्न सकिएन %s"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "प्याकेज फेला पार्न सकिएन %s"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "वैरुप्य गरिएको अधिलेखन %s रेखा %lu #१"
-
-#: apt-pkg/sourcelist.cc:355
-#, c-format
-msgid "Opening %s"
-msgstr "%s खोलिदैछ"
-
-#: apt-pkg/sourcelist.cc:389
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (प्रकार)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:393
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन"
-
-#: apt-pkg/sourcelist.cc:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (प्रकार)"
-
-#: apt-pkg/sourcelist.cc:429
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "द्रष्टब्य, %s को सट्टा %s चयन भइरहेछ\n"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "घुमाउरो फाइलमा अवैध लाइन:%s"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2766,35 +2777,6 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "चयन %s फेला पार्न सकिएन"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2871,7 +2853,7 @@ msgstr "फाइल %s खोल्न सकिएन"
msgid "Could not open file descriptor %d"
msgstr "%s को लागि पाइप खोल्न सकिएन"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "सहायक प्रक्रिया IPC सिर्जना गर्न असफल"
@@ -2908,12 +2890,12 @@ msgstr "फाइल अनलिङ्क गर्दा समस्या"
msgid "Problem syncing the file"
msgstr "फाइल गुप्तिकरण गर्दा समस्या"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "%s स्थिर गर्न असक्षम भयो"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr " %s मा लेख्न असक्षम"
@@ -2938,6 +2920,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... गरियो"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "चयन %s फेला पार्न सकिएन"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "एउटा खाली फाइल mmap बनाउन सकिएन"
@@ -3289,87 +3300,87 @@ msgstr "संग्रह संग नियन्त्रण रेकर्
msgid "Unable to get a cursor"
msgstr "कर्सर प्राप्त गर्न असक्षम भयो"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: डाइरेक्ट्री %s पढ्न असक्षम\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: %s स्थिर गर्न असक्षम\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "E: फाइलमा त्रुटिहरू लागू गर्नुहोस्"
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "%s हल गर्न असफल भयो"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "ट्री हिडाईँ असफल भयो"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "%s खोल्न असफल"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "लिङ्क पढ्न असफल %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "अनलिङ्क गर्न असफल %s"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** %s मा %s लिङ्क असफल भयो"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr "यस %sB हिटको डि लिङ्क सिमा।\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "संग्रह संग कुनै प्याकेज फाँट छैन"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s संभारकर्ता %s हो %s होइन\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
@@ -3655,6 +3666,10 @@ msgstr "टार चेकसम असफल भयो, संग्रह द
msgid "Unknown TAR header type %u, member %s"
msgstr "अज्ञात टार हेडर प्रकार %u, सदस्य %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ"
+
#~ msgid "Failed to create pipes"
#~ msgstr "पाइपहरू सिर्जना गर्न असफल"
diff --git a/po/nl.po b/po/nl.po
index 6d86d7ad7..35aa17740 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -12,7 +12,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: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\n"
"PO-Revision-Date: 2014-11-09 23:47+0100\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -119,7 +119,7 @@ msgstr ""
"Dit commando is verouderd. Gelieve in de plaats 'apt-mark showauto' te "
"gebruiken."
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Kan pakket %s niet vinden"
@@ -364,18 +364,18 @@ msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt"
msgid "Unable to lock the download directory"
msgstr "Kon de ophaalmap niet vergrendelen"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr ""
"U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet "
"worden"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kan geen bronpakket vinden voor %s"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -385,7 +385,7 @@ msgstr ""
"'%s' op:\n"
"%s\n"
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -397,69 +397,69 @@ msgstr ""
"om de nieuwste (mogelijk nog niet uitgebrachte) bijwerkingen van het pakket "
"op te halen.\n"
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Moet %sB aan bronarchieven ophalen.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Ophalen bron %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Ophalen van sommige archieven is mislukt."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Ophalen klaar en alleen-ophalen-modus staat aan"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uitpakopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Gelieve na te gaan of het pakket 'dpkg-dev' geïnstalleerd is.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Bouwopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Dochterproces is mislukt"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"U dient tenminste één pakket op te geven om er de bouwvereisten van te "
"controleren"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -468,27 +468,27 @@ msgstr ""
"Er is geen architectuurinformatie beschikbaar voor %s. Raadpleeg apt.conf(5) "
"APT::Architectures om dit te configureren"
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Verwerken van de bouwvereisten is mislukt"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s heeft geen bouwvereisten.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -497,7 +497,7 @@ msgstr ""
"De vereiste %s van %s kan niet voldaan worden omdat %s niet toegestaan is "
"voor de pakketten van '%s'"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -505,14 +505,14 @@ msgid ""
msgstr ""
"De vereiste %s van %s kan niet voldaan worden omdat pakket %s onvindbaar is"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Voldoen van vereiste %s van %s is mislukt: geïnstalleerd pakket %s is te "
"nieuw"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -521,7 +521,7 @@ msgstr ""
"De vereiste %s van %s kan niet voldaan worden omdat de beschikbare versie "
"van pakket %s niet aan de versievereisten voldoet"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -530,25 +530,25 @@ msgstr ""
"De vereiste %s van %s kan niet voldaan worden omdat er geen geschikte versie "
"is van pakket %s"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Voldoen van de vereiste %s van %s is mislukt: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Bouwvereisten voor %s konden niet voldaan worden."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "Verwerken van de bouwvereisten is mislukt"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Ondersteunde modules:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -647,21 +647,16 @@ msgstr "Heb een URL als argument nodig"
msgid "Must specify at least one pair url/filename"
msgstr "U dient minstens 1 paar van url/bestandsnaam op te geven"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr "Ophalen mislukt"
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "U dient minstens 1 paar van url/bestandsnaam op te geven"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
#, fuzzy
msgid ""
"Usage: apt-helper [options] command\n"
@@ -858,12 +853,12 @@ msgstr "Schijf niet gevonden."
msgid "File not found"
msgstr "Bestand niet gevonden"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "Kon status niet bepalen"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "Instellen van de aanpassingstijd is mislukt"
@@ -955,7 +950,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:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Mislukt"
@@ -1028,64 +1023,64 @@ msgstr "Zoekopdracht"
msgid "Unable to invoke "
msgstr "Mislukking bij aanroepen van "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Er wordt verbinding gemaakt met %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Kon de socket voor %s (f=%u t=%u p=%u) niet aanmaken"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Kan de verbinding met %s:%s (%s) niet aangaan."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Kon niet verbinden met %s:%s (%s); de verbinding verliep"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Kon niet verbinden met %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Er wordt verbinding gemaakt met %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "Kon '%s' niet vinden"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Tijdelijke fout bij het opzoeken van '%s'"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, c-format
msgid "System error resolving '%s:%s'"
msgstr "Systeemfout bij het opzoeken van '%s:%s'"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Er gebeurde iets raars bij het omzetten van '%s:%s' (%i - %s)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Kan geen verbinding maken met %s:%s:"
@@ -1108,7 +1103,7 @@ msgstr ""
"geïnstalleerd?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1213,229 +1208,6 @@ msgstr ""
msgid "Internal error"
msgstr "Interne fout"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr "Bezig met oplijsten"
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] "Er is %i bijkomende versie. Gebruik schakelaar '-a' om het te zien."
-msgstr[1] ""
-"Er zijn %i bijkomende versies. Gebruik schakelaar '-a' om ze te zien."
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Vereisten worden gecorrigeerd..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " mislukt."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Kan vereisten niet corrigeren"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "Kon de verzameling op te waarderen pakketten niet minimaliseren"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Klaar"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "U kunt 'apt-get -f install' uitvoeren om dit op te lossen."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr "onbekend"
-
-#: apt-private/private-output.cc:272
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[geïnstalleerd,opwaardeerbaar naar: %s]"
-
-#: apt-private/private-output.cc:275
-msgid "[installed,local]"
-msgstr "[geïnstalleerd,lokaal]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr "[geïnstalleerd,automatisch verwijderbaar]"
-
-#: apt-private/private-output.cc:279
-msgid "[installed,automatic]"
-msgstr "[geïnstalleerd,automatisch]"
-
-#: apt-private/private-output.cc:281
-msgid "[installed]"
-msgstr "[geïnstalleerd]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr "[opwaardeerbaar van: %s]"
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr "[overgebleven configuratie]"
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "maar %s is geïnstalleerd"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "maar %s zal geïnstalleerd worden"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "maar het is niet installeerbaar"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "maar het is een virtueel pakket"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "maar het is niet geïnstalleerd"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "maar het zal niet geïnstalleerd worden"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " of"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "De volgende pakketten hebben niet-voldane vereisten:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "De volgende pakketten zullen VERWIJDERD worden:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "De volgende pakketten zijn achtergehouden:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "De volgende pakketten zullen opgewaardeerd worden:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "De volgende pakketten zullen GEDEGRADEERD worden:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (vanwege %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu opgewaardeerd, %lu nieuw geïnstalleerd, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu opnieuw geïnstalleerd, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu gedegradeerd, "
-
-#: apt-private/private-output.cc:641
-#, 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:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu niet volledig geïnstalleerd of verwijderd.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[J/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-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:684
-msgid "Y"
-msgstr "J"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Regex-compilatiefout - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "De opdracht 'update' aanvaardt geen argumenten"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-"%i pakket kan opgewaardeerd worden. Voer 'apt list --upgradable' uit om het "
-"te zien.\n"
-msgstr[1] ""
-"%i pakketten kunnen opgewaardeerd worden. Voer 'apt list --upgradable' uit "
-"om ze te zien.\n"
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr "Alle pakketten zijn up-to-date."
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr "Bezig met sorteren"
@@ -1516,20 +1288,6 @@ msgstr "Pakket '%s' is niet geïnstalleerd, en wordt dus niet verwijderd\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Let op, '%s' wordt geselecteerd in plaats van '%s'\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-"Er is %i bijkomend record. Gebruik de schakeloptie '-a' om het te zien"
-msgstr[1] ""
-"Er zijn %i bijkomende records. Gebruik de schakeloptie '-a' om ze te zien."
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr "geen echt pakket (virtueel)"
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Interne fout. InstallPackages is aangeroepen met defecte pakketten!"
@@ -1538,7 +1296,7 @@ msgstr "Interne fout. InstallPackages is aangeroepen met defecte pakketten!"
msgid "Packages need to be removed but remove is disabled."
msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1807,6 +1565,243 @@ msgstr "Versie '%s' (%s) geselecteerd voor '%s'\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Versie '%s' (%s) geselecteerd voor '%s' omwille van '%s'\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "Bezig met oplijsten"
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] "Er is %i bijkomende versie. Gebruik schakelaar '-a' om het te zien."
+msgstr[1] ""
+"Er zijn %i bijkomende versies. Gebruik schakelaar '-a' om ze te zien."
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Vereisten worden gecorrigeerd..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " mislukt."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Kan vereisten niet corrigeren"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Kon de verzameling op te waarderen pakketten niet minimaliseren"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Klaar"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "U kunt 'apt-get -f install' uitvoeren om dit op te lossen."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "onbekend"
+
+#: apt-private/private-output.cc:272
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[geïnstalleerd,opwaardeerbaar naar: %s]"
+
+#: apt-private/private-output.cc:275
+msgid "[installed,local]"
+msgstr "[geïnstalleerd,lokaal]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr "[geïnstalleerd,automatisch verwijderbaar]"
+
+#: apt-private/private-output.cc:279
+msgid "[installed,automatic]"
+msgstr "[geïnstalleerd,automatisch]"
+
+#: apt-private/private-output.cc:281
+msgid "[installed]"
+msgstr "[geïnstalleerd]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[opwaardeerbaar van: %s]"
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr "[overgebleven configuratie]"
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "maar %s is geïnstalleerd"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "maar %s zal geïnstalleerd worden"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "maar het is niet installeerbaar"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "maar het is een virtueel pakket"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "maar het is niet geïnstalleerd"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "maar het zal niet geïnstalleerd worden"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " of"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "De volgende pakketten hebben niet-voldane vereisten:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "De volgende pakketten zullen VERWIJDERD worden:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "De volgende pakketten zijn achtergehouden:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "De volgende pakketten zullen opgewaardeerd worden:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "De volgende pakketten zullen GEDEGRADEERD worden:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (vanwege %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu opgewaardeerd, %lu nieuw geïnstalleerd, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu opnieuw geïnstalleerd, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu gedegradeerd, "
+
+#: apt-private/private-output.cc:641
+#, 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:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu niet volledig geïnstalleerd of verwijderd.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[J/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+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:684
+msgid "Y"
+msgstr "J"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Regex-compilatiefout - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "De opdracht 'update' aanvaardt geen argumenten"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"%i pakket kan opgewaardeerd worden. Voer 'apt list --upgradable' uit om het "
+"te zien.\n"
+msgstr[1] ""
+"%i pakketten kunnen opgewaardeerd worden. Voer 'apt list --upgradable' uit "
+"om ze te zien.\n"
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr "Alle pakketten zijn up-to-date."
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+"Er is %i bijkomend record. Gebruik de schakeloptie '-a' om het te zien"
+msgstr[1] ""
+"Er zijn %i bijkomende records. Gebruik de schakeloptie '-a' om ze te zien."
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr "geen echt pakket (virtueel)"
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1819,48 +1814,41 @@ msgstr ""
" Houd er ook rekening mee dat vergrendeling is uitgeschakeld.\n"
" Steun dus niet op haar relevantie voor de huidige concrete situatie!"
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr ""
"WAARSCHUWING: De volgende pakketten kunnen niet geauthenticeerd worden!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "Authenticiteitswaarschuwing werd genegeerd.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "Sommige pakketten konden niet geauthenticeerd worden"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "Wilt u deze pakketten installeren zonder verificatie?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ophalen van %s is mislukt %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "U heeft onvoldoende vrije schijfruimte op %s."
@@ -1929,16 +1917,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Kan %s niet lezen"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -2085,29 +2073,6 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr "De lijst van bronnen kon niet gelezen worden."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Het methodestuurprogramma %s kon niet gevonden worden."
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "Is the package %s installed?"
-msgstr "Is het pakket %s geïnstalleerd?"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Methode %s startte niet op de juiste manier"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr ""
-"Gelieve de schijf met label '%s' in het station '%s' te plaatsen en op "
-"'enter' te drukken."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Lege pakketcache"
@@ -2194,106 +2159,82 @@ msgstr "extra"
msgid "Calculating upgrade"
msgstr "Opwaardering wordt doorgerekend"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indexbestand van type '%s' wordt niet ondersteund"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "Cache heeft een niet-compatibel versienummeringssysteem"
+msgid "The method driver %s could not be found."
+msgstr "Het methodestuurprogramma %s kon niet gevonden worden."
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Fout tijdens verwerken van %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Wauw, u heeft het maximum aantal pakketnamen dat deze APT aankan "
-"overschreden."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"Wauw, u heeft het maximum aantal versies dat deze APT aankan overschreden."
+msgid "Is the package %s installed?"
+msgstr "Is het pakket %s geïnstalleerd?"
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"Wauw, u heeft het maximum aantal beschrijvingen dat deze APT aankan "
-"overschreden."
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Methode %s startte niet op de juiste manier"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
msgstr ""
-"Wauw, u heeft het maximum aantal afhankelijkheden dat deze APT aankan "
-"overschreden."
-
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Pakketlijsten worden ingelezen"
+"Gelieve de schijf met label '%s' in het station '%s' te plaatsen en op "
+"'enter' te drukken."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bron-cache"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Boom van vereisten wordt opgebouwd"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr "Scenario naar de oplosser sturen"
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Kandidaat-versies"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr "Verzoek naar de oplosser sturen"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Genereren van vereisten"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr "Instellen op het ontvangen van een oplossing"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "De statusinformatie wordt gelezen"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr "Externe oplosser faalde zonder passende foutmelding"
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Openen van StateFile %s is mislukt"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr "Externe oplosser uitvoeren"
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Wegschrijven van tijdelijke StateFile %s is mislukt"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "het hernoemen is mislukt, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "Hash-som komt niet overeen"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "Grootte komt niet overeen"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
msgid "Invalid file format"
msgstr "Ongeldig bestandsformaat"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Schrijffout"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, fuzzy, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2304,12 +2245,12 @@ msgstr ""
"%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-fout: %s: %s"
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2318,7 +2259,7 @@ msgstr ""
"Kon de verwachte regel '%s' in het Release-bestand niet vinden (Foute regel "
"in het bestand sources.list of bestand in een ongeldig formaat)"
-#: apt-pkg/acquire-item.cc:1026
+#: apt-pkg/acquire-item.cc:1122
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-ID's:\n"
@@ -2326,7 +2267,7 @@ msgstr ""
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2335,37 +2276,37 @@ msgstr ""
"Het Release-bestand voor %s is vervallen (ongeldig sinds %s). Bijwerkingen "
"voor deze pakketbron zullen niet uitgevoerd worden."
-#: apt-pkg/acquire-item.cc:1107
+#: apt-pkg/acquire-item.cc:1203
#, 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:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "De map %s is al omgeleid"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2374,12 +2315,12 @@ msgstr ""
"Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
"dit pakket handmatig moet repareren (wegens ontbrekende architectuur)"
-#: apt-pkg/acquire-item.cc:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Kan geen bron vinden om versie '%s' van '%s' op te halen"
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2388,43 +2329,122 @@ msgstr ""
"pakket %s."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Logbestand met veranderingen aan %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "Cache heeft een niet-compatibel versienummeringssysteem"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Fout tijdens verwerken van %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Wauw, u heeft het maximum aantal pakketnamen dat deze APT aankan "
+"overschreden."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+"Wauw, u heeft het maximum aantal versies dat deze APT aankan overschreden."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+"Wauw, u heeft het maximum aantal beschrijvingen dat deze APT aankan "
+"overschreden."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Wauw, u heeft het maximum aantal afhankelijkheden dat deze APT aankan "
+"overschreden."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Pakketlijsten worden ingelezen"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bron-cache"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr "Lijstmap %spartial is afwezig."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Archiefmap %spartial is afwezig."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, c-format
msgid "Unable to lock directory %s"
msgstr "Kan de map %s niet vergrendelen"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, c-format
msgid "Clean of %s is not supported"
msgstr "Opschonen van %s wordt niet ondersteund"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Bestand %li van %li wordt opgehaald (nog %s te gaan)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Bestand %li van %li wordt opgehaald"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Ophalen van %s is mislukt %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Ophalen van sommige indexbestanden is mislukt. Deze zijn of genegeerd, of er "
+"zijn oudere versies van gebruikt."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
+"Uw bronnenlijst (/etc/apt/sources.list) dient tenminste één bron-URI te "
+"bevatten"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Kan de status van %s niet opvragen."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2454,30 +2474,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Ophalen van %s is mislukt %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Ophalen van sommige indexbestanden is mislukt. Deze zijn of genegeerd, of er "
-"zijn oudere versies van gebruikt."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
-"Uw bronnenlijst (/etc/apt/sources.list) dient tenminste één bron-URI te "
-"bevatten"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Kan de status van %s niet opvragen."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2606,31 +2602,30 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Boom van vereisten wordt opgebouwd"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr "Scenario naar de oplosser sturen"
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Kandidaat-versies"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr "Verzoek naar de oplosser sturen"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Genereren van vereisten"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr "Instellen op het ontvangen van een oplossing"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "De statusinformatie wordt gelezen"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr "Externe oplosser faalde zonder passende foutmelding"
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Openen van StateFile %s is mislukt"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr "Externe oplosser uitvoeren"
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Wegschrijven van tijdelijke StateFile %s is mislukt"
+msgid "Index file type '%s' is not supported"
+msgstr "Indexbestand van type '%s' wordt niet ondersteund"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2642,59 +2637,97 @@ msgstr "Kon pakketbestand %s niet ontleden (%d)"
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Niet juist gevormde voorrangsingang %s op regel %llu (%s)"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "%s wordt geopend"
+
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Niet juist gevormde regel %u in bronlijst %s (type)"
+
+#: apt-pkg/sourcelist.cc:405
+#, 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:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Niet juist gevormde regel %u in bronlijst %s (type)"
+
+#: apt-pkg/sourcelist.cc:441
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Type '%s' van element %u in bronlijst %s is onbekend"
+
+#: apt-pkg/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release '%s' voor '%s' is niet gevonden"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versie '%s' voor '%s' is niet gevonden"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Kon taak '%s' niet vinden"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Kon geen enkel pakket vinden via regex '%s'"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Kon geen enkel pakket vinden via glob '%s'"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Kan geen versies selecteren voor pakket '%s' omdat het puur virtueel is"
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Kan de nieuwste versie van het pakket '%s' niet selecteren omdat het puur "
"virtueel is"
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Kan de kandidaat-versie van het pakket %s niet selecteren omdat het geen "
"kandidaat heeft"
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Kan de geïnstalleerde versie van het pakket %s niet selecteren omdat het "
"niet geïnstalleerd is"
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -2703,78 +2736,56 @@ msgstr ""
"Kan noch de geïnstalleerde, noch de kandidaat-versie van het pakket '%s' "
"selecteren omdat geen van beide er zijn"
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Niet juist gevormde voorrangsingang %s op regel %llu (%s)"
-
-#: apt-pkg/sourcelist.cc:355
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Opening %s"
-msgstr "%s wordt geopend"
-
-#: apt-pkg/sourcelist.cc:389
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Niet juist gevormde regel %u in bronlijst %s (type)"
-
-#: apt-pkg/sourcelist.cc:393
-#, 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:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "Niet juist gevormde regel %u in bronlijst %s (type)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:429
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Type '%s' van element %u in bronlijst %s is onbekend"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Kon Release-bestand %s niet ontleden"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr "Geen secties in Release-bestand %s"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Geen Hash-vermelding in Release-bestand %s"
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ongeldige 'Date'-vermelding in Release-bestand %s"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Ongeldige 'Valid-Until'-vermelding in Release-bestand %s"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2950,35 +2961,6 @@ msgstr ""
msgid "Not locked"
msgstr "Niet vergrendeld"
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %liu %limin %lis"
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%liu %limin %lis"
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "Selectie %s niet gevonden"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -3061,7 +3043,7 @@ msgstr "Kon het bestand %s niet openen"
msgid "Could not open file descriptor %d"
msgstr "Kon de bestandsindicator %d niet openen"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "Aanmaken IPC-subproces is mislukt"
@@ -3098,12 +3080,12 @@ msgstr "Probleem bij het ontkoppelen van het bestand %s"
msgid "Problem syncing the file"
msgstr "Probleem bij het synchroniseren van het bestand"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, c-format
msgid "Unable to mkstemp %s"
msgstr "Kan tijdelijk bestand %s niet aanmaken"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Kan niet naar %s schrijven"
@@ -3128,6 +3110,35 @@ msgstr "..."
msgid "%c%s... %u%%"
msgstr "%c%s... %u%%"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %liu %limin %lis"
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%liu %limin %lis"
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "Selectie %s niet gevonden"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Kan systeem-aanroep mmap niet op een leeg bestand toepassen"
@@ -3490,87 +3501,87 @@ msgstr "Archief heeft geen 'control'-record"
msgid "Unable to get a cursor"
msgstr "Kan geen cursor verkrijgen"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Kon map %s niet lezen\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Kon de status van %s niet opvragen\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "F: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "F: Er zijn fouten van toepassing op het bestand "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "Oplossen van %s is mislukt"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Doorlopen boomstructuur is mislukt"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "Openen van %s is mislukt"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "Opdracht readlink %s is mislukt"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "Ontkoppelen van %s is mislukt"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Koppelen van %s aan %s is mislukt"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-limiet van %sB bereikt.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "Archief heeft geen 'package'-veld"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s heeft geen voorrangsingang\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s beheerder is %s, niet %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s heeft geen voorrangsingang voor bronpakketten\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n"
@@ -3855,6 +3866,10 @@ msgstr "Tar controlesom klopt niet, het pakket is beschadigd"
msgid "Unknown TAR header type %u, member %s"
msgstr "Onbekend TAR-kopteksttype %u, onderdeel %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "U dient minstens 1 paar van url/bestandsnaam op te geven"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Aanmaken van pijpen is mislukt"
diff --git a/po/nn.po b/po/nn.po
index ce10d7761..34a2ef039 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\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"
@@ -119,7 +119,7 @@ msgstr "Du m oppgi nyaktig eitt mnster"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Finn ikkje pakken %s"
@@ -358,23 +358,23 @@ msgstr "Intern feil. AllUpgrade ydelagde noko"
msgid "Unable to lock the download directory"
msgstr "Klarte ikkje lsa nedlastingskatalogen"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "Du m velja minst in pakke som kjeldekoden skal hentast for"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Finn ingen kjeldepakke for %s"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -382,114 +382,114 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "M henta %sB/%sB med kjeldekodearkiv.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "M henta %sB med kjeldekodearkiv.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Hent kjeldekode %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Klarte ikkje henta nokre av arkiva."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Nedlastinga er ferdig i nedlastingsmodus"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen %s mislukkast.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggjekommandoen %s mislukkast.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Barneprosessen mislukkast"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr "Du m velja minst ein pakke som byggjekrava skal sjekkast for"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Klarte ikkje behandla byggjekrava"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Klarte ikkje henta byggjekrav for %s"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen byggjekrav.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -498,32 +498,32 @@ msgstr ""
"Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon "
"tilgjengelege versjonar av pakken %s som oppfyller versjonskrava"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "Klarte ikkje behandla byggjekrava"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Sttta modular:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -618,21 +618,16 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Du m velja minst in pakke som kjeldekoden skal hentast for"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "Du m velja minst in pakke som kjeldekoden skal hentast for"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -775,12 +770,12 @@ msgstr "Fann ikkje fila"
msgid "File not found"
msgstr "Fann ikkje fila"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "Klarte ikkje f status"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "Klarte ikkje setja endringstidspunkt"
@@ -871,7 +866,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:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Mislukkast"
@@ -944,64 +939,64 @@ msgstr "Sprjing"
msgid "Unable to invoke "
msgstr "Klarte ikkje starta "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Koplar til %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Klarte ikkje oppretta sokkel for %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Klarte ikkje initiera sambandet til %s:%s (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Klarte ikkje kopla til %s:%s (%s), tidsavbrot p sambandet"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Klarte ikkje kopla til %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Koplar til %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "Klarte ikkje sl opp %s"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Mellombels feil ved oppslag av %s"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, fuzzy, c-format
msgid "System error resolving '%s:%s'"
msgstr "Det hende noko dumt ved oppslag av %s:%s (%i)"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Det hende noko dumt ved oppslag av %s:%s (%i)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Klarte ikkje kopla til %s %s:"
@@ -1020,7 +1015,7 @@ msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1121,229 +1116,6 @@ msgstr ""
msgid "Internal error"
msgstr "Intern feil"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Rettar p krav ..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " mislukkast."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Klarte ikkje retta p krav"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "Klarte ikkje minimera oppgraderingsmengda"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Ferdig"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Du vil kanskje prva retta p desse ved kyra apt-get -f install."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nokre krav er ikkje oppfylte. Prv med -f."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "men %s er installert"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "men %s skal installerast"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "men lt seg ikkje installera"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "men er ein virtuell pakke"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "men er ikkje installert"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "men skal ikkje installerast"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " eller"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "Flgjande pakkar har krav som ikkje er oppfylte:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "Dei flgjande NYE pakkane vil verta installerte:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Dei flgjande pakkane vil verta FJERNA:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "Dei flgjande pakkane er haldne tilbake:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "Dei flgjande pakkane vil verta oppgraderte:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Dei flgjande pakkane vil verta NEDGRADERTE:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "Dei flgjande pakkane som er haldne tilbake vil verta endra:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (fordi %s)"
-
-#: apt-private/private-output.cc:602
-#, fuzzy
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu oppgraderte, %lu nyleg installerte, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu installerte p nytt, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu nedgraderte, "
-
-#: apt-private/private-output.cc:641
-#, 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:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[J/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-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:684
-msgid "Y"
-msgstr "J"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Regex-kompileringsfeil - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Oppdateringskommandoen tek ingen argument"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1423,18 +1195,6 @@ msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Merk, vel %s i staden for %s\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
@@ -1443,7 +1203,7 @@ msgstr ""
msgid "Packages need to be removed but remove is disabled."
msgstr "Nokre pakkar m fjernast, men fjerning er sltt av."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1702,6 +1462,241 @@ msgstr "Vald versjon %s (%s) for %s\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Vald versjon %s (%s) for %s\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Rettar p krav ..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " mislukkast."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Klarte ikkje retta p krav"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Klarte ikkje minimera oppgraderingsmengda"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Ferdig"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Du vil kanskje prva retta p desse ved kyra apt-get -f install."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Nokre krav er ikkje oppfylte. Prv med -f."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "men %s er installert"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "men %s skal installerast"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "men lt seg ikkje installera"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "men er ein virtuell pakke"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "men er ikkje installert"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "men skal ikkje installerast"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " eller"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Flgjande pakkar har krav som ikkje er oppfylte:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Dei flgjande NYE pakkane vil verta installerte:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Dei flgjande pakkane vil verta FJERNA:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "Dei flgjande pakkane er haldne tilbake:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "Dei flgjande pakkane vil verta oppgraderte:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Dei flgjande pakkane vil verta NEDGRADERTE:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "Dei flgjande pakkane som er haldne tilbake vil verta endra:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (fordi %s)"
+
+#: apt-private/private-output.cc:602
+#, fuzzy
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu oppgraderte, %lu nyleg installerte, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu installerte p nytt, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu nedgraderte, "
+
+#: apt-private/private-output.cc:641
+#, 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:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[J/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+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:684
+msgid "Y"
+msgstr "J"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Regex-kompileringsfeil - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Oppdateringskommandoen tek ingen argument"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1710,47 +1705,40 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "TVARING: Klarer ikkje autentisere desse pakkane."
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr ""
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "Nokre pakkar kunne ikkje bli autentisert"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "Installer desse pakkane utan verifikasjon?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Det oppstod problem, og -y vart brukt utan --force-yes"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikkje henta %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Du har ikkje nok ledig plass i %s"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Du har ikkje nok ledig plass i %s."
@@ -1819,16 +1807,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Klarte ikkje lesa %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -1965,30 +1953,6 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr "Kjeldelista kan ikkje lesast."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Finn ikkje metodedrivaren %s."
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "Is the package %s installed?"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoden %s starta ikkje rett"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr ""
-"Skifte av medum: Set inn plata merkt\n"
-" %s\n"
-"i stasjonen %s og trykk Enter.\n"
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Tomt pakkelager"
@@ -2076,102 +2040,86 @@ msgstr "tillegg"
msgid "Calculating upgrade"
msgstr "Reknar ut oppgradering"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indeksfiltypen %s er ikkje sttta"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Feil ved behandling av %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Jss, du har overgtt talet p pakkenamn som APT kan handtera."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Jss, du har overgtt talet p versjonar som APT kan handtera."
+msgid "The method driver %s could not be found."
+msgstr "Finn ikkje metodedrivaren %s."
-#: apt-pkg/pkgcachegen.cc:263
-#, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Jss, du har overgtt talet p versjonar som APT kan handtera."
+#: apt-pkg/acquire-worker.cc:113
+#, c-format
+msgid "Is the package %s installed?"
+msgstr ""
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Jss, du har overgtt talet p krav som APT kan handtera."
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Metoden %s starta ikkje rett"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Les pakkelister"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr ""
+"Skifte av medum: Set inn plata merkt\n"
+" %s\n"
+"i stasjonen %s og trykk Enter.\n"
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "IU-feil ved lagring av kjeldelager"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Byggjer kravtre"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Kandidatversjonar"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Genererer kravforhold"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "Flettar informasjon om tilgjengelege pakkar"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:252
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Klarte ikkje opna %s"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:257
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Klarte ikkje skriva fila %s"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "endring av namn mislukkast, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Feil MD5-sum"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "Feil storleik"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
#, fuzzy
msgid "Invalid file format"
msgstr "Ugyldig operasjon %s"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Skrivefeil"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2179,63 +2127,63 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, 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:1026
+#: apt-pkg/acquire-item.cc:1122
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "Katalogen %s er avleidd"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2244,12 +2192,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:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2257,43 +2205,115 @@ msgstr ""
"Pakkeindeksfilene er ydelagde. Feltet Filename: manglar for pakken %s."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Koplar til %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Feil ved behandling av %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Jss, du har overgtt talet p pakkenamn som APT kan handtera."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Jss, du har overgtt talet p versjonar som APT kan handtera."
+
+#: apt-pkg/pkgcachegen.cc:263
+#, fuzzy
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Jss, du har overgtt talet p versjonar som APT kan handtera."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Jss, du har overgtt talet p krav som APT kan handtera."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Les pakkelister"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "IU-feil ved lagring av kjeldelager"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Listekatalogen %spartial manglar."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "Arkivkatalogen %spartial manglar."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, fuzzy, c-format
msgid "Unable to lock directory %s"
msgstr "Klarte ikkje lsa listekatalogen"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, fuzzy, c-format
msgid "Clean of %s is not supported"
msgstr "Indeksfiltypen %s er ikkje sttta"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, fuzzy, c-format
msgid "Retrieving file %li of %li"
msgstr "Les filliste"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Klarte ikkje henta %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle "
+"filer er brukte i staden."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Du m leggja nokre kjelde-URI-ar i fila sources.list."
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Klarte ikkje f status p %s."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2320,29 +2340,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "Ingen prioritet (eller null) oppgitt for spiker"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Klarte ikkje henta %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle "
-"filer er brukte i staden."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Du m leggja nokre kjelde-URI-ar i fila sources.list."
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Klarte ikkje f status p %s."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2464,32 +2461,30 @@ msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Klarte ikkje retta opp problema. Nokre ydelagde pakkar er haldne tilbake."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Byggjer kravtre"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Kandidatversjonar"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Genererer kravforhold"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr ""
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "Flettar informasjon om tilgjengelege pakkar"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr ""
-#: apt-pkg/depcache.cc:252
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Klarte ikkje opna %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr ""
-#: apt-pkg/depcache.cc:257
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Klarte ikkje skriva fila %s"
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Indeksfiltypen %s er ikkje sttta"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2501,130 +2496,146 @@ msgstr "Klarte ikkje tolka pakkefila %s (%d)"
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Misforma overstyring %s linje %lu #1"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "Opnar %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Misforma linje %u i kjeldelista %s (type)"
+
+#: apt-pkg/sourcelist.cc:405
+#, 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:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Misforma linje %u i kjeldelista %s (type)"
+
+#: apt-pkg/sourcelist.cc:441
+#, 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/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Fann ikkje utgva %s av %s"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Fann ikkje versjonen %s av %s"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Fann ikkje pakken %s"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Fann ikkje pakken %s"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Fann ikkje pakken %s"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Misforma overstyring %s linje %lu #1"
-
-#: apt-pkg/sourcelist.cc:355
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Opening %s"
-msgstr "Opnar %s"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:389
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Misforma linje %u i kjeldelista %s (type)"
-
-#: apt-pkg/sourcelist.cc:393
-#, 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:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "Misforma linje %u i kjeldelista %s (type)"
-
-#: apt-pkg/sourcelist.cc:429
-#, 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"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Klarte ikkje tolka pakkefila %s (1)"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Merk, vel %s i staden for %s\n"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Klarte ikkje tolka pakkefila %s (1)"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Ugyldig linje i avleiingsfila: %s"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2785,35 +2796,6 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "Fann ikkje utvalet %s"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2890,7 +2872,7 @@ msgstr "Klarte ikkje opna fila %s"
msgid "Could not open file descriptor %d"
msgstr "Klarte ikkje opna ryr for %s"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "Klarte ikkje oppretta underprosessen IPC"
@@ -2927,12 +2909,12 @@ msgstr "Problem ved oppheving av lenkje til fila"
msgid "Problem syncing the file"
msgstr "Problem ved synkronisering av fila"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Klarte ikkje f status til %s"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Klarte ikkje skriva til %s"
@@ -2957,6 +2939,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s ... Ferdig"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "Fann ikkje utvalet %s"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Kan ikkje utfra mmap p ei tom fil"
@@ -3305,87 +3316,87 @@ msgstr "Arkivet har ingen kontrollpost"
msgid "Unable to get a cursor"
msgstr "Klarte ikkje f peikar"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr ": Klarte ikkje lesa katalogen %s\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr ": Klarte ikkje f status til %s\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "F: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr ": "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "F: Det er feil ved fila "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "Klarte ikkje sl opp %s"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Treklatring mislukkast"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "Klarte ikkje opna %s"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "Klarte ikkje lesa lenkja %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "Klarte ikkje oppheva lenkja %s"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Klarte ikkje lenkja %s til %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-grensa p %sB er ndd.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "Arkivet har ikkje noko pakkefelt"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har inga overstyringsoppfring\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s-vedlikehaldaren er %s, ikkje %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " %s har inga overstyringsoppfring\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s har inga overstyringsoppfring\n"
@@ -3671,6 +3682,10 @@ msgstr "Tar-sjekksummen mislukkast, arkivet er ydelagt"
msgid "Unknown TAR header type %u, member %s"
msgstr "Ukjend TAR-hovud type %u, medlem %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "Du m velja minst in pakke som kjeldekoden skal hentast for"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Klarte ikkje oppretta ryr"
diff --git a/po/pl.po b/po/pl.po
index 8c0ef0fa5..afcd08cc9 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: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\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"
@@ -118,7 +118,7 @@ msgstr "Należy podać przynajmniej jeden wzorzec"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr "To polecenie jest przestarzałe. Prosimy używać \"apt-mark showauto\"."
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Nie udało się odnaleźć pakietu %s"
@@ -358,18 +358,18 @@ msgstr "Błąd wewnętrzny, spowodowany przez moduł rozwiązywania problemów"
msgid "Unable to lock the download directory"
msgstr "Nie udało się zablokować katalogu pobierania"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane "
"źródła"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nie udało się odnaleźć źródła dla pakietu %s"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -379,7 +379,7 @@ msgstr ""
"pod adresem:\n"
"%s\n"
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -391,69 +391,69 @@ msgstr ""
"by pobrać najnowsze (prawdopodobnie jeszcze niewydane) poprawki tego "
"pakietu.\n"
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Pomijanie już pobranego pliku \"%s\"\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Konieczne pobranie %sB/%sB archiwów źródeł.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Konieczne pobranie %sB archiwów źródeł.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Pobieranie źródeł %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Nie udało się pobrać niektórych archiwów."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Ukończono pobieranie w trybie samego pobierania"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Pomijanie rozpakowania już rozpakowanego źródła w %s\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Polecenie budowania \"%s\" zawiodło.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Proces potomny zawiódł"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Należy podać przynajmniej jeden pakiet, dla którego mają zostać sprawdzone "
"zależności dla budowania"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -462,27 +462,27 @@ msgstr ""
"Nie znaleziono informacji o architekturze dla %s. Proszę zapoznać się z apt."
"conf(5) APT::Architectures"
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Nie udało się przetworzyć zależności dla budowania"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nie udało się pobrać informacji o zależnościach dla budowania %s"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nie ma zależności dla budowania.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -491,7 +491,7 @@ msgstr ""
"Zależność %s od %s nie może zostać spełniona, ponieważ %s nie jest dozwolone "
"w pakietach \"%s\""
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -500,14 +500,14 @@ msgstr ""
"Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono "
"pakietu %s"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Nie udało się spełnić zależności %s od %s: Zainstalowany pakiet %s jest zbyt "
"nowy"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -516,7 +516,7 @@ msgstr ""
"Zależność %s od %s nie może zostać spełniona, ponieważ kandydująca wersja "
"pakietu %s nie spełnia wymagań wersji"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -525,25 +525,25 @@ msgstr ""
"Zależność %s od %s nie może zostać spełniona, ponieważ pakiet %s nie ma "
"wersji kandydującej"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Nie udało się spełnić zależności %s od %s: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Nie udało się spełnić zależności dla budowania %s."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "Nie udało się przetworzyć zależności dla budowania"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Obsługiwane moduły:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -642,23 +642,16 @@ msgstr ""
"Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane "
"źródła"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr ""
-"Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane "
-"źródła"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -823,12 +816,12 @@ msgstr "Nie odnaleziono dysku."
msgid "File not found"
msgstr "Nie odnaleziono pliku"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "Nie udało się wykonać operacji stat"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "Nie udało się ustawić czasu modyfikacji"
@@ -921,7 +914,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:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Nie udało się"
@@ -994,64 +987,64 @@ msgstr "Info"
msgid "Unable to invoke "
msgstr "Nie można wywołać "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Łączenie z %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Nie udało się utworzyć gniazda dla %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Nie udało się zainicjalizować połączenia z %s:%s (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Nie udało się połączyć z %s:%s (%s), przekroczenie czasu połączenia"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Nie udało się połączyć z %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Łączenie z %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nie udało się przetłumaczyć nazwy \"%s\""
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Tymczasowy błąd przy tłumaczeniu \"%s\""
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, fuzzy, c-format
msgid "System error resolving '%s:%s'"
msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i - %s)"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i - %s)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Nie udało się połączyć z %s:%s:"
@@ -1073,7 +1066,7 @@ msgstr ""
"zainstalowane?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1175,229 +1168,6 @@ msgstr ""
msgid "Internal error"
msgstr "Błąd wewnętrzny"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Naprawianie zależności..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " nie udało się."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Nie udało się naprawić zależności"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "Nie udało się zminimalizować zbioru aktualizacji"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Gotowe"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Niespełnione zależności. Proszę spróbować użyć -f."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Zainstalowany]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Zainstalowany]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Zainstalowany]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr " [Zainstalowany]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "ale %s jest zainstalowany"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ale %s ma zostać zainstalowany"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "ale nie da się go zainstalować"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "ale jest pakietem wirtualnym"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "ale nie jest zainstalowany"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "ale nie zostanie zainstalowany"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " lub"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "Następujące pakiety mają niespełnione zależności:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "Zostaną zainstalowane następujące NOWE pakiety:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Następujące pakiety zostaną USUNIĘTE:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "Następujące pakiety zostały zatrzymane:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "Następujące pakiety zostaną zaktualizowane:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Zostaną zainstalowane STARE wersje następujących pakietów:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "Zostaną zmienione następujące zatrzymane pakiety:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (z powodu %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu aktualizowanych, %lu nowo instalowanych, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu ponownie instalowanych, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu cofniętych wersji, "
-
-#: apt-private/private-output.cc:641
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu usuwanych i %lu nieaktualizowanych.\n"
-
-#: apt-private/private-output.cc:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[T/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-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:684
-msgid "Y"
-msgstr "T"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Błąd kompilacji wyrażenia regularnego - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Polecenie update nie wymaga żadnych argumentów"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1478,19 +1248,6 @@ msgstr "Pakiet \"%s\" nie jest zainstalowany, więc nie zostanie usunięty\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Uwaga, wybieranie \"%s\" zamiast \"%s\"\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Błąd wewnętrzny, użyto InstallPackages z uszkodzonymi pakietami!"
@@ -1499,7 +1256,7 @@ msgstr "Błąd wewnętrzny, użyto InstallPackages z uszkodzonymi pakietami!"
msgid "Packages need to be removed but remove is disabled."
msgstr "Pakiety powinny zostać usunięte, ale Remove jest wyłączone."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1780,6 +1537,242 @@ msgstr "Wybrano wersję \"%s\" (%s) pakietu \"%s\"\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Wybrano wersję \"%s\" (%s) pakietu \"%s\", z powodu \"%s\"\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Naprawianie zależności..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " nie udało się."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Nie udało się naprawić zależności"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Nie udało się zminimalizować zbioru aktualizacji"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Gotowe"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Niespełnione zależności. Proszę spróbować użyć -f."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Zainstalowany]"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Zainstalowany]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Zainstalowany]"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr " [Zainstalowany]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "ale %s jest zainstalowany"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ale %s ma zostać zainstalowany"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "ale nie da się go zainstalować"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "ale jest pakietem wirtualnym"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "ale nie jest zainstalowany"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "ale nie zostanie zainstalowany"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " lub"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Następujące pakiety mają niespełnione zależności:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Zostaną zainstalowane następujące NOWE pakiety:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Następujące pakiety zostaną USUNIĘTE:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "Następujące pakiety zostały zatrzymane:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "Następujące pakiety zostaną zaktualizowane:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Zostaną zainstalowane STARE wersje następujących pakietów:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "Zostaną zmienione następujące zatrzymane pakiety:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (z powodu %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu aktualizowanych, %lu nowo instalowanych, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu ponownie instalowanych, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu cofniętych wersji, "
+
+#: apt-private/private-output.cc:641
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu usuwanych i %lu nieaktualizowanych.\n"
+
+#: apt-private/private-output.cc:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[T/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+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:684
+msgid "Y"
+msgstr "T"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Błąd kompilacji wyrażenia regularnego - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Polecenie update nie wymaga żadnych argumentów"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1792,47 +1785,40 @@ msgstr ""
" Aktualnie blokowanie jest wyłączone, więc nie należy polegać\n"
" na związku z rzeczywistą sytuacją!"
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "UWAGA: Następujące pakiety nie mogą zostać zweryfikowane!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "Zignorowano ostrzeżenie uwierzytelniania.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "Niektóre pakiety nie mogły zostać zweryfikowane"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "Zainstalować te pakiety bez weryfikacji?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Wystąpiły problemy, a użyto -y bez --force-yes"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Nie udało się pobrać %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nie udało się ustalić ilości wolnego miejsca w %s"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Niestety w %s nie ma wystarczającej ilości wolnego miejsca."
@@ -1904,16 +1890,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Nie można czytać %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -2052,27 +2038,6 @@ msgstr "Należy uruchomić apt-get update aby naprawić te problemy."
msgid "The list of sources could not be read."
msgstr "Nie udało się odczytać list źródeł."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Nie udało się odnaleźć sterownika metody %s."
-
-#: apt-pkg/acquire-worker.cc:113
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoda %s nie uruchomiła się poprawnie"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr "Proszę włożyć do napędu \"%s\" dysk o nazwie: \"%s\" i nacisnąć enter."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Pusty magazyn podręczny pakietów"
@@ -2159,102 +2124,81 @@ msgstr "dodatkowy"
msgid "Calculating upgrade"
msgstr "Obliczanie aktualizacji"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Plik indeksu typu \"%s\" nie jest obsługiwany"
+msgid "The method driver %s could not be found."
+msgstr "Nie udało się odnaleźć sterownika metody %s."
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "Magazyn podręczny ma niezgodny system wersji"
+#: apt-pkg/acquire-worker.cc:113
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n"
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:164
#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Wystąpił błąd podczas przetwarzania %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Przekroczono liczbę pakietów, którą ten APT jest w stanie obsłużyć."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Przekroczono liczbę wersji, którą ten APT jest w stanie obsłużyć."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Przekroczono liczbę opisów, którą ten APT jest w stanie obsłużyć."
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Przekroczono liczbę zależności, którą ten APT jest w stanie obsłużyć."
+msgid "Method %s did not start correctly"
+msgstr "Metoda %s nie uruchomiła się poprawnie"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Czytanie list pakietów"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr "Proszę włożyć do napędu \"%s\" dysk o nazwie: \"%s\" i nacisnąć enter."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "Błąd wejścia/wyjścia przy zapisywaniu podręcznego magazynu źródeł"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Budowanie drzewa zależności"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr "Wysyłanie scenariusza do mechanizmu rozwiązywania zależności"
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Kandydujące wersje"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr "Wysyłanie żądania do mechanizmu rozwiązywania zależności"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generowanie zależności"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr "Przygotowywanie na otrzymanie rozwiązania"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Odczyt informacji o stanie"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr ""
-"Zewnętrzny mechanizm rozwiązywania zależności zawiódł, bez podania "
-"prawidłowego komunikatu o błędzie"
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Nie udało się otworzyć pliku stanu %s"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr "Wykonywanie zewnętrznego mechanizmu rozwiązywania zależności"
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Nie udało się zapisać tymczasowego pliku stanu %s"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "nie udało się zmienić nazwy, %s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "Błędna suma kontrolna"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "Błędny rozmiar"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
#, fuzzy
msgid "Invalid file format"
msgstr "Nieprawidłowa operacja %s"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Błąd zapisu"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, fuzzy, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2264,12 +2208,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:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr "Błąd GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2278,14 +2222,14 @@ 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:1026
+#: apt-pkg/acquire-item.cc:1122
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"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2294,37 +2238,37 @@ msgstr ""
"Plik Release dla %s wygasnął (nieprawidłowy od %s). Aktualizacje z tego "
"repozytorium nie będą wykonywane."
-#: apt-pkg/acquire-item.cc:1107
+#: apt-pkg/acquire-item.cc:1203
#, 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:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "Ominięcie katalogu %s"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2333,12 +2277,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:2677
+#: apt-pkg/acquire-item.cc:2751
#, 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:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2346,43 +2290,113 @@ msgstr ""
"Pliki indeksu pakietów są uszkodzone. Brak pola Filename: dla pakietu %s."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Dziennik zmian %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "Magazyn podręczny ma niezgodny system wersji"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Wystąpił błąd podczas przetwarzania %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Przekroczono liczbę pakietów, którą ten APT jest w stanie obsłużyć."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Przekroczono liczbę wersji, którą ten APT jest w stanie obsłużyć."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Przekroczono liczbę opisów, którą ten APT jest w stanie obsłużyć."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Przekroczono liczbę zależności, którą ten APT jest w stanie obsłużyć."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Czytanie list pakietów"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "Błąd wejścia/wyjścia przy zapisywaniu podręcznego magazynu źródeł"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr "Brakuje katalogu list %spartial."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Brakuje katalogu archiwów %spartial."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, c-format
msgid "Unable to lock directory %s"
msgstr "Nie udało się zablokować katalogu %s"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, fuzzy, c-format
msgid "Clean of %s is not supported"
msgstr "Plik indeksu typu \"%s\" nie jest obsługiwany"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Pobieranie pliku %li z %li (pozostało %s)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Pobieranie pliku %li z %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Nie udało się pobrać %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Nie udało się pobrać niektórych plików indeksu, zostały one zignorowane lub "
+"użyto ich starszej wersji."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Należy dopisać jakieś URI pakietów źródłowych do pliku sources.list"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Nie udało się wykonać operacji stat na pliku %s."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2411,28 +2425,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "Brak (lub zerowy) priorytet przypięcia"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Nie udało się pobrać %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Nie udało się pobrać niektórych plików indeksu, zostały one zignorowane lub "
-"użyto ich starszej wersji."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Należy dopisać jakieś URI pakietów źródłowych do pliku sources.list"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Nie udało się wykonać operacji stat na pliku %s."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2562,31 +2554,32 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nie udało się naprawić problemów, zatrzymano uszkodzone pakiety."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Budowanie drzewa zależności"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr "Wysyłanie scenariusza do mechanizmu rozwiązywania zależności"
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Kandydujące wersje"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr "Wysyłanie żądania do mechanizmu rozwiązywania zależności"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generowanie zależności"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr "Przygotowywanie na otrzymanie rozwiązania"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Odczyt informacji o stanie"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr ""
+"Zewnętrzny mechanizm rozwiązywania zależności zawiódł, bez podania "
+"prawidłowego komunikatu o błędzie"
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nie udało się otworzyć pliku stanu %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr "Wykonywanie zewnętrznego mechanizmu rozwiązywania zależności"
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Nie udało się zapisać tymczasowego pliku stanu %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Plik indeksu typu \"%s\" nie jest obsługiwany"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2598,62 +2591,100 @@ msgstr "Nie udało się zanalizować pliku pakietu %s (%d)"
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Nieprawidłowa linia %llu #1 pliku override %s"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "Otwieranie %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, 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:405
+#, 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:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)"
+
+#: apt-pkg/sourcelist.cc:441
+#, 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/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Wydanie \"%s\" dla \"%s\" nie zostało znalezione"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Wersja \"%s\" dla \"%s\" nie została znaleziona"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Nie udało się odnaleźć zadania \"%s\""
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr ""
"Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\""
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr ""
"Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\""
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Nie udało się wybrać wersji z pakietu \"%s\", ponieważ jest on czysto "
"wirtualny"
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Nie udało się wybrać najnowszej wersji pakietu \"%s\", ponieważ jest on "
"czysto wirtualny"
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Nie udało się wybrać wersji kandydującej pakietu %s, ponieważ nie ma "
"kandydata"
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Nie udało się wybrać zainstalowanej wersji z pakietu %s, ponieważ nie jest "
"zainstalowany"
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -2662,78 +2693,56 @@ msgstr ""
"Nie udało się wybrać zainstalowanej ani kandydującej wersji pakietu \"%s\", "
"ponieważ nie ma żadnej z nich"
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Nieprawidłowa linia %llu #1 pliku override %s"
-
-#: apt-pkg/sourcelist.cc:355
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Opening %s"
-msgstr "Otwieranie %s"
-
-#: apt-pkg/sourcelist.cc:389
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:393
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, 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:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)"
-
-#: apt-pkg/sourcelist.cc:429
-#, 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"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Nie udało się przeanalizować pliku Release %s"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr "Brak sekcji w pliku Release %s"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Brak wpisu Hash w pliku Release %s"
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Nieprawidłowy wpis Date w pliku Release %s"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Nieprawidłowy wpis Valid-Until w pliku Release %s"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2911,35 +2920,6 @@ msgstr ""
msgid "Not locked"
msgstr "Niezablokowany"
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lidni %lig %limin %lis"
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lig %limin %lis"
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "Nie odnaleziono wyboru %s"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -3021,7 +3001,7 @@ msgstr "Nie udało się otworzyć pliku %s"
msgid "Could not open file descriptor %d"
msgstr "Nie udało się otworzyć deskryptora pliku %d"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "Nie udało się utworzyć IPC z podprocesem"
@@ -3058,12 +3038,12 @@ msgstr "Problem przy odlinkowywaniu pliku %s"
msgid "Problem syncing the file"
msgstr "Problem przy zapisywaniu pliku na dysk"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Nie można wykonać operacji stat na %s"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Nie udało się pisać do %s"
@@ -3088,6 +3068,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Gotowe"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lidni %lig %limin %lis"
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lig %limin %lis"
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "Nie odnaleziono wyboru %s"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Nie można wykonać mmap na pustym pliku"
@@ -3446,87 +3455,87 @@ msgstr "Archiwum nie posiada rekordu kontrolnego"
msgid "Unable to get a cursor"
msgstr "Nie udało się pobrać kursora"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Nie udało się odczytać katalogu %s\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Nie można wykonać operacji stat na %s\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "E: Błędy odnoszą się do pliku "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "Nie udało się przetłumaczyć nazwy %s"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Przejście po drzewie nie powiodło się"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "Nie udało się otworzyć %s"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Odłączenie %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "Nie udało się odczytać dowiązania %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "Nie udało się usunąć %s"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Nie udało się dowiązać %s do %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Osiągnięto ograniczenie odłączania %sB.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "Archiwum nie posiadało pola pakietu"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nie posiada wpisu w pliku override\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " opiekunem %s jest %s, a nie %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nie posiada wpisu w pliku override źródeł\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nie posiada również wpisu w pliku override binariów\n"
@@ -3812,6 +3821,12 @@ msgstr "Niepoprawna suma kontrolna tar, archiwum jest uszkodzone"
msgid "Unknown TAR header type %u, member %s"
msgstr "Nieznany typ nagłówka TAR %u, składnik %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr ""
+#~ "Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane "
+#~ "źródła"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Nie udało się utworzyć potoków"
diff --git a/po/pt.po b/po/pt.po
index f9829a139..6c4859cd5 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\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"
@@ -115,7 +115,7 @@ msgstr ""
"Este comando foi depreceado. Em vez disso por favor utilize 'apt-mark "
"showauto'."
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Não foi possível encontrar o pacote %s"
@@ -353,16 +353,16 @@ msgstr "Erro Interno, o solucionador de problemas estragou coisas"
msgid "Unable to lock the download directory"
msgstr "Impossível criar acesso exclusivo ao directório de downloads"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Não foi possível encontrar um pacote de código fonte para %s"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -372,7 +372,7 @@ msgstr ""
"'%s' em:\n"
"%s\n"
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -383,70 +383,70 @@ msgstr ""
"bzr branch %s\n"
"para obter as últimas actualizações (possivelmente por lançar) ao pacote.\n"
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "A saltar o ficheiro '%s', já tinha sido feito download'\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "É necessário obter %sB/%sB de arquivos de código fonte.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "É necessário obter %sB de arquivos de código fonte.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter código fonte %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Falhou obter alguns arquivos."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Download completo e em modo de fazer apenas o download"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"A saltar a descompactação do pacote de código fonte já descompactado em %s\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "O comando de descompactação '%s' falhou.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "O comando de compilação '%s' falhou.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "O processo filho falhou"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Deve especificar pelo menos um pacote para verificar as dependências de "
"compilação"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -455,28 +455,28 @@ msgstr ""
"Nenhuma informação de arquitectura disponível para %s. Para configuração "
"veja apt.conf(5) APT::Architectures"
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Falhou processar as dependências de compilação"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"Não foi possível obter informações de dependências de compilação para %s"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s não tem dependências de compilação.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -485,7 +485,7 @@ msgstr ""
"a dependência de %s por %s não pode ser satisfeita porque %s não é permitido "
"em pacotes '%s'"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -494,14 +494,14 @@ msgstr ""
"a dependência de %s para %s não pôde ser satisfeita porque o pacote %s não "
"pôde ser encontrado"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Falha ao satisfazer a dependência %s para %s: O pacote instalado %s é "
"demasiado novo"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -510,7 +510,7 @@ msgstr ""
"a dependência de %s para %s não pode ser satisfeita porque a versão "
"candidata do pacote %s não pode satisfazer os requisitos de versão"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -519,25 +519,25 @@ msgstr ""
"a dependência de %s para %s não pode ser satisfeita porque o pacote %s não "
"tem versão candidata"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Falha ao satisfazer a dependência %s para %s: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Não foi possível satisfazer as dependências de compilação para %s."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "Falhou processar as dependências de compilação"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Módulos Suportados:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -636,21 +636,16 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -812,12 +807,12 @@ msgstr "Disco não encontrado."
msgid "File not found"
msgstr "Ficheiro não encontrado"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "Falhou o stat"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "Falhou definir hora de modificação"
@@ -908,7 +903,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:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Falhou"
@@ -981,64 +976,64 @@ msgstr "Pesquisa"
msgid "Unable to invoke "
msgstr "Não foi possível invocar "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "A Ligar a %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Não foi possível criar um socket para %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Não posso iniciar a ligação para %s:%s (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Não foi possível ligar a %s:%s (%s), a conexão expirou"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Não foi possível ligar em %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "A ligar a %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "Não foi possível resolver '%s'"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Falha temporária a resolver '%s'"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, fuzzy, c-format
msgid "System error resolving '%s:%s'"
msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i - %s)"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i - %s)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Não foi possível ligar a %s:%s:"
@@ -1061,7 +1056,7 @@ msgstr ""
"está instalado?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1163,227 +1158,6 @@ msgstr ""
msgid "Internal error"
msgstr "Erro interno"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "A corrigir dependências..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " falhou."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Não foi possível corrigir dependências"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "Não foi possível minimizar o conjunto de actualizações"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Feito"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Você pode querer executar 'apt-get -f install' para corrigir isso."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependências não satisfeitas. Tente utilizar -f."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "mas %s está instalado"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "mas %s está para ser instalado"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "mas não é instalável"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "mas é um pacote virtual"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "mas não está instalado"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "mas não vai ser instalado"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " ou"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "Os pacotes a seguir têm dependências não satisfeitas:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "Serão instalados os seguintes NOVOS pacotes:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Serão REMOVIDOS os seguintes pacotes:"
-
-#: apt-private/private-output.cc:481
-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:497
-msgid "The following packages will be upgraded:"
-msgstr "Serão actualizados os seguintes pacotes:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Será feito o DOWNGRADE aos seguintes pacotes:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "Os seguintes pacotes mantidos serão mudados:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (devido a %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstalados, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu a que foi feito o downgrade, "
-
-#: apt-private/private-output.cc:641
-#, 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:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[S/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-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:684
-msgid "Y"
-msgstr "S"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Erro de compilação de regex - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "O comando update não leva argumentos"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1464,18 +1238,6 @@ msgstr "O pacote '%s' não está instalado, por isso não será removido\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Note, a seleccionar '%s' em vez de '%s'\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!"
@@ -1484,7 +1246,7 @@ msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!"
msgid "Packages need to be removed but remove is disabled."
msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1748,6 +1510,239 @@ msgstr "Versão seleccionada '%s' (%s) para '%s'\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Versão seleccionada '%s' (%s) para '%s' devido a '%s'\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "A corrigir dependências..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " falhou."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Não foi possível corrigir dependências"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Não foi possível minimizar o conjunto de actualizações"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Feito"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Você pode querer executar 'apt-get -f install' para corrigir isso."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependências não satisfeitas. Tente utilizar -f."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "mas %s está instalado"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "mas %s está para ser instalado"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "mas não é instalável"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "mas é um pacote virtual"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "mas não está instalado"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "mas não vai ser instalado"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " ou"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Os pacotes a seguir têm dependências não satisfeitas:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Serão instalados os seguintes NOVOS pacotes:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Serão REMOVIDOS os seguintes pacotes:"
+
+#: apt-private/private-output.cc:481
+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:497
+msgid "The following packages will be upgraded:"
+msgstr "Serão actualizados os seguintes pacotes:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Será feito o DOWNGRADE aos seguintes pacotes:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "Os seguintes pacotes mantidos serão mudados:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (devido a %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstalados, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu a que foi feito o downgrade, "
+
+#: apt-private/private-output.cc:641
+#, 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:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[S/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+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:684
+msgid "Y"
+msgstr "S"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Erro de compilação de regex - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "O comando update não leva argumentos"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1760,47 +1755,40 @@ 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-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "AVISO: Os seguintes pacotes não podem ser autenticados!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "Aviso de autenticação ultrapassado.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "Alguns pacotes não puderam ser autenticados"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "Instalar estes pacotes sem verificação?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Há problemas e foi utilizado -y sem --force-yes"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falhou obter %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Não foi possível determinar o espaço livre em %s"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Você não possui espaço livre suficiente em %s."
@@ -1869,16 +1857,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Não foi possível ler %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -2023,28 +2011,6 @@ msgstr "Você terá que executar apt-get update para corrigir estes problemas"
msgid "The list of sources could not be read."
msgstr "A lista de fontes não pôde ser lida."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "O driver do método %s não pôde ser encontrado."
-
-#: apt-pkg/acquire-worker.cc:113
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Método %s não iniciou correctamente"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr ""
-"Por favor insira o disco denominado: '%s' no leitor '%s' e pressione enter."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Cache de pacotes vazia"
@@ -2131,105 +2097,82 @@ msgstr "extra"
msgid "Calculating upgrade"
msgstr "A calcular a actualização"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Tipo do ficheiro de índice '%s' não é suportado"
+msgid "The method driver %s could not be found."
+msgstr "O driver do método %s não pôde ser encontrado."
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "A cache possui um sistema de versões incompatível"
+#: apt-pkg/acquire-worker.cc:113
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:164
#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Ocorreu um erro ao processar %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Uau, você excedeu o número de nomes de pacotes que este APT é capaz de "
-"suportar."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"Uau, você excedeu o número de versões que este APT é capaz de suportar."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"Uau, você excedeu o número de descrições que este APT é capaz de suportar."
+msgid "Method %s did not start correctly"
+msgstr "Método %s não iniciou correctamente"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
msgstr ""
-"Uau, você excedeu o número de dependências que este APT é capaz de suportar."
-
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "A ler as listas de pacotes"
+"Por favor insira o disco denominado: '%s' no leitor '%s' e pressione enter."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "Erro de I/O ao gravar a cache de código fonte"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "A construir árvore de dependências"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr "Enviar cenário a resolver"
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Versões candidatas"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr "Enviar pedido para resolvedor"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Geração de dependências"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr "Preparar para receber solução"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "A ler a informação de estado"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr "O resolvedor externo falhou sem uma mensagem de erro adequada"
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Falhou abrir o StateFile %s"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr "Executar resolvedor externo"
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falha escrever ficheiro temporário StateFile %s"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "falhou renomear, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "Código de verificação hash não coincide"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "Tamanho incorrecto"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
#, fuzzy
msgid "Invalid file format"
msgstr "Operação %s inválida"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Erro de escrita"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, fuzzy, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2240,12 +2183,12 @@ msgstr ""
"GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr "Erro GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2254,7 +2197,7 @@ msgstr ""
"Incapaz de encontrar a entrada '%s' esperada no ficheiro Release (entrada "
"errada em sources.list ou ficheiro malformado)"
-#: apt-pkg/acquire-item.cc:1026
+#: apt-pkg/acquire-item.cc:1122
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 "
@@ -2263,7 +2206,7 @@ msgstr ""
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2272,37 +2215,37 @@ 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, 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:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "O directório %s é desviado"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2312,12 +2255,12 @@ msgstr ""
"significar que você precisa corrigir manualmente este pacote. (devido a "
"arquitectura em falta)"
-#: apt-pkg/acquire-item.cc:2677
+#: apt-pkg/acquire-item.cc:2751
#, 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:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2326,43 +2269,118 @@ msgstr ""
"para o pacote %s."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Changlog para %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "A cache possui um sistema de versões incompatível"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Ocorreu um erro ao processar %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Uau, você excedeu o número de nomes de pacotes que este APT é capaz de "
+"suportar."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+"Uau, você excedeu o número de versões que este APT é capaz de suportar."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+"Uau, você excedeu o número de descrições que este APT é capaz de suportar."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Uau, você excedeu o número de dependências que este APT é capaz de suportar."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "A ler as listas de pacotes"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "Erro de I/O ao gravar a cache de código fonte"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr "Falta directório de listas %spartial."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Falta o directório de arquivos %spartial."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, c-format
msgid "Unable to lock directory %s"
msgstr "Impossível criar acesso exclusivo ao directório %s"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, fuzzy, c-format
msgid "Clean of %s is not supported"
msgstr "Tipo do ficheiro de índice '%s' não é suportado"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "A obter o ficheiro %li de %li (%s restantes)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "A obter o ficheiro %li de %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Falhou obter %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Falhou o download de alguns ficheiros de índice. Foram ignorados ou os "
+"antigos foram usados em seu lugar."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Você deve colocar alguns URIs 'source' no seu sources.list"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Não foi possível fazer stat %s."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2391,28 +2409,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "Nenhuma prioridade (ou zero) especificada para marcação (pin)"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Falhou obter %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Falhou o download de alguns ficheiros de índice. Foram ignorados ou os "
-"antigos foram usados em seu lugar."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Você deve colocar alguns URIs 'source' no seu sources.list"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Não foi possível fazer stat %s."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2543,31 +2539,30 @@ msgstr ""
"Não foi possível corrigir problemas, você tem pacotes mantidos (hold) "
"estragados."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "A construir árvore de dependências"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr "Enviar cenário a resolver"
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Versões candidatas"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr "Enviar pedido para resolvedor"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Geração de dependências"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr "Preparar para receber solução"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "A ler a informação de estado"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr "O resolvedor externo falhou sem uma mensagem de erro adequada"
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Falhou abrir o StateFile %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr "Executar resolvedor externo"
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falha escrever ficheiro temporário StateFile %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Tipo do ficheiro de índice '%s' não é suportado"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2579,59 +2574,97 @@ msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (%d)"
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Override %s malformado linha %llu #1"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "A abrir %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, 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:405
+#, 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:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Linha mal formada %u na lista de fontes %s (tipo)"
+
+#: apt-pkg/sourcelist.cc:441
+#, 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/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Não foi encontrado o Release '%s' para '%s'"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Não foi encontrada a versão '%s' para '%s'"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Não foi possível encontrar a tarefa '%s'"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Não foi possível seleccionar versões do pacote '%s' pois é puramente virtual"
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Não foi possível seleccionar a versão mais recente a partir do pacote '%s' "
"já que é puramente virtual"
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Não é possível seleccionar a versão candidata do pacote %s já que não tem "
"candidato"
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Não é possível seleccionar a versão instalada do pacote %s pois não está "
"instalado"
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -2640,78 +2673,56 @@ msgstr ""
"Não pode seleccionar a versão instalada nem a versão candidata do pacote "
"'%s' pois não tem nenhuma destas"
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Override %s malformado linha %llu #1"
-
-#: apt-pkg/sourcelist.cc:355
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Opening %s"
-msgstr "A abrir %s"
-
-#: apt-pkg/sourcelist.cc:389
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Linha mal formada %u na lista de fontes %s (tipo)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:393
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, 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:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "Linha mal formada %u na lista de fontes %s (tipo)"
-
-#: apt-pkg/sourcelist.cc:429
-#, 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"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Não foi possível fazer parse ao ficheiro Release %s"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr "Nenhuma secção, no ficheiro Release %s"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Nenhuma entrada hash no ficheiro Release %s"
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Entrada, 'Date', inválida no ficheiro Release %s"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Entrada inválida, 'Valid-until', no ficheiro de Release: %s"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2889,35 +2900,6 @@ msgstr ""
msgid "Not locked"
msgstr "Sem acesso exclusivo"
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "A selecção %s não foi encontrada"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -3002,7 +2984,7 @@ msgstr "Não foi possível abrir ficheiro o %s"
msgid "Could not open file descriptor %d"
msgstr "Não foi possível abrir o descritor de ficheiro %d"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "Falhou criar subprocesso IPC"
@@ -3039,12 +3021,12 @@ msgstr "Problema ao remover o link do ficheiro %s"
msgid "Problem syncing the file"
msgstr "Problema sincronizando o ficheiro"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Não foi possível fazer stat %s"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Não conseguiu escrever para %s"
@@ -3069,6 +3051,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Pronto"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "A selecção %s não foi encontrada"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Não é possível fazer mmap a um ficheiro vazio"
@@ -3427,87 +3438,87 @@ msgstr "O arquivo não tem registo de controlo"
msgid "Unable to get a cursor"
msgstr "Não foi possível obter um cursor"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Não foi possível ler o directório %s\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Não foi possível fazer stat %s\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "E: Os erros aplicam-se ao ficheiro "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "Falhou resolver %s"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Falhou ao percorrer a árvore"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "Falhou abrir %s"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "Falhou o readlink %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "Falhou o unlink %s"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Falhou ligar %s a %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Limite DeLink de %sB atingido.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "Arquivo não possuía campo package"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s não possui entrada override\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " o maintainer de %s é %s, não %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s não possui fonte de entrada de 'override'\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s também não possui entrada binária de 'override'\n"
@@ -3793,6 +3804,11 @@ msgstr "A soma de controlo do tar falhou, arquivo corrompido"
msgid "Unknown TAR header type %u, member %s"
msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr ""
+#~ "Tem de especificar pelo menos um pacote para obter o código fonte de"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Falhou a criação de pipes"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7c8edde4e..94e93c0aa 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\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."
@@ -115,7 +115,7 @@ msgstr "Você deve passar exatamente um padrão"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Impossível encontrar o pacote %s"
@@ -358,23 +358,23 @@ msgstr "Erro interno, o solucionador de problemas quebrou coisas"
msgid "Unable to lock the download directory"
msgstr "Impossível criar trava no diretório de download"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossível encontrar um pacote fonte para %s"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -382,96 +382,96 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Pulando arquivo já baixado '%s'\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Preciso obter %sB/%sB de arquivos fonte.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Preciso obter %sB de arquivos fonte.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter fonte %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Falhou ao buscar alguns arquivos."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Baixar completo e no modo somente baixar (\"download only\")"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Pulando o desempacotamento de fontes já desempacotados em %s\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando de desempacotamento '%s' falhou.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comando de construção '%s' falhou.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Processo filho falhou"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Deve-se especificar pelo menos um pacote para que se cheque as dependências "
"de construção"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Falhou ao processar as dependências de construção"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossível conseguir informações de dependência de construção para %s"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s não tem dependências de construção.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -480,7 +480,7 @@ msgstr ""
"a dependência de %s por %s não pode ser satisfeita porque o pacote %s não "
"pode ser encontrado"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -489,14 +489,14 @@ msgstr ""
"a dependência de %s por %s não pode ser satisfeita porque o pacote %s não "
"pode ser encontrado"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Falhou ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito "
"novo"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -505,7 +505,7 @@ msgstr ""
"a dependência de %s por %s não pode ser satisfeita porque nenhuma versão "
"disponível do pacote %s pode satisfazer os requerimentos de versão"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -514,25 +514,25 @@ msgstr ""
"a dependência de %s por %s não pode ser satisfeita porque o pacote %s não "
"pode ser encontrado"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Falhou ao satisfazer a dependência de %s por %s: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Não foi possível satisfazer as dependências de compilação para %s."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "Falhou ao processar as dependências de construção"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Módulos para os quais há suporte:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -629,21 +629,16 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -784,12 +779,12 @@ msgstr "Disco não encontrado."
msgid "File not found"
msgstr "Arquivo não encontrado"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "Falhou ao executar \"stat\""
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "Falhou ao definir hora de modificação"
@@ -880,7 +875,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:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Falhou"
@@ -953,64 +948,64 @@ msgstr "Pesquisa"
msgid "Unable to invoke "
msgstr "Impossível invocar "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Conectando em %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Não foi possível criar um socket para %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Não foi possível iniciar a conexão para %s:%s (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Não foi possível conectar em %s:%s (%s), conexão expirou"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Não foi possível conectar em %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Conectando a %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "Não foi possível resolver '%s'"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Falha temporária resolvendo '%s'"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, fuzzy, c-format
msgid "System error resolving '%s:%s'"
msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Impossível conectar em %s %s:"
@@ -1034,7 +1029,7 @@ msgstr ""
"instalado?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1136,228 +1131,6 @@ msgstr ""
msgid "Internal error"
msgstr "Erro interno"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Corrigindo dependências..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " falhou."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Impossível corrigir dependências"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "Impossível minimizar o conjunto de atualizações"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Pronto"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Você pode querer executar 'apt-get -f install' para corrigí-los."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependências desencontradas. Tente usar -f."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "mas %s está instalado"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "mas %s está para ser instalado"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "mas não é instalável"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "mas é um pacote virtual"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "mas não está instalado"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "mas não será instalado"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " ou"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "Os pacotes a seguir têm dependências desencontradas:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "Os NOVOS pacotes a seguir serão instalados:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Os pacotes a seguir serão REMOVIDOS:"
-
-#: apt-private/private-output.cc:481
-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:497
-msgid "The following packages will be upgraded:"
-msgstr "Os pacotes a seguir serão atualizados:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Os pacotes a seguir serão REVERTIDOS:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "Os seguintes pacotes mantidos serão mudados:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (por causa de %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"AVISO: Os pacotes essenciais a seguir serão removidos.\n"
-"Isso NÃO deveria ser feito a menos que você saiba exatamente o que você está "
-"fazendo!"
-
-#: apt-private/private-output.cc:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstalados, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu revertidos, "
-
-#: apt-private/private-output.cc:641
-#, 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:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[S/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-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:684
-msgid "Y"
-msgstr "S"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Erro de compilação de regex - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "O comando update não leva argumentos"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1437,18 +1210,6 @@ msgstr "O pacote %s não está instalado, então não será removido\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Nota, selecionando %s ao invés de %s\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Erro interno, InstallPackages foi chamado com pacotes quebrados!"
@@ -1457,7 +1218,7 @@ msgstr "Erro interno, InstallPackages foi chamado com pacotes quebrados!"
msgid "Packages need to be removed but remove is disabled."
msgstr "Pacotes precisam ser removidos mas a remoção está desabilitada."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1722,6 +1483,240 @@ msgstr "Versão selecionada %s (%s) para %s\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Versão selecionada %s (%s) para %s\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Corrigindo dependências..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " falhou."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Impossível corrigir dependências"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Impossível minimizar o conjunto de atualizações"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Pronto"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Você pode querer executar 'apt-get -f install' para corrigí-los."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependências desencontradas. Tente usar -f."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "mas %s está instalado"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "mas %s está para ser instalado"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "mas não é instalável"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "mas é um pacote virtual"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "mas não está instalado"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "mas não será instalado"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " ou"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Os pacotes a seguir têm dependências desencontradas:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Os NOVOS pacotes a seguir serão instalados:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Os pacotes a seguir serão REMOVIDOS:"
+
+#: apt-private/private-output.cc:481
+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:497
+msgid "The following packages will be upgraded:"
+msgstr "Os pacotes a seguir serão atualizados:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Os pacotes a seguir serão REVERTIDOS:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "Os seguintes pacotes mantidos serão mudados:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (por causa de %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"AVISO: Os pacotes essenciais a seguir serão removidos.\n"
+"Isso NÃO deveria ser feito a menos que você saiba exatamente o que você está "
+"fazendo!"
+
+#: apt-private/private-output.cc:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstalados, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu revertidos, "
+
+#: apt-private/private-output.cc:641
+#, 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:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[S/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+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:684
+msgid "Y"
+msgstr "S"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Erro de compilação de regex - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "O comando update não leva argumentos"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1730,47 +1725,40 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "AVISO: Os pacotes a seguir não podem ser autenticados!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "Aviso de autenticação sobreposto.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "Alguns pacotes não puderam ser autenticados"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "Instalar estes pacotes sem verificação?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Há problemas e -y foi usado sem --force-yes"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falhou ao buscar %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Não foi possível determinar o espaço livre em %s"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Você não possui espaço suficiente em %s."
@@ -1839,16 +1827,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Impossível ler %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -1994,28 +1982,6 @@ msgstr "Você terá que executar apt-get update para corrigir estes problemas"
msgid "The list of sources could not be read."
msgstr "A lista de fontes não pode ser lida."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "O driver do método %s não pode ser encontrado."
-
-#: apt-pkg/acquire-worker.cc:113
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Método %s não iniciou corretamente"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr ""
-"Por favor, insira o disco nomeado: '%s' na unidade '%s' e pressione enter."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Cache de pacotes vazio"
@@ -2103,105 +2069,82 @@ msgstr "extra"
msgid "Calculating upgrade"
msgstr "Calculando atualização"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Tipo de arquivo de índice '%s' não é suportado"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "O cache possui um sistema de versões incompatível"
+msgid "The method driver %s could not be found."
+msgstr "O driver do método %s não pode ser encontrado."
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Um erro ocorreu processando %s (EncontrarPacote)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Uau, você excedeu o número de nomes de pacotes que este APT é capaz de "
-"suportar."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"Uau, você excedeu o número de versões que este APT é capaz de suportar."
+msgid "Is the package %s installed?"
+msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"Uau, você excedeu o número de descrições que este APT é capaz de suportar."
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Método %s não iniciou corretamente"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
msgstr ""
-"Uau, você excedeu o número de dependências que este APT é capaz de suportar."
-
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Lendo listas de pacotes"
+"Por favor, insira o disco nomeado: '%s' na unidade '%s' e pressione enter."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "Erro de E/S ao gravar cache fonte"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Construindo árvore de dependências"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Versões candidatas"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Geração de dependência"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Lendo informação de estado"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Falha ao abrir Arquivo de Estado (\"StateFile\") %s"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falha ao escrever Arquivo de Estado (\"StateFile\") temporário %s"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "renomeação falhou, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "Hash Sum incorreto"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "Tamanho incorreto"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
#, fuzzy
msgid "Invalid file format"
msgstr "Operação %s inválida"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Erro de escrita"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2209,63 +2152,63 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, 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:1026
+#: apt-pkg/acquire-item.cc:1122
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"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "O diretório %s é desviado (\"diverted\")"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2275,12 +2218,12 @@ msgstr ""
"que você precisa consertar manualmente este pacote. (devido a arquitetura "
"não especificada)."
-#: apt-pkg/acquire-item.cc:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2289,43 +2232,119 @@ msgstr ""
"\" para o pacote %s."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Conectando em %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "O cache possui um sistema de versões incompatível"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Um erro ocorreu processando %s (EncontrarPacote)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Uau, você excedeu o número de nomes de pacotes que este APT é capaz de "
+"suportar."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+"Uau, você excedeu o número de versões que este APT é capaz de suportar."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+"Uau, você excedeu o número de descrições que este APT é capaz de suportar."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Uau, você excedeu o número de dependências que este APT é capaz de suportar."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Lendo listas de pacotes"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "Erro de E/S ao gravar cache fonte"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Diretório de listas %spartial está faltando."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "Diretório de arquivos %spartial está faltando."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, fuzzy, c-format
msgid "Unable to lock directory %s"
msgstr "Impossível criar trava no diretório de listas"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, fuzzy, c-format
msgid "Clean of %s is not supported"
msgstr "Tipo de arquivo de índice '%s' não é suportado"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Obtendo o arquivo %li de %li (%s restantes)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Obtendo arquivo %li de %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Falhou ao buscar %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Alguns arquivos de índice falharam para baixar, eles foram ignorados ou os "
+"antigos foram usados no lugar."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Você deve colocar algumas URIs 'source' em seu sources.list"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Impossível executar \"stat\" %s."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2352,29 +2371,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "Nenhuma prioridade (ou zero) especificada para \"pin\""
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Falhou ao buscar %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Alguns arquivos de índice falharam para baixar, eles foram ignorados ou os "
-"antigos foram usados no lugar."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Você deve colocar algumas URIs 'source' em seu sources.list"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Impossível executar \"stat\" %s."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2499,31 +2495,30 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Construindo árvore de dependências"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Versões candidatas"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Geração de dependência"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr ""
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Lendo informação de estado"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr ""
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Falha ao abrir Arquivo de Estado (\"StateFile\") %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr ""
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falha ao escrever Arquivo de Estado (\"StateFile\") temporário %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Tipo de arquivo de índice '%s' não é suportado"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2535,130 +2530,146 @@ msgstr "Impossível analisar arquivo de pacote %s (%d)"
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Override malformado %s linha %lu #1"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "Abrindo %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, 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:405
+#, 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:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Linha mal formada %u no arquivo de fontes %s (tipo)"
+
+#: apt-pkg/sourcelist.cc:441
+#, 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/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release '%s' para '%s' não foi encontrada"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versão '%s' para '%s' não foi encontrada"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Impossível achar tarefa %s"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Impossível achar pacote %s"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Impossível achar pacote %s"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Override malformado %s linha %lu #1"
-
-#: apt-pkg/sourcelist.cc:355
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Opening %s"
-msgstr "Abrindo %s"
-
-#: apt-pkg/sourcelist.cc:389
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Linha mal formada %u no arquivo de fontes %s (tipo)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:393
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, 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:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "Linha mal formada %u no arquivo de fontes %s (tipo)"
-
-#: apt-pkg/sourcelist.cc:429
-#, 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"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Impossível analisar arquivo de pacote %s (1)"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Nota, selecionando %s ao invés de %s\n"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Impossível analisar arquivo de pacote %s (1)"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Linha inválida no arquivo de desvios: %s"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2819,35 +2830,6 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "Seleção %s não encontrada"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2924,7 +2906,7 @@ msgstr "Não foi possível abrir arquivo %s"
msgid "Could not open file descriptor %d"
msgstr "Não foi possível abrir \"pipe\" para %s"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "Falhou ao criar sub-processo IPC"
@@ -2961,12 +2943,12 @@ msgstr "Problema removendo o arquivo"
msgid "Problem syncing the file"
msgstr "Problema sincronizando o arquivo"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Impossível executar \"stat\" em %s"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Impossível escrever para %s"
@@ -2991,6 +2973,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Pronto"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "Seleção %s não encontrada"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Não foi possível fazer \"mmap\" de um arquivo vazio"
@@ -3347,87 +3358,87 @@ msgstr "Repositório não possui registro de controle"
msgid "Unable to get a cursor"
msgstr "Impossível obter um cursor"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Impossível ler o diretório %s\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Impossível executar \"stat\" em %s\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "E: Erros que se aplicam ao arquivo "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "Falhou ao resolver %s"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Falhou ao percorrer a árvore"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "Falhou ao abrir %s"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "Falhou ao executar \"readlink\" %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "Falhou ao executar \"unlink\" %s"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Falhou ao ligar %s a %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Limite DeLink de %sB atingido.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "Repositório não possuía campo pacote"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s não possui entrada override\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " mantenedor de %s é %s, não %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s não possui entrada override fonte\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s também não possui entrada override binária\n"
@@ -3715,6 +3726,10 @@ msgstr "Checksum do arquivo tar falhou, arquivo corrompido"
msgid "Unknown TAR header type %u, member %s"
msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Falhou ao criar \"pipes\""
diff --git a/po/ro.po b/po/ro.po
index 71964b813..9f64fd6d7 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\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"
@@ -116,7 +116,7 @@ msgstr "Trebuie să dați exact un șablon"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Nu s-a putut localiza pachetul %s"
@@ -355,23 +355,23 @@ msgstr ""
msgid "Unable to lock the download directory"
msgstr "Nu s-a putut bloca directorul de descărcare"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "Trebuie specificat cel puțin un pachet pentru a-i aduce sursa"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nu s-a putut găsi o sursă pachet pentru %s"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -379,96 +379,96 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Sar peste fișierul deja descărcat '%s'\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Este nevoie să descărcați %sB/%sB din arhivele surselor.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Este nevoie să descărcați %sB din arhivele surselor.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Aducere sursa %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Eșec la aducerea unor arhive."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Descărcare completă și în modul doar descărcare"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Sar peste despachetarea sursei deja despachetate în %s\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comanda de despachetare '%s' eșuată.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comanda de construire '%s' eșuată.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Procesul copil a eșuat"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Trebuie specificat cel puțin un pachet pentru a-i verifica dependențele "
"înglobate"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Eșec la prelucrarea dependențelor de compilare"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nu pot prelua informațiile despre dependențele înglobate ale lui %s"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nu are dependențe înglobate.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -477,7 +477,7 @@ msgstr ""
"Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
"poate fi găsit"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -486,14 +486,14 @@ msgstr ""
"Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
"poate fi găsit"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Eșec la satisfacerea dependenței %s pentru %s: Pachetul instalat %s este "
"prea nou"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -502,7 +502,7 @@ msgstr ""
"Dependența lui %s de %s nu poate fi satisfăcută deoarece nici o versiune "
"disponibilă a pachetului %s nu poate satisface versiunile cerute"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -511,25 +511,25 @@ msgstr ""
"Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
"poate fi găsit"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Eșec la satisfacerea dependenței %s pentru %s: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Dependențele înglobate pentru %s nu pot fi satisfăcute."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "Eșec la prelucrarea dependențelor de compilare"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Module suportate:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -627,21 +627,16 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Trebuie specificat cel puțin un pachet pentru a-i aduce sursa"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "Trebuie specificat cel puțin un pachet pentru a-i aduce sursa"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -782,12 +777,12 @@ msgstr "Disc negăsit."
msgid "File not found"
msgstr "Fișier negăsit"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "Eșec la „stat”"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "Eșec la ajustarea timpului de modificare"
@@ -880,7 +875,7 @@ msgstr ""
"Nu s-a putut realiza conectarea la socket-ul de date, timpul de conectare a "
"expirat"
-#: methods/ftp.cc:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Eșec"
@@ -953,65 +948,65 @@ msgstr "Interogare"
msgid "Unable to invoke "
msgstr "Nu s-a putut invoca"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Conectare la %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Nu s-a putut crea un socket pentru %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Nu s-a putut iniția conexiunea cu %s:%s (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr ""
"Nu s-a putut realiza conexiunea cu %s:%s (%s), timpul de conectare expirat"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Nu s-a putut realiza conexiunea cu %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Conectare la %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nu s-a putut rezolva „%s”"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Eșec temporar la rezolvarea lui „%s”"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, fuzzy, c-format
msgid "System error resolving '%s:%s'"
msgstr "S-a întâmplat ceva „necurat” la rezolvarea lui „%s:%s” (%i)"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "S-a întâmplat ceva „necurat” la rezolvarea lui „%s:%s” (%i)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Nu s-a putut realiza conexiunea cu %s %s:"
@@ -1035,7 +1030,7 @@ msgstr ""
"instalat?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1138,229 +1133,6 @@ msgstr ""
msgid "Internal error"
msgstr "Eroare internă"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Corectez dependențele..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " eșec."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Nu s-au putut corecta dependențele"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "Nu s-a putut micșora mulțimea pachetelor de înnoit"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Terminat"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Ați putea să porniți 'apt-get -f install' pentru a corecta acestea."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependențe neîndeplinite. Încercați să folosiți -f."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instalat]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instalat]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instalat]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instalat]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "dar %s este instalat"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "dar %s este pe cale de a fi instalat"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "dar nu este instalabil"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "dar este un pachet virtual"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "dar nu este instalat"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "dar nu este pe cale să fie instalat"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " sau"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "Următoarele pachete au dependențe neîndeplinite:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "Următoarele pachete NOI vor fi instalate:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Următoarele pachete vor fi ȘTERSE:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "Următoarele pachete au fost reținute:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "Următoarele pachete vor fi ÎNNOITE:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Următoarele pachete vor fi DE-GRADATE:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "Următoarele pachete ținute vor fi schimbate:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (datorită %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu înnoite, %lu nou instalate, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstalate, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu de-gradate, "
-
-#: apt-private/private-output.cc:641
-#, 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:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu instalate sau șterse incomplet.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:684
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Eroare de compilare expresie regulată - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Comanda de actualizare nu are argumente"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1440,19 +1212,6 @@ msgstr "Pachetul %s nu este instalat, așa încât nu este șters\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Notă, se selectează %s în locul lui %s\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!"
@@ -1461,7 +1220,7 @@ msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!"
msgid "Packages need to be removed but remove is disabled."
msgstr "Pachete trebuiesc șterse dar ștergerea este dezactivată."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1730,6 +1489,242 @@ msgstr "Versiune selectată %s (%s) pentru %s\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Versiune selectată %s (%s) pentru %s\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Corectez dependențele..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " eșec."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Nu s-au putut corecta dependențele"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Nu s-a putut micșora mulțimea pachetelor de înnoit"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Terminat"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Ați putea să porniți 'apt-get -f install' pentru a corecta acestea."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependențe neîndeplinite. Încercați să folosiți -f."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instalat]"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instalat]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instalat]"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instalat]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "dar %s este instalat"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "dar %s este pe cale de a fi instalat"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "dar nu este instalabil"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "dar este un pachet virtual"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "dar nu este instalat"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "dar nu este pe cale să fie instalat"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " sau"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Următoarele pachete au dependențe neîndeplinite:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Următoarele pachete NOI vor fi instalate:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Următoarele pachete vor fi ȘTERSE:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "Următoarele pachete au fost reținute:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "Următoarele pachete vor fi ÎNNOITE:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Următoarele pachete vor fi DE-GRADATE:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "Următoarele pachete ținute vor fi schimbate:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (datorită %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu înnoite, %lu nou instalate, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstalate, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu de-gradate, "
+
+#: apt-private/private-output.cc:641
+#, 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:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu instalate sau șterse incomplet.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:684
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Eroare de compilare expresie regulată - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Comanda de actualizare nu are argumente"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1738,47 +1733,40 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "Avertisment de autentificare înlocuit.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "Unele pachete n-au putut fi autentificate"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "Instalați aceste pachete fără verificare?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Sunt unele probleme și -y a fost folosit fără --force-yes"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Eșec la aducerea lui %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "N-am putut determina spațiul disponibil în %s"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Nu aveți suficient spațiu în %s."
@@ -1847,16 +1835,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Nu s-a putut citi %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -1999,28 +1987,6 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr "Lista surselor nu poate fi citită."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Metoda driver %s nu poate fi găsită."
-
-#: apt-pkg/acquire-worker.cc:113
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoda %s nu s-a lansat corect"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr ""
-"Vă rog introduceți discul numit: '%s' în unitatea '%s' și apăsați Enter."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Cache gol de pachet"
@@ -2108,105 +2074,82 @@ msgstr "extra"
msgid "Calculating upgrade"
msgstr "Calculez înnoirea"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Tipul de fișier index '%s' nu este suportat"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "Cache are un versioning system incompatibil"
+msgid "The method driver %s could not be found."
+msgstr "Metoda driver %s nu poate fi găsită."
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Eroare apărută în timpul procesării %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Mamăăă, ați depășit numărul de nume de pachete de care este capabil acest "
-"APT."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"Mamăăă, ați depășit numărul de versiuni de care este capabil acest APT."
+msgid "Is the package %s installed?"
+msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n"
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"Mamăăă, ați depășit numărul de descrieri de care este capabil acest APT."
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Metoda %s nu s-a lansat corect"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
msgstr ""
-"Mamăăă, ați depășit numărul de dependențe de care este capabil acest APT."
-
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Citire liste de pachete"
+"Vă rog introduceți discul numit: '%s' în unitatea '%s' și apăsați Enter."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "Eroare IO în timpul salvării sursei cache"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Se construiește arborele de dependență"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Versiuni candidat"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generare dependențe"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Se citesc informațiile de stare"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Eșec la deschiderea fișierului de stare %s"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Eșec la scrierea fișierului temporar de stare %s"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "redenumire eșuată, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "Nepotrivire la suma de căutare"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "Nepotrivire dimensiune"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
#, fuzzy
msgid "Invalid file format"
msgstr "Operațiune invalidă %s"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Eroare de scriere"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2214,19 +2157,19 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, 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:1026
+#: apt-pkg/acquire-item.cc:1122
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Nu există nici o cheie publică disponibilă pentru următoarele "
@@ -2235,44 +2178,44 @@ msgstr ""
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "Directorul %s este redirectat"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2281,12 +2224,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:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2295,43 +2238,119 @@ msgstr ""
"pachetul %s."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Conectare la %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "Cache are un versioning system incompatibil"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Eroare apărută în timpul procesării %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Mamăăă, ați depășit numărul de nume de pachete de care este capabil acest "
+"APT."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+"Mamăăă, ați depășit numărul de versiuni de care este capabil acest APT."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+"Mamăăă, ați depășit numărul de descrieri de care este capabil acest APT."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Mamăăă, ați depășit numărul de dependențe de care este capabil acest APT."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Citire liste de pachete"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "Eroare IO în timpul salvării sursei cache"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Directorul de liste %spartial lipsește."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "Directorul de arhive %spartial lipsește."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, fuzzy, c-format
msgid "Unable to lock directory %s"
msgstr "Nu pot încuia directorul cu lista"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, fuzzy, c-format
msgid "Clean of %s is not supported"
msgstr "Tipul de fișier index '%s' nu este suportat"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Se descarcă fișierul %li din %li (%s rămas)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Se descarcă fișierul %li din %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Eșec la aducerea lui %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Descărcarea unor fișiere index a eșuat, acestea fie au fost ignorate, fie au "
+"fost folosite în loc unele vechi."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Trebuie să puneți niște 'surse' de URI în sources.list"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Nu pot determina starea %s."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2358,29 +2377,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "Fără prioritate (sau zero) specificată pentru pin"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Eșec la aducerea lui %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Descărcarea unor fișiere index a eșuat, acestea fie au fost ignorate, fie au "
-"fost folosite în loc unele vechi."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Trebuie să puneți niște 'surse' de URI în sources.list"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Nu pot determina starea %s."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2505,31 +2501,30 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nu pot corecta problema, ați ținut pachete deteriorate."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Se construiește arborele de dependență"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Versiuni candidat"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generare dependențe"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr ""
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Se citesc informațiile de stare"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr ""
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Eșec la deschiderea fișierului de stare %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr ""
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Eșec la scrierea fișierului temporar de stare %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Tipul de fișier index '%s' nu este suportat"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2541,130 +2536,146 @@ msgstr "Nu s-a putut analiza fișierul pachet %s (%d)"
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Înlocuire greșită %s linia %lu #1"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "Deschidere %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, 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:405
+#, 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:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Linie greșită %u în lista sursă %s (tip)"
+
+#: apt-pkg/sourcelist.cc:441
+#, 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/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release '%s' pentru '%s' n-a fost găsită"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versiunea '%s' pentru '%s' n-a fost găsită"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Nu s-a putut găsi sarcina %s"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Nu pot găsi pachetul %s"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Nu pot găsi pachetul %s"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Înlocuire greșită %s linia %lu #1"
-
-#: apt-pkg/sourcelist.cc:355
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Opening %s"
-msgstr "Deschidere %s"
-
-#: apt-pkg/sourcelist.cc:389
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Linie greșită %u în lista sursă %s (tip)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:393
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, 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:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "Linie greșită %u în lista sursă %s (tip)"
-
-#: apt-pkg/sourcelist.cc:429
-#, 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"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Notă, se selectează %s în locul lui %s\n"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Linie necorespunzătoare în fișierul-redirectare: %s"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2825,35 +2836,6 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "Selecția %s nu a fost găsită"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2930,7 +2912,7 @@ msgstr "Nu s-a putut deschide fișierul %s"
msgid "Could not open file descriptor %d"
msgstr "Nu s-a putut deschide conexiunea pentru %s"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "Eșec la crearea IPC-ului pentru subproces"
@@ -2967,12 +2949,12 @@ msgstr "Problemă la dezlegarea fișierului"
msgid "Problem syncing the file"
msgstr "Problemă în timpul sincronizării fișierului"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Nu se poate executa „stat” pe %s"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Nu s-a putut scrie în %s"
@@ -2997,6 +2979,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Terminat"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "Selecția %s nu a fost găsită"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Nu s-a putut executa „mmap” cu un fișier gol"
@@ -3358,87 +3369,87 @@ msgstr "Arhiva nu are înregistrare de control"
msgid "Unable to get a cursor"
msgstr "Nu s-a putut obține un cursor"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Nu s-a putut citi directorul %s\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: Nu s-a putut efectua „stat” pentru %s\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "E: Erori la fișierul "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "Eșec la „resolve” pentru %s"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Parcurgerea arborelui a eșuat"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "Eșec la „open” pentru %s"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Dezlegare %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "Eșec la „readlink” pentru %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "Eșec la „unlink” pentru %s"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Eșec la „link” între %s și %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Limita de %sB a dezlegării a fost atinsă.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "Arhiva nu are câmp de pachet"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nu are intrare de înlocuire\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s responsabil este %s nu %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nu are nici o intrare sursă de înlocuire\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nu are nici intrare binară de înlocuire\n"
@@ -3728,6 +3739,10 @@ msgstr ""
msgid "Unknown TAR header type %u, member %s"
msgstr "Tip antet TAR %u necunoscut, membrul %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "Trebuie specificat cel puțin un pachet pentru a-i aduce sursa"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Eșec la crearea conexiunilor"
diff --git a/po/ru.po b/po/ru.po
index d6c15bde4..4204d448a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.9.10\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\n"
"PO-Revision-Date: 2015-06-23 20:40+0300\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -119,7 +119,7 @@ msgstr "Вы должны задать не менее одно шаблона
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr "Эта команда устарела. Используйте вместо неё «apt-mark showauto»."
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Не удалось найти пакет %s"
@@ -360,17 +360,17 @@ msgstr "Внутренняя ошибка, решатель проблем вс
msgid "Unable to lock the download directory"
msgstr "Невозможно заблокировать каталог, куда складываются скачиваемые файлы"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Укажите как минимум один пакет, исходный код которого необходимо получить"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Невозможно найти пакет с исходным кодом для %s"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -379,7 +379,7 @@ msgstr ""
"ВНИМАНИЕ: упаковка «%s» поддерживается в системе контроля версий «%s»:\n"
"%s\n"
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -390,69 +390,69 @@ msgstr ""
"bzr branch %s\n"
"для получения последних (возможно не выпущенных) обновлений пакета.\n"
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Пропускаем уже скачанный файл «%s»\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Необходимо получить %sб/%sб архивов исходного кода.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Необходимо получить %sб архивов исходного кода.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Получение исходного кода %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Некоторые архивы не удалось получить."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Указан режим «только скачивание», и скачивание завершено"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Пропускается распаковка уже распакованного исходного кода в %s\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Команда распаковки «%s» завершилась неудачно.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Команда сборки «%s» завершилась неудачно.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Порождённый процесс завершился неудачно"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Для проверки зависимостей для сборки необходимо указать как минимум один "
"пакет"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -461,27 +461,27 @@ msgstr ""
"У %s отсутствует информация об архитектуре. Для её настройки смотрите apt."
"conf(5) APT::Architectures"
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Обработка зависимостей для сборки завершилась неудачно"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Невозможно получить информацию о зависимостях для сборки %s"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s не имеет зависимостей для сборки.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -490,7 +490,7 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, так как %s не "
"разрешён для пакетов «%s»"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -499,14 +499,14 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не "
"найден"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный "
"пакет %s новее, чем надо"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -515,7 +515,7 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, так как версия-"
"кандидат пакета %s не может удовлетворить требованиям по версии"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -524,25 +524,25 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не "
"имеет версии-кандидата"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Зависимости для сборки %s не могут быть удовлетворены."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "Обработка зависимостей для сборки завершилась неудачно"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Поддерживаемые модули:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -642,21 +642,16 @@ msgstr "В качестве аргумента требуется URL"
msgid "Must specify at least one pair url/filename"
msgstr "Укажите, как минимум, одну пару url/имя файла"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr "Ошибка при скачивании"
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "Укажите, как минимум, одну пару url/имя файла"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
#, fuzzy
msgid ""
"Usage: apt-helper [options] command\n"
@@ -853,12 +848,12 @@ msgstr "Диск не найден."
msgid "File not found"
msgstr "Файл не найден"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "Не удалось получить атрибуты"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "Не удалось установить время модификации"
@@ -953,7 +948,7 @@ msgstr ""
"Не удалось присоединиться к сокету данных, время на установление соединения "
"истекло"
-#: methods/ftp.cc:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Неудачно"
@@ -1026,64 +1021,64 @@ msgstr "Запрос"
msgid "Unable to invoke "
msgstr "Невозможно вызвать "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Соединение с %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Не удаётся создать сокет для %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Невозможно инициализировать соединение с %s:%s (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Не удаётся соединиться с %s:%s (%s), connection timed out"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Не удаётся соединиться с %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Соединение с %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "Не удалось найти IP-адрес для «%s»"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Временная ошибка при попытке получить IP-адрес «%s»"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, c-format
msgid "System error resolving '%s:%s'"
msgstr "Системная ошибка при определении «%s:%s»"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Что-то странное произошло при определении «%s:%s» (%i - %s)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Невозможно соединиться с %s: %s:"
@@ -1105,7 +1100,7 @@ msgstr ""
"Не удалось выполнить «apt-key» для проверки подписи (gnupg установлена?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1209,234 +1204,6 @@ msgstr ""
msgid "Internal error"
msgstr "Внутренняя ошибка"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr "Вывод списка"
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] "Есть %i дополнительная версия. Используйте «-a» для просмотра"
-msgstr[1] "Есть %i дополнительные версии. Используйте «-a» для их просмотра"
-msgstr[2] "Есть %i дополнительных версий. Используйте «-a» для их просмотра"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Исправление зависимостей…"
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " не удалось."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Невозможно скорректировать зависимости"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "Невозможно минимизировать набор обновлений"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Готово"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Возможно, для исправления этих ошибок вы захотите воспользоваться «apt-get -"
-"f install»."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Неудовлетворённые зависимости. Попытайтесь использовать -f."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr "неизвестно"
-
-#: apt-private/private-output.cc:272
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[установлен, может быть обновлён до: %s]"
-
-#: apt-private/private-output.cc:275
-msgid "[installed,local]"
-msgstr "[установлен, локальный]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr "[установлен, удаляется автоматически]"
-
-#: apt-private/private-output.cc:279
-msgid "[installed,automatic]"
-msgstr "[установлен, автоматически]"
-
-#: apt-private/private-output.cc:281
-msgid "[installed]"
-msgstr "[установлен]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr "[может быть обновлён до: %s]"
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr "[остались файлы настроек]"
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "но %s уже установлен"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "но %s будет установлен"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "но он не может быть установлен"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "но это виртуальный пакет"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "но он не установлен"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "но он не будет установлен"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " или"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "Пакеты, имеющие неудовлетворённые зависимости:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "НОВЫЕ пакеты, которые будут установлены:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Пакеты, которые будут УДАЛЕНЫ:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "Пакеты, которые будут оставлены в неизменном виде:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "Пакеты, которые будут обновлены:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr ""
-"Пакеты, которые должны были бы остаться без изменений, но будут заменены:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (вследствие %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"ВНИМАНИЕ: Эти существенно важные пакеты будут удалены.\n"
-"НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!"
-
-#: apt-private/private-output.cc:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "обновлено %lu, установлено %lu новых пакетов, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "переустановлено %lu переустановлено, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu пакетов заменены на старые версии, "
-
-#: apt-private/private-output.cc:641
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n"
-
-#: apt-private/private-output.cc:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "не установлено до конца или удалено %lu пакетов.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[Д/н]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-msgid "[y/N]"
-msgstr "[д/Н]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:684
-msgid "Y"
-msgstr "Д"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr "Н"
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Ошибка компиляции регулярного выражения — %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Команде update не нужны аргументы"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-"Может быть обновлён %i пакет. Запустите «apt list --upgradable» для показа.\n"
-msgstr[1] ""
-"Может быть обновлено %i пакета. Запустите «apt list --upgradable» для их "
-"показа.\n"
-msgstr[2] ""
-"Может быть обновлено %i пакетов. Запустите «apt list --upgradable» для их "
-"показа.\n"
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr "Все пакеты имеют последние версии."
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr "Сортировка"
@@ -1517,19 +1284,6 @@ msgstr "Пакет «%s» не установлен, поэтому не мож
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Заметьте, вместо «%2$s» выбирается «%1$s»\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] "Есть %i дополнительная запись. Используйте «-a» для просмотра"
-msgstr[1] "Есть %i дополнительные записи. Используйте «-a» для их просмотра"
-msgstr[2] "Есть %i дополнительных записей. Используйте «-a» для их просмотра"
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr "не реальный (виртуальный) пакет"
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
@@ -1540,7 +1294,7 @@ msgstr ""
msgid "Packages need to be removed but remove is disabled."
msgstr "Пакеты необходимо удалить, но удаление запрещено."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1812,6 +1566,247 @@ msgstr "Выбрана версия «%s» (%s) для «%s»\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Выбрана версия «%s» (%s) для «%s» из-за «%s»\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "Вывод списка"
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] "Есть %i дополнительная версия. Используйте «-a» для просмотра"
+msgstr[1] "Есть %i дополнительные версии. Используйте «-a» для их просмотра"
+msgstr[2] "Есть %i дополнительных версий. Используйте «-a» для их просмотра"
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Исправление зависимостей…"
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " не удалось."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Невозможно скорректировать зависимости"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Невозможно минимизировать набор обновлений"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Готово"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Возможно, для исправления этих ошибок вы захотите воспользоваться «apt-get -"
+"f install»."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Неудовлетворённые зависимости. Попытайтесь использовать -f."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "неизвестно"
+
+#: apt-private/private-output.cc:272
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[установлен, может быть обновлён до: %s]"
+
+#: apt-private/private-output.cc:275
+msgid "[installed,local]"
+msgstr "[установлен, локальный]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr "[установлен, удаляется автоматически]"
+
+#: apt-private/private-output.cc:279
+msgid "[installed,automatic]"
+msgstr "[установлен, автоматически]"
+
+#: apt-private/private-output.cc:281
+msgid "[installed]"
+msgstr "[установлен]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[может быть обновлён до: %s]"
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr "[остались файлы настроек]"
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "но %s уже установлен"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "но %s будет установлен"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "но он не может быть установлен"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "но это виртуальный пакет"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "но он не установлен"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "но он не будет установлен"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " или"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Пакеты, имеющие неудовлетворённые зависимости:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "НОВЫЕ пакеты, которые будут установлены:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Пакеты, которые будут УДАЛЕНЫ:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "Пакеты, которые будут оставлены в неизменном виде:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "Пакеты, которые будут обновлены:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr ""
+"Пакеты, которые должны были бы остаться без изменений, но будут заменены:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (вследствие %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"ВНИМАНИЕ: Эти существенно важные пакеты будут удалены.\n"
+"НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!"
+
+#: apt-private/private-output.cc:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "обновлено %lu, установлено %lu новых пакетов, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "переустановлено %lu переустановлено, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu пакетов заменены на старые версии, "
+
+#: apt-private/private-output.cc:641
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n"
+
+#: apt-private/private-output.cc:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "не установлено до конца или удалено %lu пакетов.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[Д/н]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+msgid "[y/N]"
+msgstr "[д/Н]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:684
+msgid "Y"
+msgstr "Д"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr "Н"
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Ошибка компиляции регулярного выражения — %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Команде update не нужны аргументы"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"Может быть обновлён %i пакет. Запустите «apt list --upgradable» для показа.\n"
+msgstr[1] ""
+"Может быть обновлено %i пакета. Запустите «apt list --upgradable» для их "
+"показа.\n"
+msgstr[2] ""
+"Может быть обновлено %i пакетов. Запустите «apt list --upgradable» для их "
+"показа.\n"
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr "Все пакеты имеют последние версии."
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] "Есть %i дополнительная запись. Используйте «-a» для просмотра"
+msgstr[1] "Есть %i дополнительные записи. Используйте «-a» для их просмотра"
+msgstr[2] "Есть %i дополнительных записей. Используйте «-a» для их просмотра"
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr "не реальный (виртуальный) пакет"
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1824,47 +1819,40 @@ msgstr ""
" Учтите, что блокировка не используется,\n"
" поэтому нет полного соответствия с текущей реальной ситуацией!"
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ВНИМАНИЕ: Следующие пакеты невозможно аутентифицировать!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "Предупреждение об аутентификации не принято в внимание.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "Некоторые пакеты невозможно аутентифицировать"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "Установить эти пакеты без проверки?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Существуют проблемы, а параметр -y указан без --force-yes"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Не удалось получить %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Не удалось определить количество свободного места в %s"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Недостаточно свободного места в %s."
@@ -1933,16 +1921,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Невозможно прочитать %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -2082,27 +2070,6 @@ msgstr "Вы можете запустить «apt-get update» для испр
msgid "The list of sources could not be read."
msgstr "Не читается перечень источников."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Драйвер для метода %s не найден."
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "Is the package %s installed?"
-msgstr "Проверьте, установлен ли пакет %s?"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Метод %s запустился не корректно"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr "Вставьте диск с меткой «%s» в устройство «%s» и нажмите ввод."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Кэш пакетов пуст"
@@ -2189,105 +2156,80 @@ msgstr "дополнительный"
msgid "Calculating upgrade"
msgstr "Расчёт обновлений"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Не поддерживается индексный файл типа «%s»"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "Кэш имеет несовместимую систему версий"
+msgid "The method driver %s could not be found."
+msgstr "Драйвер для метода %s не найден."
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Произошла ошибка во время обработки %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Превышено допустимое количество имён пакетов, которое способен обработать "
-"APT."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"Превышено допустимое количество версий, которое способен обработать APT."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"Превышено допустимое количество описаний, которое способен обработать APT."
+msgid "Is the package %s installed?"
+msgstr "Проверьте, установлен ли пакет %s?"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"Превышено допустимое количество зависимостей, которое способен обработать "
-"APT."
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Метод %s запустился не корректно"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Чтение списков пакетов"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr "Вставьте диск с меткой «%s» в устройство «%s» и нажмите ввод."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "Ошибка ввода/вывода при попытке сохранить кэш источников"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Построение дерева зависимостей"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr "Отправка сценария решателю"
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Версии-кандидаты"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr "Отправка запроса решателю"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Генерирование зависимостей"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr "Подготовка к приёму решения"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Чтение информации о состоянии"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr "Внешний решатель завершился с ошибкой не передав сообщения об ошибке"
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Не удалось открыть StateFile %s"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr "Запустить внешний решатель"
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Не удалось записать временный StateFile %s"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "переименовать не удалось, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "Хеш сумма не совпадает"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "Не совпадает размер"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
msgid "Invalid file format"
msgstr "Неправильный формат файла"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Ошибка записи"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, fuzzy, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2297,12 +2239,12 @@ msgstr ""
"использованы предыдущие индексные файлы. Ошибка GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr "Ошибка GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2311,14 +2253,14 @@ msgstr ""
"Невозможно найти ожидаемый элемент «%s» в файле Release (некорректная запись "
"в sources.list или файл)"
-#: apt-pkg/acquire-item.cc:1026
+#: apt-pkg/acquire-item.cc:1122
msgid "There is no public key available for the following key IDs:\n"
msgstr "Недоступен открытый ключ для следующих ID ключей:\n"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2327,37 +2269,37 @@ msgstr ""
"Файл Release для %s просрочен (недостоверный начиная с %s). Обновление этого "
"репозитория производиться не будет."
-#: apt-pkg/acquire-item.cc:1107
+#: apt-pkg/acquire-item.cc:1203
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Конфликт распространения: %s (ожидался %s, но получен %s)"
-#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "Каталог %s входит в список diverted"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2366,55 +2308,131 @@ msgstr ""
"Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся "
"вручную исправить этот пакет (возможно, пропущен arch)"
-#: apt-pkg/acquire-item.cc:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Невозможно найти источник для загрузки «%2$s» версии «%1$s»"
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Changelog для %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "Кэш имеет несовместимую систему версий"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Произошла ошибка во время обработки %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Превышено допустимое количество имён пакетов, которое способен обработать "
+"APT."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+"Превышено допустимое количество версий, которое способен обработать APT."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+"Превышено допустимое количество описаний, которое способен обработать APT."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Превышено допустимое количество зависимостей, которое способен обработать "
+"APT."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Чтение списков пакетов"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "Ошибка ввода/вывода при попытке сохранить кэш источников"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr "Каталог списка %spartial отсутствует."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Архивный каталог %spartial отсутствует."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, c-format
msgid "Unable to lock directory %s"
msgstr "Невозможно заблокировать каталог %s"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, c-format
msgid "Clean of %s is not supported"
msgstr "Очистка «%s» не поддерживается"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Скачивается файл %li из %li (осталось %s)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Скачивается файл %li из %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Не удалось получить %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Некоторые индексные файлы не скачались. Они были проигнорированы или вместо "
+"них были использованы старые версии."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Вы должны заполнить sources.list, поместив туда URI источников пакетов"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Невозможно получить атрибуты %s."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2443,28 +2461,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "Для фиксации не указан приоритет (или указан нулевой)"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Не удалось получить %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Некоторые индексные файлы не скачались. Они были проигнорированы или вместо "
-"них были использованы старые версии."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Вы должны заполнить sources.list, поместив туда URI источников пакетов"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Невозможно получить атрибуты %s."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2593,31 +2589,30 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Невозможно исправить ошибки, у вас отложены (held) битые пакеты."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Построение дерева зависимостей"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr "Отправка сценария решателю"
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Версии-кандидаты"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr "Отправка запроса решателю"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Генерирование зависимостей"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr "Подготовка к приёму решения"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Чтение информации о состоянии"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr "Внешний решатель завершился с ошибкой не передав сообщения об ошибке"
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Не удалось открыть StateFile %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr "Запустить внешний решатель"
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Не удалось записать временный StateFile %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Не поддерживается индексный файл типа «%s»"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, fuzzy, c-format
@@ -2629,59 +2624,97 @@ msgstr "Невозможно разобрать содержимое пакет
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Неправильная запись о переназначении (override) %s в строке %llu (%s)"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "Открытие %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Искажённая строка %u в списке источников %s (тип)"
+
+#: apt-pkg/sourcelist.cc:405
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Неизвестный тип «%s» в строке %u в списке источников %s"
+
+#: apt-pkg/sourcelist.cc:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Искажённая строка %u в списке источников %s (тип)"
+
+#: apt-pkg/sourcelist.cc:441
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Неизвестный тип «%s» в строфе %u в списке источников %s"
+
+#: apt-pkg/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Выпуск «%s» для «%s» не найден"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Версия «%s» для «%s» не найдена"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Не удалось найти задачу «%s»"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Не удалось найти пакет с помощью regex «%s»"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Не удалось найти пакет с помощью glob «%s»"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Не удалось выбрать версии из пакета «%s», так как он полностью виртуальный"
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Не удалось выбрать самую новую версию из пакета «%s», так как он полностью "
"виртуальный"
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Не удалось выбрать самую версию кандидата из пакета %s, так как у него нет "
"кандидатов"
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Не удалось выбрать установленную версию из пакета %s, так как он не "
"установлен"
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -2690,78 +2723,56 @@ msgstr ""
"Не удалось выбрать ни установленную, ни версию кандидата из пакета «%s», так "
"как в нём нет ни той, ни другой"
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Неправильная запись о переназначении (override) %s в строке %llu (%s)"
-
-#: apt-pkg/sourcelist.cc:355
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Opening %s"
-msgstr "Открытие %s"
-
-#: apt-pkg/sourcelist.cc:389
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Искажённая строка %u в списке источников %s (тип)"
-
-#: apt-pkg/sourcelist.cc:393
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Неизвестный тип «%s» в строке %u в списке источников %s"
-
-#: apt-pkg/sourcelist.cc:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "Искажённая строка %u в списке источников %s (тип)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:429
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Неизвестный тип «%s» в строфе %u в списке источников %s"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Невозможно разобрать содержимое файла Release (%s)"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr "Отсутствуют разделы в файле Release (%s)"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Отсутствуют элементы Hash в файле Release (%s)"
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Неправильный элемент «Date» в файле Release %s"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Неправильный элемент «Valid-Until» в файле Release %s"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2938,35 +2949,6 @@ msgstr ""
msgid "Not locked"
msgstr "Не заблокирован"
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%liд %liч %liмин %liс"
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%liч %liмин %liс"
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr "%liмин %liс"
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr "%liс"
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "Не найдено: %s"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -3050,7 +3032,7 @@ msgstr "Не удалось открыть файл %s"
msgid "Could not open file descriptor %d"
msgstr "Не удалось открыть файловый дескриптор %d"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "Не удалось создать IPC с порождённым процессом"
@@ -3088,12 +3070,12 @@ msgstr "Проблема при удалении файла %s"
msgid "Problem syncing the file"
msgstr "Проблема при синхронизации файла"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, c-format
msgid "Unable to mkstemp %s"
msgstr "Невозможно выполнить mkstemp %s"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Невозможно записать в %s"
@@ -3118,6 +3100,35 @@ msgstr "…"
msgid "%c%s... %u%%"
msgstr "%c%s… %u%%"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%liд %liч %liмин %liс"
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%liч %liмин %liс"
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr "%liмин %liс"
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr "%liс"
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "Не найдено: %s"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Невозможно отобразить в память пустой файл"
@@ -3479,87 +3490,87 @@ msgstr "В архиве нет поля control"
msgid "Unable to get a cursor"
msgstr "Невозможно получить курсор"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Не удалось прочитать каталог %s\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Не удалось прочитать атрибуты %s\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "E: Ошибки относятся к файлу "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "Не удалось проследовать по ссылке %s"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Не удалось совершить обход дерева"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "Не удалось открыть %s"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr "DeLink %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "Не удалось прочесть ссылку %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "Не удалось удалить %s"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Не удалось создать ссылку %s на %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Превышен лимит в %sB в DeLink.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "В архиве нет поля package"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " Нет записи о переназначении (override) для %s\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " пакет %s сопровождает %s, а не %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " Нет записи source override для %s\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " Нет записи binary override для %s\n"
@@ -3846,6 +3857,10 @@ msgstr "Неправильная контрольная сумма Tar, архи
msgid "Unknown TAR header type %u, member %s"
msgstr "Неизвестный заголовок в архиве TAR. Тип %u, элемент %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "Укажите, как минимум, одну пару url/имя файла"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Не удалось создать каналы"
diff --git a/po/sk.po b/po/sk.po
index 604a743e7..9eda086f5 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\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"
@@ -117,7 +117,7 @@ msgstr ""
"Tento príkaz je zavrhovaný. Prosím, použite namiesto neho „apt-mark "
"showauto“."
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Nedá sa nájsť balík %s"
@@ -352,16 +352,16 @@ msgstr "Vnútorná chyba, „problem resolver“ niečo pokazil"
msgid "Unable to lock the download directory"
msgstr "Adresár pre sťahovanie sa nedá zamknúť"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nedá sa nájsť zdrojový balík pre %s"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -371,7 +371,7 @@ msgstr ""
"adrese:\n"
"%s\n"
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -383,69 +383,69 @@ msgstr ""
"ak chcete získať najnovšie (a pravdepodobne zatiaľ nevydané) aktualizácie "
"balíka.\n"
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Preskakuje sa už stiahnutý súbor „%s“\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Je potrebné stiahnuť %sB/%sB zdrojových archívov.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Je potrebné stiahnuť %sB zdrojových archívov.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Stiahnuť zdroj %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Zlyhalo stiahnutie niektorých archívov."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Sťahovanie ukončené v režime „iba stiahnuť“"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Preskakuje sa rozbalenie už rozbaleného zdroja v %s\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Príkaz na rozbalenie „%s“ zlyhal.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Skontrolujte, či je nainštalovaný balík „dpkg-dev“.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Príkaz na zostavenie „%s“ zlyhal.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Proces potomka zlyhal"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Musíte zadať aspoň jeden balík, pre ktorý sa budú overovať závislosti na "
"zostavenie"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -454,27 +454,27 @@ msgstr ""
"Informácie o architektúre nie sú dostupné pre %s. Informácie o nastavení "
"nájdete v apt.conf(5) APT::Architectures"
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Spracovanie závislostí na zostavenie zlyhalo"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nedajú sa získať závislosti na zostavenie %s"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žiadne závislosti na zostavenie.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -483,20 +483,20 @@ msgstr ""
"%s závislosť pre %s nemožno splniť, pretože %s nie je povolené na balíkoch "
"„%s“"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s závislosť pre %s nemožno splniť, pretože sa nedá nájsť balík %s"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Zlyhalo splnenie %s závislosti pre %s: Inštalovaný balík %s je príliš nový"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -505,7 +505,7 @@ msgstr ""
"%s závislosť pre %s nemožno splniť, pretože kandidátska verzia balíka %s, "
"nedokáže splniť požiadavky na verziu"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -513,25 +513,25 @@ msgid ""
msgstr ""
"%s závislosť pre %s nemožno splniť, pretože balík %s nemá kandidátsku verziu"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Zlyhalo splnenie %s závislosti pre %s: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Závislosti na zostavenie %s nemožno splniť."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "Spracovanie závislostí na zostavenie zlyhalo"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -628,21 +628,16 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -803,12 +798,12 @@ msgstr "Disk sa nenašiel."
msgid "File not found"
msgstr "Súbor sa nenašiel"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "Vyhodnotenie zlyhalo"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "Zlyhalo nastavenie času zmeny"
@@ -899,7 +894,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:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Chyba"
@@ -972,64 +967,64 @@ msgstr "Dotaz"
msgid "Unable to invoke "
msgstr "Nedá sa vyvolať "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Pripája sa k %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Nedá sa vytvoriť socket pre %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Nedá sa nadviazať spojenie na %s:%s (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Nedá sa pripojiť k %s:%s (%s), uplynul čas spojenia"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Nedá sa pripojiť k %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Pripája sa k %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nie je možné preložiť „%s“"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Dočasné zlyhanie pri preklade „%s“"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, fuzzy, c-format
msgid "System error resolving '%s:%s'"
msgstr "Niečo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i - %s)"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Niečo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i - %s)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Nedá sa pripojiť k %s:%s:"
@@ -1049,7 +1044,7 @@ msgstr ""
"Nedá sa spustiť „apt-key“ kvôli overeniu podpisu (je nainštalované gnupg?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1151,229 +1146,6 @@ msgstr ""
msgid "Internal error"
msgstr "Vnútorná chyba"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Opravujú sa závislosti..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " zlyhalo."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Závislosti sa nedajú opraviť"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "Sada na aktualizáciu sa nedá minimalizovať"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Hotovo"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Možno to budete chcieť napraviť spustením „apt-get -f install“."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nesplnené závislosti. Skúste použiť -f."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Nainštalovaný]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Nainštalovaný]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Nainštalovaný]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr " [Nainštalovaný]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "ale nainštalovaný je %s"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ale inštalovať sa bude %s"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "ale sa nedá nainštalovať"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "ale je to virtuálny balík"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "ale nie je nainštalovaný"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "ale sa nebude inštalovať"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " alebo"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "Nasledovné balíky majú nesplnené závislosti:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "Nainštalujú sa nasledovné NOVÉ balíky:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Nasledovné balíky sa ODSTRÁNIA:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "Nasledovné balíky sa aktualizujú:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Nasledovné balíky sa DEGRADUJÚ:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "Nasledovné pridržané balíky sa zmenia:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (kvôli %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu aktualizovaných, %lu nových nainštalovaných, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinštalovaných, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu degradovaných, "
-
-#: apt-private/private-output.cc:641
-#, 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:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:684
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Chyba pri preklade regulárneho výrazu - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Príkaz update neprijíma žiadne argumenty"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1453,19 +1225,6 @@ msgstr "Balík „%s“ nie je nainštalovaný, nedá sa teda odstrániť\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Poznámka: „%s“ sa vyberá namiesto „%s“\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Vnútorná chyba, InstallPackages bolo volané s poškodenými balíkmi!"
@@ -1474,7 +1233,7 @@ msgstr "Vnútorná chyba, InstallPackages bolo volané s poškodenými balíkmi!
msgid "Packages need to be removed but remove is disabled."
msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1745,6 +1504,242 @@ msgstr "Vybraná verzia „%s“ (%s) pre „%s“\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Vybraná verzia „%s“ (%s) pre „%s“ kvôli „%s“\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Opravujú sa závislosti..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " zlyhalo."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Závislosti sa nedajú opraviť"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Sada na aktualizáciu sa nedá minimalizovať"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Hotovo"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Možno to budete chcieť napraviť spustením „apt-get -f install“."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Nesplnené závislosti. Skúste použiť -f."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Nainštalovaný]"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Nainštalovaný]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Nainštalovaný]"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr " [Nainštalovaný]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "ale nainštalovaný je %s"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ale inštalovať sa bude %s"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "ale sa nedá nainštalovať"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "ale je to virtuálny balík"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "ale nie je nainštalovaný"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "ale sa nebude inštalovať"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " alebo"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Nasledovné balíky majú nesplnené závislosti:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Nainštalujú sa nasledovné NOVÉ balíky:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Nasledovné balíky sa ODSTRÁNIA:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "Nasledovné balíky sa aktualizujú:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Nasledovné balíky sa DEGRADUJÚ:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "Nasledovné pridržané balíky sa zmenia:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (kvôli %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu aktualizovaných, %lu nových nainštalovaných, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinštalovaných, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu degradovaných, "
+
+#: apt-private/private-output.cc:641
+#, 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:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:684
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Chyba pri preklade regulárneho výrazu - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Príkaz update neprijíma žiadne argumenty"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1757,47 +1752,40 @@ 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-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "UPOZORNENIE: Pri nasledovných balíkoch sa nedá overiť vierohodnosť!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "Upozornenie o vierohodnosti bolo potlačené.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "Nedala sa zistiť vierohodnosť niektorých balíkov"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "Nainštalovať tieto nekontrolované balíky?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Nastali problémy a -y bolo použité bez --force-yes"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Zlyhalo stiahnutie %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Na %s sa nedá zistiť veľkosť voľného miesta"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Na %s nemáte dostatok voľného miesta."
@@ -1866,16 +1854,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Nedá sa načítať %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -2011,27 +1999,6 @@ msgstr "Na opravu týchto problémov môžete skúsiť spustiť apt-get update"
msgid "The list of sources could not be read."
msgstr "Nedá sa načítať zoznam zdrojov."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Nedá sa nájsť ovládač spôsobu %s."
-
-#: apt-pkg/acquire-worker.cc:113
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Skontrolujte, či je nainštalovaný balík „dpkg-dev“.\n"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Spôsob %s nebol správne spustený"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr "Vložte disk nazvaný „%s“ do mechaniky „%s“ a stlačte Enter."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Vyrovnávacia pamäť balíkov je prázdna"
@@ -2118,102 +2085,81 @@ msgstr "extra"
msgid "Calculating upgrade"
msgstr "Prepočítava sa aktualizácia"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indexový súbor typu „%s“ nie je podporovaný"
+msgid "The method driver %s could not be found."
+msgstr "Nedá sa nájsť ovládač spôsobu %s."
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií"
+#: apt-pkg/acquire-worker.cc:113
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Skontrolujte, či je nainštalovaný balík „dpkg-dev“.\n"
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:164
#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Vyskytla sa chyba pri spracovávaní %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Fíha, prekročili ste počet názvov balíkov, ktoré toto APT zvládne spracovať."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Fíha, prekročili ste počet verzií, ktoré toto APT zvládne spracovať."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Fíha, prekročili ste počet popisov, ktoré toto APT zvládne spracovať."
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"Fíha, prekročili ste počet závislostí, ktoré toto APT zvládne spracovať."
+msgid "Method %s did not start correctly"
+msgstr "Spôsob %s nebol správne spustený"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Načítavajú sa zoznamy balíkov"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr "Vložte disk nazvaný „%s“ do mechaniky „%s“ a stlačte Enter."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäti"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Vytvára sa strom závislostí"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr "Poslať scénár riešiteľovi"
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Kandidátske verzie"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr "Poslať požiadavku riešiteľovi"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generovanie závislostí"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr "Pripraviť sa na prijatie riešenia"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Načítavajú sa stavové informácie"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr "Externý riešiteľ zlyhal bez uvedenia chybovej správy"
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Nie je možné otvoriť StateFile %s"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr "Spustiť externého riešiteľa"
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Nie je možné zapísať dočasný StateFile %s"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "premenovanie zlyhalo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "Nezhoda kontrolných haš súčtov"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "Veľkosti sa nezhodujú"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
#, fuzzy
msgid "Invalid file format"
msgstr "Neplatná operácia %s"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Chyba pri zápise"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, fuzzy, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2223,12 +2169,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:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr "Chyba GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2237,14 +2183,14 @@ 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:1026
+#: apt-pkg/acquire-item.cc:1122
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"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2253,37 +2199,37 @@ 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, 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:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "Adresár %s je divertovaný"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2292,55 +2238,127 @@ 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:2677
+#: apt-pkg/acquire-item.cc:2751
#, 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:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Indexové súbory balíka sú narušené. Chýba pole Filename: pre balík %s."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Záznam zmien %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Vyskytla sa chyba pri spracovávaní %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Fíha, prekročili ste počet názvov balíkov, ktoré toto APT zvládne spracovať."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Fíha, prekročili ste počet verzií, ktoré toto APT zvládne spracovať."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Fíha, prekročili ste počet popisov, ktoré toto APT zvládne spracovať."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Fíha, prekročili ste počet závislostí, ktoré toto APT zvládne spracovať."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Načítavajú sa zoznamy balíkov"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäti"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr "Adresár zoznamov %spartial chýba."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Archívny adresár %spartial chýba."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, c-format
msgid "Unable to lock directory %s"
msgstr "Adresár %s sa nedá zamknúť"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, fuzzy, c-format
msgid "Clean of %s is not supported"
msgstr "Indexový súbor typu „%s“ nie je podporovaný"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Sťahuje sa %li. súbor z %li (zostáva %s)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Sťahuje sa %li. súbor z %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Zlyhalo stiahnutie %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Niektoré indexové súbory sa nepodarilo stiahnuť. Boli ignorované alebo sa "
+"použili staršie verzie."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Do sources.list musíte zadať nejaký „source“ (zdrojový) URI"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Nie je možné vykonať stat %s."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2369,28 +2387,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "Nebola zadaná žiadna (alebo nulová) priorita na pridržanie"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Zlyhalo stiahnutie %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Niektoré indexové súbory sa nepodarilo stiahnuť. Boli ignorované alebo sa "
-"použili staršie verzie."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Do sources.list musíte zadať nejaký „source“ (zdrojový) URI"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Nie je možné vykonať stat %s."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2516,31 +2512,30 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Problémy sa nedajú opraviť, niektoré balíky držíte v poškodenom stave."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Vytvára sa strom závislostí"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr "Poslať scénár riešiteľovi"
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Kandidátske verzie"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr "Poslať požiadavku riešiteľovi"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generovanie závislostí"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr "Pripraviť sa na prijatie riešenia"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Načítavajú sa stavové informácie"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr "Externý riešiteľ zlyhal bez uvedenia chybovej správy"
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nie je možné otvoriť StateFile %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr "Spustiť externého riešiteľa"
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Nie je možné zapísať dočasný StateFile %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Indexový súbor typu „%s“ nie je podporovaný"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2552,57 +2547,95 @@ msgstr "Súbor %s sa nedá spracovať (%d)"
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Skomolený „override“ %s riadok %llu #1"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "Otvára sa %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)"
+
+#: apt-pkg/sourcelist.cc:405
+#, 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:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)"
+
+#: apt-pkg/sourcelist.cc:441
+#, 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/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Nebolo nájdené vydanie „%s“ pre „%s“"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Nebola nájdená verzia „%s“ pre „%s“"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Nebolo možné nájsť úlohu „%s“"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Nie je možné vybrať verzie z balíka „%s“, pretože je čisto virtuálny"
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Nie je možné vybrať najnovšiu verziu z balíka „%s“, pretože je čisto "
"virtuálny"
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Nie je možné vybrať kandidátsku verziu z balíka „%s“, pretože nemá kandidáta"
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Nie je možné vybrať nainštalovanú verziu z balíka „%s“, pretože nie je "
"nainštalovaný"
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -2611,78 +2644,56 @@ msgstr ""
"Nie je možné vybrať nainštalované ani kandidátske verzie z balíka „%s“, "
"pretože nemá žiadnu z nich"
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Skomolený „override“ %s riadok %llu #1"
-
-#: apt-pkg/sourcelist.cc:355
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Opening %s"
-msgstr "Otvára sa %s"
-
-#: apt-pkg/sourcelist.cc:389
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:393
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, 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:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)"
-
-#: apt-pkg/sourcelist.cc:429
-#, 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"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Nedá spracovať súbor Release %s"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr "Žiadne sekcie v Release súbore %s"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Chýba položka „Hash“ v súbore Release %s"
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Chýba položka „Date“ v súbore Release %s"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Chýba položka „Valid-Until“ v súbore Release %s"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2853,35 +2864,6 @@ msgstr "dpkg bol prerušený, musíte ručne opraviť problém spustením „%s
msgid "Not locked"
msgstr "Nie je zamknuté"
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%li d %li h %li min %li s"
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li h %li min %li s"
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr "%li min %li s"
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr "%li s"
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "Voľba %s nenájdená"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2959,7 +2941,7 @@ msgstr "Nedá sa otvoriť súbor %s"
msgid "Could not open file descriptor %d"
msgstr "Nedá sa otvoriť popisovač súboru %d"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "Nedá sa vytvoriť podproces IPC"
@@ -2996,12 +2978,12 @@ msgstr "Problém pri odstraňovaní súboru %s"
msgid "Problem syncing the file"
msgstr "Problém pri synchronizovaní súboru"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Nedá sa vyhodnotiť %s"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Do %s sa nedá zapisovať"
@@ -3026,6 +3008,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Hotovo"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%li d %li h %li min %li s"
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%li h %li min %li s"
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr "%li min %li s"
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr "%li s"
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "Voľba %s nenájdená"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Nedá sa vykonať mmap prázdneho súboru"
@@ -3380,87 +3391,87 @@ msgstr "Archív nemá riadiaci záznam"
msgid "Unable to get a cursor"
msgstr "Nedá sa získať kurzor"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Adresár %s sa nedá čítať\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: %s sa nedá vyhodnotiť\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "E: Chyby sa týkajú súboru "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "Chyba pri preklade %s"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Prechod stromom zlyhal"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "%s sa nedá otvoriť"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Odlinkovanie %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "Nie je možné vykonať readlink %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "Nie je možné vykonať unlink %s"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Nepodarilo sa zlinkovať %s s %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Bol dosiahnutý odlinkovací limit %sB.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "Archív neobsahuje pole „package“"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nemá žiadnu položku override\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " správcom %s je %s, nie %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nemá žiadnu položku „source override“\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nemá žiadnu položku „binary override“\n"
@@ -3745,6 +3756,10 @@ msgstr "Kontrolný súčet pre tar zlyhal, archív je poškodený"
msgid "Unknown TAR header type %u, member %s"
msgstr "Neznáma TAR hlavička typu %u, člen %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Vytvorenie rúry zlyhalo"
diff --git a/po/sl.po b/po/sl.po
index 6f55dcb7e..d3eeb71ee 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: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\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"
@@ -115,7 +115,7 @@ msgstr "Podati morate vsaj en iskalni vzorec"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr "Ta ukaz je zastarel. Namesto njega uporabite 'apt-mark showauto'."
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Ni mogoče najti paketa %s"
@@ -350,17 +350,17 @@ msgstr "Notranja napaka, reševalnik težav je pokvaril stvari"
msgid "Unable to lock the download directory"
msgstr "Ni mogoče zakleniti mape prejemov"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Potrebno je navesti vsaj en paket, za katerega želite dobiti izvorno kodo"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Izvornega paketa za %s ni mogoče najti"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -369,7 +369,7 @@ msgstr ""
"OPOMBA: pakiranje '%s' vzdrževano v sistemu nadzora različice '%s' na:\n"
"%s\n"
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -380,69 +380,69 @@ msgstr ""
"bzr branch %s\n"
"za pridobitev zadnjih (morda še neizdanih) posodobitev paketa.\n"
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Preskok že prejete datoteke '%s'\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Potrebno je dobiti %sB izvornih arhivov.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Dobi vir %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Nekaterih arhivov ni mogoče pridobiti."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Prejem je dokončan in uporabljen je način samo prejema"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Odpakiranje že odpakiranih izvornih paketov v %s je bilo preskočeno\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Izberite, če je paket 'dpkg-dev' nameščen.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Ukaz gradnje '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Podrejeno opravilo ni uspelo"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Potrebno je navesti vsaj en paket, za katerega želite preveriti odvisnosti "
"za gradnjo"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -451,27 +451,27 @@ msgstr ""
"Za %s ni bilo mogoče najti podatkov o arhitekturi. Za nastavitev si oglejte "
"apt.conf(5) APT::Architectures"
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Obdelava odvisnosti za gradnjo je spodletela"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ni mogoče dobiti podrobnosti o odvisnostih za gradnjo za %s"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nima odvisnosti za gradnjo.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -479,20 +479,20 @@ msgid ""
msgstr ""
"odvisnosti %s za %s ni mogoče zadovoljiti, ker %s ni dovoljen na paketih '%s'"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s odvisnosti za %s ni mogoče zadostiti, ker ni mogoče najti paketa %s"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Ni mogoče zadostiti %s odvisnosti za %s. Nameščen paket %s je preveč nov"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -501,7 +501,7 @@ msgstr ""
"odvisnosti %s za %s ni mogoče zadovoljiti, ker je različica kandidata paketa "
"%s ne more zadostiti zahtev različice"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -510,25 +510,25 @@ msgstr ""
"odvisnosti %s za %s ni mogoče zadovoljiti, ker je različica kandidata paketa "
"%s nima različice kandidata"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Ni mogoče zadostiti %s odvisnosti za %s: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Odvisnosti za gradnjo %s ni bilo mogoče zadostiti."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "Obdelava odvisnosti za gradnjo je spodletela"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Podprti moduli:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -625,22 +625,16 @@ msgid "Must specify at least one pair url/filename"
msgstr ""
"Potrebno je navesti vsaj en paket, za katerega želite dobiti izvorno kodo"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr ""
-"Potrebno je navesti vsaj en paket, za katerega želite dobiti izvorno kodo"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -800,12 +794,12 @@ msgstr "Diska ni mogoče najti."
msgid "File not found"
msgstr "Datoteke ni mogoče najti"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "Določitev ni uspela"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "Nastavitev časa spremembe je spodletela"
@@ -896,7 +890,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:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Spodletelo"
@@ -969,64 +963,64 @@ msgstr "Poizvedba"
msgid "Unable to invoke "
msgstr "Ni mogoče klicati "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Povezovanje z %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Ni mogoče ustvariti vtiča za %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Ni mogoče začeti povezave z %s:%s (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Ni se mogoče povezati z %s:%s (%s). Povezava je zakasnela."
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Ni se mogoče povezati z %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Povezovanje z %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "Ni mogoče razrešiti '%s'"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Začasna napaka med razreševanjem '%s'"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, fuzzy, c-format
msgid "System error resolving '%s:%s'"
msgstr "Nekaj čudnega se je zgodilo med razreševanjem '%s:%s' (%i - %s)"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Nekaj čudnega se je zgodilo med razreševanjem '%s:%s' (%i - %s)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Ni se mogoče povezati z %s:%s:"
@@ -1047,7 +1041,7 @@ msgstr ""
"Ni mogoče izvesti 'apt-key' za preverjanje podpisa (je gnupg nameščen?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1148,231 +1142,6 @@ msgstr ""
msgid "Internal error"
msgstr "Notranja napaka"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Popravljanje odvisnosti ..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " spodletelo."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Ni mogoče popraviti odvisnosti"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "Ni mogoče pomanjšati zbirke za nadgradnjo"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Opravljeno"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Če želite popraviti napake, poskusite pognati 'apt-get -f install'."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nerešene odvisnosti. Poskusite uporabiti -f."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Nameščeno]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Nameščeno]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Nameščeno]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr " [Nameščeno]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "vendar je paket %s nameščen"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "vendar bo paket %s nameščen"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "vendar se ga ne da namestiti"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "vendar je navidezen paket"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "vendar ni nameščen"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "vendar ne bo nameščen"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " ali"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "Naslednji paketi imajo nerešene odvisnosti:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "Naslednji NOVI paketi bodo nameščeni:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Naslednji novi paketi bodo ODSTRANJENI:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "Naslednji paketi so bili zadržani:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "Naslednji paketi bodo nadgrajeni:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Naslednji paketi bodo POSTARANI:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "Naslednji zadržani paketi bodo spremenjeni:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (zaradi %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"OPOZORILO: Naslednji nujni paketi bodo odstranjeni.\n"
-"Tega NE storite, razen če ne veste natanko kaj počenjate!"
-
-#: apt-private/private-output.cc:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu nadgrajenih, %lu na novo nameščenih, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu posodobljenih, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu postaranih, "
-
-#: apt-private/private-output.cc:641
-#, 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:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:684
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Napaka med prevajanjem logičnega izraza - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Ukaz update ne sprejema argumentov"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1452,20 +1221,6 @@ msgstr "Paket '%s' ni nameščen, zato ni bil odstranjen\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Izbiranje '%s' namesto '%s'\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Notranja napaka, NamestiPakete je bil klican z pokvarjenimi paketi!"
@@ -1474,7 +1229,7 @@ msgstr "Notranja napaka, NamestiPakete je bil klican z pokvarjenimi paketi!"
msgid "Packages need to be removed but remove is disabled."
msgstr "Odstraniti je treba pakete, a je odstranjevanje onemogočeno."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1748,6 +1503,245 @@ msgstr "Izbrana različica '%s' (%s) za '%s'\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Izbrana različica '%s' (%s) za '%s' namesto '%s'\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Popravljanje odvisnosti ..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " spodletelo."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Ni mogoče popraviti odvisnosti"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Ni mogoče pomanjšati zbirke za nadgradnjo"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Opravljeno"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Če želite popraviti napake, poskusite pognati 'apt-get -f install'."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Nerešene odvisnosti. Poskusite uporabiti -f."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Nameščeno]"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Nameščeno]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Nameščeno]"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr " [Nameščeno]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "vendar je paket %s nameščen"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "vendar bo paket %s nameščen"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "vendar se ga ne da namestiti"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "vendar je navidezen paket"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "vendar ni nameščen"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "vendar ne bo nameščen"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " ali"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Naslednji paketi imajo nerešene odvisnosti:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Naslednji NOVI paketi bodo nameščeni:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Naslednji novi paketi bodo ODSTRANJENI:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "Naslednji paketi so bili zadržani:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "Naslednji paketi bodo nadgrajeni:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Naslednji paketi bodo POSTARANI:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "Naslednji zadržani paketi bodo spremenjeni:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (zaradi %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"OPOZORILO: Naslednji nujni paketi bodo odstranjeni.\n"
+"Tega NE storite, razen če ne veste natanko kaj počenjate!"
+
+#: apt-private/private-output.cc:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu nadgrajenih, %lu na novo nameščenih, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu posodobljenih, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu postaranih, "
+
+#: apt-private/private-output.cc:641
+#, 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:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:684
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Napaka med prevajanjem logičnega izraza - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Ukaz update ne sprejema argumentov"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1760,47 +1754,40 @@ msgstr ""
" Zaklepanje je onemogočeno, zato se ne zanašajte\n"
" na pomembnost trenutnega pravega stanja!"
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "POZOR: Naslednjih paketov ni bilo mogoče overiti!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "Opozorilo overitve je bilo prepisano.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "Nekaterih paketkov bi bilo mogoče overiti"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "Ali želite te pakete namestiti brez preverjanja?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Prišlo je do težav in -y je bil uporabljen brez --force-yes"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ni mogoče dobiti %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Ni mogoče določiti prostega prostora v %s"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Na %s je premalo prostora."
@@ -1869,16 +1856,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Ni mogoče brati %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -2017,27 +2004,6 @@ msgstr "Za odpravljanje težav poskusite zagnati apt-get update."
msgid "The list of sources could not be read."
msgstr "Seznama virov ni mogoče brati."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Gonilnika načinov %s ni mogoče najti."
-
-#: apt-pkg/acquire-worker.cc:113
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Izberite, če je paket 'dpkg-dev' nameščen.\n"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Način %s se ni začel pravilno"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr "Vstavite disk z oznako '%s' v pogon '%s' in pritisnite vnosno tipko."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Prazen predpomnilnik paketov"
@@ -2124,100 +2090,81 @@ msgstr "dodatno"
msgid "Calculating upgrade"
msgstr "Preračunavanje nadgradnje"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Vrsta datoteke s kazalom '%s' ni podprta"
+msgid "The method driver %s could not be found."
+msgstr "Gonilnika načinov %s ni mogoče najti."
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "Predpomnilnik ima neustrezen sistem različic"
+#: apt-pkg/acquire-worker.cc:113
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Izberite, če je paket 'dpkg-dev' nameščen.\n"
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:164
#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Med obdelovanjem %s je prišlo do napake (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Čestitamo, presegli ste število imen paketov, ki jih zmore APT."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Čestitamo, presegli ste število različic, ki jih zmore APT."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Čestitamo, presegli ste število opisov, ki jih je zmožen APT."
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Čestitamo, presegli ste število odvisnosti, ki jih zmore APT."
+msgid "Method %s did not start correctly"
+msgstr "Način %s se ni začel pravilno"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Branje seznama paketov"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr "Vstavite disk z oznako '%s' v pogon '%s' in pritisnite vnosno tipko."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "Napaka VI med shranjevanjem predpomnilnika virov"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Gradnja drevesa odvisnosti"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr "Pošlji scenarij reševalniku"
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Različice kandidatov"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr "Pošlji zahtevo reševalniku"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Ustvarjanje odvisnosti"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr "Priprava za rešitev prejemanja"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Branje podatkov o stanju"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr "Zunanji reševalnik je spodletel brez pravega sporočila o napakah"
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Odpiranje DatotekeStanja %s je spodletelo"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr "Izvedi zunanji reševalnik"
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Pisanje začasne DatotekeStanja %s je spodletelo"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "preimenovanje je spodletelo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "Neujemanje vsote razpršil"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "Neujemanje velikosti"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
#, fuzzy
msgid "Invalid file format"
msgstr "Neveljavno opravilo %s"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Napaka pisanja"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, fuzzy, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2227,12 +2174,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:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr "Napaka GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2241,14 +2188,14 @@ 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:1026
+#: apt-pkg/acquire-item.cc:1122
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"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2257,37 +2204,37 @@ msgstr ""
"Datoteka Release za %s je potekla (neveljavna od %s). Posodobitev za to "
"skladišče ne bo uveljavljena."
-#: apt-pkg/acquire-item.cc:1107
+#: apt-pkg/acquire-item.cc:1203
#, 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:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "Mapa %s je odklonjena"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2296,12 +2243,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:2677
+#: apt-pkg/acquire-item.cc:2751
#, 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:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2310,43 +2257,113 @@ msgstr ""
"%s."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Dnevnik sprememb za %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "Predpomnilnik ima neustrezen sistem različic"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Med obdelovanjem %s je prišlo do napake (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Čestitamo, presegli ste število imen paketov, ki jih zmore APT."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Čestitamo, presegli ste število različic, ki jih zmore APT."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Čestitamo, presegli ste število opisov, ki jih je zmožen APT."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Čestitamo, presegli ste število odvisnosti, ki jih zmore APT."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Branje seznama paketov"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "Napaka VI med shranjevanjem predpomnilnika virov"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr "Mapa seznama %spartial manjka."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Mapa arhivov %spartial manjka."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, c-format
msgid "Unable to lock directory %s"
msgstr "Mape %s ni mogoče zakleniti"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, fuzzy, c-format
msgid "Clean of %s is not supported"
msgstr "Vrsta datoteke s kazalom '%s' ni podprta"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Pridobivanje datoteke %li od %li (%s preostalo)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Pridobivanje datoteke %li od %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Ni mogoče dobiti %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Prejem nekaterih datotek kazala je spodletel. Bile so prezrte ali pa so bile "
+"namesto njih uporabljene stare."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "V sources.list morate vstaviti URI-je z viri"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Ni mogoče določiti %s."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2375,28 +2392,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "Prednost bucike ni navedena ali pa je nič."
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Ni mogoče dobiti %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Prejem nekaterih datotek kazala je spodletel. Bile so prezrte ali pa so bile "
-"namesto njih uporabljene stare."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "V sources.list morate vstaviti URI-je z viri"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Ni mogoče določiti %s."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2522,31 +2517,30 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Ni mogoče popraviti težav. Imate pokvarjene pakete."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Gradnja drevesa odvisnosti"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr "Pošlji scenarij reševalniku"
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Različice kandidatov"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr "Pošlji zahtevo reševalniku"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Ustvarjanje odvisnosti"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr "Priprava za rešitev prejemanja"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Branje podatkov o stanju"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr "Zunanji reševalnik je spodletel brez pravega sporočila o napakah"
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Odpiranje DatotekeStanja %s je spodletelo"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr "Izvedi zunanji reševalnik"
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Pisanje začasne DatotekeStanja %s je spodletelo"
+msgid "Index file type '%s' is not supported"
+msgstr "Vrsta datoteke s kazalom '%s' ni podprta"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2558,54 +2552,92 @@ msgstr "Ni mogoče razčleniti datoteke paketa %s (%d)"
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "Odpiranje %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, 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:405
+#, 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:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Slabo oblikovana vrstica %u v seznamu virov %s (vrsta)"
+
+#: apt-pkg/sourcelist.cc:441
+#, 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/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Izdaje '%s' za '%s' ni mogoče najti"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Različice '%s' za '%s' ni mogoče najti"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Ni mogoče najti naloge '%s'"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Ni mogoče izbrati različic in paketa '%s', saj je popolnoma navidezen"
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Ni mogoče izbrati najnovejše različice iz paketa '%s', saj je popolnoma "
"navidezen"
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr "Ni mogoče izbrati različice kandidata iz paketa %s, ker nima kandidata"
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr "Ni mogoče izbrati nameščene različice iz paketa %s, saj ni nameščen"
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -2614,78 +2646,56 @@ msgstr ""
"Ni mogoče izbrati nameščene različice ali različice kandidata iz paketa "
"'%s', saj nima nobenega od njiju"
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1"
-
-#: apt-pkg/sourcelist.cc:355
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Opening %s"
-msgstr "Odpiranje %s"
-
-#: apt-pkg/sourcelist.cc:389
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Slabo oblikovana vrstica %u v seznamu virov %s (vrsta)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:393
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, 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:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "Slabo oblikovana vrstica %u v seznamu virov %s (vrsta)"
-
-#: apt-pkg/sourcelist.cc:429
-#, 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"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Ni mogoče razčleniti Release datoteke %s"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr "Ni izbir v Release datoteki %s"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Ni vnosa razpršila v Release datoteki %s"
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Neveljavne vnos 'Datum' v Release datoteki %s"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Neveljaven vnos 'Veljavno-do' v Release datoteki %s"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2858,35 +2868,6 @@ msgstr "dpkg je bil prekinjen. Za popravilo napake morate ročno pognati '%s'. "
msgid "Not locked"
msgstr "Ni zaklenjeno"
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "Izbire %s ni mogoče najti"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2964,7 +2945,7 @@ msgstr "Ni mogoče odpreti datoteke %s"
msgid "Could not open file descriptor %d"
msgstr "Ni mogoče odpreti opisnika datotek %d"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "Ni mogoče ustvariti podopravila IPD"
@@ -3001,12 +2982,12 @@ msgstr "Težava med razvezovanjem datoteke %s"
msgid "Problem syncing the file"
msgstr "Težava med usklajevanjem datoteke"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Ni mogoče določiti %s"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Ni mogoče pisati na %s"
@@ -3031,6 +3012,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s ... Narejeno"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "Izbire %s ni mogoče najti"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "mmap prazne datoteke ni mogoč"
@@ -3384,87 +3394,87 @@ msgstr "Arhiv nima nadzornega zapisa"
msgid "Unable to get a cursor"
msgstr "Ni mogoče najti kazalke"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "O: ni mogoče brati mape %s\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "O: Ni mogoče določiti %s\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "O: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "N: Napake se sklicujejo na datoteko "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "Ni mogoče razrešiti %s"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Hoja drevesa je spodletela"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "Ni mogoče odprti %s"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " RazVeži %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "Napaka med branjem povezave %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "Napaka med odvezovanjem %s"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Napaka med povezovanjem %s in %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Dosežena meja RazVezovanja %sB.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "Arhiv ni imel polja s paketom"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nima prepisanega vnosa\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Vzdrževalec %s je %s in ne %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nima izvornega vnosa prepisa\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nima tudi binarnega vnosa prepisa\n"
@@ -3751,6 +3761,11 @@ msgstr "Nadzorna vsota tar ni uspela, arhiv je pokvarjen"
msgid "Unknown TAR header type %u, member %s"
msgstr "Neznana vrsta glave TAR %u, član %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr ""
+#~ "Potrebno je navesti vsaj en paket, za katerega želite dobiti izvorno kodo"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Ni mogoče ustvariti pip"
diff --git a/po/sv.po b/po/sv.po
index 12e5c87ef..6d6979ce8 100644
--- a/po/sv.po
+++ b/po/sv.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: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\n"
"PO-Revision-Date: 2015-08-19 21:33+0200\n"
"Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
"Language-Team: Swedish <debian-l10n-swedish@debian.org>\n"
@@ -117,7 +117,7 @@ msgstr "Du måste ange minst ett sökmönster"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr "Detta kommando är föråldrat. Använd ”apt-mark showauto” istället."
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Kunde inte hitta paketet %s"
@@ -356,16 +356,16 @@ msgstr "Internt fel, problemlösaren förstörde någonting"
msgid "Unable to lock the download directory"
msgstr "Kunde inte låsa hämtningskatalogen"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "Du måste ange minst ett paket att hämta källkod för"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kunde inte hitta något källkodspaket för %s"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -375,7 +375,7 @@ msgstr ""
"på:\n"
"%s\n"
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -387,67 +387,67 @@ msgstr ""
"för att hämta de senaste (möjligen inte utgivna) uppdateringarna av "
"paketet.\n"
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Hoppar över redan hämtade filen ”%s”\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Behöver hämta %sB källkodsarkiv.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Hämtar källkoden %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Misslyckades med att hämta vissa arkiv."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Hämtningen färdig i ”endast-hämta”-läge"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Packar inte upp redan uppackad källkod i %s\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uppackningskommandot ”%s” misslyckades.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Försäkra dig om att paketet ”dpkg-dev” är installerat.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggkommandot ”%s” misslyckades.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Underprocess misslyckades"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr "Du måste ange minst ett paket att kontrollera byggberoenden för"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -456,27 +456,27 @@ msgstr ""
"Ingen arkitekturinformation tillgänglig för %s. Se apt.conf(5) APT::"
"Architectures för inställning"
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr "Observera, använder katalogen ”%s” för att få byggberoendena\n"
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Observera, använder filen ”%s” för att få byggberoendena\n"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kunde inte hämta information om byggberoenden för %s"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har inga byggberoenden.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -485,7 +485,7 @@ msgstr ""
"%s-beroendet på %s kan inte tillfredsställas eftersom %s inte är tillåtet på "
"”%s”-paket"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -494,14 +494,14 @@ msgstr ""
"%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
"hittas"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Misslyckades med att tillfredsställa %s-beroendet för %s: Det installerade "
"paketet %s är för nytt"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -510,7 +510,7 @@ msgstr ""
"%s-beroendet på %s kan inte tillfredsställas eftersom kandidatversionen av "
"paketet %s inte tillfredsställer versionskraven"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -519,25 +519,25 @@ msgstr ""
"%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte har "
"någon kandidatversion"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Misslyckades med att tillfredsställa %s-beroendet för %s: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggberoenden för %s kunde inte tillfredsställas."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "Misslyckades med att behandla byggberoenden"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Moduler som stöds:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -632,21 +632,16 @@ msgstr "Behöver en URL som argument"
msgid "Must specify at least one pair url/filename"
msgstr "Du måste ange minst ett par bestående av url och filnamn"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr "Hämtning misslyckades"
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "Du måste ange minst ett par bestående av url och filnamn"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
#, fuzzy
msgid ""
"Usage: apt-helper [options] command\n"
@@ -842,12 +837,12 @@ msgstr "Skivan hittades inte."
msgid "File not found"
msgstr "Filen hittades inte"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "Misslyckades med att ta status"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "Misslyckades med att ställa in ändringstid"
@@ -938,7 +933,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:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Misslyckades"
@@ -1012,67 +1007,67 @@ msgstr "Frågar"
msgid "Unable to invoke "
msgstr "Kunde inte starta "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Ansluter till %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
# [f]amilj, [t]yp, [p]rotokoll
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Kunde inte skapa ett uttag (socket) för %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Kunde inte initiera anslutningen till %s:%s (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Kunde inte ansluta till %s:%s (%s), anslutningen överskred tidsgräns"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Kunde inte ansluta till %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Ansluter till %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "Kunde inte slå upp ”%s”"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Temporärt fel vid uppslagning av ”%s”"
# Okänd felkod; %i = koden
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, c-format
msgid "System error resolving '%s:%s'"
msgstr "Systemfel när ”%s:%s” slogs upp"
# Okänd felkod; %i = koden
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Något konstigt hände när ”%s:%s” slogs upp (%i - %s)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Kunde inte ansluta till %s:%s:"
@@ -1094,7 +1089,7 @@ msgstr ""
"Kunde inte köra ”apt-key” för att verifiera signatur (är gnupg installerad?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1200,229 +1195,6 @@ msgstr ""
msgid "Internal error"
msgstr "Internt fel"
-# Förloppsindikator då lista skapas.
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr "Listar"
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-"Det finns %i ytterligare version. Använd växeln ”-a” för att se den."
-msgstr[1] ""
-"Det finns %i ytterligare versioner. Använd växeln ”-a” för att se dem."
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Korrigerar beroenden…"
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " misslyckades."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Kunde inte korrigera beroenden"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "Kunde inte minimera uppgraderingsuppsättningen"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Färdig"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Du bör köra ”apt-get -f install” för att korrigera dessa."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Otillfredsställda beroenden. Prova med -f."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr "okänd"
-
-#: apt-private/private-output.cc:272
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[installerat,uppgraderingsbart till: %s]"
-
-#: apt-private/private-output.cc:275
-msgid "[installed,local]"
-msgstr "[installerat,lokalt]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr "[installerat,automatiskt borttagbart]"
-
-#: apt-private/private-output.cc:279
-msgid "[installed,automatic]"
-msgstr "[installerat,automatiskt]"
-
-#: apt-private/private-output.cc:281
-msgid "[installed]"
-msgstr "[installerat]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr "[uppgraderingsbart från: %s]"
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr "[kvarvarande-inställning]"
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "men %s är installerat"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "men %s kommer att installeras"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "men det kan inte installeras"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "men det är ett virtuellt paket"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "men det är inte installerat"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "men det kommer inte att installeras"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " eller"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "Följande paket har beroenden som inte kan tillfredsställas:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "Följande NYA paket kommer att installeras:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Följande paket kommer att TAS BORT:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "Följande paket har hållits tillbaka:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "Följande paket kommer att uppgraderas:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Följande paket kommer att NEDGRADERAS:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "Följande tillbakahållna paket kommer att ändras:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (på grund av %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu att uppgradera, %lu att nyinstallera, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu att installera om, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu att nedgradera, "
-
-#: apt-private/private-output.cc:641
-#, 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:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu är inte helt installerade eller borttagna.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[J/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-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:684
-msgid "Y"
-msgstr "J"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Fel vid kompilering av reguljärt uttryck - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Uppdateringskommandot tar inga argument"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-"%i paket kan uppgraderas. Kör ”apt list --upgradable” för att se det.\n"
-msgstr[1] ""
-"%i paket kan uppgraderas. Kör ”apt list --upgradable” för att se dem.\n"
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr "Alla paket är uppdaterade."
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr "Sorterar"
@@ -1502,18 +1274,6 @@ msgstr "Paketet ”%s” är inte installerat, så det tas inte bort\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Observera, väljer \"%s\" istället för \"%s\"\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] "Det finns %i ytterligare post. Använd växeln ”-a” för att se den."
-msgstr[1] "Det finns %i ytterligare poster. Använd växeln ”-a” för att se dem."
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr "inte ett riktigt paket (virtuellt)"
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Internt fel. InstallPackages anropades med trasiga paket!"
@@ -1522,7 +1282,7 @@ msgstr "Internt fel. InstallPackages anropades med trasiga paket!"
msgid "Packages need to be removed but remove is disabled."
msgstr "Paketen måste tas bort men ”Remove” är inaktiverat."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1791,6 +1551,241 @@ msgstr "Valde version ”%s” (%s) för ”%s”\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Valde version ”%s” (%s) för ”%s” på grund av ”%s”\n"
+# Förloppsindikator då lista skapas.
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "Listar"
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+"Det finns %i ytterligare version. Använd växeln ”-a” för att se den."
+msgstr[1] ""
+"Det finns %i ytterligare versioner. Använd växeln ”-a” för att se dem."
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Korrigerar beroenden…"
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " misslyckades."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Kunde inte korrigera beroenden"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Kunde inte minimera uppgraderingsuppsättningen"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Färdig"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Du bör köra ”apt-get -f install” för att korrigera dessa."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Otillfredsställda beroenden. Prova med -f."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "okänd"
+
+#: apt-private/private-output.cc:272
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[installerat,uppgraderingsbart till: %s]"
+
+#: apt-private/private-output.cc:275
+msgid "[installed,local]"
+msgstr "[installerat,lokalt]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr "[installerat,automatiskt borttagbart]"
+
+#: apt-private/private-output.cc:279
+msgid "[installed,automatic]"
+msgstr "[installerat,automatiskt]"
+
+#: apt-private/private-output.cc:281
+msgid "[installed]"
+msgstr "[installerat]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[uppgraderingsbart från: %s]"
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr "[kvarvarande-inställning]"
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "men %s är installerat"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "men %s kommer att installeras"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "men det kan inte installeras"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "men det är ett virtuellt paket"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "men det är inte installerat"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "men det kommer inte att installeras"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " eller"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Följande paket har beroenden som inte kan tillfredsställas:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Följande NYA paket kommer att installeras:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Följande paket kommer att TAS BORT:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "Följande paket har hållits tillbaka:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "Följande paket kommer att uppgraderas:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Följande paket kommer att NEDGRADERAS:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "Följande tillbakahållna paket kommer att ändras:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (på grund av %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu att uppgradera, %lu att nyinstallera, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu att installera om, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu att nedgradera, "
+
+#: apt-private/private-output.cc:641
+#, 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:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu är inte helt installerade eller borttagna.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[J/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+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:684
+msgid "Y"
+msgstr "J"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Fel vid kompilering av reguljärt uttryck - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Uppdateringskommandot tar inga argument"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"%i paket kan uppgraderas. Kör ”apt list --upgradable” för att se det.\n"
+msgstr[1] ""
+"%i paket kan uppgraderas. Kör ”apt list --upgradable” för att se dem.\n"
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr "Alla paket är uppdaterade."
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] "Det finns %i ytterligare post. Använd växeln ”-a” för att se den."
+msgstr[1] "Det finns %i ytterligare poster. Använd växeln ”-a” för att se dem."
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr "inte ett riktigt paket (virtuellt)"
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1803,49 +1798,40 @@ 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-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-"Kan inte släppa privilegier för hämtning eftersom filen ”%s” inte kunde "
-"kommas åt av användaren ”%s”."
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "VARNING: Följande paket kunde inte autentiseras!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "Autentiseringsvarning åsidosatt.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "Några av paketen kunde inte autentiseras"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "Installera dessa paket utan verifiering?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Problem har uppstått och -y användes utan --force-yes"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Misslyckades med att hämta %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kunde inte fastställa ledigt utrymme i %s"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s."
@@ -1914,8 +1900,8 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
@@ -1923,8 +1909,8 @@ msgid "Unable to read %s"
msgstr "Kunde inte läsa %s"
# Felmeddelande för misslyckad chdir
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -2062,27 +2048,6 @@ msgstr "Du kan möjligen rätta till problemet genom att köra ”apt-get update
msgid "The list of sources could not be read."
msgstr "Listan över källor kunde inte läsas."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Metoddrivrutinen %s kunde inte hittas."
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "Is the package %s installed?"
-msgstr "Är paketet %s installerat?"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoden %s startade inte korrekt"
-
-#: apt-pkg/acquire-worker.cc:537
-#, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr "Mata in skivan med etiketten ”%s” i enheten ”%s” och tryck på [Retur]."
-
# Felmeddelande
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
@@ -2172,99 +2137,79 @@ msgstr "extra"
msgid "Calculating upgrade"
msgstr "Beräknar uppgradering"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indexfiler av typ ”%s” stöds inte"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "Cachen har ett inkompatibelt versionssystem"
+msgid "The method driver %s could not be found."
+msgstr "Metoddrivrutinen %s kunde inte hittas."
-# NewPackage etc. är funktionsnamn
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Fel uppstod vid hantering av %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Grattis, du överskred antalet paketnamn som denna APT kan hantera."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Grattis, du överskred antalet versioner som denna APT kan hantera."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Grattis, du överskred antalet beskrivningar som denna APT kan hantera."
+msgid "Is the package %s installed?"
+msgstr "Är paketet %s installerat?"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Grattis, du överskred antalet beroenden som denna APT kan hantera."
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Metoden %s startade inte korrekt"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Läser paketlistor"
+#: apt-pkg/acquire-worker.cc:543
+#, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr "Mata in skivan med etiketten ”%s” i enheten ”%s” och tryck på [Retur]."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "In-/utfel vid lagring av källcache"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Bygger beroendeträd"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr "Skicka scenario till lösare"
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Kandiderande versioner"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr "Skicka förfrågan till lösare"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Beroendegenerering"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr "Förbered för att motta lösning"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Läser tillståndsinformation"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr "Extern lösare misslyckades utan något informativt felmeddelande"
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Misslyckades med att öppna StateFile %s"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr "Kör extern lösare"
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Misslyckades med att skriva temporär StateFile %s"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr "Använd --allow-insecure-repositories för att tvinga uppdateringen"
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "namnbyte misslyckades, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "Hash-kontrollsumman stämmer inte"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "Storleken stämmer inte"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
msgid "Invalid file format"
msgstr "Ogiltigt filformat"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
msgid "Signature error"
msgstr "Signaturfel"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, fuzzy, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2275,12 +2220,12 @@ msgstr ""
"%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-fel: %s: %s"
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2289,14 +2234,14 @@ msgstr ""
"Kunde inte hitta förväntad post ”%s” i Release-fil (Felaktig sources.list-"
"post eller fel format på fil)"
-#: apt-pkg/acquire-item.cc:1026
+#: apt-pkg/acquire-item.cc:1122
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"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2305,12 +2250,12 @@ msgstr ""
"Release-fil för %s har gått ut (ogiltig sedan %s). Uppdateringar för detta "
"förråd kommer inte verkställas."
-#: apt-pkg/acquire-item.cc:1107
+#: apt-pkg/acquire-item.cc:1203
#, 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:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
@@ -2319,7 +2264,7 @@ msgstr ""
"Data från ”%s” är inte signerat. Paket från det förrådet kan inte "
"autentiseras."
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
@@ -2328,12 +2273,12 @@ msgstr ""
"Förrådet ”%s” har inte en Release-fil. Detta är föråldrat, kontakta "
"förrådets ägare."
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, c-format
msgid "The repository '%s' is no longer signed."
msgstr "Förrådet ”%s” är inte längre signerat."
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
@@ -2341,7 +2286,7 @@ msgstr ""
"Detta är vanligen inte tillåtet, men flaggan Acquire::"
"AllowDowngradeToInsecureRepositories gavs för att åsidosätta detta."
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2350,55 +2295,128 @@ 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:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Kan inte hitta en källa för att hämta version ”%s” av ”%s”"
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Paketindexfilerna är skadade. Inget ”Filename:”-fält för paketet %s."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Ändringslogg för %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "Cachen har ett inkompatibelt versionssystem"
+
+# NewPackage etc. är funktionsnamn
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Fel uppstod vid hantering av %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Grattis, du överskred antalet paketnamn som denna APT kan hantera."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Grattis, du överskred antalet versioner som denna APT kan hantera."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Grattis, du överskred antalet beskrivningar som denna APT kan hantera."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Grattis, du överskred antalet beroenden som denna APT kan hantera."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Läser paketlistor"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "In-/utfel vid lagring av källcache"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr "Listkatalogen %spartial saknas."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Arkivkatalogen %spartial saknas."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, c-format
msgid "Unable to lock directory %s"
msgstr "Kunde inte låsa katalogen %s"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+"Kan inte släppa privilegier för hämtning eftersom filen ”%s” inte kunde "
+"kommas åt av användaren ”%s”."
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, c-format
msgid "Clean of %s is not supported"
msgstr "Rensning av %s stöds inte"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Hämtar fil %li av %li (%s återstår)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Hämtar fil %li av %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Misslyckades med att hämta %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Vissa indexfiler kunde inte hämtas. De har ignorerats eller så har de gamla "
+"använts istället."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Du måste lägga till några ”source”-URI:er i din sources.list"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Kunde inte ta status på %s."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2428,28 +2446,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "Prioritet ej angiven (eller noll) för nål"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Misslyckades med att hämta %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Vissa indexfiler kunde inte hämtas. De har ignorerats eller så har de gamla "
-"använts istället."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Du måste lägga till några ”source”-URI:er i din sources.list"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Kunde inte ta status på %s."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2577,31 +2573,30 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Kunde inte korrigera problemen, du har hållit tillbaka trasiga paket."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Bygger beroendeträd"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr "Skicka scenario till lösare"
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Kandiderande versioner"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr "Skicka förfrågan till lösare"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Beroendegenerering"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr "Förbered för att motta lösning"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Läser tillståndsinformation"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr "Extern lösare misslyckades utan något informativt felmeddelande"
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Misslyckades med att öppna StateFile %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr "Kör extern lösare"
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Misslyckades med att skriva temporär StateFile %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Indexfiler av typ ”%s” stöds inte"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2613,59 +2608,98 @@ msgstr "Kunde inte tolka paketfilen %s (%d)"
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+# parametrar: filnamn, radnummer
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Felaktig åsidosättning %s rad %llu (%s)"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "Öppnar %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, 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:405
+#, 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 källistan %s"
+
+#: apt-pkg/sourcelist.cc:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Rad %u i källistan %s har fel format (typ)"
+
+#: apt-pkg/sourcelist.cc:441
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typen ”%s” är inte känd i post %u i källistan %s"
+
+#: apt-pkg/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Utgåvan ”%s” för ”%s” hittades inte"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Version ”%s” för ”%s” hittades inte"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Kunde inte hitta funktionen ”%s”"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Kunde inte hitta något paket enligt reguljära uttrycket ”%s”"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Kunde inte hitta något paket med sökmönstret ”%s”"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Kan inte välja versioner från paketet ”%s” eftersom det är helt virtuellt"
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Kan inte välja senaste version från paketet ”%s” eftersom det är helt "
"virtuellt"
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Kan inte välja kandidatversion från paketet %s eftersom det inte har någon "
"kandidat"
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Kan inte välja installerad version från paketet %s eftersom det inte är "
"installerat"
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -2674,79 +2708,56 @@ msgstr ""
"Kan inte välja installerad version eller kandidatversion från paketet ”%s” "
"eftersom det inte har någon av dem"
-# parametrar: filnamn, radnummer
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Felaktig åsidosättning %s rad %llu (%s)"
-
-#: apt-pkg/sourcelist.cc:355
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Opening %s"
-msgstr "Öppnar %s"
-
-#: apt-pkg/sourcelist.cc:389
-#, 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:393
-#, 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 källistan %s"
-
-#: apt-pkg/sourcelist.cc:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "Rad %u i källistan %s har fel format (typ)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:429
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Typen ”%s” är inte känd i post %u i källistan %s"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Kunde inte tolka Release-filen %s"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr "Inga sektioner i Release-filen %s"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Ingen Hash-post i Release-filen %s"
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ogiltig ”Date”-post i Release-filen %s"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Ogiltig ”Valid-Until”-post i Release-filen %s"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2919,35 +2930,6 @@ msgstr ""
msgid "Not locked"
msgstr "Inte låst"
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "Valet %s hittades inte"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -3026,7 +3008,7 @@ msgstr "Kunde inte öppna filen %s"
msgid "Could not open file descriptor %d"
msgstr "Kunde inte öppna filhandtag %d"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "Misslyckades med att skapa underprocess-IPC"
@@ -3063,12 +3045,12 @@ msgstr "Problem med att avlänka filen %s"
msgid "Problem syncing the file"
msgstr "Problem med att synkronisera filen"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, c-format
msgid "Unable to mkstemp %s"
msgstr "Kunde inte anropa mkstemp för %s"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Kunde inte skriva till %s"
@@ -3093,6 +3075,35 @@ msgstr "…"
msgid "%c%s... %u%%"
msgstr "%c%s… %u%%"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "Valet %s hittades inte"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Kan inte utföra mmap på en tom fil"
@@ -3448,90 +3459,90 @@ msgstr "Arkivet har ingen styrpost"
msgid "Unable to get a cursor"
msgstr "Kunde inte få tag i någon markör"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "V: Kunde inte läsa katalogen %s\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "V: Kunde inte ta status på %s\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "F: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "V: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "F: Felen gäller filen "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "Misslyckades med att slå upp %s"
# ???
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Trädvandring misslyckades"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "Misslyckades med att öppna %s"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Avlänka %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "Misslyckades med att läsa länken %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "Misslyckades med att länka ut %s"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Misslyckades med att länka %s till %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Avlänkningsgränsen på %sB nåddes.\n"
# Fält vid namn "Package"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "Arkivet har inget package-fält"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har ingen post i åsidosättningsfilen\n"
# parametrar: paket, ny, gammal
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " ansvarig för paketet %s är %s ej %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s har ingen källåsidosättningspost\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s har heller ingen binär åsidosättningspost\n"
@@ -3820,6 +3831,10 @@ msgstr "Tar-kontrollsumma misslyckades, arkivet skadat"
msgid "Unknown TAR header type %u, member %s"
msgstr "Okänd TAR-rubriktyp %u, del %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "Du måste ange minst ett par bestående av url och filnamn"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Misslyckades med att skapa rör"
diff --git a/po/th.po b/po/th.po
index 8199da324..23630d1be 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\n"
"PO-Revision-Date: 2014-12-12 13:00+0700\n"
"Last-Translator: Theppitak Karoonboonyanan <thep@debian.org>\n"
"Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -113,7 +113,7 @@ msgstr "คุณต้องระบุแพตเทิร์นสำหร
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr "คำสั่งนี้ไม่แนะนำให้ใช้แล้ว กรุณาใช้ 'apt-mark showauto' แทน"
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "ไม่พบแพกเกจ %s"
@@ -348,16 +348,16 @@ msgstr "เกิดข้อผิดพลาดภายใน: กลไก
msgid "Unable to lock the download directory"
msgstr "ไม่สามารถล็อคไดเรกทอรีดาวน์โหลด"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "ไม่พบแพกเกจซอร์สโค้ดสำหรับ %s"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -366,7 +366,7 @@ msgstr ""
"ข้อสังเกต: การจัดทำแพกเกจ '%s' พัฒนาผ่านระบบควบคุมรุ่น '%s' อยู่ที่:\n"
"%s\n"
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -377,67 +377,67 @@ msgstr ""
"bzr branch %s\n"
"เพื่อดึงรุ่นล่าสุด (ที่อาจยังไม่ปล่อยออกมา) ของตัวแพกเกจ\n"
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "จะข้ามแฟ้ม '%s' ที่ดาวน์โหลดไว้แล้ว\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB/%sB\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "ดาวน์โหลดซอร์ส %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "ไม่สามารถดาวน์โหลดบางแฟ้ม"
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "ดาวน์โหลดสำเร็จแล้ว และอยู่ในโหมดดาวน์โหลดอย่างเดียว"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "จะข้ามการแตกซอร์สของซอร์สที่แตกไว้แล้วใน %s\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "คำสั่งแตกแฟ้ม '%s' ล้มเหลว\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "คำสั่ง build '%s' ล้มเหลว\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "โพรเซสลูกล้มเหลว"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะตรวจสอบสิ่งที่ต้องการสำหรับการ build"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -445,27 +445,27 @@ msgid ""
msgstr ""
"ไม่มีข้อมูลสถาปัตยกรรมสำหรับ %s ดูวิธีตั้งค่าที่หัวข้อ APT::Architectures ของ apt.conf(5)"
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้องการสำหรับการ build ของ %s"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s ไม่ต้องการสิ่งใดสำหรับ build\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -473,19 +473,19 @@ msgid ""
msgstr ""
"ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่สามารถใช้ %s กับแพกเกจ '%s' ได้"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่พบแพกเกจ %s"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: แพกเกจ %s ที่ติดตั้งไว้ใหม่เกินไป"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -494,32 +494,32 @@ msgstr ""
"ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มีแพกเกจ %s "
"รุ่นที่จะสอดคล้องกับความต้องการรุ่นของแพกเกจได้"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะ %s ไม่มีรุ่นที่ติดตั้งได้"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับการ build ของ %s ได้"
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "มอดูลที่รองรับ:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -614,21 +614,16 @@ msgstr "ต้องการ URL หนึ่งรายการเป็น
msgid "Must specify at least one pair url/filename"
msgstr "ต้องระบุคู่ URL, ชื่อแฟ้ม อย่างน้อยหนึ่งคู่"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr "ดาวน์โหลดไม่สำเร็จ"
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "ต้องระบุคู่ URL, ชื่อแฟ้ม อย่างน้อยหนึ่งคู่"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
#, fuzzy
msgid ""
"Usage: apt-helper [options] command\n"
@@ -820,12 +815,12 @@ msgstr "ไม่พบแผ่น"
msgid "File not found"
msgstr "ไม่พบแฟ้ม"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "stat ไม่สำเร็จ"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "กำหนดเวลาแก้ไขไม่สำเร็จ"
@@ -914,7 +909,7 @@ msgstr "ไม่สามารถสร้างซ็อกเก็ต"
msgid "Could not connect data socket, connection timed out"
msgstr "ไม่สามารถเชื่อมต่อซ็อกเก็ตข้อมูล เนื่องจากหมดเวลาคอย"
-#: methods/ftp.cc:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "ล้มเหลว"
@@ -987,64 +982,64 @@ msgstr "สอบถาม"
msgid "Unable to invoke "
msgstr "ไม่สามารถเรียก "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "เชื่อมต่อไปยัง %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "ไม่สามารถสร้างซ็อกเก็ตสำหรับ %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "ไม่สามารถเริ่มการเชื่อมต่อไปยัง %s:%s (%s)"
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s (%s) เนื่องจากหมดเวลาคอย"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s (%s)"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "เชื่อมต่อไปยัง %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "ไม่สามารถเปิดหาที่อยู่ '%s'"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "เกิดความล้มเหลวชั่วคราวขณะเปิดหาที่อยู่ '%s'"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, c-format
msgid "System error resolving '%s:%s'"
msgstr "เกิดข้อผิดพลาดในระบบขณะเปิดหาที่อยู่ '%s:%s'"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "เกิดปัญหาร้ายแรงบางอย่างขณะเปิดหาที่อยู่ '%s:%s' (%i - %s)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s:"
@@ -1063,7 +1058,7 @@ msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr "ไม่สามารถเรียก 'apt-key' เพื่อตรวจสอบลายเซ็น (ได้ติดตั้ง gnupg ไว้หรือไม่?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1165,223 +1160,6 @@ msgstr ""
msgid "Internal error"
msgstr "ข้อผิดพลาดภายใน"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr "กำลังแสดงรายชื่อ"
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] "มีอีก %i รุ่น กรุณาใช้ตัวเลือก '-a' หากต้องการดูเพิ่ม"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "กำลังแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจ..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " ล้มเหลว"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "ไม่สามารถแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจได้"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "ไม่สามารถจำกัดรายการปรับรุ่นให้น้อยที่สุดได้"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " เสร็จแล้ว"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "คุณอาจต้องเรียก 'apt-get -f install' เพื่อแก้ปัญหาเหล่านี้"
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "รายการแพกเกจที่ต้องใช้ไม่ครบ กรุณาลองใช้ตัวเลือก -f"
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr "ไม่ทราบ"
-
-#: apt-private/private-output.cc:272
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[ติดตั้งอยู่,สามารถปรับรุ่นเป็น: %s]"
-
-#: apt-private/private-output.cc:275
-msgid "[installed,local]"
-msgstr "[ติดตั้งอยู่,ในเครื่อง]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr "[ติดตั้งอยู่,ถอดถอนอัตโนมัติได้]"
-
-#: apt-private/private-output.cc:279
-msgid "[installed,automatic]"
-msgstr "[ติดตั้งอยู่,อัตโนมัติ]"
-
-#: apt-private/private-output.cc:281
-msgid "[installed]"
-msgstr "[ติดตั้งอยู่]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr "[สามารถปรับรุ่นจาก: %s]"
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr "[ค่าตั้งตกค้าง]"
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "แต่รุ่นที่ติดตั้งไว้คือ %s"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "แต่รุ่นที่จะติดตั้งคือ %s"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "แต่ไม่สามารถติดตั้งได้"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "แต่แพกเกจนี้เป็นแพกเกจเสมือน"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "แต่ไม่ได้ติดตั้งไว้"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "แต่แพกเกจนี้จะไม่ถูกติดตั้ง"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " หรือ"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "แพกเกจต่อไปนี้ขาดแพกเกจที่ต้องใช้:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "จะติดตั้งแพกเกจ *ใหม่* ต่อไปนี้:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "จะ *ลบ* แพกเกจต่อไปนี้:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "จะคงรุ่นแพกเกจต่อไปนี้:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ขึ้น:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ *ลง*:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "จะเปลี่ยนแปลงรายการคงรุ่นแพกเกจต่อไปนี้:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (เนื่องจาก %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"*คำเตือน*: แพกเกจที่จำเป็นต่อไปนี้จะถูกถอดถอน\n"
-"คุณ *ไม่ควร* ทำเช่นนี้ นอกจากคุณเข้าใจสิ่งที่จะทำ!"
-
-#: apt-private/private-output.cc:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "ปรับรุ่นขึ้น %lu, ติดตั้งใหม่ %lu, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "ติดตั้งซ้ำ %lu, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "ปรับรุ่นลง %lu, "
-
-#: apt-private/private-output.cc:641
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "ถอดถอน %lu และไม่ปรับรุ่น %lu\n"
-
-#: apt-private/private-output.cc:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "ติดตั้งหรือถอดถอนไม่ครบ %lu\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[Y/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-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:684
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-"มี %i แพกเกจสามารถปรับรุ่นได้ เรียก 'apt list --upgradable' หากต้องการดูรายชื่อ\n"
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr "ปรับรุ่นทุกแพกเกจเป็นรุ่นล่าสุดแล้ว"
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr "กำลังเรียงลำดับ"
@@ -1459,17 +1237,6 @@ msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "หมายเหตุ: จะเลือก '%s' แทน '%s'\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] "มีอีก %i ระเบียน กรุณาใช้ตัวเลือก '-a' หากต้องการดูเพิ่ม"
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr "ไม่ใช่แพกเกจจริง (เสมือน)"
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "เกิดข้อผิดพลาดภายใน: มีการเรียก InstallPackages ด้วยแพกเกจที่เสีย!"
@@ -1478,7 +1245,7 @@ msgstr "เกิดข้อผิดพลาดภายใน: มีกา
msgid "Packages need to be removed but remove is disabled."
msgstr "มีแพกเกจที่จำเป็นต้องถอดถอน แต่ถูกห้ามการถอดถอนไว้"
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1727,6 +1494,234 @@ msgstr "เลือกรุ่น '%s' (%s) สำหรับ '%s' แล้
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "เลือกรุ่น '%s' (%s) สำหรับ '%s' แล้ว อันเนื่องมาจาก '%s'\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "กำลังแสดงรายชื่อ"
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] "มีอีก %i รุ่น กรุณาใช้ตัวเลือก '-a' หากต้องการดูเพิ่ม"
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "กำลังแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจ..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " ล้มเหลว"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "ไม่สามารถแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจได้"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "ไม่สามารถจำกัดรายการปรับรุ่นให้น้อยที่สุดได้"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " เสร็จแล้ว"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "คุณอาจต้องเรียก 'apt-get -f install' เพื่อแก้ปัญหาเหล่านี้"
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "รายการแพกเกจที่ต้องใช้ไม่ครบ กรุณาลองใช้ตัวเลือก -f"
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "ไม่ทราบ"
+
+#: apt-private/private-output.cc:272
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[ติดตั้งอยู่,สามารถปรับรุ่นเป็น: %s]"
+
+#: apt-private/private-output.cc:275
+msgid "[installed,local]"
+msgstr "[ติดตั้งอยู่,ในเครื่อง]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr "[ติดตั้งอยู่,ถอดถอนอัตโนมัติได้]"
+
+#: apt-private/private-output.cc:279
+msgid "[installed,automatic]"
+msgstr "[ติดตั้งอยู่,อัตโนมัติ]"
+
+#: apt-private/private-output.cc:281
+msgid "[installed]"
+msgstr "[ติดตั้งอยู่]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[สามารถปรับรุ่นจาก: %s]"
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr "[ค่าตั้งตกค้าง]"
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "แต่รุ่นที่ติดตั้งไว้คือ %s"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "แต่รุ่นที่จะติดตั้งคือ %s"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "แต่ไม่สามารถติดตั้งได้"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "แต่แพกเกจนี้เป็นแพกเกจเสมือน"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "แต่ไม่ได้ติดตั้งไว้"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "แต่แพกเกจนี้จะไม่ถูกติดตั้ง"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " หรือ"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "แพกเกจต่อไปนี้ขาดแพกเกจที่ต้องใช้:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "จะติดตั้งแพกเกจ *ใหม่* ต่อไปนี้:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "จะ *ลบ* แพกเกจต่อไปนี้:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "จะคงรุ่นแพกเกจต่อไปนี้:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ขึ้น:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ *ลง*:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "จะเปลี่ยนแปลงรายการคงรุ่นแพกเกจต่อไปนี้:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (เนื่องจาก %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"*คำเตือน*: แพกเกจที่จำเป็นต่อไปนี้จะถูกถอดถอน\n"
+"คุณ *ไม่ควร* ทำเช่นนี้ นอกจากคุณเข้าใจสิ่งที่จะทำ!"
+
+#: apt-private/private-output.cc:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "ปรับรุ่นขึ้น %lu, ติดตั้งใหม่ %lu, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "ติดตั้งซ้ำ %lu, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "ปรับรุ่นลง %lu, "
+
+#: apt-private/private-output.cc:641
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "ถอดถอน %lu และไม่ปรับรุ่น %lu\n"
+
+#: apt-private/private-output.cc:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "ติดตั้งหรือถอดถอนไม่ครบ %lu\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+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:684
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"มี %i แพกเกจสามารถปรับรุ่นได้ เรียก 'apt list --upgradable' หากต้องการดูรายชื่อ\n"
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr "ปรับรุ่นทุกแพกเกจเป็นรุ่นล่าสุดแล้ว"
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] "มีอีก %i ระเบียน กรุณาใช้ตัวเลือก '-a' หากต้องการดูเพิ่ม"
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr "ไม่ใช่แพกเกจจริง (เสมือน)"
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1739,47 +1734,40 @@ msgstr ""
" อย่าลืมด้วยว่าการล็อคก็ไม่ทำงานเช่นกัน\n"
" ดังนั้น อย่าถือผลลัพธ์นี้ว่าตรงกับสภาพความเป็นจริงของระบบ!"
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "*คำเตือน*: แพกเกจต่อไปนี้ไม่สามารถยืนยันแหล่งต้นตอได้!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "จะข้ามการเตือนเกี่ยวกับการยืนยันแหล่งต้นตอ\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "มีบางแพกเกจไม่สามารถยืนยันแหล่งต้นตอได้"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "จะติดตั้งแพกเกจเหล่านี้โดยไม่ตรวจสอบหรือไม่?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "มีปัญหาบางประการ และมีการใช้ -y โดยไม่ระบุ --force-yes"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "ไม่สามารถดาวน์โหลด %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "ไม่สามารถคำนวณพื้นที่ว่างใน %s"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s"
@@ -1848,16 +1836,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "ไม่สามารถอ่าน %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -1991,27 +1979,6 @@ msgstr "คุณอาจเรียก `apt-get update' เพื่อแก
msgid "The list of sources could not be read."
msgstr "ไม่สามารถอ่านรายชื่อแหล่งแพกเกจได้"
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "ไม่พบไดรเวอร์สำหรับวิธีการ %s"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "Is the package %s installed?"
-msgstr "ได้ติดตั้งแพกเกจ %s ไว้หรือไม่?"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "ไม่สามารถเรียกทำงานวิธีการ %s"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr "กรุณาใส่แผ่นชื่อ: '%s' ลงในไดรว์ '%s' แล้วกด enter"
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "แคชของแพกเกจว่างเปล่า"
@@ -2098,99 +2065,80 @@ msgstr "ส่วนเสริม"
msgid "Calculating upgrade"
msgstr "กำลังคำนวณการปรับรุ่น"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "ไม่รองรับแฟ้มดัชนีชนิด '%s'"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "แคชมีระบบนับรุ่นที่ไม่ตรงกัน"
+msgid "The method driver %s could not be found."
+msgstr "ไม่พบไดรเวอร์สำหรับวิธีการ %s"
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนชื่อแพกเกจที่ APT สามารถรองรับได้แล้ว"
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนรุ่นแพกเกจที่ APT สามารถรองรับได้แล้ว"
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนคำบรรยายแพกเกจที่ APT สามารถรองรับได้แล้ว"
+msgid "Is the package %s installed?"
+msgstr "ได้ติดตั้งแพกเกจ %s ไว้หรือไม่?"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนความสัมพันธ์ระหว่างแพกเกจที่ APT สามารถรองรับได้แล้ว"
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "ไม่สามารถเรียกทำงานวิธีการ %s"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "กำลังอ่านรายชื่อแพกเกจ"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr "กรุณาใส่แผ่นชื่อ: '%s' ลงในไดรว์ '%s' แล้วกด enter"
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "กำลังสร้างโครงสร้างลำดับความสัมพันธ์"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr "ส่งสภาวการณ์ไปยังกลไกการแก้ปัญหา"
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "รุ่นแพกเกจที่มี"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr "ส่งคำสั่งไปยังกลไกการแก้ปัญหา"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "สร้างลำดับความสัมพันธ์"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr "เตรียมรับคำตอบ"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "กำลังอ่านข้อมูลสถานะ"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr "กลไกการแก้ปัญหาภายนอกทำงานล้มเหลวโดยไม่มีข้อความข้อผิดพลาดที่เหมาะสม"
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "ไม่สามารถเปิดแฟ้มสถานะ %s"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr "เรียกกลไกการแก้ปัญหาภายนอก"
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "ไม่สามารถเขียนแฟ้มสถานะชั่วคราว %s"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "เปลี่ยนชื่อไม่สำเร็จ: %s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "ผลรวมแฮชไม่ตรงกัน"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "ขนาดไม่ตรงกัน"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
msgid "Invalid file format"
msgstr "รูปแบบของแฟ้มไม่ถูกต้อง"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "การเขียนข้อมูลผิดพลาด"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, fuzzy, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2200,12 +2148,12 @@ msgstr ""
"ข้อผิดพลาดจาก GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr "ข้อผิดพลาดจาก GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2214,14 +2162,14 @@ msgstr ""
"ไม่พบรายการ '%s' ที่ต้องการในแฟ้ม Release (รายการ sources.list ไม่ถูกต้อง "
"หรือแฟ้มผิดรูปแบบ)"
-#: apt-pkg/acquire-item.cc:1026
+#: apt-pkg/acquire-item.cc:1122
msgid "There is no public key available for the following key IDs:\n"
msgstr "ไม่มีกุญแจสาธารณะสำหรับกุญแจหมายเลขต่อไปนี้:\n"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2230,92 +2178,160 @@ msgstr ""
"แฟ้ม Release สำหรับ %s หมดอายุแล้ว (ตั้งแต่ %s ที่แล้ว) จะไม่ใช้รายการปรับรุ่นต่างๆ "
"ของคลังแพกเกจนี้"
-#: apt-pkg/acquire-item.cc:1107
+#: apt-pkg/acquire-item.cc:1203
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "ชุดจัดแจกขัดแย้งกัน: %s (ต้องการ %s แต่พบ %s)"
-#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "ไดเรกทอรี %s ถูก divert"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, 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:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "ไม่พบแหล่งที่จะดาวน์โหลดรุ่น '%s' ของ '%s' ได้"
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "แฟ้มดัชนีแพกเกจเสียหาย ไม่มีข้อมูล Filename: (ชื่อแฟ้ม) สำหรับแพกเกจ %s"
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "ปูมการแก้ไขสำหรับ %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "แคชมีระบบนับรุ่นที่ไม่ตรงกัน"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนชื่อแพกเกจที่ APT สามารถรองรับได้แล้ว"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนรุ่นแพกเกจที่ APT สามารถรองรับได้แล้ว"
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนคำบรรยายแพกเกจที่ APT สามารถรองรับได้แล้ว"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนความสัมพันธ์ระหว่างแพกเกจที่ APT สามารถรองรับได้แล้ว"
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "กำลังอ่านรายชื่อแพกเกจ"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr "ไม่มีไดเรกทอรีรายชื่อแพกเกจ %spartial"
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "ไม่มีไดเรกทอรีแพกเกจ %spartial"
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, c-format
msgid "Unable to lock directory %s"
msgstr "ไม่สามารถล็อคไดเรกทอรี %s"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, c-format
msgid "Clean of %s is not supported"
msgstr "ไม่รองรับการล้างข้อมูลที่ %s"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จาก %li (เหลืออีก %s)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จาก %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "ไม่สามารถดาวน์โหลด %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr "ดาวน์โหลดแฟ้มดัชนีบางแฟ้มไม่สำเร็จ จะข้ามรายการดังกล่าวไป หรือใช้ข้อมูลเก่าแทน"
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "คุณต้องเพิ่ม URI ชนิด 'source' ใน sources.list ของคุณด้วย"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "ไม่สามารถ stat %s"
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2342,26 +2358,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "ไม่ได้ระบุลำดับความสำคัญ (หรือค่าศูนย์) สำหรับการตรึง"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "ไม่สามารถดาวน์โหลด %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr "ดาวน์โหลดแฟ้มดัชนีบางแฟ้มไม่สำเร็จ จะข้ามรายการดังกล่าวไป หรือใช้ข้อมูลเก่าแทน"
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "คุณต้องเพิ่ม URI ชนิด 'source' ใน sources.list ของคุณด้วย"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "ไม่สามารถ stat %s"
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2486,31 +2482,30 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "ไม่สามารถแก้ปัญหาได้ คุณได้คงรุ่นแพกเกจที่เสียอยู่ไว้"
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "กำลังสร้างโครงสร้างลำดับความสัมพันธ์"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr "ส่งสภาวการณ์ไปยังกลไกการแก้ปัญหา"
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "รุ่นแพกเกจที่มี"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr "ส่งคำสั่งไปยังกลไกการแก้ปัญหา"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "สร้างลำดับความสัมพันธ์"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr "เตรียมรับคำตอบ"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "กำลังอ่านข้อมูลสถานะ"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr "กลไกการแก้ปัญหาภายนอกทำงานล้มเหลวโดยไม่มีข้อความข้อผิดพลาดที่เหมาะสม"
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "ไม่สามารถเปิดแฟ้มสถานะ %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr "เรียกกลไกการแก้ปัญหาภายนอก"
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "ไม่สามารถเขียนแฟ้มสถานะชั่วคราว %s"
+msgid "Index file type '%s' is not supported"
+msgstr "ไม่รองรับแฟ้มดัชนีชนิด '%s'"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2522,52 +2517,90 @@ msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (%
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu (%s)"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "กำลังเปิด %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ชนิด)"
+
+#: apt-pkg/sourcelist.cc:405
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
+
+#: apt-pkg/sourcelist.cc:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ชนิด)"
+
+#: apt-pkg/sourcelist.cc:441
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "ไม่รู้จักชนิด '%s' ที่วรรคที่ %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
+
+#: apt-pkg/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "ไม่พบรุ่นย่อย '%s' ของ '%s'"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "ไม่พบรุ่น '%s' ของ '%s'"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, c-format
msgid "Couldn't find task '%s'"
msgstr "ไม่พบงานติดตั้ง '%s'"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "ไม่พบแพกเกจที่ตรงกับนิพจน์เรกิวลาร์ '%s'"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "ไม่พบแพกเกจที่ตรงกับ glob '%s'"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "ไม่สามารถเลือกรุ่นต่างๆ ของแพกเกจ '%s' ได้ เนื่องจากเป็นแพกเกจเสมือนอย่างแท้จริง"
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr "ไม่สามารถเลือกรุ่นใหม่ที่สุดของแพกเกจ '%s' ได้ เนื่องจากเป็นแพกเกจเสมือนอย่างแท้จริง"
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr "ไม่สามารถเลือกรุ่นสำหรับติดตั้งของแพกเกจ '%s' ได้ เนื่องจากไม่มีรุ่นสำหรับติดตั้ง"
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr "ไม่สามารถเลือกรุ่นที่ติดตั้งไว้ของแพกเกจ '%s' ได้ เนื่องจากแพกเกจไม่ได้ติดตั้งไว้"
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -2575,78 +2608,56 @@ msgid ""
msgstr ""
"ไม่สามารถเลือกรุ่นที่ติดตั้งไว้หรือรุ่นสำหรับติดตั้งของแพกเกจ '%s' ได้ เนื่องจากไม่มีทั้งสองอย่าง"
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu (%s)"
-
-#: apt-pkg/sourcelist.cc:355
-#, c-format
-msgid "Opening %s"
-msgstr "กำลังเปิด %s"
-
-#: apt-pkg/sourcelist.cc:389
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ชนิด)"
-
-#: apt-pkg/sourcelist.cc:393
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
-
-#: apt-pkg/sourcelist.cc:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ชนิด)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:429
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "ไม่รู้จักชนิด '%s' ที่วรรคที่ %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, c-format
msgid "Unable to parse Release file %s"
msgstr "ไม่สามารถแจงแฟ้ม Release %s"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr "ไม่มีหัวข้อย่อยในแฟ้ม Release %s"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "ไม่มีรายการแฮชในแฟ้ม Release %s"
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "รายการ 'Date' ไม่ถูกต้องในแฟ้ม Release %s"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "รายการ 'Valid-Until' ไม่ถูกต้องในแฟ้ม Release %s"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2810,35 +2821,6 @@ msgstr "dpkg ถูกขัดจังหวะ คุณต้องเรี
msgid "Not locked"
msgstr "ไม่ได้ล็อคอยู่"
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%liวัน %liชม. %liนาที %liวิ"
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%liชม. %liนาที %liวิ"
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr "%liนาที %liวิ"
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr "%liวิ"
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "ไม่พบรายการเลือก %s"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2915,7 +2897,7 @@ msgstr "ไม่สามารถเปิดแฟ้ม %s"
msgid "Could not open file descriptor %d"
msgstr "ไม่สามารถเปิด file destriptor %d"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "สร้าง IPC ของโพรเซสย่อยไม่สำเร็จ"
@@ -2952,12 +2934,12 @@ msgstr "เกิดปัญหาขณะลบแฟ้ม %s"
msgid "Problem syncing the file"
msgstr "เกิดปัญหาขณะ sync แฟ้ม"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, c-format
msgid "Unable to mkstemp %s"
msgstr "ไม่สามารถ mkstemp %s"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "ไม่สามารถเขียนลงแฟ้ม %s"
@@ -2982,6 +2964,35 @@ msgstr "..."
msgid "%c%s... %u%%"
msgstr "%c%s... %u%%"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%liวัน %liชม. %liนาที %liวิ"
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%liชม. %liนาที %liวิ"
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr "%liนาที %liวิ"
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr "%liวิ"
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "ไม่พบรายการเลือก %s"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "ไม่สามารถ mmap แฟ้มเปล่า"
@@ -3325,87 +3336,87 @@ msgstr "แพกเกจไม่มีระเบียนควบคุม
msgid "Unable to get a cursor"
msgstr "ไม่สามารถนำตัวชี้ตำแหน่งมาใช้ได้"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: อ่านไดเรกทอรี %s ไม่สำเร็จ\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: stat %s ไม่สำเร็จ\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "E: ข้อผิดพลาดเกิดกับแฟ้ม "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "หาพาธเต็มของ %s ไม่สำเร็จ"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "เดินท่องต้นไม้ไม่สำเร็จ"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "เปิด %s ไม่สำเร็จ"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "readlink %s ไม่สำเร็จ"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "unlink %s ไม่สำเร็จ"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** ลิงก์ %s ไปยัง %s ไม่สำเร็จ"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " มาถึงขีดจำกัดการ DeLink ที่ %sB แล้ว\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "แพกเกจไม่มีช่องข้อมูล 'Package'"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s ไม่มีข้อมูล override\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " ผู้ดูแล %s คือ %s ไม่ใช่ %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s ไม่มีข้อมูล override สำหรับซอร์ส\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s ไม่มีข้อมูล override สำหรับไบนารีเช่นกัน\n"
@@ -3691,6 +3702,10 @@ msgstr "checksum ของแฟ้ม tar ผิดพลาด แฟ้มจ
msgid "Unknown TAR header type %u, member %s"
msgstr "พบชนิด %u ของข้อมูลส่วนหัว TAR ที่ไม่รู้จัก ที่สมาชิก %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "ต้องระบุคู่ URL, ชื่อแฟ้ม อย่างน้อยหนึ่งคู่"
+
#~ msgid "Failed to create pipes"
#~ msgstr "สร้างไปป์ไม่สำเร็จ"
diff --git a/po/tl.po b/po/tl.po
index b6709cdea..42c24bdf7 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\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"
@@ -119,7 +119,7 @@ msgstr "Kailangan niyong magbigay ng isa lamang na pattern"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Hindi mahanap ang paketeng %s"
@@ -358,23 +358,23 @@ msgstr "Error na internal, may nasira ang problem resolver"
msgid "Unable to lock the download directory"
msgstr "Hindi maaldaba ang directory ng download"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Hindi mahanap ang paketeng source para sa %s"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -382,94 +382,94 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Linaktawan ang nakuha na na talaksan '%s'\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Kailangang kumuha ng %sB ng arkibong source.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Kunin ang Source %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Bigo sa pagkuha ng ilang mga arkibo."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Bigo ang utos ng pagbuklat '%s'.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Utos na build '%s' ay bigo.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Bigo ang prosesong anak"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr "Kailangang magtakda ng kahit isang pakete na susuriin ang builddeps"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Bigo sa pagproseso ng build dependencies"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Hindi makuha ang impormasyong build-dependency para sa %s"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "Walang build depends ang %s.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -478,7 +478,7 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
"mahanap"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -487,14 +487,14 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
"mahanap"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng "
"%s ay bagong-bago pa lamang."
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -503,7 +503,7 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil walang magamit na bersyon "
"ng paketeng %s na tumutugon sa kinakailangang bersyon"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -512,25 +512,25 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
"mahanap"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Hindi mabuo ang build-dependencies para sa %s."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "Bigo sa pagproseso ng build dependencies"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Suportadong mga Module:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -624,21 +624,16 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -779,12 +774,12 @@ msgstr "Hindi nahanap ang Disk."
msgid "File not found"
msgstr "Hindi Nahanap ang Talaksan"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "Bigo ang pag-stat"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "Bigo ang pagtakda ng oras ng pagbago"
@@ -875,7 +870,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:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Bigo"
@@ -948,64 +943,64 @@ msgstr "Tanong"
msgid "Unable to invoke "
msgstr "Hindi ma-invoke "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Kumokonekta sa %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Hindi makalikha ng socket para sa %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Hindi maumpisahan ang koneksyon sa %s:%s (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Hindi maka-konekta sa %s:%s (%s), nag-timeout ang koneksyon"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Hindi maka-konekta sa %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Kumokonekta sa %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "Hindi maresolba ang '%s'"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Pansamantalang kabiguan sa pagresolba ng '%s'"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, fuzzy, c-format
msgid "System error resolving '%s:%s'"
msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Hindi maka-konekta sa %s %s:"
@@ -1028,7 +1023,7 @@ msgstr ""
"Hindi maitakbo ang '%s' upang maberipika ang lagda (nakaluklok ba ang gnupg?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1130,227 +1125,6 @@ msgstr ""
msgid "Internal error"
msgstr "Internal na error"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Inaayos ang mga dependensiya..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " ay bigo."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Hindi maayos ang mga dependensiya"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "Hindi mai-minimize ang upgrade set"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Tapos"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Maaari ninyong patakbuhin ang 'apt-get -f install' upang ayusin ito."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -f."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Nakaluklok]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Nakaluklok]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Nakaluklok]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr " [Nakaluklok]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "ngunit ang %s ay nakaluklok"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ngunit ang %s ay iluluklok"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "ngunit hindi ito maaaring iluklok"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "ngunit ito ay birtwal na pakete"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "ngunit ito ay hindi nakaluklok"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "ngunit ito ay hindi iluluklok"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " o"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "Ang susunod na mga pakete ay iu-upgrade:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (dahil sa %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu na nai-upgrade, %lu na bagong luklok, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu iniluklok muli, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu nai-downgrade, "
-
-#: apt-private/private-output.cc:641
-#, 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:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[O/h]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-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:684
-msgid "Y"
-msgstr "O"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr "H"
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Error sa pag-compile ng regex - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1430,18 +1204,6 @@ msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Paunawa, pinili ang %s imbes na %s\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
@@ -1452,7 +1214,7 @@ msgid "Packages need to be removed but remove is disabled."
msgstr ""
"May mga paketeng kailangang tanggalin ngunit naka-disable ang Tanggal/Remove."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1710,6 +1472,239 @@ msgstr "Ang napiling bersyon %s (%s) para sa %s\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Ang napiling bersyon %s (%s) para sa %s\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Inaayos ang mga dependensiya..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " ay bigo."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Hindi maayos ang mga dependensiya"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Hindi mai-minimize ang upgrade set"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Tapos"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Maaari ninyong patakbuhin ang 'apt-get -f install' upang ayusin ito."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -f."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Nakaluklok]"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Nakaluklok]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Nakaluklok]"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr " [Nakaluklok]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "ngunit ang %s ay nakaluklok"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ngunit ang %s ay iluluklok"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "ngunit hindi ito maaaring iluklok"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "ngunit ito ay birtwal na pakete"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "ngunit ito ay hindi nakaluklok"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "ngunit ito ay hindi iluluklok"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " o"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "Ang susunod na mga pakete ay iu-upgrade:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (dahil sa %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu na nai-upgrade, %lu na bagong luklok, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu iniluklok muli, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu nai-downgrade, "
+
+#: apt-private/private-output.cc:641
+#, 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:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[O/h]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+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:684
+msgid "Y"
+msgstr "O"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr "H"
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Error sa pag-compile ng regex - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1718,49 +1713,42 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr ""
"BABALA: Ang susunod na mga pakete ay hindi matiyak ang pagka-awtentiko!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr ""
"Ipina-walang-bisa ang babala tungkol sa pagka-awtentiko ng mga pakete.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "May mga paketeng hindi matiyak ang pagka-awtentiko"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "Iluklok ang mga paketeng ito na walang beripikasyon?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "May mga problema at -y ay ginamit na walang --force-yes"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Bigo sa pagkuha ng %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Hindi matantsa ang libreng puwang sa %s"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Kulang kayo ng libreng puwang sa %s."
@@ -1829,16 +1817,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Hindi mabasa ang %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -1982,28 +1970,6 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Ang driver ng paraang %s ay hindi mahanap."
-
-#: apt-pkg/acquire-worker.cc:113
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Hindi umandar ng tama ang paraang %s"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr ""
-"Ikasa ang disk na may pangalang: '%s' sa drive '%s' at pindutin ang enter."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Walang laman ang cache ng pakete"
@@ -2091,103 +2057,84 @@ msgstr "extra"
msgid "Calculating upgrade"
msgstr "Sinusuri ang pag-upgrade"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Hindi suportado ang uri ng talaksang index na '%s'"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "Hindi akma ang versioning system ng cache"
+msgid "The method driver %s could not be found."
+msgstr "Ang driver ng paraang %s ay hindi mahanap."
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "May naganap na error habang prinoseso ang %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Wow, nalagpasan niyo ang bilang ng pangalan ng pakete na kaya ng APT na ito."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito."
-
-#: apt-pkg/pkgcachegen.cc:263
-#, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito."
+msgid "Is the package %s installed?"
+msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Wow, nalagpasan niyo ang bilang ng dependensiya na kaya ng APT na ito."
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Hindi umandar ng tama ang paraang %s"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Binabasa ang Listahan ng mga Pakete"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr ""
+"Ikasa ang disk na may pangalang: '%s' sa drive '%s' at pindutin ang enter."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "IO Error sa pag-imbak ng source cache"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Ginagawa ang puno ng mga dependensiya"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Bersyong Kandidato"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Pagbuo ng Dependensiya"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "Pinagsasama ang magagamit na impormasyon"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:252
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Bigo ang pagbukas ng %s"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:257
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Bigo sa pagsulat ng talaksang %s"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Di tugmang MD5Sum"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "Di tugmang laki"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
#, fuzzy
msgid "Invalid file format"
msgstr "Di tanggap na operasyon %s"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Error sa pagsulat"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2195,63 +2142,63 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, 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:1026
+#: apt-pkg/acquire-item.cc:1122
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"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "Ang directory %s ay divertado"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2260,12 +2207,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:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2274,43 +2221,116 @@ msgstr ""
"paketeng %s."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Kumokonekta sa %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "Hindi akma ang versioning system ng cache"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "May naganap na error habang prinoseso ang %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Wow, nalagpasan niyo ang bilang ng pangalan ng pakete na kaya ng APT na ito."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito."
+
+#: apt-pkg/pkgcachegen.cc:263
+#, fuzzy
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Wow, nalagpasan niyo ang bilang ng dependensiya na kaya ng APT na ito."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Binabasa ang Listahan ng mga Pakete"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "IO Error sa pag-imbak ng source cache"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Nawawala ang directory ng talaan %spartial."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "Nawawala ang directory ng arkibo %spartial."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, fuzzy, c-format
msgid "Unable to lock directory %s"
msgstr "Hindi maaldaba ang directory ng talaan"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, fuzzy, c-format
msgid "Clean of %s is not supported"
msgstr "Hindi suportado ang uri ng talaksang index na '%s'"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Kinukuha ang talaksang %li ng %li (%s ang natitira)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Kinukuha ang talaksang %li ng %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Bigo sa pagkuha ng %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"May mga talaksang index na hindi nakuha, sila'y di pinansin, o ginamit ang "
+"mga luma na lamang."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Kailangan niyong maglagay ng 'source' URIs sa inyong sources.list"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Hindi ma-stat ang %s"
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2337,29 +2357,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "Walang prioridad (o sero) na nakatakda para sa pin"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Bigo sa pagkuha ng %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"May mga talaksang index na hindi nakuha, sila'y di pinansin, o ginamit ang "
-"mga luma na lamang."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Kailangan niyong maglagay ng 'source' URIs sa inyong sources.list"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Hindi ma-stat ang %s"
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2485,32 +2482,30 @@ msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Hindi maayos ang mga problema, mayroon kayong sirang mga pakete na naka-hold."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Ginagawa ang puno ng mga dependensiya"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Bersyong Kandidato"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Pagbuo ng Dependensiya"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr ""
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "Pinagsasama ang magagamit na impormasyon"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr ""
-#: apt-pkg/depcache.cc:252
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Bigo ang pagbukas ng %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr ""
-#: apt-pkg/depcache.cc:257
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Bigo sa pagsulat ng talaksang %s"
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Hindi suportado ang uri ng talaksang index na '%s'"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2522,130 +2517,146 @@ msgstr "Hindi ma-parse ang talaksang pakete %s (%d)"
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Maling anyo ng override %s linya %lu #1"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "Binubuksan %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, 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:405
+#, 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:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)"
+
+#: apt-pkg/sourcelist.cc:441
+#, 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/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release '%s' para sa '%s' ay hindi nahanap"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Hindi mahanap ang paketeng %s"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Hindi mahanap ang paketeng %s"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Hindi mahanap ang paketeng %s"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Maling anyo ng override %s linya %lu #1"
-
-#: apt-pkg/sourcelist.cc:355
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Opening %s"
-msgstr "Binubuksan %s"
-
-#: apt-pkg/sourcelist.cc:389
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:393
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, 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:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)"
-
-#: apt-pkg/sourcelist.cc:429
-#, 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"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Paunawa, pinili ang %s imbes na %s\n"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Di tanggap na linya sa talaksang diversion: %s"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2806,35 +2817,6 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "Piniling %s ay hindi nahanap"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2914,7 +2896,7 @@ msgstr "Hindi mabuksan ang talaksang %s"
msgid "Could not open file descriptor %d"
msgstr "Hindi makapag-bukas ng pipe para sa %s"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "Bigo ang paglikha ng subprocess IPC"
@@ -2951,12 +2933,12 @@ msgstr "Problema sa pag-unlink ng talaksan"
msgid "Problem syncing the file"
msgstr "Problema sa pag-sync ng talaksan"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Hindi ma-stat ang %s"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Hindi makapagsulat sa %s"
@@ -2981,6 +2963,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Tapos"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "Piniling %s ay hindi nahanap"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Hindi mai-mmap ang talaksang walang laman"
@@ -3341,87 +3352,87 @@ msgstr "Walang kontrol rekord ang arkibo"
msgid "Unable to get a cursor"
msgstr "Hindi makakuha ng cursor"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Hindi mabasa ang directory %s\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Hindi ma-stat %s\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "E: Mga error ay tumutukoy sa talaksang "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "Bigo sa pag-resolba ng %s"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Bigo ang paglakad sa puno"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "Bigo ang pagbukas ng %s"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "Bigo ang pagbasa ng link %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "Bigo ang pag-unlink ng %s"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Bigo ang pag-link ng %s sa %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink limit na %sB tinamaan.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "Walang field ng pakete ang arkibo"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s ay walang override entry\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Tagapangalaga ng %s ay %s hindi %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s ay walang override entry para sa pinagmulan\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s ay wala ring override entry na binary\n"
@@ -3708,6 +3719,10 @@ msgstr "Bigo ang checksum ng tar, sira ang arkibo"
msgid "Unknown TAR header type %u, member %s"
msgstr "Hindi kilalang uri ng TAR header %u, miyembrong %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Bigo sa paglikha ng mga pipe"
diff --git a/po/tr.po b/po/tr.po
index dd1527715..a29f92343 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\n"
"PO-Revision-Date: 2015-06-21 16:54+0200\n"
"Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
"Language-Team: Debian l10n Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -117,7 +117,7 @@ msgstr ""
"Bu komutun kullanımı bırakılmıştır. Lütfen bunun yerine 'apt-mark showauto' "
"komutunu kullanın."
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "%s paketi bulunamadı"
@@ -359,16 +359,16 @@ msgstr "İç hata, sorun çözücü nesneyi bozdu"
msgid "Unable to lock the download directory"
msgstr "İndirme dizini kilitlenemiyor"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "Kaynağının indirileceği en az bir paket seçilmeli"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s paketinin kaynak paketi bulunamadı"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -378,7 +378,7 @@ msgstr ""
"yapılmaktadır:\n"
"%s\n"
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -390,67 +390,67 @@ msgstr ""
"bzr branch %s\n"
"komutunu kullanın.\n"
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Zaten indirilmiş olan '%s' dosyası atlanıyor\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB/%sB kaynak arşivi indirilecek.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB kaynak arşivi indirilecek.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "%s kaynağını al\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Bazı arşivler alınamadı."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "İndirme işlemi tamamlandı ve sadece indirme kipinde"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%s için zaten açılmış bazı paketlerin açılması atlanıyor\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Paket açma komutu '%s' başarısız.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev' paketinin kurulu olduğundan emin olun.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "İnşa komutu '%s' başarısız oldu.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Alt süreç başarısız"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr "İnşa bağımlılıklarının denetleneceği en az bir paket belirtilmelidir"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -459,27 +459,27 @@ msgstr ""
"%s mimarisine uygun mimari bilgileri mevcut değil. Kurulumu için apt.conf(5) "
"rehber sayfasındaki APT::Architectures kısmına göz atın"
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "İnşa bağımlılıklarını işleme başarısız oldu"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s paketinin inşa-bağımlılığı bilgisi alınamıyor"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s paketinin hiç inşa bağımlılığı yok.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -488,7 +488,7 @@ msgstr ""
"'%4$s' paketlerinde %3$s paketine izin verilmediği için %2$s kaynağının %1$s "
"bağımlılığı karşılanamıyor"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -496,12 +496,12 @@ msgid ""
msgstr ""
"%2$s için %1$s bağımlılığı, %3$s paketi bulunamadığı için karşılanamadı"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "%2$s için %1$s bağımlılığı karşılanamadı: Kurulu %3$s paketi çok yeni"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -510,7 +510,7 @@ msgstr ""
"%2$s için %1$s bağımlılığı sağlanamıyor, çünkü %3$s paketinin aday sürümü "
"gerekli sürüm şartlarını karşılamıyor"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -518,25 +518,25 @@ msgid ""
msgstr ""
"%2$s için %1$s bağımlılığı sağlanamıyor, çünkü %3$s paketinin aday sürümü yok"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s için %1$s bağımlılığı karşılanamadı: %3$s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s için inşa bağımlılıkları karşılanamadı."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "İnşa bağımlılıklarını işleme başarısız oldu"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Desteklenen birimler:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -634,21 +634,16 @@ msgstr "Argüman olarak bir adet URL'ye ihtiyaç vardır"
msgid "Must specify at least one pair url/filename"
msgstr "En az bir adet url/dosya-adı çifti belirtilmelidir"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr "İndirme Başarısız"
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "En az bir adet url/dosya-adı çifti belirtilmelidir"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
#, fuzzy
msgid ""
"Usage: apt-helper [options] command\n"
@@ -843,12 +838,12 @@ msgstr "Disk bulunamadı."
msgid "File not found"
msgstr "Dosya bulunamadı"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "Durum bilgisi okunamadı"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "Değişiklik zamanı ayarlanamadı"
@@ -939,7 +934,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:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Başarısız"
@@ -1012,64 +1007,64 @@ msgstr "Sorgu"
msgid "Unable to invoke "
msgstr "Çağrılamıyor "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Bağlanılıyor %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "%s için bir soket oluşturulamadı (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "%s:%s bağlantısı başlatılamıyor (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Adrese bağlanılamadı: %s:%s (%s), bağlantı zaman aşımına uğradı"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Adrese bağlanılamadı: %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Bağlanılıyor: %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "'%s' çözümlenemedi"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "'%s' çözümlenirken geçici bir sorunla karşılaşıldı"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, c-format
msgid "System error resolving '%s:%s'"
msgstr "'%s:%s' çözümlenirken bir sistem hatası oluştu"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "'%s:%s' (%i - %s) adresi çözümlenirken bir şeyler kötü gitti"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Bağlanılamadı %s:%s:"
@@ -1088,7 +1083,7 @@ msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr "İmza doğrulama için 'apt-key' çalıştırılamadı (gnupg kurulu mu?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1190,232 +1185,6 @@ msgstr ""
msgid "Internal error"
msgstr "İç hata"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr "Listeleme"
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] "Fazladan %i sürüm daha var. Görmek için '-a' anahtarını kullanın."
-msgstr[1] ""
-"Fazladan %i sürüm daha var. Bu sürümleri görmek için '-a' anahtarını "
-"kullanın."
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Bağımlılıklar düzeltiliyor..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " başarısız oldu."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Bağımlılıklar düzeltilemedi"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "Yükseltme kümesi küçültülemiyor"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Tamamlandı"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Bu sorunları düzeltmek için 'apt-get -f install' komutunu çalıştırmanız "
-"gerekebilir."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Karşılanmayan bağımlılıklar. -f kullanmayı deneyin."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr "bilinmeyen"
-
-#: apt-private/private-output.cc:272
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[kurulu,yükseltilebilir: %s]"
-
-#: apt-private/private-output.cc:275
-msgid "[installed,local]"
-msgstr "[kurulu,yerel]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr "[kurulu,otomatik-kaldırılabilir]"
-
-#: apt-private/private-output.cc:279
-msgid "[installed,automatic]"
-msgstr "[kurulu,otomatik]"
-
-#: apt-private/private-output.cc:281
-msgid "[installed]"
-msgstr "[kurulu]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr "[şundan yükseltilebilir: %s]"
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr "[artık-yapılandırma]"
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "ama %s kurulu"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ama %s kurulacak"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "ama kurulabilir değil"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "ama o bir sanal paket"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "ama kurulu değil"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "ama kurulmayacak"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " ya da"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "Aşağıdaki paketler karşılanmamış bağımlılıklara sahip:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "Aşağıdaki YENİ paketler kurulacak:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Aşağıdaki paketler KALDIRILACAK:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "Aşağıdaki paketlerin mevcut durumları korunacak:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "Aşağıdaki paketler yükseltilecek:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Aşağıdaki paketlerin SÜRÜMLERİ DÜŞÜRÜLECEK:"
-
-#: apt-private/private-output.cc:525
-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:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (%s nedeniyle)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu paket yükseltilecek, %lu yeni paket kurulacak, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu paket yeniden kurulacak, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu paketin sürümü düşürülecek, "
-
-#: apt-private/private-output.cc:641
-#, 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:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[E/h]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-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:684
-msgid "Y"
-msgstr "E"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr "H"
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Regex derleme hatası - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "'update' komutu argüman almaz"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-"%i paket yükseltilebilir. Bu paketi görmek için 'apt list --upgradable' "
-"komutunu çalıştırın.\n"
-msgstr[1] ""
-"%i paket yükseltilebilir. Bu paketleri görmek için 'apt list --upgradable' "
-"komutunu çalıştırın.\n"
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr "Tüm paketler güncel."
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr "Sıralama"
@@ -1496,21 +1265,6 @@ msgstr "'%s' kurulu değildi, dolayısıyla kaldırılmadı\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Bilgi, '%2$s' yerine '%1$s' seçiliyor\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-"Fazladan %i kayıt daha var. Görmek için '-a' anahtarını kullanabilirsiniz."
-msgstr[1] ""
-"Fazladan %i kayıt daha var. Bu kayıtları görmek için '-a' anahtarını "
-"kullanabilirsiniz."
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr "gerçek bir paket değil (sanal)"
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "İç hata, InstallPackages bozuk paketler ile çağrıldı!"
@@ -1521,7 +1275,7 @@ msgstr ""
"Paketlerin kaldırılması gerekiyor ancak kaldırma işlemi devre dışı "
"bırakılmış."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1786,6 +1540,247 @@ msgstr "'%3$s' paketinin '%1$s' (%2$s) sürümü seçildi\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "'%4$s' nedeniyle '%3$s' paketinin '%1$s' (%2$s) sürümü seçildi\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "Listeleme"
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] "Fazladan %i sürüm daha var. Görmek için '-a' anahtarını kullanın."
+msgstr[1] ""
+"Fazladan %i sürüm daha var. Bu sürümleri görmek için '-a' anahtarını "
+"kullanın."
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Bağımlılıklar düzeltiliyor..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " başarısız oldu."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Bağımlılıklar düzeltilemedi"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Yükseltme kümesi küçültülemiyor"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Tamamlandı"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Bu sorunları düzeltmek için 'apt-get -f install' komutunu çalıştırmanız "
+"gerekebilir."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Karşılanmayan bağımlılıklar. -f kullanmayı deneyin."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "bilinmeyen"
+
+#: apt-private/private-output.cc:272
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[kurulu,yükseltilebilir: %s]"
+
+#: apt-private/private-output.cc:275
+msgid "[installed,local]"
+msgstr "[kurulu,yerel]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr "[kurulu,otomatik-kaldırılabilir]"
+
+#: apt-private/private-output.cc:279
+msgid "[installed,automatic]"
+msgstr "[kurulu,otomatik]"
+
+#: apt-private/private-output.cc:281
+msgid "[installed]"
+msgstr "[kurulu]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[şundan yükseltilebilir: %s]"
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr "[artık-yapılandırma]"
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "ama %s kurulu"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ama %s kurulacak"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "ama kurulabilir değil"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "ama o bir sanal paket"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "ama kurulu değil"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "ama kurulmayacak"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " ya da"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Aşağıdaki paketler karşılanmamış bağımlılıklara sahip:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Aşağıdaki YENİ paketler kurulacak:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Aşağıdaki paketler KALDIRILACAK:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "Aşağıdaki paketlerin mevcut durumları korunacak:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "Aşağıdaki paketler yükseltilecek:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Aşağıdaki paketlerin SÜRÜMLERİ DÜŞÜRÜLECEK:"
+
+#: apt-private/private-output.cc:525
+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:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (%s nedeniyle)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu paket yükseltilecek, %lu yeni paket kurulacak, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu paket yeniden kurulacak, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu paketin sürümü düşürülecek, "
+
+#: apt-private/private-output.cc:641
+#, 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:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[E/h]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+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:684
+msgid "Y"
+msgstr "E"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr "H"
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Regex derleme hatası - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "'update' komutu argüman almaz"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"%i paket yükseltilebilir. Bu paketi görmek için 'apt list --upgradable' "
+"komutunu çalıştırın.\n"
+msgstr[1] ""
+"%i paket yükseltilebilir. Bu paketleri görmek için 'apt list --upgradable' "
+"komutunu çalıştırın.\n"
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr "Tüm paketler güncel."
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+"Fazladan %i kayıt daha var. Görmek için '-a' anahtarını kullanabilirsiniz."
+msgstr[1] ""
+"Fazladan %i kayıt daha var. Bu kayıtları görmek için '-a' anahtarını "
+"kullanabilirsiniz."
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr "gerçek bir paket değil (sanal)"
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1798,47 +1793,40 @@ msgstr ""
" Unutmayın ki benzetim kipinde kilitleme yapılmaz, bu nedenle\n"
" bu benzetimin gerçekteki durumla birebir aynı olacağına güvenmeyin!"
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "UYARI: Aşağıdaki paketler doğrulanamıyor!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "Kimlik denetimi uyarısı görmezden geliniyor.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "Bazı paketlerin kimlik denetimi yapılamadı"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "Paketler doğrulanmadan kurulsun mu?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Bazı sorunlar çıktı ve -y seçeneği, --force-yes olmadan kullanıldı"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s ağdan alınamadı. %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s içindeki boş alan miktarı belirlenemedi"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "%s içinde yeterli boş alanınız yok."
@@ -1907,16 +1895,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "%s okunamadı"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -2055,29 +2043,6 @@ msgstr "Bu sorunları gidermek için apt-get update komutunu çalıştırabilirs
msgid "The list of sources could not be read."
msgstr "Kaynak listesi okunamadı."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Yöntem sürücüsü %s bulunamadı."
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "Is the package %s installed?"
-msgstr "%s paketi kurulu mu?"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "%s yöntemi düzgün şekilde başlamadı"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr ""
-"Lütfen '%s' olarak etiketlenmiş diski '%s' sürücüsüne yerleştirin ve giriş "
-"(enter) tuşuna basın."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Paket önbelleği boş"
@@ -2164,99 +2129,82 @@ msgstr "ilave"
msgid "Calculating upgrade"
msgstr "Yükseltme hesaplanıyor"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "İndeks dosyası türü '%s' desteklenmiyor"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "Önbelleğin uyumsuz bir sürümleme sistemi var"
+msgid "The method driver %s could not be found."
+msgstr "Yöntem sürücüsü %s bulunamadı."
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s paketi işlenirken sorunlarla karşılaşıldı (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Vay canına, bu APT'nin alabileceği paket adları sayısını aştınız."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Vay canına, bu APT'nin alabileceği sürüm sayısını aştınız."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Vay canına, bu APT'nin alabileceği açıklama sayısını aştınız."
+msgid "Is the package %s installed?"
+msgstr "%s paketi kurulu mu?"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Vay canına, bu APT'nin alabileceği bağımlılık sayısını aştınız."
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "%s yöntemi düzgün şekilde başlamadı"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Paket listeleri okunuyor"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr ""
+"Lütfen '%s' olarak etiketlenmiş diski '%s' sürücüsüne yerleştirin ve giriş "
+"(enter) tuşuna basın."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "Kaynak önbelleği kaydedilirken GÇ Hatası"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Bağımlılık ağacı oluşturuluyor"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr "Çözücüye senaryo gönder"
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Aday sürümler"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr "Çözücüye istek gönder"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Bağımlılık oluşturma"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr "Çözüm almak için hazırlan"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Durum bilgisi okunuyor"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr "Harici çözücü düzgün bir hata iletisi göstermeden başarısız oldu"
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Durum dosyası (StateFile) %s açılamadı"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr "Harici çözücüyü çalıştır"
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Geçici durum dosyasına (%s) yazma başarısız oldu"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "yeniden adlandırma başarısız, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "Sağlama toplamları eşleşmiyor"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "Boyutlar eşleşmiyor"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
msgid "Invalid file format"
msgstr "Geçersiz dosya biçimi"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Yazma hatası"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, fuzzy, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2266,12 +2214,12 @@ msgstr ""
"indeks dosyaları kullanılacak. GPG hatası: %s:%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG hatası: %s: %s"
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2280,7 +2228,7 @@ msgstr ""
"'Release' dosyasında olması beklenilen '%s' girdisi bulunamadı (sources.list "
"dosyasındaki girdi ya da satır hatalı)"
-#: apt-pkg/acquire-item.cc:1026
+#: apt-pkg/acquire-item.cc:1122
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"
@@ -2288,7 +2236,7 @@ msgstr ""
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2297,37 +2245,37 @@ msgstr ""
"%s konumundaki 'Release' dosyasının vâdesi dolmuş (%s önce). Bu deponun "
"güncelleştirmeleri uygulanmayacak."
-#: apt-pkg/acquire-item.cc:1107
+#: apt-pkg/acquire-item.cc:1203
#, 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:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "%s dizini yönlendirilmiş"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2336,55 +2284,125 @@ 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:2677
+#: apt-pkg/acquire-item.cc:2751
#, 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:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Paket indeks dosyaları bozuk. %s paketinin 'Filename:' alanı yok."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "%s (%s) paketinin değişim günlüğü"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "Önbelleğin uyumsuz bir sürümleme sistemi var"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "%s paketi işlenirken sorunlarla karşılaşıldı (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Vay canına, bu APT'nin alabileceği paket adları sayısını aştınız."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Vay canına, bu APT'nin alabileceği sürüm sayısını aştınız."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Vay canına, bu APT'nin alabileceği açıklama sayısını aştınız."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Vay canına, bu APT'nin alabileceği bağımlılık sayısını aştınız."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Paket listeleri okunuyor"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "Kaynak önbelleği kaydedilirken GÇ Hatası"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr "Liste dizini %spartial bulunamadı."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Arşiv dizini %spartial bulunamadı."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, c-format
msgid "Unable to lock directory %s"
msgstr "%s dizini kilitlenemiyor"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, c-format
msgid "Clean of %s is not supported"
msgstr "%s temizliği desteklenmiyor"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Alınan dosya: %li / %li (%s kaldı)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Alınan dosya: %li / %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "%s ağdan alınamadı. %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Bazı indeks dosyaları indirilemedi. Bu dosyalar yok sayıldılar ya da önceki "
+"sürümleri kullanıldı."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "'sources.list' dosyası içine bazı 'source' adresleri koymalısınız"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "%s için dosya bilgisi alınamadı."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2413,28 +2431,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "İğne için öncelik belirlenmedi (ya da sıfır)"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "%s ağdan alınamadı. %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Bazı indeks dosyaları indirilemedi. Bu dosyalar yok sayıldılar ya da önceki "
-"sürümleri kullanıldı."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "'sources.list' dosyası içine bazı 'source' adresleri koymalısınız"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s için dosya bilgisi alınamadı."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2563,31 +2559,30 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Sorunlar giderilemedi, tutulan bozuk paketleriniz var."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Bağımlılık ağacı oluşturuluyor"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr "Çözücüye senaryo gönder"
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Aday sürümler"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr "Çözücüye istek gönder"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Bağımlılık oluşturma"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr "Çözüm almak için hazırlan"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Durum bilgisi okunuyor"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr "Harici çözücü düzgün bir hata iletisi göstermeden başarısız oldu"
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Durum dosyası (StateFile) %s açılamadı"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr "Harici çözücüyü çalıştır"
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Geçici durum dosyasına (%s) yazma başarısız oldu"
+msgid "Index file type '%s' is not supported"
+msgstr "İndeks dosyası türü '%s' desteklenmiyor"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, fuzzy, c-format
@@ -2599,52 +2594,90 @@ msgstr "Paket dosyası %s ayrıştırılamadı (1)"
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Hatalı geçersiz kılma %s satır %llu (%s)"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "%s Açılıyor"
+
+#: apt-pkg/sourcelist.cc:401
+#, 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:405
+#, 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:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı hatalı (tür)"
+
+#: apt-pkg/sourcelist.cc:441
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "'%s' türü bilinmiyor (girdi: %u, kaynak listesi: %s)"
+
+#: apt-pkg/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, c-format
msgid "Couldn't find task '%s'"
msgstr "'%s' görevi bulunamadı"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "'%s' düzenli ifadesini içeren herhangi bir paket bulunamadı"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "'%s' ifadesine eşleşen herhangi bir paket bulunamadı"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "'%s' paketi tamamen sanal olduğu için sürümü seçilemiyor"
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr "'%s' paketi sanal olduğu için en yeni sürümü seçilemiyor"
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr "'%s' paketinin aday sürümü olmadığı için aday sürüm seçilemiyor"
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr "'%s' paketi kurulu olmadığı için kurulu sürüm seçilemiyor"
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -2653,78 +2686,56 @@ msgstr ""
"'%s' paketi kurulu olmadığı ve aday sürüme sahip olmadığı için her ikisi de "
"seçilemiyor"
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Hatalı geçersiz kılma %s satır %llu (%s)"
-
-#: apt-pkg/sourcelist.cc:355
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Opening %s"
-msgstr "%s Açılıyor"
-
-#: apt-pkg/sourcelist.cc:389
-#, 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:393
-#, 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:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı hatalı (tür)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:429
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "'%s' türü bilinmiyor (girdi: %u, kaynak listesi: %s)"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, c-format
msgid "Unable to parse Release file %s"
msgstr "'Release' dosyası (%s) ayrıştırılamadı"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr "'Release' dosyası %s içinde hiç bölüm yok"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "'Release' dosyasında (%s) sağlama girdisi yok"
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "'Release' dosyasında (%s) geçersiz 'Date' girdisi"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "'Release' dosyasında (%s) geçersiz 'Valid-Until' girdisi"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2898,35 +2909,6 @@ msgstr ""
msgid "Not locked"
msgstr "Kilitlenmemiş"
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%li gün %li saat %li dk. %li sn."
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li saat %li dk. %li sn."
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr "%li dk. %li sn."
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr "%li sn."
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "%s seçimi bulunamadı"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -3007,7 +2989,7 @@ msgstr "%s dosyası açılamadı"
msgid "Could not open file descriptor %d"
msgstr "Dosya tanımlayıcı %d açılamadı"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "Altsüreç IPC'si oluşturulamadı"
@@ -3044,12 +3026,12 @@ msgstr "%s dosyasından bağ kaldırma sorunu"
msgid "Problem syncing the file"
msgstr "Dosya eşitlenirken sorun çıktı"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, c-format
msgid "Unable to mkstemp %s"
msgstr "mkstemp %s başarısız oldu"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "%s dosyasına yazılamıyor"
@@ -3074,6 +3056,35 @@ msgstr "..."
msgid "%c%s... %u%%"
msgstr "%c%s... %u%%"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%li gün %li saat %li dk. %li sn."
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%li saat %li dk. %li sn."
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr "%li dk. %li sn."
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr "%li sn."
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "%s seçimi bulunamadı"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Boş dosya mmap yapılamıyor"
@@ -3433,87 +3444,87 @@ msgstr "Arşivin denetim kaydı yok"
msgid "Unable to get a cursor"
msgstr "İmleç alınamıyor"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "U: %s dizini okunamıyor\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "U: %s durum bilgisi alınamıyor\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "H: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "U: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "H: Hatalar şu dosya için geçerli: "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "%s çözümlenemedi"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Ağaçta gezinme başarısız"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "%s açılamadı"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "%s readlink çağrısı başarısız oldu"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "%s bağı koparılamadı"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** %s, %s konumuna bağlanamadı"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " %sB'lik bağ koparma (DeLink) sınırına ulaşıldı.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "Arşivde paket alanı yok"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s için geçersiz kılma girdisi yok\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s geliştiricisi %s, %s değil\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " '%s' paketinin yerine geçecek bir kaynak paket yok\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " '%s' paketinin yerine geçecek bir ikili paket de yok\n"
@@ -3800,6 +3811,10 @@ msgstr "Tar sağlama toplamı başarısız, arşiv bozulmuş"
msgid "Unknown TAR header type %u, member %s"
msgstr "Bilinmeyen TAR başlığı türü %u, üye %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "En az bir adet url/dosya-adı çifti belirtilmelidir"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Boru oluşturulamadı"
diff --git a/po/uk.po b/po/uk.po
index 4e0ac8829..dbc15c148 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\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"
@@ -121,7 +121,7 @@ msgstr "Ви повинні задати не менше одного шабло
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr "Ця команда є застарілою. Будь-ласка використовуйте 'apt-mark showauto'"
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Не можу знайти пакунок %s"
@@ -355,18 +355,18 @@ msgstr "Внутрішня помилка, вирішувач проблем щ
msgid "Unable to lock the download directory"
msgstr "Неможливо заблокувати директорію для завантаження"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні "
"тексти"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Неможливо знайти пакунок з вихідними текстами для %s"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -375,7 +375,7 @@ msgstr ""
"УВАГА: Пакування '%s' відбувається в системі контролю версій '%s' на:\n"
"%s\n"
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -386,70 +386,70 @@ msgstr ""
"bzr branch %s\n"
"щоб отримати найновіші (потенційно не випущені) оновлення до пакунку.\n"
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Пропускаємо вже завантажений файл '%s'\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Необхідно завантажити %sB/%sB з архівів вихідних текстів.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Завантаження вихідних текстів %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Деякі архіви не вдалося завантажити."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Завантаження завершено в режимі \"тільки завантаження\""
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"Пропускається розпакування вихідних текстів, тому що вже розпаковано в %s\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Команда розпакування '%s' завершилася невдало.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Команда побудови '%s' закінчилася невдало.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Породжений процес завершився невдало"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Для перевірки залежностей для побудови необхідно вказати як мінімум один "
"пакунок"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -458,27 +458,27 @@ msgstr ""
"Відсутня інформація про архітектуру для %s. Дивись apt.conf(5) APT::"
"Архітектури для налащтування"
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Обробка залежностей для побудови закінчилася невдало"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Неможливо одержати інформацію про залежності для побудови %s"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s не має залежностей для побудови.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -487,7 +487,7 @@ msgstr ""
"Залежність типу %s для %s не може бути задоволена, бо %s не є дозволеним на "
"'%s' пакунках"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -495,14 +495,14 @@ msgid ""
msgstr ""
"Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Не вдалося задовольнити залежність типу %s для %s: Встановлений пакунок %s "
"новіше, аніж треба"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -511,7 +511,7 @@ msgstr ""
"Залежність типу %s для %s не може бути задоволена, бо версія пакунку-"
"кандидата %s не задовольняє умови по версіям"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -520,25 +520,25 @@ msgstr ""
"Залежність типу %s для %s не може бути задоволена, бо немає пакунку-"
"кандидата %s потрібної версії"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Залежності для побудови %s не можуть бути задоволені."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "Обробка залежностей для побудови закінчилася невдало"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Підтримувані модулі:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -641,23 +641,16 @@ msgstr ""
"Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні "
"тексти"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr ""
-"Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні "
-"тексти"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -819,13 +812,13 @@ msgstr "Диск не знайдено."
msgid "File not found"
msgstr "Файл не знайдено"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
#, fuzzy
msgid "Failed to stat"
msgstr "Не вдалося одержати атрибути (stat)"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "Не вдалося встановити час модифікації"
@@ -916,7 +909,7 @@ msgstr "Неможливо створити сокет (socket)"
msgid "Could not connect data socket, connection timed out"
msgstr "Неможливо під'єднати сокет (socket) з даними, час з'єднання вичерпався"
-#: methods/ftp.cc:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Невдача"
@@ -989,64 +982,64 @@ msgstr "Черга"
msgid "Unable to invoke "
msgstr "Неможливо викликати "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "З'єднання з %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Неможливо створити сокет для %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Неможливо почати з'єднання з %s:%s (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Неможливо з'єднатися з %s:%s (%s), час з'єднання вичерпався"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Неможливо під'єднатися до %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "З'єднання з %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "Не можу знайти IP адрес для %s"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Тимчасова помилка при отриманні IP адреси '%s'"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, fuzzy, c-format
msgid "System error resolving '%s:%s'"
msgstr "Сталося щось дивне при спробі отримати IP адрес для '%s:%s' (%i - %s)"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Сталося щось дивне при спробі отримати IP адрес для '%s:%s' (%i - %s)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Неможливо під'єднатися до %s:%s:"
@@ -1068,7 +1061,7 @@ msgstr ""
"Неможливо виконати 'apt-key' для перевірки підпису (чи встановлено gnupg?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1170,230 +1163,6 @@ msgstr ""
msgid "Internal error"
msgstr "Внутрішня помилка"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Виправлення залежностей..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " невдача."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Неможливо скоригувати залежності"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "Неможливо мінімізувати набір оновлень"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Виконано"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Для виправлення цих помилок ви можете скористатися 'apt-get -f install'."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Незадоволені залежності. Спробуйте використати -f."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Встановлено]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Встановлено]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Встановлено]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr " [Встановлено]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "але %s вже встановлений"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "але %s буде встановлений"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "але він не може бути встановлений"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "але це віртуальний пакунок"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "але він не встановлений"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "але він не буде встановлений"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " чи"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "Пакунки, що мають незадоволені залежності:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "НОВІ пакунки, які будуть встановлені:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Пакунки, які будуть ВИДАЛЕНІ:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "Пакунки, які залишені в незмінному стані:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "Пакунки, які будуть ОНОВЛЕНІ:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Пакунки, які будуть замінені на СТАРІШІ версії:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "Пакунки, які мали б залишитися без змін, але будуть замінені:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (внаслідок %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"УВАГА: Наступні важливі пакунки будуть вилучені.\n"
-"НЕ РОБІТЬ цього, якщо ви НЕ уявляєте собі всі можливі наслідки!"
-
-#: apt-private/private-output.cc:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "оновлено %lu, встановлено %lu нових, "
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu перевстановлено, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu замінено на старіші версії, "
-
-#: apt-private/private-output.cc:641
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu відмічено для видалення і %lu не оновлено.\n"
-
-#: apt-private/private-output.cc:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "не встановлено(видалено) до кінця %lu пакунків.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:684
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Помилка компіляції регулярного виразу - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Команді update не потрібні аргументи"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1475,19 +1244,6 @@ msgstr "Пакунок '%s' не встановлений, тому не вид
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Помітьте, вибирається '%s' замість '%s'\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
@@ -1498,7 +1254,7 @@ msgstr ""
msgid "Packages need to be removed but remove is disabled."
msgstr "Необхідно видалити пакунки, але видалення заборонене."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1769,6 +1525,243 @@ msgstr "Обрана версія '%s' (%s) для '%s'\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Обрана версія '%s' (%s) для '%s' через '%s'\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Виправлення залежностей..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " невдача."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Неможливо скоригувати залежності"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Неможливо мінімізувати набір оновлень"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Виконано"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Для виправлення цих помилок ви можете скористатися 'apt-get -f install'."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Незадоволені залежності. Спробуйте використати -f."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Встановлено]"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Встановлено]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Встановлено]"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr " [Встановлено]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "але %s вже встановлений"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "але %s буде встановлений"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "але він не може бути встановлений"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "але це віртуальний пакунок"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "але він не встановлений"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "але він не буде встановлений"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " чи"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Пакунки, що мають незадоволені залежності:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "НОВІ пакунки, які будуть встановлені:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Пакунки, які будуть ВИДАЛЕНІ:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "Пакунки, які залишені в незмінному стані:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "Пакунки, які будуть ОНОВЛЕНІ:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Пакунки, які будуть замінені на СТАРІШІ версії:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "Пакунки, які мали б залишитися без змін, але будуть замінені:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (внаслідок %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"УВАГА: Наступні важливі пакунки будуть вилучені.\n"
+"НЕ РОБІТЬ цього, якщо ви НЕ уявляєте собі всі можливі наслідки!"
+
+#: apt-private/private-output.cc:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "оновлено %lu, встановлено %lu нових, "
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu перевстановлено, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu замінено на старіші версії, "
+
+#: apt-private/private-output.cc:641
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu відмічено для видалення і %lu не оновлено.\n"
+
+#: apt-private/private-output.cc:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "не встановлено(видалено) до кінця %lu пакунків.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:684
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Помилка компіляції регулярного виразу - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Команді update не потрібні аргументи"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1781,47 +1774,40 @@ msgstr ""
" Також не забувайте, що блокування вимикається,\n"
" тому не очікуйте на відповідність поточній реальній ситуації!"
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "УВАГА: Наступні пакунки неможливо автентифікувати!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "Автентифікаційне попередження не прийнято до уваги.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "Деякі пакунки неможливо автентифікувати"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "Встановити ці пакунки без перевірки?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Виявлено проблеми, а опція -y була використана без --force-yes"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Не вдалося завантажити %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Не вдалося визначити кількість вільного місця в %s"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Недостатньо вільного місця в %s."
@@ -1890,16 +1876,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Неможливо прочитати %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -2038,28 +2024,6 @@ msgstr "Для виправлення цих помилок Ви можете в
msgid "The list of sources could not be read."
msgstr "Неможливо прочитати перелік вихідних кодів."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Драйвер для метода %s не знайдено."
-
-#: apt-pkg/acquire-worker.cc:113
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Метод %s стартував некоректно"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr ""
-"Будь-ласка, вставте диск з поміткою: '%s' в привід '%s' і натисніть Enter."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Кеш пакунків пустий"
@@ -2146,106 +2110,82 @@ msgstr "додаткові (extra)"
msgid "Calculating upgrade"
msgstr "Обчислення оновлень"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Тип '%s' індексного файлу не підтримується"
+msgid "The method driver %s could not be found."
+msgstr "Драйвер для метода %s не знайдено."
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "Кеш має несумісну систему призначення версій"
+#: apt-pkg/acquire-worker.cc:113
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n"
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:164
#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Виникла помилка під час обробки %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Ого! Ви перевищили кількість імен пакунків, які APT може обробити."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Ого! Ви перевищили кількість версій, які APT може обробити."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Ого! Ви перевищили кількість описів, які APT може обробити."
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Ого! Ви перевищили кількість залежностей, які APT може обробити."
+msgid "Method %s did not start correctly"
+msgstr "Метод %s стартував некоректно"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Зчитування переліків пакунків"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr ""
+"Будь-ласка, вставте диск з поміткою: '%s' в привід '%s' і натисніть Enter."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "Помилка IO під час збереження кешу вихідних текстів"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Побудова дерева залежностей"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-#, fuzzy
-msgid "Send scenario to solver"
-msgstr "Відправити сценарій розв'язувачу"
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Версії кандидатів"
-#: apt-pkg/edsp.cc:232
-#, fuzzy
-msgid "Send request to solver"
-msgstr "Відправити запит розв'язувачу"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Ґенерація залежностей"
-#: apt-pkg/edsp.cc:311
-#, fuzzy
-msgid "Prepare for receiving solution"
-msgstr "Пригодуватися до отримання розв'язку"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Зчитування інформації про стан"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr ""
-"Зовнішній розв'язувач завершився невдало без відповідного повідомлення про "
-"помилку"
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Не вдалося відкрити StateFile %s"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-#, fuzzy
-msgid "Execute external solver"
-msgstr "Виконати зовнішній розв'язувач"
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Не вдалося записати до тимчасового StateFile файла %s"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "не вдалося перейменувати, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "Невідповідність хешу MD5Sum"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "Невідповідність розміру"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
#, fuzzy
msgid "Invalid file format"
msgstr "Невірна дія %s"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Помилка запису"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, fuzzy, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2255,12 +2195,12 @@ msgstr ""
"попередні індексні файли будуть використані. Помилка GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr "Помилка GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2269,14 +2209,14 @@ msgstr ""
"Неможливо знайти очікуваний запис '%s' у 'Release' файлі (Невірний запис у "
"sources.list, або пошкоджений файл)"
-#: apt-pkg/acquire-item.cc:1026
+#: apt-pkg/acquire-item.cc:1122
msgid "There is no public key available for the following key IDs:\n"
msgstr "Відсутній публічний ключ для заданих ідентифікаторів (ID) ключа:\n"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2285,37 +2225,37 @@ msgstr ""
"Файл 'Release' для %s застарів (недійсний з %s). Оновлення для цього "
"репозиторія не будуть застосовані."
-#: apt-pkg/acquire-item.cc:1107
+#: apt-pkg/acquire-item.cc:1203
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Конфліктуючий дистрибутив: %s (очікувався %s, але є %s)"
-#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "Директорія %s є відхиленою (diverted)"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2324,12 +2264,12 @@ msgstr ""
"Я не зміг знайти файл для пакунку %s. Можливо, це значить, що вам потрібно "
"власноруч виправити цей пакунок. (через відсутність 'arch')"
-#: apt-pkg/acquire-item.cc:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Неможливо знайти джерело для завантаження версії '%s' для '%s'"
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2337,43 +2277,113 @@ msgstr ""
"Індексні файли пакунків пошкоджені. Немає поля 'Filename' для пакунку %s."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Журнал змін для %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "Кеш має несумісну систему призначення версій"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Виникла помилка під час обробки %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Ого! Ви перевищили кількість імен пакунків, які APT може обробити."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Ого! Ви перевищили кількість версій, які APT може обробити."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Ого! Ви перевищили кількість описів, які APT може обробити."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Ого! Ви перевищили кількість залежностей, які APT може обробити."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Зчитування переліків пакунків"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "Помилка IO під час збереження кешу вихідних текстів"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr "Відсутня директорія зі списками: %spartial"
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Відсутня директорія для архівів: %spartial"
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, c-format
msgid "Unable to lock directory %s"
msgstr "Неможливо заблокувати директорію %s"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, fuzzy, c-format
msgid "Clean of %s is not supported"
msgstr "Тип '%s' індексного файлу не підтримується"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Завантажується файл %li з %li (залишилось %s)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Завантажується файл %li з %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Не вдалося завантажити %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Деякі індексні файли не вдалося завантажити. Вони були зігноровані, або "
+"замість них були використані старіші версії."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Додайте деякі посилання (URI) на вихідні тексти у ваш sources.list"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Неможливо прочитати атрибути %s."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2402,28 +2412,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "Не встановлено пріоритету (або стоїть 0) для фіксатора пакунків (pin)"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Не вдалося завантажити %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Деякі індексні файли не вдалося завантажити. Вони були зігноровані, або "
-"замість них були використані старіші версії."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Додайте деякі посилання (URI) на вихідні тексти у ваш sources.list"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Неможливо прочитати атрибути %s."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2551,31 +2539,36 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Неможливо усунути проблеми, ви маєте поламані зафіксовані пакунки."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Побудова дерева залежностей"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+#, fuzzy
+msgid "Send scenario to solver"
+msgstr "Відправити сценарій розв'язувачу"
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Версії кандидатів"
+#: apt-pkg/edsp.cc:232
+#, fuzzy
+msgid "Send request to solver"
+msgstr "Відправити запит розв'язувачу"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Ґенерація залежностей"
+#: apt-pkg/edsp.cc:311
+#, fuzzy
+msgid "Prepare for receiving solution"
+msgstr "Пригодуватися до отримання розв'язку"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Зчитування інформації про стан"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr ""
+"Зовнішній розв'язувач завершився невдало без відповідного повідомлення про "
+"помилку"
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Не вдалося відкрити StateFile %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+#, fuzzy
+msgid "Execute external solver"
+msgstr "Виконати зовнішній розв'язувач"
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Не вдалося записати до тимчасового StateFile файла %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Тип '%s' індексного файлу не підтримується"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2587,56 +2580,94 @@ msgstr "Неможливо проаналізувати файл пакунку
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #1"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "Відкриття %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Спотворений рядок %u у переліку джерел %s (тип)"
+
+#: apt-pkg/sourcelist.cc:405
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s"
+
+#: apt-pkg/sourcelist.cc:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Спотворений рядок %u у переліку джерел %s (тип)"
+
+#: apt-pkg/sourcelist.cc:441
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s"
+
+#: apt-pkg/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Випуск '%s' для '%s' не знайдено"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Версія '%s' для '%s' не знайдена"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Неможливо знайти завдання '%s'"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Неможливо вибирати версії пакунку '%s', так як він є чисто віртуальним"
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Неможливо вибрати найновішу версію пакунку '%s', так як він є чисто "
"віртуальним"
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr "Неможливо вибрати версію пакунку %s, так як він не має кандидатів"
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Неможливо вибрати встановлену версію пакунку %s, так як такий пакунок не "
"встановлено"
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -2645,78 +2676,56 @@ msgstr ""
"Неможливо вибрати встановлений пакунок, або версію-кандидат пакунку '%s', "
"так як вони відсутні"
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #1"
-
-#: apt-pkg/sourcelist.cc:355
-#, c-format
-msgid "Opening %s"
-msgstr "Відкриття %s"
-
-#: apt-pkg/sourcelist.cc:389
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Спотворений рядок %u у переліку джерел %s (тип)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:393
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s"
-
-#: apt-pkg/sourcelist.cc:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "Спотворений рядок %u у переліку джерел %s (тип)"
-
-#: apt-pkg/sourcelist.cc:429
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Неможливо проаналізувати 'Release' файл %s"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr "Немає секцій у 'Release' файлі %s"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Немає запису 'Hash' у 'Release' файлі %s"
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Невірний запис 'Date' у 'Release' файлі %s"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Невірний запис 'Valid-Until' у 'Release' файлі %s"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2894,35 +2903,6 @@ msgstr ""
msgid "Not locked"
msgstr "Не заблоковано"
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%liд %liг %liхв %liс"
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%liг %liхв %liс"
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr "%liхв %liс"
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr "%liс"
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "Вибір %s не знайдено"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -3004,7 +2984,7 @@ msgstr "Неможливо відкрити файл %s"
msgid "Could not open file descriptor %d"
msgstr "Неможливо відкрити файловий дескриптор %d"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "Не вдалося створити IPC з породженим процесом"
@@ -3041,12 +3021,12 @@ msgstr "Проблема з роз'єднанням файла %s"
msgid "Problem syncing the file"
msgstr "Проблема з синхронізацією файла"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Неможливо прочитати атрибути %s"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Неможливо записати в %s"
@@ -3071,6 +3051,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Виконано"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%liд %liг %liхв %liс"
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%liг %liхв %liс"
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr "%liхв %liс"
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr "%liс"
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "Вибір %s не знайдено"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Неможливо відобразити в пам'яті (mmap) пустий файл"
@@ -3438,87 +3447,87 @@ msgstr "В архіві немає запису 'control'"
msgid "Unable to get a cursor"
msgstr "Неможливо одержати курсор"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "У: Не вдалося прочитати директорію %s\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "У: Неможливо прочитати атрибути %s\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "П: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "У: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "П: Помилки відносяться до файлу "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "Не вдалося визначити %s"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Не вдалося зробити обхід дерева"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "Не вдалося відкрити %s"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr "DeLink %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "Не вдалося прочитати посилання (readlink) %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "Не вдалося видалити посилання (unlink) %s"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Не вдалося створити посилання %s на %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Перевищено ліміт в %sB в DeLink.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "Архів не мав поля 'package'"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, fuzzy, c-format
msgid " %s has no override entry\n"
msgstr " Відсутній запис про перепризначення (override) для %s\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " пакунок %s супроводжується %s, а не %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " Відсутній запис про перепризначення вихідних текстів для %s\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " Крім того, відсутній запис про бінарне перепризначення для %s\n"
@@ -3810,6 +3819,12 @@ msgstr "Контрольна сума tar архіва невірна, архі
msgid "Unknown TAR header type %u, member %s"
msgstr "Невідомий тип заголовку TAR - %u, член %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr ""
+#~ "Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні "
+#~ "тексти"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Не вдалося створити канали (pipes)"
diff --git a/po/vi.po b/po/vi.po
index be13721d2..57f1d228b 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.8\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\n"
"PO-Revision-Date: 2014-09-12 13:48+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -118,7 +118,7 @@ msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
"Lệnh này đã lỗi thời. Xin hãy dùng lệnh “apt-mark showauto” để thay thế."
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "Không thể định vị gói %s"
@@ -364,16 +364,16 @@ msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì"
msgid "Unable to lock the download directory"
msgstr "Không thể khoá thư mục tải về"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "Phải chỉ định ít nhất một gói để mà lấy mã nguồn về cho nó"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Không tìm thấy gói nguồn cho %s"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -383,7 +383,7 @@ msgstr ""
"“%s” tại:\n"
"%s\n"
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -394,68 +394,68 @@ msgstr ""
"bzr branch %s\n"
"để lấy các gói mới nhất (có thể là chưa phát hành).\n"
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Đang bỏ qua tập tin đã được tải về “%s”\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Cần phải lấy %sB/%sB kho nguồn.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Cần phải lấy %sB từ kho nguồn.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "Lấy mã nguồn %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "Gặp lỗi khi lấy một số kho."
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "Hoàn tất việc tải về và trong chế độ chỉ tải về"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Lệnh giải nén “%s” bị lỗi.\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Hãy kiểm tra xem gói “dpkg-dev” đã được cài đặt chưa.\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Lệnh biên dịch “%s” bị lỗi.\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "Tiến trình con bị lỗi"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Phải chỉ ra ít nhất một gói cần kiểm tra các phần phụ thuộc cần khi biên dịch"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -464,27 +464,27 @@ msgstr ""
"Không có thông tin kiến trúc sẵn sàng cho %s. Xem apt.conf(5) APT::"
"Architectures để cài đặt"
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Gặp lỗi khi xử lý các quan hệ phụ thuộc khi biên dịch"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Không thể lấy thông tin về các phần phụ thuộc khi biên dịch cho %s"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s không phụ thuộc vào gì khi biên dịch.\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -493,7 +493,7 @@ msgstr ""
"Phần phụ thuộc %s cho %s không ổn thỏa bởi vì %s không được cho phép trên "
"gói “%s”"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -501,14 +501,14 @@ msgid ""
msgstr ""
"Phần phụ thuộc %s cho %s không thể được thỏa mãn vì không tìm thấy gói %s"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Việc cố thỏa mãn quan hệ phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s là "
"quá mới"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -517,7 +517,7 @@ msgstr ""
"phần phụ thuộc %s cho %s không thể được thỏa mãn phiên bản ứng cử của gói %s "
"có thể thỏa mãn điều kiện phiên bản"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -526,25 +526,25 @@ msgstr ""
"phần phụ thuộc %s cho %s không thể được thỏa mãn bởi vì gói %s không có bản "
"ứng cử"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi: %s."
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Không thể thỏa mãn quan hệ phụ thuộc khi biên dịch cho %s."
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "Gặp lỗi khi xử lý các quan hệ phụ thuộc khi biên dịch"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "Hỗ trợ các mô-đun:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -646,21 +646,16 @@ msgstr "Cần một URL làm đối số"
msgid "Must specify at least one pair url/filename"
msgstr "Phải chỉ định ít nhất một cặp url/tên-tập-tin"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr "Gặp lỗi khi tải về"
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "Phải chỉ định ít nhất một cặp url/tên-tập-tin"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
#, fuzzy
msgid ""
"Usage: apt-helper [options] command\n"
@@ -858,12 +853,12 @@ msgstr "Không tìm thấy đĩa."
msgid "File not found"
msgstr "Không tìm thấy tập tin"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "Gặp lỗi khi lấy thống kê"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "Gặp lỗi khi đặt giờ sửa đổi"
@@ -954,7 +949,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:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "Gặp lỗi"
@@ -1027,64 +1022,64 @@ msgstr "Truy vấn"
msgid "Unable to invoke "
msgstr "Không thể gọi "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Đang kết nối đến %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[Địa chỉ IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Không thể tạo ổ cắm cho %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Không thể khởi tạo kết nối đến %s:%s (%s)."
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Không thể kết nối đến %s:%s (%s), kết nối bị quá giờ"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Không thể kết nối đến %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "Đang kết nối đến %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "Không thể phân giải “%s”"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Việc phân giải “%s” bị lỗi tạm thời"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, c-format
msgid "System error resolving '%s:%s'"
msgstr "Lỗi hệ thống khi phân giải “%s:%s”"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Một số hư hỏng đã xảy ra khi phân giải “%s:%s” (%i - %s)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Không thể kết nối đến %s: %s:"
@@ -1105,7 +1100,7 @@ msgstr ""
"chưa?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1212,223 +1207,6 @@ msgstr ""
msgid "Internal error"
msgstr "Gặp lỗi nội bộ"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr "Đang liệt kê"
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] "Ở đây có %i phiên bản phụ thêm. Hãy dùng tùy chọn “-a” để xem."
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Đang sửa chữa quan hệ phụ thuộc..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " gặp lỗi."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "Không thể sửa phần phụ thuộc"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "Không thể tối thiểu hóa tập hợp nâng cấp"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " Xong"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Bạn có thể chạy lệnh “apt-get -f install” để sửa những lỗi trên."
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "Chưa thỏa mãn quan hệ phụ thuộc. Hãy thử dùng tùy chọn “-f”."
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr "không hiểu"
-
-#: apt-private/private-output.cc:272
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[đã cài, có thể nâng cấp thành: %s]"
-
-#: apt-private/private-output.cc:275
-msgid "[installed,local]"
-msgstr "[đã cài đặt,nội bộ]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr "[đã cài,có thể tự động gỡ bỏ]"
-
-#: apt-private/private-output.cc:279
-msgid "[installed,automatic]"
-msgstr "[đã cài đặt,tự động]"
-
-#: apt-private/private-output.cc:281
-msgid "[installed]"
-msgstr "[đã cài đặt]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr "[có thể nâng cấp từ: %s]"
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr "[residual-config]"
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "nhưng mà %s đã được cài đặt"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "nhưng mà %s sẽ được cài đặt"
-
-#: apt-private/private-output.cc:411
-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:413
-msgid "but it is a virtual package"
-msgstr "nhưng mà nó là gói ảo"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "nhưng mà nó không được cài đặt"
-
-#: apt-private/private-output.cc:416
-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:421
-msgid " or"
-msgstr " hay"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-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:455
-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:465
-msgid "The following packages will be REMOVED:"
-msgstr "Những gói sau sẽ bị GỠ BỎ:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "Những gói sau đây được giữ lại:"
-
-#: apt-private/private-output.cc:497
-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:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Những gói sau đây sẽ bị HẠ CẤP:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "Những gói giữ lại sau đây sẽ bị THAY ĐỔI:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (bởi vì %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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:633
-#, 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:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu được cài đặt lại, "
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu bị hạ cấp, "
-
-#: apt-private/private-output.cc:641
-#, 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:645
-#, 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"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[C/k]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-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:684
-msgid "Y"
-msgstr "C"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr "K"
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Lỗi biên dịch biểu thức chính quy - %s"
-
-#: apt-private/private-update.cc:31
-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-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-"%i gói có thể được cập nhật. Chạy “apt list --upgradable” để xem chúng.\n"
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr "Mọi gói đã được cập nhật."
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr "Đang sắp xếp"
@@ -1507,17 +1285,6 @@ msgstr "Gói %s chưa được cài đặt, thế nên không thể gỡ bỏ n
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Ghi chú: đang chọn “%s” thay cho “%s”\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] "Ở đây có %i bản ghi phụ thêm. Hãy dùng tùy chọn “-a” để xem"
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr "không là gói thật (ảo)"
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Lỗi nội bộ: InstallPackages (cài đặt gói) được gọi với gói bị hỏng!"
@@ -1527,7 +1294,7 @@ msgid "Packages need to be removed but remove is disabled."
msgstr ""
"Cần phải gỡ bỏ một số gói, nhưng mà tính năng Gỡ bỏ (Remove) đã bị tắt."
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1784,6 +1551,234 @@ msgstr "Đã chọn phiên bản “%s” (%s) cho “%s”\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Đã chọn phiên bản “%s” (%s) cho “%s” vì “%s”\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "Đang liệt kê"
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] "Ở đây có %i phiên bản phụ thêm. Hãy dùng tùy chọn “-a” để xem."
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Đang sửa chữa quan hệ phụ thuộc..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " gặp lỗi."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Không thể sửa phần phụ thuộc"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Không thể tối thiểu hóa tập hợp nâng cấp"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Xong"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Bạn có thể chạy lệnh “apt-get -f install” để sửa những lỗi trên."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Chưa thỏa mãn quan hệ phụ thuộc. Hãy thử dùng tùy chọn “-f”."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "không hiểu"
+
+#: apt-private/private-output.cc:272
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[đã cài, có thể nâng cấp thành: %s]"
+
+#: apt-private/private-output.cc:275
+msgid "[installed,local]"
+msgstr "[đã cài đặt,nội bộ]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr "[đã cài,có thể tự động gỡ bỏ]"
+
+#: apt-private/private-output.cc:279
+msgid "[installed,automatic]"
+msgstr "[đã cài đặt,tự động]"
+
+#: apt-private/private-output.cc:281
+msgid "[installed]"
+msgstr "[đã cài đặt]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[có thể nâng cấp từ: %s]"
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr "[residual-config]"
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "nhưng mà %s đã được cài đặt"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "nhưng mà %s sẽ được cài đặt"
+
+#: apt-private/private-output.cc:411
+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:413
+msgid "but it is a virtual package"
+msgstr "nhưng mà nó là gói ảo"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "nhưng mà nó không được cài đặt"
+
+#: apt-private/private-output.cc:416
+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:421
+msgid " or"
+msgstr " hay"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+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:455
+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:465
+msgid "The following packages will be REMOVED:"
+msgstr "Những gói sau sẽ bị GỠ BỎ:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "Những gói sau đây được giữ lại:"
+
+#: apt-private/private-output.cc:497
+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:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Những gói sau đây sẽ bị HẠ CẤP:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "Những gói giữ lại sau đây sẽ bị THAY ĐỔI:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (bởi vì %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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:633
+#, 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:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu được cài đặt lại, "
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu bị hạ cấp, "
+
+#: apt-private/private-output.cc:641
+#, 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:645
+#, 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"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[C/k]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+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:684
+msgid "Y"
+msgstr "C"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr "K"
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Lỗi biên dịch biểu thức chính quy - %s"
+
+#: apt-private/private-update.cc:31
+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-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"%i gói có thể được cập nhật. Chạy “apt list --upgradable” để xem chúng.\n"
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr "Mọi gói đã được cập nhật."
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] "Ở đây có %i bản ghi phụ thêm. Hãy dùng tùy chọn “-a” để xem"
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr "không là gói thật (ảo)"
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1796,47 +1791,40 @@ 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ư khi làm thật!"
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "CẢNH BÁO: Không thể xác thực những gói sau đây!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "Cảnh báo xác thực bị đè.\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "Một số gói không thể được xác thực"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "Cài đặt những gói này mà không cần thẩm tra?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "Có lỗi và đã dùng tùy chọn “-y” mà không có “--force-yes”"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Gặp lỗi khi lấy về %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Không thể tìm được chỗ trống trong %s"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Bạn không có đủ dung lượng đĩa còn trống trong %s."
@@ -1905,16 +1893,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Không thể đọc %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -2054,27 +2042,6 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr "Không thể đọc danh sách nguồn."
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Không tìm thấy trình điều khiển phương thức %s."
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "Is the package %s installed?"
-msgstr "Gói “%s” đã được cài đặt chưa?"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Phương thức %s đã không khởi chạy đúng đắn."
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr "Hãy cho đĩa có nhãn “%s” vào ổ “%s” rồi bấm nút Enter."
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "Bộ nhớ tạm gói trống"
@@ -2161,99 +2128,80 @@ msgstr "bổ sung"
msgid "Calculating upgrade"
msgstr "Đang tính toán nâng cấp"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Không hỗ trợ kiểu tập tin chỉ mục “%s”"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "Bộ nhớ tạm có hệ thống điều khiển phiên bản không tương thích"
+msgid "The method driver %s could not be found."
+msgstr "Không tìm thấy trình điều khiển phương thức %s."
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Có lỗi phát sinh khi xử lý %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Ồ, bạn đã vượt quá số tên gói mà trình APT này có thể quản lý."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Ồ, bạn đã vượt quá số mô tả mà trình APT này có thể quản lý."
+msgid "Is the package %s installed?"
+msgstr "Gói “%s” đã được cài đặt chưa?"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Ồ, bạn đã vượt quá số cách phụ thuộc mà trình APT này có thể quản lý."
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Phương thức %s đã không khởi chạy đúng đắn."
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "Đang đọc các danh sách gói"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr "Hãy cho đĩa có nhãn “%s” vào ổ “%s” rồi bấm nút Enter."
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Đang xây dựng cây quan hệ phụ thuộc"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr "Gửi kịch bản đến bộ phân giải"
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Phiên bản ứng cử"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr "Gửi yêu cầu đến bộ phân giải"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Tạo ra quan hệ phụ thuộc"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr "Chuẩn bị để lấy cách giải quyết"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Đang đọc thông tin về tình trạng"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr "Bộ phân giải bên ngoài gặp lỗi mà không trả về thông tin lỗi thích hợp"
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Lỗi mở tập tin tình trạng StateFile %s"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr "Thi hành bộ phân giải từ bên ngoài"
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Gặp lỗi khi ghi tập tin tình trạng StateFile tạm thời %s"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "gặp lỗi khi đổi tên, %s (%s → %s)."
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "Mã băm tổng kiểm tra không khớp"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "Kích cỡ không khớp nhau"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
msgid "Invalid file format"
msgstr "Định dạng tập tập tin không hợp lệ"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "Lỗi ghi"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, fuzzy, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2264,12 +2212,12 @@ msgstr ""
"Lỗi GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr "Lỗi GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2278,14 +2226,14 @@ 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:1026
+#: apt-pkg/acquire-item.cc:1122
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"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2294,37 +2242,37 @@ 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, 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:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "Thư mục %s bị trệch hướng"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2333,12 +2281,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:2677
+#: apt-pkg/acquire-item.cc:2751
#, 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:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2347,43 +2295,114 @@ msgstr ""
"tin:) cho gói %s."
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "Changelog cho %s (%s)"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "Bộ nhớ tạm có hệ thống điều khiển phiên bản không tương thích"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Có lỗi phát sinh khi xử lý %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Ồ, bạn đã vượt quá số tên gói mà trình APT này có thể quản lý."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Ồ, bạn đã vượt quá số mô tả mà trình APT này có thể quản lý."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Ồ, bạn đã vượt quá số cách phụ thuộc mà trình APT này có thể quản lý."
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "Đang đọc các danh sách gói"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr "Thiếu thư mục danh sách %spartial."
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Thiếu thư mục kho lưu %spartial."
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, c-format
msgid "Unable to lock directory %s"
msgstr "Không thể khoá thư mục %s"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, c-format
msgid "Clean of %s is not supported"
msgstr "Không hỗ trợ việc xóa %s"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Đang tải tập tin thứ %li trong tổng số %li (còn lại %s)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Đang tải tập tin %li trong tổng số %li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "Gặp lỗi khi lấy về %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Một số tập tin chỉ mục không tải về được. Chúng đã bị bỏ qua, hoặc cái cũ đã "
+"được dùng thay thế."
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
+"Bạn phải để một số địa chỉ URI “nguồn” vào “sources.list” (danh sách nguồn)"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Không thể lấy trạng thái về %s."
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2413,29 +2432,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "Gặp lỗi khi lấy về %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Một số tập tin chỉ mục không tải về được. Chúng đã bị bỏ qua, hoặc cái cũ đã "
-"được dùng thay thế."
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
-"Bạn phải để một số địa chỉ URI “nguồn” vào “sources.list” (danh sách nguồn)"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Không thể lấy trạng thái về %s."
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2561,31 +2557,30 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Không thể sửa trục trặc này, bạn đã giữ lại một số gói bị hỏng."
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Đang xây dựng cây quan hệ phụ thuộc"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr "Gửi kịch bản đến bộ phân giải"
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "Phiên bản ứng cử"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr "Gửi yêu cầu đến bộ phân giải"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Tạo ra quan hệ phụ thuộc"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr "Chuẩn bị để lấy cách giải quyết"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Đang đọc thông tin về tình trạng"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr "Bộ phân giải bên ngoài gặp lỗi mà không trả về thông tin lỗi thích hợp"
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Lỗi mở tập tin tình trạng StateFile %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr "Thi hành bộ phân giải từ bên ngoài"
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Gặp lỗi khi ghi tập tin tình trạng StateFile tạm thời %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Không hỗ trợ kiểu tập tin chỉ mục “%s”"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2597,54 +2592,92 @@ msgstr "Không thể phân tích tập tin gói %s (%d)"
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Sai “override” %s dòng %llu (%s)"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "Đang mở %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, 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:405
+#, 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:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %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:441
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Không hiểu kiểu “%s” trên đoạn %u trong danh sách nguồn %s"
+
+#: apt-pkg/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Không tìm thấy bản phát hành “%s” cho “%s”"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Không tìm thấy phiên bản “%s” cho “%s”"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Không tìm thấy tác vụ “%s”"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Không tìm thấy gói nào theo biểu thức chính quy “%s”"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Không tìm thấy gói nào theo đường dẫn “%s”"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Không thể chọn phiên bản trong gói “%s” vì nó chỉ là ảo"
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr "Không thể chọn phiên bản mới nhất trong gói “%s” vì nó chỉ là ảo"
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr "Không thể chọn phiên bản ứng cử trong gói %s vì nó không có ứng cử"
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Không thể chọn phiên bản được cài đặt trong gói %s vì nó không phải được cài "
"đặt"
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -2653,66 +2686,44 @@ msgstr ""
"Không thể chọn phiên bản được cài đặt hoặc phiên bản ứng cử trong gói “%s” "
"mà không có trong nó"
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Sai “override” %s dòng %llu (%s)"
-
-#: apt-pkg/sourcelist.cc:355
-#, c-format
-msgid "Opening %s"
-msgstr "Đang mở %s"
-
-#: apt-pkg/sourcelist.cc:389
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, 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:393
-#, 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:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "Gặp dòng sai dạng %u trong danh sách nguồn %s (kiểu)."
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:429
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Không hiểu kiểu “%s” trên đoạn %u trong danh sách nguồn %s"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Không thể phân tích cú pháp của tập tin Phát hành %s"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr "Không có phần nào trong tập tin Phát hành %s"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Không có mục Hash (chuỗi duy nhất) nào trong tập tin Phát hành %s"
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr ""
"Gặp mục tin “Date” (ngày tháng) không hợp lệ trong tập tin Phát hành %s"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr ""
@@ -2720,14 +2731,14 @@ msgstr ""
"hành %s"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2901,35 +2912,6 @@ msgstr ""
msgid "Not locked"
msgstr "Chưa được khoá"
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%li ngày %li giờ %li phút %li giây"
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li giờ %li phút %li giây"
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr "%li phút %li giây"
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr "%li giây"
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "Không tìm thấy vùng chọn %s"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -3010,7 +2992,7 @@ msgstr "Không thể mở tập tin %s"
msgid "Could not open file descriptor %d"
msgstr "Không thể mở bộ mô tả tập tin %d"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "Việc tạo tiến trình con IPC bị lỗi"
@@ -3047,12 +3029,12 @@ msgstr "Gặp vấn đề khi bỏ liên kết tập tin %s"
msgid "Problem syncing the file"
msgstr "Gặp vấn đề khi đồng bộ hóa tập tin"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, c-format
msgid "Unable to mkstemp %s"
msgstr "Không thể tạo tập tin tạm (hàm mkstemp) %s"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "Không thể ghi vào %s"
@@ -3077,6 +3059,35 @@ msgstr "..."
msgid "%c%s... %u%%"
msgstr "%c%s... %u%%"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%li ngày %li giờ %li phút %li giây"
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%li giờ %li phút %li giây"
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr "%li phút %li giây"
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr "%li giây"
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "Không tìm thấy vùng chọn %s"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Không thể mmap (ánh xạ bộ nhớ) tập tin rỗng"
@@ -3450,87 +3461,87 @@ msgstr "Kho không có mục ghi điều khiển"
msgid "Unable to get a cursor"
msgstr "Không thể lấy con trỏ"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "CB: Không thể đọc thư mục %s\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "CB: Không thể lấy thông tin thống kê %s\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "L: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "CB: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "LỖI: có lỗi áp dụng vào tập tin "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "Gặp lỗi khi phân giải %s"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "Việc di chuyển qua cây bị lỗi"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "Gặp lỗi khi mở %s"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Bỏ liên kết %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "Gặp lỗi khi đọc liên kết %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "Việc bỏ liên kết %s bị lỗi"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Gặp lỗi khi liên kết %s đến %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Hết hạn bỏ liên kết của %sB.\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "Kho không có trường gói"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s không có mục ghi đè (override)\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " người bảo trì %s là %s không phải %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s không có mục ghi đè (override) nguồn\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s cũng không có mục ghi đè (override) nhị phân\n"
@@ -3818,6 +3829,10 @@ msgstr "Gặp lỗi khi tổng kiểm “tar”, kho bị hỏng"
msgid "Unknown TAR header type %u, member %s"
msgstr "Không rõ kiểu phần đầu tar %u, thành viên %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "Phải chỉ định ít nhất một cặp url/tên-tập-tin"
+
#~ msgid "Failed to create pipes"
#~ msgstr "Gặp lỗi khi tạo các đường ống dẫn lệnh"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index dac30949b..6706bb88a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,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: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\n"
"PO-Revision-Date: 2014-12-04 04:42+0000\n"
"Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -115,7 +115,7 @@ msgstr "您必须明确地给出至少一个表达式"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr "该命令已废弃。请使用‘apt-mark showauto’。"
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "无法定位软件包 %s"
@@ -350,16 +350,16 @@ msgstr "内部错误,问题解决工具坏事了"
msgid "Unable to lock the download directory"
msgstr "无法锁定下载目录"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "要下载源代码,必须指定至少一个对应的软件包"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "无法找到与 %s 对应的源代码包"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -368,7 +368,7 @@ msgstr ""
"提示:%s 的打包工作被维护于以下位置的 %s 版本控制系统中:\n"
"%s\n"
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -379,67 +379,67 @@ msgstr ""
"bzr branch %s\n"
"获得该软件包的最近更新(可能尚未正式发布)。\n"
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "忽略已下载的文件“%s”\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下载 %sB/%sB 的源代码包。\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下载 %sB 的源代码包。\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "下载源代码 %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "下载完毕,目前是“仅下载”模式"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "忽略已经被解包到 %s 目录的源代码包\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "运行解包的命令“%s”出错。\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "执行构造软件包命令“%s”失败。\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "子进程出错"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr "要检查生成软件包的构建依赖关系,必须指定至少一个软件包"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -448,27 +448,27 @@ msgstr ""
"找不到关于 %s 的有效体系结构信息。请参见 apt.conf(5) APT::Architectures for "
"setup"
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "无法处理构建依赖关系"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "无法获得 %s 的构建依赖关系信息"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr " %s 没有构建依赖关系信息。\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -476,19 +476,19 @@ msgid ""
msgstr ""
"由于 %3$s 不被软件包 %4$s 所允许,因此不能满足 %2$s 所要求的 %1$s 依赖关系"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "由于无法找到软件包 %3$s ,因此不能满足 %2$s 所要求的 %1$s 依赖关系"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系:已安装的软件包 %3$s 太新"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -496,32 +496,32 @@ msgid ""
msgstr ""
"软件包 %3$s 的候选版本不能满足版本要求,因此 %2$s 软件包的 %1$s 依赖无法满足"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "软件包 %3$s 没有可用的候选版本,因此 %2$s 的 %1$s 依赖无法满足"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系:%3$s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "无法处理构建依赖关系"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "支持的模块:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -616,21 +616,16 @@ msgstr "需要一个 URL 作为参数"
msgid "Must specify at least one pair url/filename"
msgstr "必须指定至少一对URL或者文件名"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr "下载失败"
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "必须指定至少一对URL或者文件名"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
#, fuzzy
msgid ""
"Usage: apt-helper [options] command\n"
@@ -823,12 +818,12 @@ msgstr "找不到盘片。"
msgid "File not found"
msgstr "无法找到该文件"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "无法读取状态"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "无法设置文件的修改日期"
@@ -918,7 +913,7 @@ msgstr "无法创建套接字"
msgid "Could not connect data socket, connection timed out"
msgstr "无法连接上数据套接字,连接超时"
-#: methods/ftp.cc:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "失败"
@@ -991,64 +986,64 @@ msgstr "查询"
msgid "Unable to invoke "
msgstr "无法调用 "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "正在连接 %s (%s)"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "无法为 %s 创建套接字(f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "无法发起与 %s:%s (%s) 的连接"
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "无法连接上 %s:%s (%s),连接超时"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "无法连接上 %s:%s (%s)。"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "正在连接 %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "无法解析域名“%s”"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "暂时不能解析域名“%s”"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, c-format
msgid "System error resolving '%s:%s'"
msgstr "解析“%s:%s”时出现系统故障"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "解析“%s:%s”时,出现了某些故障(%i - %s)"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "不能连接到 %s:%s:"
@@ -1067,7 +1062,7 @@ msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr "无法运行 apt-key 以验证签名(您安装了 gnupg 吗?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1167,223 +1162,6 @@ msgstr ""
msgid "Internal error"
msgstr "内部错误"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr "正在列表"
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] "还有 %i 个版本。请使用 -a 选项来查看它(他们)。"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "正在更正依赖关系..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " 失败。"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "无法更正依赖关系"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "无法最小化要升级的软件包集合"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " 完成"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。"
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr "未知"
-
-#: apt-private/private-output.cc:272
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[已安装,可升级至:%s]"
-
-#: apt-private/private-output.cc:275
-msgid "[installed,local]"
-msgstr "[已安装,本地]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr "[已安装,可自动卸载]"
-
-#: apt-private/private-output.cc:279
-msgid "[installed,automatic]"
-msgstr "[已安装,自动]"
-
-#: apt-private/private-output.cc:281
-msgid "[installed]"
-msgstr "[已安装]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr "[可从该版本升级:%s]"
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr "[配置文件残留]"
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "但是 %s 已经安装"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "但是 %s 正要被安装"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "但无法安装它"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "但是它是虚拟软件包"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "但是它还没有被安装"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "但是它将不会被安装"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " 或"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "下列软件包有未满足的依赖关系:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "下列【新】软件包将被安装:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "下列软件包将被【卸载】:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "下列软件包的版本将保持不变:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "下列软件包将被升级:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "下列软件包将被【降级】:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "下列被要求保持版本不变的软件包将被改变:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (是由于 %s)"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"【警告】:下列基础软件包将被卸载。\n"
-"请勿尝试,除非您确实知道您在做什么!"
-
-#: apt-private/private-output.cc:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "升级了 %lu 个软件包,新安装了 %lu 个软件包,"
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "重新安装了 %lu 个软件包,"
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "降级了 %lu 个软件包,"
-
-#: apt-private/private-output.cc:641
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "要卸载 %lu 个软件包,有 %lu 个软件包未被升级。\n"
-
-#: apt-private/private-output.cc:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr "[Y/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-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:684
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "编译正则表达式时出错 - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr " update 命令不需要参数"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-"有 %i 个软件包可以升级。请执行 ‘apt list --upgradable’ 来查看它们。\n"
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr "所有软件包均为最新。"
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr "正在排序"
@@ -1462,17 +1240,6 @@ msgstr "软件包 %s 还未安装,因而不会被卸载\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "注意,选取 %s 而非 %s\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] "有 %i 条附加记录。请加上 ‘-a’ 参数来查看它们"
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr "不是一个实包(虚包)"
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "内部错误,InstallPackages 被用在了无法安装的软件包上!"
@@ -1481,7 +1248,7 @@ msgstr "内部错误,InstallPackages 被用在了无法安装的软件包上
msgid "Packages need to be removed but remove is disabled."
msgstr "有软件包需要被卸载,但是卸载动作被程序设置所禁止。"
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1726,6 +1493,234 @@ msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "由于 %4$s,为 %3$s 选定了版本 %1$s (%2$s)\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "正在列表"
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] "还有 %i 个版本。请使用 -a 选项来查看它(他们)。"
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "正在更正依赖关系..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " 失败。"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "无法更正依赖关系"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "无法最小化要升级的软件包集合"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " 完成"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。"
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "未知"
+
+#: apt-private/private-output.cc:272
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[已安装,可升级至:%s]"
+
+#: apt-private/private-output.cc:275
+msgid "[installed,local]"
+msgstr "[已安装,本地]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr "[已安装,可自动卸载]"
+
+#: apt-private/private-output.cc:279
+msgid "[installed,automatic]"
+msgstr "[已安装,自动]"
+
+#: apt-private/private-output.cc:281
+msgid "[installed]"
+msgstr "[已安装]"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[可从该版本升级:%s]"
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr "[配置文件残留]"
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "但是 %s 已经安装"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "但是 %s 正要被安装"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "但无法安装它"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "但是它是虚拟软件包"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "但是它还没有被安装"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "但是它将不会被安装"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " 或"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "下列软件包有未满足的依赖关系:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "下列【新】软件包将被安装:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "下列软件包将被【卸载】:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "下列软件包的版本将保持不变:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "下列软件包将被升级:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "下列软件包将被【降级】:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "下列被要求保持版本不变的软件包将被改变:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (是由于 %s)"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"【警告】:下列基础软件包将被卸载。\n"
+"请勿尝试,除非您确实知道您在做什么!"
+
+#: apt-private/private-output.cc:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "升级了 %lu 个软件包,新安装了 %lu 个软件包,"
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "重新安装了 %lu 个软件包,"
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "降级了 %lu 个软件包,"
+
+#: apt-private/private-output.cc:641
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "要卸载 %lu 个软件包,有 %lu 个软件包未被升级。\n"
+
+#: apt-private/private-output.cc:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+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:684
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "编译正则表达式时出错 - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr " update 命令不需要参数"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"有 %i 个软件包可以升级。请执行 ‘apt list --upgradable’ 来查看它们。\n"
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr "所有软件包均为最新。"
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] "有 %i 条附加记录。请加上 ‘-a’ 参数来查看它们"
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr "不是一个实包(虚包)"
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1737,47 +1732,40 @@ msgstr ""
"   apt-get 需要 root 特权进行实际的执行。\n"
"   同时请记住此时并未锁定,所以请勿完全相信当前的情况!"
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "【警告】:下列软件包不能通过验证!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "忽略了认证警告。\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "有些软件包不能通过验证"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "不经验证就安装这些软件包吗?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "碰到了一些问题,您使用了 -y 选项,但是没有用 --force-yes"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "无法获知您在 %s 上的可用空间"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "您在 %s 上没有足够的可用空间。"
@@ -1846,16 +1834,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "无法读取 %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -1989,27 +1977,6 @@ msgstr "您可能需要运行 apt-get update 来解决这些问题"
msgid "The list of sources could not be read."
msgstr "无法读取源列表。"
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "Is the package %s installed?"
-msgstr "请检查是否安装了 %s 软件包"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "软件包缓存区是空的"
@@ -2096,99 +2063,80 @@ msgstr "额外"
msgid "Calculating upgrade"
msgstr "正在对升级进行计算"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "不支持索引文件类型“%s”"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "软件包暂存区使用的是不兼容的版本控制系统"
+msgid "The method driver %s could not be found."
+msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "处理 %s (%s%d) 时出错"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "哇,软件包数量超出了本 APT 的处理能力。"
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "哇,软件包版本数量超出了本 APT 的处理能力。"
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "哇,软件包说明数量超出了本 APT 的处理能力。"
+msgid "Is the package %s installed?"
+msgstr "请检查是否安装了 %s 软件包"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "哇,依赖关系数量超出了本 APT 的处理能力。"
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "正在读取软件包列表"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "无法读取或写入软件源缓存"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "正在分析软件包的依赖关系树"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr "向solver发送情景"
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "候选版本"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr "向solver发送请求"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "生成依赖关系"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr "准备接收解决方案"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "正在读取状态信息"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr "外部solver出错,错误信息不恰当"
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "无法打开状态文件 %s"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr "执行外部solver"
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "无法写入临时状态文件 %s"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "无法重命名文件,%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "Hash 校验和不符"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "大小不符"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
msgid "Invalid file format"
msgstr "无效的文件格式 %s"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "写出错"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, fuzzy, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2197,12 +2145,12 @@ msgstr ""
"校验签名出错。此仓库未被更新,仍然使用以前的索引文件。GPG 错误:%s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG 错误:%s: %s"
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2210,14 +2158,14 @@ msgid ""
msgstr ""
"在 Release 文件中找不到期望的条目 %s(sources.list条目有误,或者文件有误)"
-#: apt-pkg/acquire-item.cc:1026
+#: apt-pkg/acquire-item.cc:1122
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下 ID 的密钥没有可用的公钥:\n"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2225,37 +2173,37 @@ msgid ""
msgstr ""
"%s 的 Release 文件已经过期(invalid since %s)。该仓库的更新将不会被应用。"
-#: apt-pkg/acquire-item.cc:1107
+#: apt-pkg/acquire-item.cc:1203
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "冲突的发行版:%s (期望 %s 但得到 %s)"
-#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "目录 %s 已被转移"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2264,55 +2212,123 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "没有源可以用来下载 %s 版本的 %s"
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "%s (%s) 的 Changelog"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "软件包暂存区使用的是不兼容的版本控制系统"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "处理 %s (%s%d) 时出错"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "哇,软件包数量超出了本 APT 的处理能力。"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "哇,软件包版本数量超出了本 APT 的处理能力。"
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "哇,软件包说明数量超出了本 APT 的处理能力。"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "哇,依赖关系数量超出了本 APT 的处理能力。"
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "正在读取软件包列表"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "无法读取或写入软件源缓存"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, c-format
msgid "List directory %spartial is missing."
msgstr "软件包列表的目录 %spartial 缺失。"
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "仓库目录 %spartial 确实。"
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, c-format
msgid "Unable to lock directory %s"
msgstr "无法对目录 %s 加锁"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, c-format
msgid "Clean of %s is not supported"
msgstr "%s 的 Clean (清理)不被支持"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "正在下载第 %li 个文件,共 %li 个(还剩 %s 个)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "正在下载第 %li 个文件,共 %li 个"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "无法下载 %s %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr "部分索引文件下载失败。如果忽略它们,那将转而使用旧的索引文件。"
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "无法读取 %s 的状态。"
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2340,26 +2356,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "没有为版本锁定指定优先级(或为零)"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "无法下载 %s %s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr "部分索引文件下载失败。如果忽略它们,那将转而使用旧的索引文件。"
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "无法读取 %s 的状态。"
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2487,31 +2483,30 @@ msgstr ""
"无法修正错误,因为您要求某些软件包保持现状,就是它们破坏了软件包间的依赖关"
"系。"
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "正在分析软件包的依赖关系树"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr "向solver发送情景"
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "候选版本"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr "向solver发送请求"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "生成依赖关系"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr "准备接收解决方案"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "正在读取状态信息"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr "外部solver出错,错误信息不恰当"
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "无法打开状态文件 %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr "执行外部solver"
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "无法写入临时状态文件 %s"
+msgid "Index file type '%s' is not supported"
+msgstr "不支持索引文件类型“%s”"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2523,130 +2518,146 @@ msgstr "无法解析软件包文件 %s (%d)"
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "override 文件 %s 第 %llu (%s) 行的格式有误"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "正在打开 %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
+
+#: apt-pkg/sourcelist.cc:405
+#, 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:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
+
+#: apt-pkg/sourcelist.cc:441
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "无法识别在源列表 %3$s 里,第 %2$u 节中的软件包类别“%1$s”"
+
+#: apt-pkg/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”发布版本"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”版本"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, c-format
msgid "Couldn't find task '%s'"
msgstr "无法找到任务 %s"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "无法按照正则表达式 %s 找到任何软件包"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "无法按照 glob ‘%s’ 找到任何软件包"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "无法从完全虚拟的软件包 %s 中选择版本"
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr "因为软件包 %s 是完全的虚拟软件包,无法选择它的最新版"
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr "因为软件包 %s 没有候选版本,无法进行选择"
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr "因为软件包 %s 没有安装,无法选择它的已安装版本"
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr "因为软件包 %s 没有已安装或候选的版本,无法进行选择"
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "override 文件 %s 第 %llu (%s) 行的格式有误"
-
-#: apt-pkg/sourcelist.cc:355
-#, c-format
-msgid "Opening %s"
-msgstr "正在打开 %s"
-
-#: apt-pkg/sourcelist.cc:389
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
-
-#: apt-pkg/sourcelist.cc:393
-#, 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:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:429
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "无法识别在源列表 %3$s 里,第 %2$u 节中的软件包类别“%1$s”"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, c-format
msgid "Unable to parse Release file %s"
msgstr "无法解析软件包仓库 Release 文件 %s"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2807,35 +2818,6 @@ msgstr "dpkg 被中断,您必须手工运行 ‘%s’ 解决此问题。"
msgid "Not locked"
msgstr "未锁定"
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%li天 %li小时 %li分 %li秒"
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li小时 %li分 %li秒"
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr "%li分 %li秒"
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr "%li秒"
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "找不到您选则的 %s"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2912,7 +2894,7 @@ msgstr "无法打开文件 %s"
msgid "Could not open file descriptor %d"
msgstr "无法打开文件描述符 %d"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "无法创建子进程的 IPC 管道"
@@ -2949,12 +2931,12 @@ msgstr "用 unlink 删除文件 %s 出错"
msgid "Problem syncing the file"
msgstr "同步文件出错"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, c-format
msgid "Unable to mkstemp %s"
msgstr "无法建立临时文件(mkstemp) %s "
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "无法写入 %s"
@@ -2979,6 +2961,35 @@ msgstr "..."
msgid "%c%s... %u%%"
msgstr "%c%s... %u%%"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%li天 %li小时 %li分 %li秒"
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%li小时 %li分 %li秒"
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr "%li分 %li秒"
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr "%li秒"
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "找不到您选则的 %s"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "无法 mmap 一个空文件"
@@ -3326,87 +3337,87 @@ msgstr "归档文件没有包含控制字段"
msgid "Unable to get a cursor"
msgstr "无法获得游标"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "警告:无法读取目录 %s\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "警告:无法获得 %s 的状态\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "错误:"
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "警告:"
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "错误:处理文件时出错 "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "无法解析 %s"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "无法遍历目录树"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "无法打开 %s"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "无法读取符号链接 %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "无法使用 unlink 删除 %s"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** 无法将 %s 链接到 %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " 达到了 DeLink 的上限 %sB。\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "归档文件没有包含 package 字段"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s 中没有 override 项\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 的维护者 %s 并非 %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s 没有源代码的 override 项\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s 中没有二进制文件的 override 项\n"
@@ -3691,6 +3702,10 @@ msgstr "Tar 的校验和不符,文件已损坏"
msgid "Unknown TAR header type %u, member %s"
msgstr "未知的 TAR 数据头类型 %u,成员 %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "必须指定至少一对URL或者文件名"
+
#~ msgid "Failed to create pipes"
#~ msgstr "无法创建管道"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 4158cccdd..7310b151f 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.4\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-08-27 17:55+0200\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\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."
@@ -115,7 +115,7 @@ msgstr "您必須明確得給定一個樣式"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754
#, c-format
msgid "Unable to locate package %s"
msgstr "找不到套件 %s"
@@ -351,23 +351,23 @@ msgstr "內部錯誤,問題排除器造成了損壞"
msgid "Unable to lock the download directory"
msgstr "無法鎖定下載目錄"
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685
msgid "Must specify at least one package to fetch source for"
msgstr "在取得原始碼時必須至少指定一個套件"
-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029
#, c-format
msgid "Unable to find a source package for %s"
msgstr "無法找到 %s 的原始碼套件"
-#: cmdline/apt-get.cc:745
+#: cmdline/apt-get.cc:742
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747
#, c-format
msgid ""
"Please use:\n"
@@ -375,113 +375,113 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "略過已下載的檔案 '%s'\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下載 %sB/%sB 的原始套件檔。\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:830
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下載 %sB 的原始套件檔。\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Fetch source %s\n"
msgstr "取得原始碼 %s\n"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858
msgid "Failed to fetch some archives."
msgstr "無法取得某些套件檔。"
-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300
msgid "Download complete and in download only mode"
msgstr "下載完成,且這是『僅下載』模式"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "不解開,因原始碼已解開至 %s\n"
-#: cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:901
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "解開指令 '%s' 失敗。\n"
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:902
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:930
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "編譯指令 '%s' 失敗。\n"
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:949
msgid "Child process failed"
msgstr "子程序失敗"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970
msgid "Must specify at least one package to check builddeps for"
msgstr "在檢查編譯相依關係時必須至少指定一個套件"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:988
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "無法處理編譯相依關係"
-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "無法取得 %s 的編譯相依關係資訊"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1064
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 沒有編譯相依關係。\n"
-#: cmdline/apt-get.cc:1240
+#: cmdline/apt-get.cc:1234
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係,因為找不到套件 %3$s"
-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係,因為找不到套件 %3$s"
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1275
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "無法滿足 %2$s 的相依關係 %1$s:已安裝的套件 %3$s 太新了"
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1314
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -489,32 +489,32 @@ msgid ""
msgstr ""
"無法滿足 %2$s 所要求的 %1$s 相依關係,因為套件 %3$s 沒有版本符合其版本需求"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係,因為找不到套件 %3$s"
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1343
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "無法滿足 %2$s 的相依關係 %1$s:%3$s"
-#: cmdline/apt-get.cc:1364
+#: cmdline/apt-get.cc:1358
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "無法滿足套件 %s 的編譯相依關係。"
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1363
msgid "Failed to process build dependencies"
msgstr "無法處理編譯相依關係"
-#: cmdline/apt-get.cc:1551
+#: cmdline/apt-get.cc:1553
msgid "Supported modules:"
msgstr "已支援模組:"
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1594
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -609,21 +609,16 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "在取得原始碼時必須至少指定一個套件"
-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "在取得原始碼時必須至少指定一個套件"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101
#, c-format
msgid "GetSrvRec failed for %s"
msgstr ""
-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -763,12 +758,12 @@ msgstr "找不到磁碟。"
msgid "File not found"
msgstr "找不到檔案"
-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673
msgid "Failed to stat"
msgstr "無法取得狀態"
-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670
msgid "Failed to set modification time"
msgstr "無法設定修改時間"
@@ -858,7 +853,7 @@ msgstr "無法建立 Socket"
msgid "Could not connect data socket, connection timed out"
msgstr "無法和 data socket 連線,連線逾時"
-#: methods/ftp.cc:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102
msgid "Failed"
msgstr "失敗"
@@ -931,64 +926,64 @@ msgstr "查詢"
msgid "Unable to invoke "
msgstr "無法 invoke "
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Connecting to %s (%s)"
msgstr "正和 %s (%s) 連線"
-#: methods/connect.cc:91
+#: methods/connect.cc:90
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:98
+#: methods/connect.cc:97
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "無法建立 socket 指向 %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "無法初始和 %s:%s (%s) 的連線。"
-#: methods/connect.cc:112
+#: methods/connect.cc:111
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "無法和 %s:%s (%s) 連線,連線逾時"
-#: methods/connect.cc:130
+#: methods/connect.cc:129
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "無法和 %s:%s (%s) 連線。"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460
#, c-format
msgid "Connecting to %s"
msgstr "正連線至 %s"
-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198
#, c-format
msgid "Could not resolve '%s'"
msgstr "無法解析 '%s'"
-#: methods/connect.cc:206
+#: methods/connect.cc:204
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "暫時無法解析 '%s'"
-#: methods/connect.cc:210
+#: methods/connect.cc:208
#, fuzzy, c-format
msgid "System error resolving '%s:%s'"
msgstr "在解析 '%s:%s' (%i) 時出了怪事"
-#: methods/connect.cc:212
+#: methods/connect.cc:210
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "在解析 '%s:%s' (%i) 時出了怪事"
-#: methods/connect.cc:259
+#: methods/connect.cc:257
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "無法連線至 %s %s:"
@@ -1008,7 +1003,7 @@ msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr "無法執行 '%s' 來驗證簽章(gnupg 是否安裝了?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1108,227 +1103,6 @@ msgstr ""
msgid "Internal error"
msgstr "內部錯誤"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "正在修正相依關係..."
-
-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " 失敗。"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to correct dependencies"
-msgstr "無法修正相依關係"
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unable to minimize the upgrade set"
-msgstr "無法將升級計劃最小化"
-
-#: apt-private/private-cachefile.cc:107
-msgid " Done"
-msgstr " 完成"
-
-#: apt-private/private-cachefile.cc:111
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "您也許得執行 'apt-get -f install' 以修正這些問題。"
-
-#: apt-private/private-cachefile.cc:114
-msgid "Unmet dependencies. Try using -f."
-msgstr "未能滿足相依關係。試試 -f 選項。"
-
-#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "【已安裝】"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr "【已安裝】"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr "【已安裝】"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr "【已安裝】"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "但 %s 卻已安裝"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "但 %s 卻將被安裝"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "但它卻無法安裝"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "但它是虛擬套件"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "但它卻尚未安裝"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not going to be installed"
-msgstr "但它卻將不會被安裝"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr "或"
-
-#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
-msgid "The following packages have unmet dependencies:"
-msgstr "下列的套件有未滿足的相依關係:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "下列【新】套件將會被安裝:"
-
-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "下列套件將會被【移除】:"
-
-#: apt-private/private-output.cc:481
-msgid "The following packages have been kept back:"
-msgstr "下列套件將會維持其原有版本:"
-
-#: apt-private/private-output.cc:497
-msgid "The following packages will be upgraded:"
-msgstr "下列套件將會被升級:"
-
-#: apt-private/private-output.cc:512
-msgid "The following packages will be DOWNGRADED:"
-msgstr "下列套件將會被【降級】:"
-
-#: apt-private/private-output.cc:525
-msgid "The following held packages will be changed:"
-msgstr "下列被保留 (hold) 的套件將會被更改:"
-
-#: apt-private/private-output.cc:552
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s(因為 %s"
-
-#: apt-private/private-output.cc:602
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"【警告】:下列的基本套件都將被移除。\n"
-"除非您很清楚您在做什麼,否則請勿輕易嘗試!"
-
-#: apt-private/private-output.cc:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "升級 %lu 個,新安裝 %lu 個,"
-
-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "重新安裝 %lu 個,"
-
-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "降級 %lu 個,"
-
-#: apt-private/private-output.cc:641
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "移除 %lu 個,有 %lu 個未被升級。\n"
-
-#: apt-private/private-output.cc:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu 個沒有完整得安裝或移除。\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:667
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:673
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:684
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "編譯正規表示式時發生錯誤 - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "update 指令不需任何參數"
-
-#: apt-private/private-update.cc:96
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:100
-msgid "All packages are up to date."
-msgstr ""
-
#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
@@ -1407,18 +1181,6 @@ msgstr "套件 %s 並沒有被安裝,所以也不會被移除\n"
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "注意,選擇了以 %s 替代 %s\n"
-#: apt-private/private-show.cc:158
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
-msgstr ""
-
#: apt-private/private-install.cc:87
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "內部錯誤,在損毀的套件上執行 InstallPackages!"
@@ -1427,7 +1189,7 @@ msgstr "內部錯誤,在損毀的套件上執行 InstallPackages!"
msgid "Packages need to be removed but remove is disabled."
msgstr "有套件需要被移除,但卻被禁止移除。"
-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69
msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
@@ -1680,6 +1442,239 @@ msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n"
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "正在修正相依關係..."
+
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " 失敗。"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "無法修正相依關係"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "無法將升級計劃最小化"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " 完成"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "您也許得執行 'apt-get -f install' 以修正這些問題。"
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "未能滿足相依關係。試試 -f 選項。"
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "【已安裝】"
+
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr "【已安裝】"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr "【已安裝】"
+
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr "【已安裝】"
+
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "但 %s 卻已安裝"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is to be installed"
+msgstr "但 %s 卻將被安裝"
+
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "但它卻無法安裝"
+
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "但它是虛擬套件"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "但它卻尚未安裝"
+
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "但它卻將不會被安裝"
+
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr "或"
+
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "下列的套件有未滿足的相依關係:"
+
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "下列【新】套件將會被安裝:"
+
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "下列套件將會被【移除】:"
+
+#: apt-private/private-output.cc:481
+msgid "The following packages have been kept back:"
+msgstr "下列套件將會維持其原有版本:"
+
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "下列套件將會被升級:"
+
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
+msgstr "下列套件將會被【降級】:"
+
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "下列被保留 (hold) 的套件將會被更改:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s(因為 %s"
+
+#: apt-private/private-output.cc:602
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"【警告】:下列的基本套件都將被移除。\n"
+"除非您很清楚您在做什麼,否則請勿輕易嘗試!"
+
+#: apt-private/private-output.cc:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "升級 %lu 個,新安裝 %lu 個,"
+
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "重新安裝 %lu 個,"
+
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "降級 %lu 個,"
+
+#: apt-private/private-output.cc:641
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "移除 %lu 個,有 %lu 個未被升級。\n"
+
+#: apt-private/private-output.cc:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu 個沒有完整得安裝或移除。\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:667
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:673
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:684
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "編譯正規表示式時發生錯誤 - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "update 指令不需任何參數"
+
+#: apt-private/private-update.cc:96
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:158
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
+msgstr ""
+
#: apt-private/private-main.cc:34
msgid ""
"NOTE: This is only a simulation!\n"
@@ -1688,47 +1683,40 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "【警告】:無法驗證下列套件!"
-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52
msgid "Authentication warning overridden.\n"
msgstr "忽略了驗證警告。\n"
-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64
msgid "Some packages could not be authenticated"
msgstr "有部份套件無法驗證"
-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62
msgid "Install these packages without verification?"
msgstr "是否不經驗證就安裝這些套件?"
-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73
#, fuzzy
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr "發生了問題,且 -y 並沒有和 --force-yes 搭配使用"
-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "無法取得 %s,%s\n"
-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "無法確認 %s 的未使用空間"
-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144
#, c-format
msgid "You don't have enough free space in %s."
msgstr "在 %s 裡沒有足夠的的未使用空間。"
@@ -1797,16 +1785,16 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324
#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "無法讀取 %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
@@ -1942,27 +1930,6 @@ msgstr "您也許得執行 apt-get update 以修正這些問題"
msgid "The list of sources could not be read."
msgstr "無法讀取來源列表。"
-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "找不到安裝方式的驅動程式 %s。"
-
-#: apt-pkg/acquire-worker.cc:113
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
-
-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "安裝方式 %s 沒有正確啟動"
-
-#: apt-pkg/acquire-worker.cc:537
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr "請把標籤為 '%s' 的光碟放入 '%s' 裝置中,然後按下 [Enter] 鍵。"
-
#: apt-pkg/pkgcache.cc:163
msgid "Empty package cache"
msgstr "清空套件快取"
@@ -2050,100 +2017,81 @@ msgstr "額外"
msgid "Calculating upgrade"
msgstr "籌備升級中"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:111
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "不被支援的索引檔類型 '%s'"
-
-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "快取使用的是不相容的版本系統"
+msgid "The method driver %s could not be found."
+msgstr "找不到安裝方式的驅動程式 %s。"
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
-#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
-#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
-#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
-#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#: apt-pkg/acquire-worker.cc:113
#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "在處理 %s 時發生錯誤 (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "哇呀,您已經超過這個 APT 所能處理的套件名稱數量了。"
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "哇呀,您已經超過這個 APT 所能處理的版本數量了。"
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "哇呀,您已經超過這個 APT 所能處理的說明數量了。"
+msgid "Is the package %s installed?"
+msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "哇呀,您已經超過這個 APT 所能處理的相依關係數量了。"
+#: apt-pkg/acquire-worker.cc:164
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "安裝方式 %s 沒有正確啟動"
-#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
-#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
-msgid "Reading package lists"
-msgstr "正在讀取套件清單"
+#: apt-pkg/acquire-worker.cc:543
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+msgstr "請把標籤為 '%s' 的光碟放入 '%s' 裝置中,然後按下 [Enter] 鍵。"
-#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
-msgid "IO Error saving source cache"
-msgstr "在儲存來源快取時 IO 錯誤"
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "正在重建相依關係"
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "候選版本"
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "建立相依關係"
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "正在讀取狀態資料"
-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "無法開啟 StateFile %s"
-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:257
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "無法寫入暫存的 StateFile %s"
-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "無法重新命名,%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631
msgid "Hash Sum mismatch"
msgstr "Hash Sum 不符"
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636
msgid "Size mismatch"
msgstr "大小不符"
-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641
#, fuzzy
msgid "Invalid file format"
msgstr "無效的操作 %s"
-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646
#, fuzzy
msgid "Signature error"
msgstr "寫入錯誤"
-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2151,63 +2099,63 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/acquire-item.cc:1016
#, 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:1026
+#: apt-pkg/acquire-item.cc:1122
msgid "There is no public key available for the following key IDs:\n"
msgstr "無法取得以下的密鑰 ID 的公鑰:\n"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formatted in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162
#, 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:1107
+#: apt-pkg/acquire-item.cc:1203
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "發行版本衝突:%s(應當是 %s 但卻得到 %s)"
-#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555
#, fuzzy, c-format
msgid "The repository '%s' is no longer signed."
msgstr "路徑 %s 已被抽換"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562
msgid ""
"This is normally not allowed, but the option Acquire::"
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2216,55 +2164,124 @@ msgstr ""
"找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。(因為找不到平"
"台)"
-#: apt-pkg/acquire-item.cc:2677
+#: apt-pkg/acquire-item.cc:2751
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "這個套件的索引檔損壞了。沒有套件 %s 的 Filename: 欄位。"
#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132
#, fuzzy, c-format
msgid "Changelog unavailable for %s=%s"
msgstr "正和 %s (%s) 連線"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "快取使用的是不相容的版本系統"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "在處理 %s 時發生錯誤 (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "哇呀,您已經超過這個 APT 所能處理的套件名稱數量了。"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "哇呀,您已經超過這個 APT 所能處理的版本數量了。"
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "哇呀,您已經超過這個 APT 所能處理的說明數量了。"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "哇呀,您已經超過這個 APT 所能處理的相依關係數量了。"
+
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+msgid "Reading package lists"
+msgstr "正在讀取套件清單"
+
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "在儲存來源快取時 IO 錯誤"
+
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "找不到清單目錄 %spartial。"
-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "找不到套件檔目錄 %spartial。"
-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163
#, fuzzy, c-format
msgid "Unable to lock directory %s"
msgstr "無法鎖定列表目錄"
-#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
#, fuzzy, c-format
msgid "Clean of %s is not supported"
msgstr "不被支援的索引檔類型 '%s'"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "正在取得檔案 %li/%li(還有 %s)"
-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148
#, c-format
msgid "Retrieving file %li of %li"
msgstr "正在取得檔案 %li/%li"
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s %s"
+msgstr "無法取得 %s,%s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr "有一些索引檔不能下載,它們可能被略過了,或是替而使用原有的索引檔。"
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "在 sources.list 中必須包含一些 'source' URI"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "無法取得 %s 的狀態。"
+
#: apt-pkg/policy.cc:77
#, c-format
msgid ""
@@ -2291,27 +2308,6 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr "銷定並沒有優先順序之分(或零)"
-#: apt-pkg/update.cc:76
-#, fuzzy, c-format
-msgid "Failed to fetch %s %s"
-msgstr "無法取得 %s,%s\n"
-
-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr "有一些索引檔不能下載,它們可能被略過了,或是替而使用原有的索引檔。"
-
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "在 sources.list 中必須包含一些 'source' URI"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "無法取得 %s 的狀態。"
-
#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
#, c-format
msgid ""
@@ -2430,31 +2426,30 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "無法修正問題,您保留 (hold) 了損毀的套件。"
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "正在重建相依關係"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:140
-msgid "Candidate versions"
-msgstr "候選版本"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr ""
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "建立相依關係"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr ""
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "正在讀取狀態資料"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr ""
-#: apt-pkg/depcache.cc:252
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "無法開啟 StateFile %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr ""
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "無法寫入暫存的 StateFile %s"
+msgid "Index file type '%s' is not supported"
+msgstr "不被支援的索引檔類型 '%s'"
#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
#, c-format
@@ -2466,130 +2461,146 @@ msgstr "無法辨識套件檔 %s (%d)"
msgid "Cannot convert %s to integer"
msgstr ""
-#: apt-pkg/cacheset.cc:500
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #1"
+
+#: apt-pkg/sourcelist.cc:367
+#, c-format
+msgid "Opening %s"
+msgstr "正在開啟 %s"
+
+#: apt-pkg/sourcelist.cc:401
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤(類型)"
+
+#: apt-pkg/sourcelist.cc:405
+#, 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:425 apt-pkg/sourcelist.cc:431
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤(類型)"
+
+#: apt-pkg/sourcelist.cc:441
+#, 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/cacheset.cc:492
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "找不到 '%2$s' 的 '%1$s' 發行版"
-#: apt-pkg/cacheset.cc:503
+#: apt-pkg/cacheset.cc:495
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "找不到 '%s' 版的 '%s'"
-#: apt-pkg/cacheset.cc:738
+#: apt-pkg/cacheset.cc:730
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "無法找到主題 %s"
-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "無法找到套件 %s"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:742
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "無法找到套件 %s"
-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:828
+#: apt-pkg/cacheset.cc:820
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:836
+#: apt-pkg/cacheset.cc:828
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:844
+#: apt-pkg/cacheset.cc:836
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #1"
-
-#: apt-pkg/sourcelist.cc:355
-#, c-format
-msgid "Opening %s"
-msgstr "正在開啟 %s"
-
-#: apt-pkg/sourcelist.cc:389
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤(類型)"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""
-#: apt-pkg/sourcelist.cc:393
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234
#, 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:413 apt-pkg/sourcelist.cc:419
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤(類型)"
-
-#: apt-pkg/sourcelist.cc:429
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "未知的類型 '%1$s',位於在來源列表 %3$s 中的第 %2$u 行"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:229
+#: apt-pkg/deb/debmetaindex.cc:314
#, c-format
msgid "Unable to parse Release file %s"
msgstr "無法辨別 Release 檔 %s"
-#: apt-pkg/deb/debmetaindex.cc:238
+#: apt-pkg/deb/debmetaindex.cc:323
#, c-format
msgid "No sections in Release file %s"
msgstr "在 Release 檔 %s 裡沒有區段"
-#: apt-pkg/deb/debmetaindex.cc:278
+#: apt-pkg/deb/debmetaindex.cc:363
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
-#: apt-pkg/deb/debmetaindex.cc:286
+#: apt-pkg/deb/debmetaindex.cc:371
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
-#: apt-pkg/deb/debmetaindex.cc:307
+#: apt-pkg/deb/debmetaindex.cc:392
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
#, c-format
msgid "Conflicting values set for option %s concerning source %s %s"
msgstr ""
-#: apt-pkg/deb/debmetaindex.cc:480
+#: apt-pkg/deb/debmetaindex.cc:563
#, c-format
msgid "Invalid value set for option %s concerning source %s %s (%s)"
msgstr ""
@@ -2750,35 +2761,6 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "選項 %s 找不到"
-
#: apt-pkg/contrib/fileutl.cc:197
#, c-format
msgid "Not using locking for read only lock file %s"
@@ -2855,7 +2837,7 @@ msgstr "無法開啟檔案 %s"
msgid "Could not open file descriptor %d"
msgstr "無法開啟管線給 %s 使用"
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204
msgid "Failed to create subprocess IPC"
msgstr "無法建立子程序 IPC"
@@ -2892,12 +2874,12 @@ msgstr "在刪除檔案時發生問題"
msgid "Problem syncing the file"
msgstr "在同步檔案時發生問題"
-#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "無法取得 %s 的狀態"
-#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
#, c-format
msgid "Unable to write to %s"
msgstr "無法寫入 %s"
@@ -2922,6 +2904,35 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... 完成"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "選項 %s 找不到"
+
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "不能 mmap 空白檔案"
@@ -3271,87 +3282,87 @@ msgstr "套件檔沒有 control 記錄"
msgid "Unable to get a cursor"
msgstr "無法取得遊標"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "警告:無法讀取目錄 %s\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "警告:無法取得 %s 狀態\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167
msgid "E: "
msgstr "錯誤:"
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169
msgid "W: "
msgstr "警告:"
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176
msgid "E: Errors apply to file "
msgstr "錯誤:套用到檔案時發生錯誤"
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226
#, c-format
msgid "Failed to resolve %s"
msgstr "無法解析 %s"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207
msgid "Tree walking failed"
msgstr "無法走訪目錄樹"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234
#, c-format
msgid "Failed to open %s"
msgstr "無法開啟 %s"
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301
#, c-format
msgid "Failed to readlink %s"
msgstr "無法讀取連結 %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305
#, c-format
msgid "Failed to unlink %s"
msgstr "無法移除連結 %s"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** 無法將 %s 連結到 %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " 達到了 DeLink 的上限 %sB。\n"
-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428
msgid "Archive had no package field"
msgstr "套件檔裡沒有套件資訊"
-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700
#, c-format
msgid " %s has no override entry\n"
msgstr " %s 沒有重新定義項目\n"
-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 的維護者是 %s,而非 %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:714
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s 沒有原始碼重新定義項目\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:718
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s 也沒有二元碼重新定義項目\n"
@@ -3636,6 +3647,10 @@ msgstr "Tar checksum 失敗,套件檔已損毀"
msgid "Unknown TAR header type %u, member %s"
msgstr "未知的 TAR 標頭類型 %u,成員 %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "在取得原始碼時必須至少指定一個套件"
+
#~ msgid "Failed to create pipes"
#~ msgstr "無法建立管線"