summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/sourcelist.cc58
-rw-r--r--apt-pkg/tagfile.cc84
-rw-r--r--apt-private/private-cmndline.cc4
-rw-r--r--apt-private/private-output.h2
-rw-r--r--apt-private/private-show.cc72
-rw-r--r--configure.ac2
-rw-r--r--debian/changelog26
-rw-r--r--doc/apt-verbatim.ent2
-rw-r--r--doc/po/apt-doc.pot99
-rw-r--r--doc/po/de.po97
-rw-r--r--doc/po/es.po97
-rw-r--r--doc/po/fr.po97
-rw-r--r--doc/po/it.po97
-rw-r--r--doc/po/ja.po97
-rw-r--r--doc/po/pl.po97
-rw-r--r--doc/po/pt.po97
-rw-r--r--doc/po/pt_BR.po97
-rw-r--r--doc/sources.list.5.xml17
-rw-r--r--po/ar.po104
-rw-r--r--po/ast.po104
-rw-r--r--po/bg.po105
-rw-r--r--po/bs.po104
-rw-r--r--po/ca.po104
-rw-r--r--po/cs.po106
-rw-r--r--po/cy.po104
-rw-r--r--po/da.po105
-rw-r--r--po/de.po105
-rw-r--r--po/dz.po104
-rw-r--r--po/el.po104
-rw-r--r--po/es.po104
-rw-r--r--po/eu.po104
-rw-r--r--po/fi.po104
-rw-r--r--po/fr.po105
-rw-r--r--po/gl.po104
-rw-r--r--po/hu.po105
-rw-r--r--po/it.po105
-rw-r--r--po/ja.po104
-rw-r--r--po/km.po104
-rw-r--r--po/ko.po103
-rw-r--r--po/ku.po104
-rw-r--r--po/lt.po104
-rw-r--r--po/mr.po104
-rw-r--r--po/nb.po104
-rw-r--r--po/ne.po104
-rw-r--r--po/nl.po104
-rw-r--r--po/nn.po104
-rw-r--r--po/pl.po106
-rw-r--r--po/pt.po105
-rw-r--r--po/pt_BR.po104
-rw-r--r--po/ro.po105
-rw-r--r--po/ru.po106
-rw-r--r--po/sk.po106
-rw-r--r--po/sl.po107
-rw-r--r--po/sv.po104
-rw-r--r--po/th.po104
-rw-r--r--po/tl.po104
-rw-r--r--po/tr.po105
-rw-r--r--po/uk.po106
-rw-r--r--po/vi.po104
-rw-r--r--po/zh_CN.po103
-rw-r--r--po/zh_TW.po104
-rwxr-xr-xtest/integration/test-apt-cli-show9
-rwxr-xr-xtest/integration/test-apt-sources-deb82246
-rw-r--r--test/libapt/sourcelist_test.cc18
64 files changed, 3421 insertions, 2286 deletions
diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index 8462027c5..1f5179885 100644
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -79,12 +79,9 @@ bool pkgSourceList::Type::ParseStanza(vector<metaIndex *> &List,
{
map<string, string> Options;
- string URI = Tags.FindS("URI");
- if (!FixupURI(URI))
- {
- _error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str());
- return false;
- }
+ string Enabled = Tags.FindS("Enabled");
+ if (Enabled.size() > 0 && StringToBool(Enabled) == false)
+ return true;
// Define external/internal options
const char* option_deb822[] = {
@@ -106,20 +103,34 @@ bool pkgSourceList::Type::ParseStanza(vector<metaIndex *> &List,
string Suite = Tags.FindS("Suites");
Suite = SubstVar(Suite,"$(ARCH)",_config->Find("APT::Architecture"));
string const Section = Tags.FindS("Sections");
+ string URIS = Tags.FindS("URIs");
+ std::vector<std::string> list_uris = StringSplit(URIS, " ");
std::vector<std::string> list_dist = StringSplit(Suite, " ");
std::vector<std::string> list_section = StringSplit(Section, " ");
- for (std::vector<std::string>::const_iterator I = list_dist.begin();
- I != list_dist.end(); I++)
+
+ for (std::vector<std::string>::const_iterator U = list_uris.begin();
+ U != list_uris.end(); U++)
{
- for (std::vector<std::string>::const_iterator J = list_section.begin();
- J != list_section.end(); J++)
+ std::string URI = (*U);
+ if (!FixupURI(URI))
+ {
+ _error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str());
+ return false;
+ }
+
+ for (std::vector<std::string>::const_iterator I = list_dist.begin();
+ I != list_dist.end(); I++)
+ {
+ for (std::vector<std::string>::const_iterator J = list_section.begin();
+ J != list_section.end(); J++)
{
if (CreateItem(List, URI, (*I), (*J), Options) == false)
{
return false;
}
}
+ }
}
return true;
}
@@ -292,7 +303,7 @@ bool pkgSourceList::Read(string File)
/* */
bool pkgSourceList::ReadAppend(string File)
{
- if (_config->FindB("APT::Sources::Use-Deb822", true) == true)
+ if (_config->FindB("APT::Sources::Use-Deb822", false) == true)
{
int lines_parsed =ParseFileDeb822(File);
if (lines_parsed < 0)
@@ -382,21 +393,26 @@ int pkgSourceList::ParseFileDeb822(string File)
// read step by step
while (Sources.Step(Tags) == true)
{
- if(!Tags.Exists("Type"))
+ if(!Tags.Exists("Types"))
continue;
- string const type = Tags.FindS("Type");
- Type *Parse = Type::GetType(type.c_str());
- if (Parse == 0)
+ string const types = Tags.FindS("Types");
+ std::vector<std::string> list_types = StringSplit(types, " ");
+ for (std::vector<std::string>::const_iterator I = list_types.begin();
+ I != list_types.end(); I++)
{
- _error->Error(_("Type '%s' is not known on stanza %u in source list %s"),type.c_str(),i,Fd.Name().c_str());
- return -1;
- }
+ Type *Parse = Type::GetType((*I).c_str());
+ if (Parse == 0)
+ {
+ _error->Error(_("Type '%s' is not known on stanza %u in source list %s"), (*I).c_str(),i,Fd.Name().c_str());
+ return -1;
+ }
- if (!Parse->ParseStanza(SrcList, Tags, i, Fd))
- return -1;
+ if (!Parse->ParseStanza(SrcList, Tags, i, Fd))
+ return -1;
- i++;
+ i++;
+ }
}
// we are done, return the number of stanzas read
diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index bef3c76ba..b92b2c15a 100644
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -567,52 +567,54 @@ bool TFRewrite(FILE *Output,pkgTagSection const &Tags,const char *Order[],
}
// Write all all of the tags, in order.
- for (unsigned int I = 0; Order[I] != 0; I++)
+ if (Order != NULL)
{
- bool Rewritten = false;
-
- // See if this is a field that needs to be rewritten
- for (unsigned int J = 0; Rewrite != 0 && Rewrite[J].Tag != 0; J++)
+ for (unsigned int I = 0; Order[I] != 0; I++)
{
- if (strcasecmp(Rewrite[J].Tag,Order[I]) == 0)
- {
- Visited[J] |= 2;
- if (Rewrite[J].Rewrite != 0 && Rewrite[J].Rewrite[0] != 0)
- {
- if (isspace(Rewrite[J].Rewrite[0]))
- fprintf(Output,"%s:%s\n",Rewrite[J].NewTag,Rewrite[J].Rewrite);
- else
- fprintf(Output,"%s: %s\n",Rewrite[J].NewTag,Rewrite[J].Rewrite);
- }
-
- Rewritten = true;
- break;
- }
- }
+ bool Rewritten = false;
+
+ // See if this is a field that needs to be rewritten
+ for (unsigned int J = 0; Rewrite != 0 && Rewrite[J].Tag != 0; J++)
+ {
+ if (strcasecmp(Rewrite[J].Tag,Order[I]) == 0)
+ {
+ Visited[J] |= 2;
+ if (Rewrite[J].Rewrite != 0 && Rewrite[J].Rewrite[0] != 0)
+ {
+ if (isspace(Rewrite[J].Rewrite[0]))
+ fprintf(Output,"%s:%s\n",Rewrite[J].NewTag,Rewrite[J].Rewrite);
+ else
+ fprintf(Output,"%s: %s\n",Rewrite[J].NewTag,Rewrite[J].Rewrite);
+ }
+ Rewritten = true;
+ break;
+ }
+ }
- // See if it is in the fragment
- unsigned Pos;
- if (Tags.Find(Order[I],Pos) == false)
- continue;
- Visited[Pos] |= 1;
-
- if (Rewritten == true)
- continue;
+ // See if it is in the fragment
+ unsigned Pos;
+ if (Tags.Find(Order[I],Pos) == false)
+ continue;
+ Visited[Pos] |= 1;
+
+ if (Rewritten == true)
+ continue;
- /* Write out this element, taking a moment to rewrite the tag
- in case of changes of case. */
- const char *Start;
- const char *Stop;
- Tags.Get(Start,Stop,Pos);
+ /* Write out this element, taking a moment to rewrite the tag
+ in case of changes of case. */
+ const char *Start;
+ const char *Stop;
+ Tags.Get(Start,Stop,Pos);
- if (fputs(Order[I],Output) < 0)
- return _error->Errno("fputs","IO Error to output");
- Start += strlen(Order[I]);
- if (fwrite(Start,Stop - Start,1,Output) != 1)
- return _error->Errno("fwrite","IO Error to output");
- if (Stop[-1] != '\n')
- fprintf(Output,"\n");
- }
+ if (fputs(Order[I],Output) < 0)
+ return _error->Errno("fputs","IO Error to output");
+ Start += strlen(Order[I]);
+ if (fwrite(Start,Stop - Start,1,Output) != 1)
+ return _error->Errno("fwrite","IO Error to output");
+ if (Stop[-1] != '\n')
+ fprintf(Output,"\n");
+ }
+ }
// Now write all the old tags that were missed.
for (unsigned int I = 0; I != Tags.Count(); I++)
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index d6d7bca64..ef7d65f3c 100644
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -230,6 +230,10 @@ bool addArgumentsAPT(std::vector<CommandLine::Args> &Args, char const * const Cm
addArg('v', "verbose", "APT::Cmd::List-Include-Summary", 0);
addArg('a', "all-versions", "APT::Cmd::All-Versions", 0);
}
+ else if (CmdMatches("show"))
+ {
+ addArg('a', "all-versions", "APT::Cache::AllVersions", 0);
+ }
else if (addArgumentsAPTGet(Args, Cmd) || addArgumentsAPTCache(Args, Cmd))
{
// we have no (supported) command-name overlaps so far, so we call
diff --git a/apt-private/private-output.h b/apt-private/private-output.h
index c3c76bb92..2a2a69458 100644
--- a/apt-private/private-output.h
+++ b/apt-private/private-output.h
@@ -28,7 +28,7 @@ void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records,
bool include_summary=true);
-
+// helper to describe global state
bool ShowList(std::ostream &out, std::string Title, std::string List,
std::string VersionsList);
void ShowBroken(std::ostream &out,CacheFile &Cache,bool Now);
diff --git a/apt-private/private-show.cc b/apt-private/private-show.cc
index 0aa42ecce..60d951316 100644
--- a/apt-private/private-show.cc
+++ b/apt-private/private-show.cc
@@ -37,6 +37,9 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V,
pkgCache *Cache = CacheFile.GetPkgCache();
if (unlikely(Cache == NULL))
return false;
+ pkgDepCache *depCache = CacheFile.GetDepCache();
+ if (unlikely(depCache == NULL))
+ return false;
// Find an appropriate file
pkgCache::VerFileIterator Vf = V.FileList();
@@ -51,26 +54,69 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V,
if (I.IsOk() == false)
return _error->Error(_("Package file %s is out of sync."),I.FileName());
+ // find matching sources.list metaindex
+ pkgSourceList *SrcList = CacheFile.GetSourceList();
+ pkgIndexFile *Index;
+ if (SrcList->FindIndex(I, Index) == false &&
+ _system->FindIndex(I, Index) == false)
+ return _error->Error("Can not find indexfile for Package %s (%s)",
+ V.ParentPkg().Name(), V.VerStr());
+ std::string source_index_file = Index->Describe(true);
+
// Read the record
FileFd PkgF;
if (PkgF.Open(I.FileName(), FileFd::ReadOnly, FileFd::Extension) == false)
return false;
pkgTagSection Tags;
pkgTagFile TagF(&PkgF);
-
+
+ if (TagF.Jump(Tags, V.FileList()->Offset) == false)
+ return _error->Error("Internal Error, Unable to parse a package record");
+
+ // make size nice
+ std::string installed_size;
+ if (Tags.FindI("Installed-Size") > 0)
+ strprintf(installed_size, "%sB", SizeToStr(Tags.FindI("Installed-Size")*1024).c_str());
+ else
+ installed_size = _("unknown");
+ std::string package_size;
+ if (Tags.FindI("Size") > 0)
+ strprintf(package_size, "%sB", SizeToStr(Tags.FindI("Size")).c_str());
+ else
+ package_size = _("unknown");
+
+ pkgDepCache::StateCache &state = (*depCache)[V.ParentPkg()];
+ bool is_installed = V.ParentPkg().CurrentVer() == V;
+ const char *manual_installed;
+ if (is_installed)
+ manual_installed = !(state.Flags & pkgCache::Flag::Auto) ? "yes" : "no";
+ else
+ manual_installed = 0;
+
+ // FIXME: add verbose that does not do the removal of the tags?
TFRewriteData RW[] = {
+ // delete, apt-cache show has this info and most users do not care
+ {"MD5sum", 0},
+ {"SHA1", 0},
+ {"SHA256", 0},
+ {"Filename", 0},
+ {"Multi-Arch", 0},
+ {"Architecture", 0},
{"Conffiles",0},
+ // we use the translated description
{"Description",0},
{"Description-md5",0},
+ // improve
+ {"Installed-Size", installed_size.c_str(), 0},
+ {"Size", package_size.c_str(), "Download-Size"},
+ // add
+ {"APT-Manual-Installed", manual_installed, 0},
+ {"APT-Sources", source_index_file.c_str(), 0},
{}
};
- const char *Zero = 0;
- if (TagF.Jump(Tags, V.FileList()->Offset) == false ||
- TFRewrite(stdout,Tags,&Zero,RW) == false)
- {
- _error->Error("Internal Error, Unable to parse a package record");
- return false;
- }
+
+ if(TFRewrite(stdout, Tags, NULL, RW) == false)
+ return _error->Error("Internal Error, Unable to parse a package record");
// write the description
pkgRecords Recs(*Cache);
@@ -92,12 +138,20 @@ bool ShowPackage(CommandLine &CmdL) /*{{{*/
{
pkgCacheFile CacheFile;
CacheSetHelperVirtuals helper(true, GlobalError::NOTICE);
- APT::VersionList::Version const select = APT::VersionList::CANDIDATE;
+ APT::VersionList::Version const select = _config->FindB("APT::Cache::AllVersions", false) ?
+ APT::VersionList::ALL : APT::VersionList::CANDIDATE;
APT::VersionList const verset = APT::VersionList::FromCommandLine(CacheFile, CmdL.FileList + 1, select, helper);
for (APT::VersionList::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver)
if (DisplayRecord(CacheFile, Ver, c1out) == false)
return false;
+ if (select == APT::VersionList::CANDIDATE)
+ {
+ APT::VersionList const verset_all = APT::VersionList::FromCommandLine(CacheFile, CmdL.FileList + 1, APT::VersionList::ALL, helper);
+ if (verset_all.size() > verset.size())
+ _error->Notice(ngettext("There is %lu additional record. Please use the '-a' switch to see it", "There are %lu additional records. Please use the '-a' switch to see them.", verset_all.size() - verset.size()), verset_all.size() - verset.size());
+ }
+
for (APT::PackageSet::const_iterator Pkg = helper.virtualPkgs.begin();
Pkg != helper.virtualPkgs.end(); ++Pkg)
{
diff --git a/configure.ac b/configure.ac
index 8c6810511..5c1900fa3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
PACKAGE="apt"
-PACKAGE_VERSION="0.9.14.3~exp3"
+PACKAGE_VERSION="0.9.14.3~exp5"
PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")
diff --git a/debian/changelog b/debian/changelog
index b140cd7cd..86c69378d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+apt (0.9.14.3~exp5) experimental; urgency=medium
+
+ [ Anthony Towns ]
+ * methods/rred: minor robustness improvements
+
+ [ Michael Vogt ]
+ * make "apt-mark help" shows all commands
+ * make "apt show" output more user friendly
+ * add "apt full-upgrade" and tweak "apt upgrade"
+ * set APT::Sources::Use-Deb822=false until the format
+ is fully finalized
+
+ -- Michael Vogt <mvo@debian.org> Fri, 24 Jan 2014 23:21:04 +0100
+
+apt (0.9.14.3~exp4) experimental; urgency=medium
+
+ * implement deb822 suggestions by Anthony Towns and Julian Andres Klode:
+ - add Description tag for deb822 sources
+ - add support for Enabled: no in deb822 sources.list
+ - add support for multiple URIs in deb822 style sources.list
+ - add support for multipl types in one line
+ * add integration test for apt search and apt show
+ * do not ignore ioctl(TIOCSCTTY) errors
+
+ -- Michael Vogt <mvo@debian.org> Wed, 22 Jan 2014 18:59:07 +0100
+
apt (0.9.14.3~exp3) experimental; urgency=low
* implement deb822 suggestions by donkult (thanks!):
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 47763c4c1..f3a24e209 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -219,7 +219,7 @@
">
<!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.14.3~exp3">
+<!ENTITY apt-product-version "0.9.14.3~exp5">
<!-- (Code)names for various things used all over the place -->
<!ENTITY oldstable-codename "squeeze">
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 039e07a24..f50068f8f 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: apt-doc 0.9.14.3~exp3\n"
+"Project-Id-Version: apt-doc 0.9.14.3~exp4\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\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"
@@ -1132,7 +1132,7 @@ msgid "Files"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111 apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:275 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 apt-ftparchive.1.xml:609
+#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111 apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 apt-ftparchive.1.xml:609
msgid "See Also"
msgstr ""
@@ -3624,7 +3624,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234 apt-ftparchive.1.xml:598
+#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239 apt-ftparchive.1.xml:598
msgid "Examples"
msgstr ""
@@ -4711,16 +4711,21 @@ msgstr ""
#: sources.list.5.xml:86
#, no-wrap
msgid ""
-" Type: deb\n"
-" URI: http://example.com\n"
-" Suites: stable\n"
+" Types: deb deb-src\n"
+" URIs: http://example.com\n"
+" Suites: stable testing\n"
" Sections: component1 component2\n"
+" Description: short\n"
+" long long long\n"
" [option1]: [option1-value]\n"
"\n"
-" Type: deb-src\n"
-" URI: http://example.com\n"
-" Suites: stable\n"
+" Types: deb\n"
+" URIs: http://another.example.com\n"
+" Suites: experimental\n"
" Sections: component1 component2\n"
+" Enabled: no\n"
+" Description: short\n"
+" long long long\n"
" [option1]: [option1-value]\n"
" "
msgstr ""
@@ -4733,7 +4738,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:100
+#: sources.list.5.xml:105
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
@@ -4746,7 +4751,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:109
+#: sources.list.5.xml:114
msgid ""
"<literal>suite</literal> may also contain a variable, "
"<literal>$(ARCH)</literal> which expands to the Debian architecture (such as "
@@ -4758,7 +4763,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:117
+#: sources.list.5.xml:122
msgid ""
"In the traditional style sources.list format since only one distribution can "
"be specified per line it may be necessary to have multiple lines for the "
@@ -4774,7 +4779,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:131
+#: sources.list.5.xml:136
msgid ""
"<literal>options</literal> is always optional and needs to be surrounded by "
"square brackets. It can consist of multiple settings in the form "
@@ -4785,7 +4790,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:137
+#: sources.list.5.xml:142
msgid ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</replaceable>,…</literal> "
"can be used to specify for which architectures information should be "
@@ -4794,7 +4799,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:146
msgid ""
"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</replaceable>,…</literal> "
"and "
@@ -4804,7 +4809,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:144
+#: sources.list.5.xml:149
msgid ""
"<literal>trusted=yes</literal> can be set to indicate that packages from "
"this source are always authenticated even if the "
@@ -4816,7 +4821,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:151
+#: sources.list.5.xml:156
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -4825,12 +4830,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:156
+#: sources.list.5.xml:161
msgid "Some examples:"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:158
+#: sources.list.5.xml:163
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -4840,17 +4845,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:164
+#: sources.list.5.xml:169
msgid "URI specification"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:166
+#: sources.list.5.xml:171
msgid "The currently recognized URI types are:"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:170
+#: sources.list.5.xml:175
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -4858,7 +4863,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:177
+#: sources.list.5.xml:182
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media "
"swapping. Use the &apt-cdrom; program to create cdrom entries in the source "
@@ -4866,7 +4871,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:189
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format "
@@ -4877,7 +4882,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:195
+#: sources.list.5.xml:200
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual "
@@ -4890,7 +4895,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:207
+#: sources.list.5.xml:212
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -4899,7 +4904,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:214
+#: sources.list.5.xml:219
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -4908,12 +4913,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:221
+#: sources.list.5.xml:226
msgid "adding more recognizable URI types"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:228
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme "
@@ -4925,42 +4930,42 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:240
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:242
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:244
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:240
+#: sources.list.5.xml:245
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:247
msgid "Source line for the above"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:243
+#: sources.list.5.xml:248
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:250
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -4968,7 +4973,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:252
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -4976,33 +4981,33 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:250
+#: sources.list.5.xml:255
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:252
+#: sources.list.5.xml:257
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:254
+#: sources.list.5.xml:259
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:256
+#: sources.list.5.xml:261
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:258
+#: sources.list.5.xml:263
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -5011,19 +5016,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:262
+#: sources.list.5.xml:267
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:271
+#: sources.list.5.xml:276
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:264
+#: sources.list.5.xml:269
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under "
@@ -5035,7 +5040,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:276
+#: sources.list.5.xml:281
msgid "&apt-cache; &apt-conf;"
msgstr ""
diff --git a/doc/po/de.po b/doc/po/de.po
index dad4c3f33..3e3d19cc3 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 0.9.7\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-06-25 22:49+0100\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -1572,7 +1572,7 @@ msgstr "Dateien"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:275
+#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280
#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
#: apt-ftparchive.1.xml:609
msgid "See Also"
@@ -5210,7 +5210,7 @@ msgstr ""
"filename> gelesenen Anbieter aus."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234
+#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239
#: apt-ftparchive.1.xml:598
msgid "Examples"
msgstr "Beispiele"
@@ -6716,16 +6716,21 @@ msgstr "deb [ Optionen ] URI Distribution [Komponente1] [Komponente2] […]"
#: sources.list.5.xml:86
#, no-wrap
msgid ""
-" Type: deb\n"
-" URI: http://example.com\n"
-" Suites: stable\n"
+" Types: deb deb-src\n"
+" URIs: http://example.com\n"
+" Suites: stable testing\n"
" Sections: component1 component2\n"
+" Description: short\n"
+" long long long\n"
" [option1]: [option1-value]\n"
"\n"
-" Type: deb-src\n"
-" URI: http://example.com\n"
-" Suites: stable\n"
+" Types: deb\n"
+" URIs: http://another.example.com\n"
+" Suites: experimental\n"
" Sections: component1 component2\n"
+" Enabled: no\n"
+" Description: short\n"
+" long long long\n"
" [option1]: [option1-value]\n"
" "
msgstr ""
@@ -6738,7 +6743,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:100
+#: sources.list.5.xml:105
#, fuzzy
#| msgid ""
#| "The URI for the <literal>deb</literal> type must specify the base of the "
@@ -6770,7 +6775,7 @@ msgstr ""
"angegeben sein."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:109
+#: sources.list.5.xml:114
#, fuzzy
#| msgid ""
#| "<literal>distribution</literal> may also contain a variable, <literal>"
@@ -6799,7 +6804,7 @@ msgstr ""
"Architektur generieren."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:117
+#: sources.list.5.xml:122
#, fuzzy
#| msgid ""
#| "Since only one distribution can be specified per line it may be necessary "
@@ -6840,7 +6845,7 @@ msgstr ""
"niedriger Bandbreite hauszuhalten."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:131
+#: sources.list.5.xml:136
msgid ""
"<literal>options</literal> is always optional and needs to be surrounded by "
"square brackets. It can consist of multiple settings in the form "
@@ -6858,7 +6863,7 @@ msgstr ""
"stillschweigend ignoriert werden."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:137
+#: sources.list.5.xml:142
msgid ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> can be used to specify for which architectures "
@@ -6874,7 +6879,7 @@ msgstr ""
"heruntergeladen."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:146
#, fuzzy
#| msgid ""
#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -6896,7 +6901,7 @@ msgstr ""
"heruntergeladen."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:144
+#: sources.list.5.xml:149
msgid ""
"<literal>trusted=yes</literal> can be set to indicate that packages from "
"this source are always authenticated even if the <filename>Release</"
@@ -6914,7 +6919,7 @@ msgstr ""
"korrekt authentifizierte Quellen als nicht authentifiziert."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:151
+#: sources.list.5.xml:156
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -6928,12 +6933,12 @@ msgstr ""
"Rechnern, zum Beispiel)."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:156
+#: sources.list.5.xml:161
msgid "Some examples:"
msgstr "Einige Beispiele:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:158
+#: sources.list.5.xml:163
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6945,17 +6950,17 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:164
+#: sources.list.5.xml:169
msgid "URI specification"
msgstr "URI-Beschreibung"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:166
+#: sources.list.5.xml:171
msgid "The currently recognized URI types are:"
msgstr "Die derzeit zulässigen URI-Typen sind:"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:170
+#: sources.list.5.xml:175
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6966,7 +6971,7 @@ msgstr ""
"lokale Spiegel oder Archive."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:177
+#: sources.list.5.xml:182
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -6976,7 +6981,7 @@ msgstr ""
"der Quellenliste zu erstellen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:189
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -6993,7 +6998,7 @@ msgstr ""
"Beachten Sie, dass dies eine unsichere Authentifizierungsmethode ist."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:195
+#: sources.list.5.xml:200
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -7015,7 +7020,7 @@ msgstr ""
"benutzen, werden ignoriert."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:207
+#: sources.list.5.xml:212
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -7028,7 +7033,7 @@ msgstr ""
"Wechseldatenträger benutzen, um Dateien mit APT umherzukopieren."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:214
+#: sources.list.5.xml:219
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -7042,12 +7047,12 @@ msgstr ""
"<command>find</command> und <command>dd</command> verwandt."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:221
+#: sources.list.5.xml:226
msgid "adding more recognizable URI types"
msgstr "weitere zulässige URI-Typen hinzufügen"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:228
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -7066,7 +7071,7 @@ msgstr ""
"Benutzung von debtorrent verfügbar – siehe &apt-transport-debtorrent;."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:240
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -7075,37 +7080,37 @@ msgstr ""
"jason/debian für stable/main, stable/contrib und stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:242
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:244
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"wie oben, außer das dies die »unstable«- (Entwicklungs-) Distribution "
"benutzt."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:240
+#: sources.list.5.xml:245
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:247
msgid "Source line for the above"
msgstr "Quellzeile für obiges"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:243
+#: sources.list.5.xml:248
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:250
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7116,7 +7121,7 @@ msgstr ""
"<literal>amd64</literal> und <literal>armel</literal> holt."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:252
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7126,7 +7131,7 @@ msgstr ""
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:250
+#: sources.list.5.xml:255
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -7135,13 +7140,13 @@ msgstr ""
"den hamm/main-Bereich zu benutzen."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:252
+#: sources.list.5.xml:257
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:254
+#: sources.list.5.xml:259
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -7151,13 +7156,13 @@ msgstr ""
"benutzen."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:256
+#: sources.list.5.xml:261
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:258
+#: sources.list.5.xml:263
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -7171,19 +7176,19 @@ msgstr ""
"für beide Quellzeilen benutzt."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:262
+#: sources.list.5.xml:267
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:271
+#: sources.list.5.xml:276
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:264
+#: sources.list.5.xml:269
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7203,7 +7208,7 @@ msgstr ""
"type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:276
+#: sources.list.5.xml:281
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
diff --git a/doc/po/es.po b/doc/po/es.po
index 9debc5967..6ec6eccef 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,7 +38,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-07-14 12:21+0200\n"
"Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -1648,7 +1648,7 @@ msgstr "Ficheros"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:275
+#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280
#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
#: apt-ftparchive.1.xml:609
msgid "See Also"
@@ -5240,7 +5240,7 @@ msgstr ""
"vendors.list</filename>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234
+#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239
#: apt-ftparchive.1.xml:598
msgid "Examples"
msgstr "Ejemplos"
@@ -6740,16 +6740,21 @@ msgstr "deb [ opciones ] uri distribución [componente1] [componente2] [...]"
#: sources.list.5.xml:86
#, no-wrap
msgid ""
-" Type: deb\n"
-" URI: http://example.com\n"
-" Suites: stable\n"
+" Types: deb deb-src\n"
+" URIs: http://example.com\n"
+" Suites: stable testing\n"
" Sections: component1 component2\n"
+" Description: short\n"
+" long long long\n"
" [option1]: [option1-value]\n"
"\n"
-" Type: deb-src\n"
-" URI: http://example.com\n"
-" Suites: stable\n"
+" Types: deb\n"
+" URIs: http://another.example.com\n"
+" Suites: experimental\n"
" Sections: component1 component2\n"
+" Enabled: no\n"
+" Description: short\n"
+" long long long\n"
" [option1]: [option1-value]\n"
" "
msgstr ""
@@ -6762,7 +6767,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:100
+#: sources.list.5.xml:105
#, fuzzy
#| msgid ""
#| "The URI for the <literal>deb</literal> type must specify the base of the "
@@ -6793,7 +6798,7 @@ msgstr ""
"<literal>distribución</literal> no define una ruta exacta."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:109
+#: sources.list.5.xml:114
#, fuzzy
#| msgid ""
#| "<literal>distribution</literal> may also contain a variable, <literal>"
@@ -6822,7 +6827,7 @@ msgstr ""
"sistema."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:117
+#: sources.list.5.xml:122
#, fuzzy
#| msgid ""
#| "Since only one distribution can be specified per line it may be necessary "
@@ -6862,7 +6867,7 @@ msgstr ""
"aprovechar mejor el ancho de banda."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:131
+#: sources.list.5.xml:136
msgid ""
"<literal>options</literal> is always optional and needs to be surrounded by "
"square brackets. It can consist of multiple settings in the form "
@@ -6879,7 +6884,7 @@ msgstr ""
"ignoran silenciosamente):"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:137
+#: sources.list.5.xml:142
msgid ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> can be used to specify for which architectures "
@@ -6894,7 +6899,7 @@ msgstr ""
"arquitecturas definidas por la opción <literal>APT::Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:146
#, fuzzy
#| msgid ""
#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -6915,7 +6920,7 @@ msgstr ""
"arquitecturas definidas por la opción <literal>APT::Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:144
+#: sources.list.5.xml:149
msgid ""
"<literal>trusted=yes</literal> can be set to indicate that packages from "
"this source are always authenticated even if the <filename>Release</"
@@ -6933,7 +6938,7 @@ msgstr ""
"autenticadas no lo están."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:151
+#: sources.list.5.xml:156
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -6946,12 +6951,12 @@ msgstr ""
"seguidos por servidores de Internet distantes, por ejemplo)."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:156
+#: sources.list.5.xml:161
msgid "Some examples:"
msgstr "Algunos ejemplos:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:158
+#: sources.list.5.xml:163
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6963,17 +6968,17 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:164
+#: sources.list.5.xml:169
msgid "URI specification"
msgstr "Especificación del URI"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:166
+#: sources.list.5.xml:171
msgid "The currently recognized URI types are:"
msgstr "Los tipos de URI permitidos actualmente son:"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:170
+#: sources.list.5.xml:175
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6984,7 +6989,7 @@ msgstr ""
"particiones montadas mediante NFS y réplicas o archivos de paquetes locales."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:177
+#: sources.list.5.xml:182
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -6994,7 +6999,7 @@ msgstr ""
"list»."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:189
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -7012,7 +7017,7 @@ msgstr ""
"autenticación no es seguro."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:195
+#: sources.list.5.xml:200
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -7033,7 +7038,7 @@ msgstr ""
"fichero de configuración."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:207
+#: sources.list.5.xml:212
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -7046,7 +7051,7 @@ msgstr ""
"permite realizar la copia de ficheros con APT."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:214
+#: sources.list.5.xml:219
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -7060,12 +7065,12 @@ msgstr ""
"transferencia de ficheros desde la máquina remota."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:221
+#: sources.list.5.xml:226
msgid "adding more recognizable URI types"
msgstr "Añadir más tipos de URI reconocidos."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:228
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -7084,7 +7089,7 @@ msgstr ""
"debtorrent, consulte &apt-transport-debtorrent;."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:240
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -7093,36 +7098,36 @@ msgstr ""
"para «stable/main», «stable/contrib», y «stable/non-free»."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:242
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:244
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Como arriba, excepto que usa la distribución «unstable» (en desarrollo)."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:240
+#: sources.list.5.xml:245
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:247
msgid "Source line for the above"
msgstr "Línea para obtener el código fuente desde la ubicación anterior."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:243
+#: sources.list.5.xml:248
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:250
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7133,7 +7138,7 @@ msgstr ""
"obtiene <literal>amd64</literal> y <literal>armel</literal>."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:252
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7143,7 +7148,7 @@ msgstr ""
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:250
+#: sources.list.5.xml:255
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -7152,13 +7157,13 @@ msgstr ""
"usa sólo la sección «hamm/main»."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:252
+#: sources.list.5.xml:257
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:254
+#: sources.list.5.xml:259
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -7167,13 +7172,13 @@ msgstr ""
"del directorio «debian», y usa sólo la sección «&stable-codename;/contrib»."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:256
+#: sources.list.5.xml:261
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:258
+#: sources.list.5.xml:263
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -7186,19 +7191,19 @@ msgstr ""
"filename>, se usará sólo una sesión FTP para ambas."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:262
+#: sources.list.5.xml:267
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:271
+#: sources.list.5.xml:276
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:264
+#: sources.list.5.xml:269
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7217,7 +7222,7 @@ msgstr ""
"tiene esta estructura.) <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:276
+#: sources.list.5.xml:281
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index de8e83d68..333bfad23 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2013-04-09 07:56+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1567,7 +1567,7 @@ msgstr "Fichiers"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:275
+#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280
#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
#: apt-ftparchive.1.xml:609
msgid "See Also"
@@ -5196,7 +5196,7 @@ msgstr ""
"list</filename>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234
+#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239
#: apt-ftparchive.1.xml:598
msgid "Examples"
msgstr "Exemples"
@@ -6685,16 +6685,21 @@ msgstr "deb [ options ] uri distribution [composant1] [composant2] [...]"
#: sources.list.5.xml:86
#, no-wrap
msgid ""
-" Type: deb\n"
-" URI: http://example.com\n"
-" Suites: stable\n"
+" Types: deb deb-src\n"
+" URIs: http://example.com\n"
+" Suites: stable testing\n"
" Sections: component1 component2\n"
+" Description: short\n"
+" long long long\n"
" [option1]: [option1-value]\n"
"\n"
-" Type: deb-src\n"
-" URI: http://example.com\n"
-" Suites: stable\n"
+" Types: deb\n"
+" URIs: http://another.example.com\n"
+" Suites: experimental\n"
" Sections: component1 component2\n"
+" Enabled: no\n"
+" Description: short\n"
+" long long long\n"
" [option1]: [option1-value]\n"
" "
msgstr ""
@@ -6707,7 +6712,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:100
+#: sources.list.5.xml:105
#, fuzzy
#| msgid ""
#| "The URI for the <literal>deb</literal> type must specify the base of the "
@@ -6739,7 +6744,7 @@ msgstr ""
"être présent."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:109
+#: sources.list.5.xml:114
#, fuzzy
#| msgid ""
#| "<literal>distribution</literal> may also contain a variable, <literal>"
@@ -6767,7 +6772,7 @@ msgstr ""
"literal> crée automatiquement un URI en fonction de l'architecture effective."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:117
+#: sources.list.5.xml:122
#, fuzzy
#| msgid ""
#| "Since only one distribution can be specified per line it may be necessary "
@@ -6807,7 +6812,7 @@ msgstr ""
"tirer plus efficacement parti des sites à faible bande passante."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:131
+#: sources.list.5.xml:136
msgid ""
"<literal>options</literal> is always optional and needs to be surrounded by "
"square brackets. It can consist of multiple settings in the form "
@@ -6824,7 +6829,7 @@ msgstr ""
"ignorés silencieusement) :"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:137
+#: sources.list.5.xml:142
msgid ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> can be used to specify for which architectures "
@@ -6839,7 +6844,7 @@ msgstr ""
"Architectures</literal> sera téléchargée."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:146
#, fuzzy
#| msgid ""
#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -6860,7 +6865,7 @@ msgstr ""
"Architectures</literal> sera téléchargée."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:144
+#: sources.list.5.xml:149
msgid ""
"<literal>trusted=yes</literal> can be set to indicate that packages from "
"this source are always authenticated even if the <filename>Release</"
@@ -6878,7 +6883,7 @@ msgstr ""
"authentifiées comme non authentifiées."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:151
+#: sources.list.5.xml:156
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -6891,12 +6896,12 @@ msgstr ""
"les hôtes distants."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:156
+#: sources.list.5.xml:161
msgid "Some examples:"
msgstr "Exemples :"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:158
+#: sources.list.5.xml:163
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6908,17 +6913,17 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:164
+#: sources.list.5.xml:169
msgid "URI specification"
msgstr "Spécification des URI"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:166
+#: sources.list.5.xml:171
msgid "The currently recognized URI types are:"
msgstr "Les types d'URI actuellement reconnues sont :"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:170
+#: sources.list.5.xml:175
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6929,7 +6934,7 @@ msgstr ""
"avec les montages NFS, les miroirs et les archives locaux."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:177
+#: sources.list.5.xml:182
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -6939,7 +6944,7 @@ msgstr ""
"pour créer des entrées dans la liste des sources."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:189
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -6956,7 +6961,7 @@ msgstr ""
"Notez qu'il s'agit d'une méthode d'authentification peu sûre."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:195
+#: sources.list.5.xml:200
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -6978,7 +6983,7 @@ msgstr ""
"configuration seront ignorés."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:207
+#: sources.list.5.xml:212
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -6992,7 +6997,7 @@ msgstr ""
"des fichiers avec APT."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:214
+#: sources.list.5.xml:219
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -7006,12 +7011,12 @@ msgstr ""
"sont utilisées pour l'accès aux fichiers de la machine distante."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:221
+#: sources.list.5.xml:226
msgid "adding more recognizable URI types"
msgstr "ajout de types d'URI supplémentaires reconnues"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:228
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -7030,7 +7035,7 @@ msgstr ""
"disponibles (voir &apt-transport-debtorrent;)."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:240
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -7039,37 +7044,37 @@ msgstr ""
"debian pour stable/main, stable/contrib et stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:242
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:244
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Comme ci-dessus, excepté que cette ligne utilise la distribution "
"« unstable » (développement)."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:240
+#: sources.list.5.xml:245
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:247
msgid "Source line for the above"
msgstr "La précédente ligne, mais pour les sources."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:243
+#: sources.list.5.xml:248
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:250
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7080,7 +7085,7 @@ msgstr ""
"<literal>amd64</literal> et <literal>armel</literal>."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:252
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7090,7 +7095,7 @@ msgstr ""
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:250
+#: sources.list.5.xml:255
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -7099,13 +7104,13 @@ msgstr ""
"n'utiliser que la section hamm/main."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:252
+#: sources.list.5.xml:257
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:254
+#: sources.list.5.xml:259
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -7114,13 +7119,13 @@ msgstr ""
"répertoire debian, et n'utiliser que la section &stable-codename;/contrib."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:256
+#: sources.list.5.xml:261
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:258
+#: sources.list.5.xml:263
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -7133,19 +7138,19 @@ msgstr ""
"apparaissent, une seule session FTP sera utilisée pour les deux lignes."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:262
+#: sources.list.5.xml:267
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:271
+#: sources.list.5.xml:276
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:264
+#: sources.list.5.xml:269
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7165,7 +7170,7 @@ msgstr ""
"type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:276
+#: sources.list.5.xml:281
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
diff --git a/doc/po/it.po b/doc/po/it.po
index 042abbc0b..f86cd53f9 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-12-23 18:04+0200\n"
"Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -1611,7 +1611,7 @@ msgstr "File"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:275
+#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280
#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
#: apt-ftparchive.1.xml:609
msgid "See Also"
@@ -5215,7 +5215,7 @@ msgstr ""
"filename>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234
+#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239
#: apt-ftparchive.1.xml:598
msgid "Examples"
msgstr "Esempi"
@@ -6722,16 +6722,21 @@ msgstr "deb [ opzioni ] uri distribuzione [componente1] [componente2] [...]"
#: sources.list.5.xml:86
#, no-wrap
msgid ""
-" Type: deb\n"
-" URI: http://example.com\n"
-" Suites: stable\n"
+" Types: deb deb-src\n"
+" URIs: http://example.com\n"
+" Suites: stable testing\n"
" Sections: component1 component2\n"
+" Description: short\n"
+" long long long\n"
" [option1]: [option1-value]\n"
"\n"
-" Type: deb-src\n"
-" URI: http://example.com\n"
-" Suites: stable\n"
+" Types: deb\n"
+" URIs: http://another.example.com\n"
+" Suites: experimental\n"
" Sections: component1 component2\n"
+" Enabled: no\n"
+" Description: short\n"
+" long long long\n"
" [option1]: [option1-value]\n"
" "
msgstr ""
@@ -6744,7 +6749,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:100
+#: sources.list.5.xml:105
#, fuzzy
#| msgid ""
#| "The URI for the <literal>deb</literal> type must specify the base of the "
@@ -6776,7 +6781,7 @@ msgstr ""
"<literal>componente</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:109
+#: sources.list.5.xml:114
#, fuzzy
#| msgid ""
#| "<literal>distribution</literal> may also contain a variable, <literal>"
@@ -6804,7 +6809,7 @@ msgstr ""
"automaticamente un URI con l'architettura corrente."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:117
+#: sources.list.5.xml:122
#, fuzzy
#| msgid ""
#| "Since only one distribution can be specified per line it may be necessary "
@@ -6845,7 +6850,7 @@ msgstr ""
"larghezza di banda."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:131
+#: sources.list.5.xml:136
msgid ""
"<literal>options</literal> is always optional and needs to be surrounded by "
"square brackets. It can consist of multiple settings in the form "
@@ -6862,7 +6867,7 @@ msgstr ""
"supportate verranno ignorate in modo silenzioso):"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:137
+#: sources.list.5.xml:142
msgid ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> can be used to specify for which architectures "
@@ -6877,7 +6882,7 @@ msgstr ""
"Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:146
#, fuzzy
#| msgid ""
#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -6898,7 +6903,7 @@ msgstr ""
"Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:144
+#: sources.list.5.xml:149
msgid ""
"<literal>trusted=yes</literal> can be set to indicate that packages from "
"this source are always authenticated even if the <filename>Release</"
@@ -6915,7 +6920,7 @@ msgstr ""
"tratta anche le fonti correttamente autenticate come non autenticate."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:151
+#: sources.list.5.xml:156
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -6928,12 +6933,12 @@ msgstr ""
"in una rete locale, seguiti da host Internet distanti)."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:156
+#: sources.list.5.xml:161
msgid "Some examples:"
msgstr "Alcuni esempi:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:158
+#: sources.list.5.xml:163
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6945,17 +6950,17 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:164
+#: sources.list.5.xml:169
msgid "URI specification"
msgstr "Specificare URI"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:166
+#: sources.list.5.xml:171
msgid "The currently recognized URI types are:"
msgstr "I tipi di URI attualmente riconosciuti sono:"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:170
+#: sources.list.5.xml:175
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6966,7 +6971,7 @@ msgstr ""
"archivi locali."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:177
+#: sources.list.5.xml:182
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -6976,7 +6981,7 @@ msgstr ""
"delle fonti."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:189
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -6993,7 +6998,7 @@ msgstr ""
"è un metodo di autenticazione non sicuro."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:195
+#: sources.list.5.xml:200
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -7013,7 +7018,7 @@ msgstr ""
"HTTP specificati nel file di configurazione verranno ignorati."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:207
+#: sources.list.5.xml:212
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -7026,7 +7031,7 @@ msgstr ""
"rimovibili, per copiare i file nelle varie posizioni con APT."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:214
+#: sources.list.5.xml:219
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -7040,12 +7045,12 @@ msgstr ""
"command> e <command>dd</command>."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:221
+#: sources.list.5.xml:226
msgid "adding more recognizable URI types"
msgstr "aggiungere ulteriori tipi di URI riconoscibili"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:228
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -7064,7 +7069,7 @@ msgstr ""
"debtorrrent; vedere &apt-transport-debtorrent;."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:240
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -7073,37 +7078,37 @@ msgstr ""
"debian per stable/main, stable/contrib e stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:242
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/gianni/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:244
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Come sopra, tranne per il fatto che usa la distribuzione unstable (di "
"sviluppo)"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:240
+#: sources.list.5.xml:245
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/gianni/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:247
msgid "Source line for the above"
msgstr "Riga per i sorgenti corrispondente alla precedente"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:243
+#: sources.list.5.xml:248
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/gianni/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:250
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7114,7 +7119,7 @@ msgstr ""
"<literal>amd64</literal> e <literal>armel</literal>."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:252
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7124,7 +7129,7 @@ msgstr ""
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:250
+#: sources.list.5.xml:255
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -7133,13 +7138,13 @@ msgstr ""
"hamm/main."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:252
+#: sources.list.5.xml:257
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:254
+#: sources.list.5.xml:259
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -7148,13 +7153,13 @@ msgstr ""
"e usa solo l'area &stable-codename;/contrib."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:256
+#: sources.list.5.xml:261
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:258
+#: sources.list.5.xml:263
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -7167,19 +7172,19 @@ msgstr ""
"usata una sola sessione FTP per entrambe le righe."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:262
+#: sources.list.5.xml:267
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:271
+#: sources.list.5.xml:276
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:264
+#: sources.list.5.xml:269
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7198,7 +7203,7 @@ msgstr ""
"modo.] <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:276
+#: sources.list.5.xml:281
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
diff --git a/doc/po/ja.po b/doc/po/ja.po
index f877f2935..e14dbf785 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.25.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-08-08 07:58+0900\n"
"Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -1559,7 +1559,7 @@ msgstr "ファイル"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:275
+#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280
#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
#: apt-ftparchive.1.xml:609
msgid "See Also"
@@ -4978,7 +4978,7 @@ msgstr ""
"します。"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234
+#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239
#: apt-ftparchive.1.xml:598
msgid "Examples"
msgstr "サンプル"
@@ -6432,16 +6432,21 @@ msgstr "deb [ オプション ] uri distribution [コンポーネント1] [コ
#: sources.list.5.xml:86
#, no-wrap
msgid ""
-" Type: deb\n"
-" URI: http://example.com\n"
-" Suites: stable\n"
+" Types: deb deb-src\n"
+" URIs: http://example.com\n"
+" Suites: stable testing\n"
" Sections: component1 component2\n"
+" Description: short\n"
+" long long long\n"
" [option1]: [option1-value]\n"
"\n"
-" Type: deb-src\n"
-" URI: http://example.com\n"
-" Suites: stable\n"
+" Types: deb\n"
+" URIs: http://another.example.com\n"
+" Suites: experimental\n"
" Sections: component1 component2\n"
+" Enabled: no\n"
+" Description: short\n"
+" long long long\n"
" [option1]: [option1-value]\n"
" "
msgstr ""
@@ -6454,7 +6459,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:100
+#: sources.list.5.xml:105
#, fuzzy
#| msgid ""
#| "The URI for the <literal>deb</literal> type must specify the base of the "
@@ -6485,7 +6490,7 @@ msgstr ""
"とつは <literal>component</literal> を指定しなければなりません。"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:109
+#: sources.list.5.xml:114
#, fuzzy
#| msgid ""
#| "<literal>distribution</literal> may also contain a variable, <literal>"
@@ -6513,7 +6518,7 @@ msgstr ""
"チャで URI を自動的に生成します。"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:117
+#: sources.list.5.xml:122
#, fuzzy
#| msgid ""
#| "Since only one distribution can be specified per line it may be necessary "
@@ -6550,7 +6555,7 @@ msgstr ""
"るホストへは、接続を並行して行うようにもしています。"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:131
+#: sources.list.5.xml:136
msgid ""
"<literal>options</literal> is always optional and needs to be surrounded by "
"square brackets. It can consist of multiple settings in the form "
@@ -6566,7 +6571,7 @@ msgstr ""
"す)。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:137
+#: sources.list.5.xml:142
msgid ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> can be used to specify for which architectures "
@@ -6580,7 +6585,7 @@ msgstr ""
"literal> オプションに定義してある、全アーキテクチャをダウンロードします。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:146
#, fuzzy
#| msgid ""
#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -6600,7 +6605,7 @@ msgstr ""
"literal> オプションに定義してある、全アーキテクチャをダウンロードします。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:144
+#: sources.list.5.xml:149
msgid ""
"<literal>trusted=yes</literal> can be set to indicate that packages from "
"this source are always authenticated even if the <filename>Release</"
@@ -6617,7 +6622,7 @@ msgstr ""
"認証として扱います。"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:151
+#: sources.list.5.xml:156
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -6630,12 +6635,12 @@ msgstr ""
"しょう。"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:156
+#: sources.list.5.xml:161
msgid "Some examples:"
msgstr "例:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:158
+#: sources.list.5.xml:163
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6647,17 +6652,17 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:164
+#: sources.list.5.xml:169
msgid "URI specification"
msgstr "URI の仕様"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:166
+#: sources.list.5.xml:171
msgid "The currently recognized URI types are:"
msgstr "現在認識できる URI タイプは以下のとおりです。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:170
+#: sources.list.5.xml:175
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6667,7 +6672,7 @@ msgstr ""
"にします。これは NFS マウントやローカルミラーで便利です。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:177
+#: sources.list.5.xml:182
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -6677,7 +6682,7 @@ msgstr ""
"グラムを使用してください。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:189
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -6693,7 +6698,7 @@ msgstr ""
"指定してください。この認証方法は安全ではないことに注意してください。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:195
+#: sources.list.5.xml:200
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -6712,7 +6717,7 @@ msgstr ""
"す)。設定ファイルで HTTP を利用するプロキシが指定してあっても、無視されます。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:207
+#: sources.list.5.xml:212
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -6724,7 +6729,7 @@ msgstr ""
"用していて、APT でコピーを行う場合に便利です。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:214
+#: sources.list.5.xml:219
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -6738,12 +6743,12 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:221
+#: sources.list.5.xml:226
msgid "adding more recognizable URI types"
msgstr "さらに認識できる URI タイプの追加"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:228
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -6761,7 +6766,7 @@ msgstr ""
"transport-debtorrent; を参照してください。"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:240
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -6770,35 +6775,35 @@ msgstr ""
"free 用のローカル (または NFS) アーカイブを使用します。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:242
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:244
msgid "As above, except this uses the unstable (development) distribution."
msgstr "上記と同様ですが、不安定版 (開発版) を使用します。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:240
+#: sources.list.5.xml:245
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:247
msgid "Source line for the above"
msgstr "上記のソース行は以下のようになります。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:243
+#: sources.list.5.xml:248
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:250
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -6809,7 +6814,7 @@ msgstr ""
"<literal>armel</literal> アーキテクチャのパッケージ情報を取得します。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:252
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -6819,7 +6824,7 @@ msgstr ""
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:250
+#: sources.list.5.xml:255
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -6828,13 +6833,13 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:252
+#: sources.list.5.xml:257
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:254
+#: sources.list.5.xml:259
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -6843,13 +6848,13 @@ msgstr ""
"&stable-codename;/contrib のみを使用します。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:256
+#: sources.list.5.xml:261
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:258
+#: sources.list.5.xml:263
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -6862,19 +6867,19 @@ msgstr ""
"つだけになります。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:262
+#: sources.list.5.xml:267
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:271
+#: sources.list.5.xml:276
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:264
+#: sources.list.5.xml:269
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -6893,7 +6898,7 @@ msgstr ""
"<placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:276
+#: sources.list.5.xml:281
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 5d66ac29c..e130991b7 100644
--- a/doc/po/pl.po
+++ b/doc/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: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-07-28 21:59+0200\n"
"Last-Translator: Robert Luberda <robert@debian.org>\n"
"Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -1642,7 +1642,7 @@ msgstr "Pliki"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:275
+#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280
#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
#: apt-ftparchive.1.xml:609
msgid "See Also"
@@ -4644,7 +4644,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234
+#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239
#: apt-ftparchive.1.xml:598
msgid "Examples"
msgstr "Przykłady"
@@ -6137,16 +6137,21 @@ msgstr "deb [ opcje ] uri dystrybucja [komponent1] [komponent2] [...]"
#: sources.list.5.xml:86
#, no-wrap
msgid ""
-" Type: deb\n"
-" URI: http://example.com\n"
-" Suites: stable\n"
+" Types: deb deb-src\n"
+" URIs: http://example.com\n"
+" Suites: stable testing\n"
" Sections: component1 component2\n"
+" Description: short\n"
+" long long long\n"
" [option1]: [option1-value]\n"
"\n"
-" Type: deb-src\n"
-" URI: http://example.com\n"
-" Suites: stable\n"
+" Types: deb\n"
+" URIs: http://another.example.com\n"
+" Suites: experimental\n"
" Sections: component1 component2\n"
+" Enabled: no\n"
+" Description: short\n"
+" long long long\n"
" [option1]: [option1-value]\n"
" "
msgstr ""
@@ -6159,7 +6164,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:100
+#: sources.list.5.xml:105
#, fuzzy
#| msgid ""
#| "The URI for the <literal>deb</literal> type must specify the base of the "
@@ -6190,7 +6195,7 @@ msgstr ""
"<literal>komponent</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:109
+#: sources.list.5.xml:114
#, fuzzy
#| msgid ""
#| "<literal>distribution</literal> may also contain a variable, <literal>"
@@ -6219,7 +6224,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:117
+#: sources.list.5.xml:122
#, fuzzy
#| msgid ""
#| "Since only one distribution can be specified per line it may be necessary "
@@ -6260,7 +6265,7 @@ msgstr ""
"sieciach o niskiej przepustowości łączy."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:131
+#: sources.list.5.xml:136
msgid ""
"<literal>options</literal> is always optional and needs to be surrounded by "
"square brackets. It can consist of multiple settings in the form "
@@ -6277,7 +6282,7 @@ msgstr ""
"wypisywania żadnego ostrzeżenia):"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:137
+#: sources.list.5.xml:142
msgid ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> can be used to specify for which architectures "
@@ -6292,7 +6297,7 @@ msgstr ""
"w opcji konfiguracji <literal>APT::Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:146
#, fuzzy
#| msgid ""
#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -6313,7 +6318,7 @@ msgstr ""
"w opcji konfiguracji <literal>APT::Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:144
+#: sources.list.5.xml:149
msgid ""
"<literal>trusted=yes</literal> can be set to indicate that packages from "
"this source are always authenticated even if the <filename>Release</"
@@ -6331,7 +6336,7 @@ msgstr ""
"niezautentykowane."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:151
+#: sources.list.5.xml:156
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -6345,12 +6350,12 @@ msgstr ""
"komputerami w Internecie)."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:156
+#: sources.list.5.xml:161
msgid "Some examples:"
msgstr "Kilka przykładów:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:158
+#: sources.list.5.xml:163
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6362,17 +6367,17 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:164
+#: sources.list.5.xml:169
msgid "URI specification"
msgstr "Określanie URI"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:166
+#: sources.list.5.xml:171
msgid "The currently recognized URI types are:"
msgstr "Obecnie rozpoznawane są następujące typy URI:"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:170
+#: sources.list.5.xml:175
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6383,7 +6388,7 @@ msgstr ""
"archiwów."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:177
+#: sources.list.5.xml:182
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -6393,7 +6398,7 @@ msgstr ""
"list."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:189
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -6410,7 +6415,7 @@ msgstr ""
"bezpieczny."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:195
+#: sources.list.5.xml:200
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -6430,7 +6435,7 @@ msgstr ""
"konfiguracyjnym serwery proxy używające HTTP zostaną zignorowane."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:207
+#: sources.list.5.xml:212
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -6443,7 +6448,7 @@ msgstr ""
"do skopiowania plików przy użyciu APT."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:214
+#: sources.list.5.xml:219
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -6457,12 +6462,12 @@ msgstr ""
"przetransferowania plików ze zdalnego komputera."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:221
+#: sources.list.5.xml:226
msgid "adding more recognizable URI types"
msgstr "dodawanie innych rozpoznawanych typów URI"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:228
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -6481,7 +6486,7 @@ msgstr ""
"zobaczyć &apt-transport-debtorrent;."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:240
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -6490,36 +6495,36 @@ msgstr ""
"debian dla zasobów stable/main, stable/contrib i stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:242
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:244
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Jak wyżej, z tą różnicą że używa dystrybucji niestabilnej (deweloperskiej)."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:240
+#: sources.list.5.xml:245
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:247
msgid "Source line for the above"
msgstr "Linie źródeł dla powyższego przykładu"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:243
+#: sources.list.5.xml:248
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:250
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -6530,7 +6535,7 @@ msgstr ""
"literal> i <literal>armel</literal>."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:252
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -6540,7 +6545,7 @@ msgstr ""
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:250
+#: sources.list.5.xml:255
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -6549,13 +6554,13 @@ msgstr ""
"org i dystrybucji hamm/main."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:252
+#: sources.list.5.xml:257
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:254
+#: sources.list.5.xml:259
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -6564,13 +6569,13 @@ msgstr ""
"katalogu debian i używa tylko dystrybucji &stable-codename;/contrib."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:256
+#: sources.list.5.xml:261
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:258
+#: sources.list.5.xml:263
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -6583,19 +6588,19 @@ msgstr ""
"to pojedyncza sesja FTP będzie użyta w celu uzyskania dostępu do obu zasobów."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:262
+#: sources.list.5.xml:267
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:271
+#: sources.list.5.xml:276
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:264
+#: sources.list.5.xml:269
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -6614,7 +6619,7 @@ msgstr ""
"nie zawiera takiej struktury). <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:276
+#: sources.list.5.xml:281
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache;, &apt-conf;"
diff --git a/doc/po/pt.po b/doc/po/pt.po
index c9a325bf0..6e04e961a 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-09-03 01:53+0100\n"
"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
"Language-Team: Portuguese <l10n@debianpt.org>\n"
@@ -1595,7 +1595,7 @@ msgstr "Ficheiros"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:275
+#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280
#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
#: apt-ftparchive.1.xml:609
msgid "See Also"
@@ -5163,7 +5163,7 @@ msgstr ""
"vendors.list</filename>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234
+#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239
#: apt-ftparchive.1.xml:598
msgid "Examples"
msgstr "Exemplos"
@@ -6658,16 +6658,21 @@ msgstr "deb [ opções ] uri distribuição [componente1] [componente2] [...]"
#: sources.list.5.xml:86
#, no-wrap
msgid ""
-" Type: deb\n"
-" URI: http://example.com\n"
-" Suites: stable\n"
+" Types: deb deb-src\n"
+" URIs: http://example.com\n"
+" Suites: stable testing\n"
" Sections: component1 component2\n"
+" Description: short\n"
+" long long long\n"
" [option1]: [option1-value]\n"
"\n"
-" Type: deb-src\n"
-" URI: http://example.com\n"
-" Suites: stable\n"
+" Types: deb\n"
+" URIs: http://another.example.com\n"
+" Suites: experimental\n"
" Sections: component1 component2\n"
+" Enabled: no\n"
+" Description: short\n"
+" long long long\n"
" [option1]: [option1-value]\n"
" "
msgstr ""
@@ -6680,7 +6685,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:100
+#: sources.list.5.xml:105
#, fuzzy
#| msgid ""
#| "The URI for the <literal>deb</literal> type must specify the base of the "
@@ -6712,7 +6717,7 @@ msgstr ""
"presente."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:109
+#: sources.list.5.xml:114
#, fuzzy
#| msgid ""
#| "<literal>distribution</literal> may also contain a variable, <literal>"
@@ -6740,7 +6745,7 @@ msgstr ""
"gerar automaticamente um URI com a arquitectura actual."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:117
+#: sources.list.5.xml:122
#, fuzzy
#| msgid ""
#| "Since only one distribution can be specified per line it may be necessary "
@@ -6780,7 +6785,7 @@ msgstr ""
"sites com baixa largura de banda."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:131
+#: sources.list.5.xml:136
msgid ""
"<literal>options</literal> is always optional and needs to be surrounded by "
"square brackets. It can consist of multiple settings in the form "
@@ -6797,7 +6802,7 @@ msgstr ""
"definições não suportadas serão ignoradas em silêncio):"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:137
+#: sources.list.5.xml:142
msgid ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> can be used to specify for which architectures "
@@ -6812,7 +6817,7 @@ msgstr ""
"<literal>APT::Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:146
#, fuzzy
#| msgid ""
#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -6833,7 +6838,7 @@ msgstr ""
"<literal>APT::Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:144
+#: sources.list.5.xml:149
msgid ""
"<literal>trusted=yes</literal> can be set to indicate that packages from "
"this source are always authenticated even if the <filename>Release</"
@@ -6850,7 +6855,7 @@ msgstr ""
"lida com fontes mesmo actualmente autenticadas como não sendo autênticas."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:151
+#: sources.list.5.xml:156
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -6864,12 +6869,12 @@ msgstr ""
"Internet, por exemplo)."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:156
+#: sources.list.5.xml:161
msgid "Some examples:"
msgstr "Alguns exemplos:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:158
+#: sources.list.5.xml:163
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6881,17 +6886,17 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:164
+#: sources.list.5.xml:169
msgid "URI specification"
msgstr "Especificação da URI"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:166
+#: sources.list.5.xml:171
msgid "The currently recognized URI types are:"
msgstr "Os tipos de URI actualmente reconhecidos são:"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:170
+#: sources.list.5.xml:175
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6902,7 +6907,7 @@ msgstr ""
"arquivos locais."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:177
+#: sources.list.5.xml:182
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -6912,7 +6917,7 @@ msgstr ""
"fontes."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:189
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -6929,7 +6934,7 @@ msgstr ""
"método de autenticação seguro."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:195
+#: sources.list.5.xml:200
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -6950,7 +6955,7 @@ msgstr ""
"configuração serão ignorados."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:207
+#: sources.list.5.xml:212
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -6963,7 +6968,7 @@ msgstr ""
"ficheiros com o APT."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:214
+#: sources.list.5.xml:219
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -6977,12 +6982,12 @@ msgstr ""
"ficheiros a partir da máquina remota."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:221
+#: sources.list.5.xml:226
msgid "adding more recognizable URI types"
msgstr "adicionando mais tipos de URI reconhecíveis"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:228
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -7001,7 +7006,7 @@ msgstr ""
"exemplo o debtorrent - veja &apt-transport-debtorrent;."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:240
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -7010,36 +7015,36 @@ msgstr ""
"para stable/main, stable/contrib, e stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:242
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:244
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Como em cima, excepto que usa a distribuição unstable (de desenvolvimento)."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:240
+#: sources.list.5.xml:245
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:247
msgid "Source line for the above"
msgstr "Linha de fonte para o referido acima"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:243
+#: sources.list.5.xml:248
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:250
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7050,7 +7055,7 @@ msgstr ""
"<literal>amd64</literal> e <literal>armel</literal>."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:252
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7060,7 +7065,7 @@ msgstr ""
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:250
+#: sources.list.5.xml:255
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -7069,13 +7074,13 @@ msgstr ""
"hamm/main."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:252
+#: sources.list.5.xml:257
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:254
+#: sources.list.5.xml:259
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -7084,13 +7089,13 @@ msgstr ""
"usa apenas a área &stable-codename;/contrib."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:256
+#: sources.list.5.xml:261
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:258
+#: sources.list.5.xml:263
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -7103,19 +7108,19 @@ msgstr ""
"uma única sessão FTP para ambas linhas de recurso."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:262
+#: sources.list.5.xml:267
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:271
+#: sources.list.5.xml:276
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:264
+#: sources.list.5.xml:269
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7134,7 +7139,7 @@ msgstr ""
"\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:276
+#: sources.list.5.xml:281
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 695d8dbea..80a8f90d4 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.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: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2004-09-20 17:02+0000\n"
"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
"Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -1120,7 +1120,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:275
+#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280
#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
#: apt-ftparchive.1.xml:609
#, fuzzy
@@ -3615,7 +3615,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234
+#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:239
#: apt-ftparchive.1.xml:598
#, fuzzy
msgid "Examples"
@@ -5112,16 +5112,21 @@ msgstr ""
#: sources.list.5.xml:86
#, no-wrap
msgid ""
-" Type: deb\n"
-" URI: http://example.com\n"
-" Suites: stable\n"
+" Types: deb deb-src\n"
+" URIs: http://example.com\n"
+" Suites: stable testing\n"
" Sections: component1 component2\n"
+" Description: short\n"
+" long long long\n"
" [option1]: [option1-value]\n"
"\n"
-" Type: deb-src\n"
-" URI: http://example.com\n"
-" Suites: stable\n"
+" Types: deb\n"
+" URIs: http://another.example.com\n"
+" Suites: experimental\n"
" Sections: component1 component2\n"
+" Enabled: no\n"
+" Description: short\n"
+" long long long\n"
" [option1]: [option1-value]\n"
" "
msgstr ""
@@ -5134,7 +5139,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:100
+#: sources.list.5.xml:105
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
@@ -5147,7 +5152,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:109
+#: sources.list.5.xml:114
msgid ""
"<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
"literal> which expands to the Debian architecture (such as <literal>amd64</"
@@ -5159,7 +5164,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:117
+#: sources.list.5.xml:122
msgid ""
"In the traditional style sources.list format since only one distribution can "
"be specified per line it may be necessary to have multiple lines for the "
@@ -5175,7 +5180,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:131
+#: sources.list.5.xml:136
msgid ""
"<literal>options</literal> is always optional and needs to be surrounded by "
"square brackets. It can consist of multiple settings in the form "
@@ -5186,7 +5191,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:137
+#: sources.list.5.xml:142
msgid ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> can be used to specify for which architectures "
@@ -5196,7 +5201,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:146
msgid ""
"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>,"
@@ -5205,7 +5210,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:144
+#: sources.list.5.xml:149
msgid ""
"<literal>trusted=yes</literal> can be set to indicate that packages from "
"this source are always authenticated even if the <filename>Release</"
@@ -5216,7 +5221,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:151
+#: sources.list.5.xml:156
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -5225,13 +5230,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:156
+#: sources.list.5.xml:161
#, fuzzy
msgid "Some examples:"
msgstr "Exemplos"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:158
+#: sources.list.5.xml:163
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -5240,17 +5245,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:164
+#: sources.list.5.xml:169
msgid "URI specification"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:166
+#: sources.list.5.xml:171
msgid "The currently recognized URI types are:"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:170
+#: sources.list.5.xml:175
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -5258,14 +5263,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:177
+#: sources.list.5.xml:182
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:189
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -5276,7 +5281,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:195
+#: sources.list.5.xml:200
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -5289,7 +5294,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:207
+#: sources.list.5.xml:212
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -5298,7 +5303,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:214
+#: sources.list.5.xml:219
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -5307,12 +5312,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:221
+#: sources.list.5.xml:226
msgid "adding more recognizable URI types"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:228
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -5324,42 +5329,42 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:240
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:242
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:244
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:240
+#: sources.list.5.xml:245
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:247
msgid "Source line for the above"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:243
+#: sources.list.5.xml:248
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:250
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -5367,7 +5372,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:252
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -5375,33 +5380,33 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:250
+#: sources.list.5.xml:255
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:252
+#: sources.list.5.xml:257
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:254
+#: sources.list.5.xml:259
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:256
+#: sources.list.5.xml:261
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:258
+#: sources.list.5.xml:263
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -5410,19 +5415,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:262
+#: sources.list.5.xml:267
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:271
+#: sources.list.5.xml:276
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:264
+#: sources.list.5.xml:269
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -5434,7 +5439,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:276
+#: sources.list.5.xml:281
#, fuzzy
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 87f4d5fc5..4d0c4d502 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -83,16 +83,21 @@
<para>Alternatively a rfc822 style format is also supported:
<literallayout>
- Type: deb
- URI: http://example.com
- Suites: stable
+ Types: deb deb-src
+ URIs: http://example.com
+ Suites: stable testing
Sections: component1 component2
+ Description: short
+ long long long
[option1]: [option1-value]
- Type: deb-src
- URI: http://example.com
- Suites: stable
+ Types: deb
+ URIs: http://another.example.com
+ Suites: experimental
Sections: component1 component2
+ Enabled: no
+ Description: short
+ long long long
[option1]: [option1-value]
</literallayout>
</para>
diff --git a/po/ar.po b/po/ar.po
index df852f62f..483401781 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2006-10-20 21:28+0300\n"
"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
"Language-Team: Arabic <support@arabeyes.org>\n"
@@ -96,7 +96,7 @@ msgid "Total space accounted for: "
msgstr "مجموع المساحة المحسوب حسابها:"
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr ""
@@ -104,7 +104,7 @@ msgstr ""
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "لم يُعثر على أية حزم"
@@ -546,7 +546,7 @@ msgstr "%s هي النسخة الأحدث.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -575,6 +575,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -602,7 +607,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -638,11 +644,11 @@ msgid "File not found"
msgstr "لم يُعثر على الملف"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "فشيل تنفيذ stat"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "فشل تعيين وقت التعديل"
@@ -731,7 +737,7 @@ msgstr ""
msgid "Could not connect data socket, connection timed out"
msgstr ""
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "فشل"
@@ -1400,16 +1406,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "لا يقبل الأمر update أية مُعطيات"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "حساب الترقية..."
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "تمّ"
@@ -1417,7 +1423,19 @@ msgstr "تمّ"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1480,8 +1498,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2495,82 +2513,82 @@ msgstr ""
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "فتح %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr ""
@@ -3153,57 +3171,61 @@ msgstr "التحضير لإزالة %s بالكامل"
msgid "Completely removed %s"
msgstr "تمت إزالة %s بالكامل"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "تعذرت الكتابة إلى %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/ast.po b/po/ast.po
index 06a3a5987..e26ac48e1 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.18\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2010-10-02 23:35+0100\n"
"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
"Language-Team: Asturian (ast)\n"
@@ -89,7 +89,7 @@ msgid "Total space accounted for: "
msgstr "Informe del total d'espaciu: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "El ficheru de paquetes %s nun ta sincronizáu."
@@ -97,7 +97,7 @@ msgstr "El ficheru de paquetes %s nun ta sincronizáu."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Nun s'alcontraron paquetes"
@@ -652,7 +652,7 @@ msgstr "%s yá ta na versión más nueva.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperaba %s pero nun taba ellí"
@@ -681,6 +681,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -708,7 +713,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -744,11 +750,11 @@ msgid "File not found"
msgstr "Nun s'atopa'l ficheru."
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Falló al lleer"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Nun se pudo afitar la hora de modificación"
@@ -837,7 +843,7 @@ msgstr "Nun se pudo crear un socket"
msgid "Could not connect data socket, connection timed out"
msgstr "Nun se pudo coneutar el zócalu de datos; gandió'l tiempu de conexón"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Falló"
@@ -1522,16 +1528,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "La orde update nun lleva argumentos"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Calculando l'anovamientu... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Error internu, AllUpgrade rompió coses"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Fecho"
@@ -1539,7 +1545,19 @@ msgstr "Fecho"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1607,8 +1625,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2705,85 +2723,85 @@ msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Nun se pudo tratar el ficheru de paquetes %s (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís d'URI)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Llinia %lu mal formada na llista d'oríxe %s ([opción] nun parcheable)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"Llinia %lu mal formada na llista d'oríxenes %s ([option] enforma curtia)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Llinia %lu mal formada na llista d'oríxenes %s ([%s] nun ye una asignación)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Llinia %lu mal formada na llista d'oríxenes %s ([%s] nun tien clave)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Llinia %lu mal formada na llista d'oríxenes %s ([%s] clave %s nun tien valor)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Llinia %lu mal formada na llista d'oríxenes %s (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Llinia %lu mal formada na llista d'oríxenes %s (dist)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís d'URI)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Llinia %lu mal formada na llista d'oríxenes %s (dist absoluta)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís de dist)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Abriendo %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Llinia %u enforma llarga na llista d'oríxenes %s."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Llinia %u mal formada na llista d'oríxenes %s (triba)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s"
@@ -3400,33 +3418,37 @@ msgstr "Preparándose pa desinstalar dafechu %s"
msgid "Completely removed %s"
msgstr "Desinstalóse dafechu %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Nun se pue escribir en %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr "Ensin informe escritu d'apport porque MaxReports llegó dafechu"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "problemes de dependencies - déxase ensin configurar"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3434,7 +3456,7 @@ msgstr ""
"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu que "
"siguió dende un fallu previu"
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3442,7 +3464,7 @@ msgstr ""
"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
"discu llenu"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3450,7 +3472,7 @@ msgstr ""
"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
"memoria"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3459,7 +3481,7 @@ msgstr ""
"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
"discu llenu"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 649a0a66a..6dd0822a5 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.21\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-06-25 17:23+0300\n"
"Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -95,7 +95,7 @@ msgid "Total space accounted for: "
msgstr "Общо отчетено пространство: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Пакетният файл %s не е синхронизиран."
@@ -103,7 +103,7 @@ msgstr "Пакетният файл %s не е синхронизиран."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Няма намерени пакети"
@@ -659,7 +659,7 @@ msgstr "Пакетът „%s“ вече е задържан.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Изчака се завършването на %s, но той не беше пуснат"
@@ -679,6 +679,7 @@ msgid "Executing dpkg failed. Are you root?"
msgstr "Неуспех при изпълняване на dpkg. Имате ли административни права?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -688,6 +689,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -734,7 +740,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -770,11 +777,11 @@ msgid "File not found"
msgstr "Файлът не е намерен"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Неуспех при получаването на атрибути"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Неуспех при задаването на време на промяна"
@@ -865,7 +872,7 @@ msgstr ""
"Неуспех при свързването на гнездо за данни, допустимото време за свързване "
"изтече"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Неуспех"
@@ -1557,16 +1564,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Командата „update“ не възприема аргументи"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Изчисляване на актуализацията..."
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Готово"
@@ -1574,7 +1581,19 @@ msgstr "Готово"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1641,8 +1660,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2743,89 +2762,89 @@ msgstr "Неуспех при анализирането на пакетен ф
msgid "Unable to parse package file %s (2)"
msgstr "Неуспех при анализирането на пакетен файл %s (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Лошо форматиран ред %lu в списъка с източници %s (неразбираема [опция])"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"Лошо форматиран ред %lu в списъка с източници %s (твърде кратка [опция])"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Лошо форматиран ред %lu в списъка с източници %s ([%s] не е присвояване)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Лошо форматиран ред %lu в списъка с източници %s (липсва ключ в [%s])"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Лошо форматиран ред %lu в списъка с източници %s ([%s] ключът %s няма "
"стойност)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Лошо форматиран ред %lu в списъка с източници %s (адрес-URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Лошо форматиран ред %lu в списъка с източници %s (дистрибуция)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
"Лошо форматиран ред %lu в списъка с източници %s (неограничена дистрибуция)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
"Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Отваряне на %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Ред %u в списъка с източници %s е твърде дълъг."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен."
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен."
@@ -3454,35 +3473,39 @@ msgstr "Подготовка за пълно премахване на %s"
msgid "Completely removed %s"
msgstr "%s е напълно премахнат"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Неуспех при записа на %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "Операцията е прекъсната"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Поради достигане на максималния брой доклади (MaxReports) не е записан нов "
"доклад за зависимостите."
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "отлагане на настройката поради неудовлетворени зависимости"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3490,7 +3513,7 @@ msgstr ""
"Доклад за зависимостите не е записан защото съобщението за грешка е породено "
"от друга грешка."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3498,7 +3521,7 @@ msgstr ""
"Доклад за зависимостите не е записан защото грешката е причинена от "
"недостатъчно дисково пространство"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3506,7 +3529,7 @@ msgstr ""
"Доклад за зависимостите не е записан защото грешката е причинена от "
"недостатъчна оперативна памет"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3515,7 +3538,7 @@ msgstr ""
"Доклад за зависимостите не е записан защото грешката е причинена от "
"недостатъчно дисково пространство"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/bs.po b/po/bs.po
index a7c3886c1..79cc5ec5d 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2004-05-06 15:25+0100\n"
"Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
"Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -92,7 +92,7 @@ msgid "Total space accounted for: "
msgstr ""
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr ""
@@ -100,7 +100,7 @@ msgstr ""
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Paketi nisu pronađeni"
@@ -552,7 +552,7 @@ msgstr ""
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -581,6 +581,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -608,7 +613,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -644,11 +650,11 @@ msgid "File not found"
msgstr "Datoteka nije pronađena"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr ""
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr ""
@@ -736,7 +742,7 @@ msgstr ""
msgid "Could not connect data socket, connection timed out"
msgstr ""
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Neuspješno"
@@ -1399,15 +1405,15 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr ""
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Računam nadogradnju..."
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
msgid "Internal error, Upgrade broke stuff"
msgstr ""
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Urađeno"
@@ -1415,7 +1421,19 @@ msgstr "Urađeno"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1475,8 +1493,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2490,82 +2508,82 @@ msgstr ""
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Otvaram %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr ""
@@ -3146,57 +3164,61 @@ msgstr ""
msgid "Completely removed %s"
msgstr "Ne mogu ukloniti %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Ne mogu zapisati na %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index d2d5d26ec..342f71b42 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.6\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-10-19 13:30+0200\n"
"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -92,7 +92,7 @@ msgid "Total space accounted for: "
msgstr "Nombre total de l'espai atribuït a: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "El fitxer %s del paquet està desincronitzat."
@@ -100,7 +100,7 @@ msgstr "El fitxer %s del paquet està desincronitzat."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "No s'han trobat paquets"
@@ -663,7 +663,7 @@ msgstr "%s ja estava no retingut.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperava %s però no hi era"
@@ -692,6 +692,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -719,7 +724,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -755,11 +761,11 @@ msgid "File not found"
msgstr "Fitxer no trobat"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "L'estat ha fallat"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "No s'ha pogut establir el temps de modificació"
@@ -848,7 +854,7 @@ msgstr "No s'ha pogut crear un sòcol"
msgid "Could not connect data socket, connection timed out"
msgstr "No s'ha pogut connectar amb el sòcol de dades, connexió finalitzada"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Ha fallat"
@@ -1545,16 +1551,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "L'ordre update no pren arguments"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "S'està calculant l'actualització… "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Error intern, AllUpgrade ha trencat coses"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Fet"
@@ -1562,7 +1568,19 @@ msgstr "Fet"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1629,8 +1647,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2728,85 +2746,85 @@ msgstr "No es pot analitzar el fitxer del paquet %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "No es pot analitzar el fitxer del paquet %s (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Línia %lu malformada en la llista de fonts %s ([opció] no reconeixible)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Línia %lu malformada en la llista de fonts %s ([opció] massa curta)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Línia %lu malformada en la llista de fonts %s ([%s] no és una assignació)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Línia %lu malformada en la llista de fonts %s ([%s] no té clau)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Línia %lu malformada en la llista de fonts %s ([%s] la clau %s no té valor)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Línia %lu malformada en la llista de fonts %s (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Línia %lu malformada en la llista de fonts %s (dist)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Línia %lu malformada en la llista de fonts %s (dist absoluta)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Línia %lu malformada en la llista de fonts %s (analitzant dist)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "S'està obrint %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "La línia %u és massa llarga en la llista de fonts %s."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "La línia %u és malformada en la llista de fonts %s (tipus)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s"
@@ -3441,33 +3459,37 @@ msgstr "S'està preparant per a suprimir completament el paquet %s"
msgid "Completely removed %s"
msgstr "S'ha suprimit completament el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "No es pot escriure en %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "S'ha interromput l'operació abans que pogués finalitzar"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr "No s'ha escrit cap informe perquè ja s'ha superat MaxReports"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "S'han produït problemes de depències, es deixa sense configurar"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3475,7 +3497,7 @@ msgstr ""
"No s'ha escrit cap informe perquè el missatge d'error indica que és un error "
"consequent de una fallida anterior."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3483,7 +3505,7 @@ msgstr ""
"No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
"disc ple"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3491,7 +3513,7 @@ msgstr ""
"No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
"falta de memòria"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3500,7 +3522,7 @@ msgstr ""
"No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
"disc ple"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 941306b86..83afed769 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-07-08 13:46+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -91,7 +91,7 @@ msgid "Total space accounted for: "
msgstr "Celkem přiřazeného místa: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Soubor balíku %s je špatně synchronizovaný."
@@ -99,7 +99,7 @@ msgstr "Soubor balíku %s je špatně synchronizovaný."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Nebyly nalezeny žádné balíky"
@@ -642,7 +642,7 @@ msgstr "%s již nebyl držen v aktuální verzi.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Čekal jsem na %s, ale nebyl tam"
@@ -662,6 +662,7 @@ msgid "Executing dpkg failed. Are you root?"
msgstr "Spuštění dpkg selhalo. Jste root?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -671,6 +672,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -716,7 +722,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -752,11 +759,11 @@ msgid "File not found"
msgstr "Soubor nebyl nalezen"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Selhalo vyhodnocení"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Nelze nastavit čas modifikace"
@@ -845,7 +852,7 @@ msgstr "Nelze vytvořit socket"
msgid "Could not connect data socket, connection timed out"
msgstr "Nelze připojit datový socket, čas spojení vypršel"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Selhalo"
@@ -1533,16 +1540,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Příkaz update neakceptuje žádné argumenty"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Propočítávám aktualizaci… "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Hotovo"
@@ -1550,7 +1557,20 @@ msgstr "Hotovo"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1617,8 +1637,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2702,82 +2722,82 @@ msgstr "Nelze zpracovat soubor %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Nelze zpracovat soubor %s (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (nezpracovatelná [volba])"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (příliš krátká [volba])"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] není přiřazení)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] nemá klíč)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] klíč %s nemá hodnotu)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (dist)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (Absolutní dist)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování dist)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Otevírám %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Řádek %u v seznamu zdrojů %s je příliš dlouhý."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý"
@@ -3387,34 +3407,38 @@ msgstr "Připravuji úplné odstranění %s"
msgid "Completely removed %s"
msgstr "Kompletně odstraněn %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Nelze zapsat do %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "Operace byla přerušena dříve, než mohla skončit"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Žádné apport hlášení nebylo vytvořeno, protože již byl dosažen MaxReports"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "problémy se závislostmi - ponechávám nezkonfigurované"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3422,7 +3446,7 @@ msgstr ""
"Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že "
"se jedná o chybu způsobenou předchozí chybou."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3430,7 +3454,7 @@ msgstr ""
"Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že "
"je chyba způsobena zcela zaplněným diskem."
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3438,7 +3462,7 @@ msgstr ""
"Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že "
"je chyba způsobena zcela zaplněnou pamětí."
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3447,7 +3471,7 @@ msgstr ""
"Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že "
"je chyba způsobena zcela zaplněným diskem."
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/cy.po b/po/cy.po
index 1d924b05e..a57084931 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: APT\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2005-06-06 13:46+0100\n"
"Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
"Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
@@ -105,7 +105,7 @@ msgid "Total space accounted for: "
msgstr "Cyfanswm Gofod Cyfrifwyd: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig."
@@ -113,7 +113,7 @@ msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Canfuwyd dim pecyn"
@@ -666,7 +666,7 @@ msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, fuzzy, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Arhoswyd am %s ond nid oedd e yna"
@@ -695,6 +695,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -722,7 +727,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -762,11 +768,11 @@ msgid "File not found"
msgstr "Ffeil heb ei ganfod"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Methwyd stat()"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Methwyd gosod amser newid"
@@ -856,7 +862,7 @@ msgstr "Methwyd creu soced"
msgid "Could not connect data socket, connection timed out"
msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Methwyd"
@@ -1552,17 +1558,17 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
#, fuzzy
msgid "Calculating upgrade... "
msgstr "Yn Cyfrifo'r Uwchraddiad... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Wedi Gorffen"
@@ -1570,7 +1576,19 @@ msgstr "Wedi Gorffen"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1633,8 +1651,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2749,87 +2767,87 @@ msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Yn agor %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, fuzzy, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
@@ -3443,57 +3461,61 @@ msgstr "Yn agor y ffeil cyfluniad %s"
msgid "Completely removed %s"
msgstr "Methwyd dileu %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Ni ellir ysgrifennu i %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/da.po b/po/da.po
index cd2a76ef6..7896cfb00 100644
--- a/po/da.po
+++ b/po/da.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2013-12-14 23:51+0200\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -94,7 +94,7 @@ msgid "Total space accounted for: "
msgstr "Total plads, der kan gøres rede for: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Pakkefilen %s er ude af trit."
@@ -102,7 +102,7 @@ msgstr "Pakkefilen %s er ude af trit."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Fandt ingen pakker"
@@ -654,7 +654,7 @@ msgstr "%s var allerede ikke i bero.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Ventede på %s, men den var der ikke"
@@ -674,6 +674,7 @@ msgid "Executing dpkg failed. Are you root?"
msgstr "Kørsel af dpkg fejlede. Er du root (administrator)?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -683,6 +684,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -731,7 +737,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -780,11 +787,11 @@ msgid "File not found"
msgstr "Fil blev ikke fundet"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Kunne ikke finde"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Kunne ikke angive ændringstidspunkt"
@@ -873,7 +880,7 @@ msgstr "Kunne ikke oprette sokkel"
msgid "Could not connect data socket, connection timed out"
msgstr "Kunne ikke forbinde datasokkel, tidsudløb på forbindelsen"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Mislykkedes"
@@ -1560,15 +1567,15 @@ msgstr "Sortering"
msgid "The update command takes no arguments"
msgstr "»update«-kommandoen benytter ingen parametre"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Beregner opgraderingen ... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
msgid "Internal error, Upgrade broke stuff"
msgstr "Intern fejl, opgradering blev afbrudt"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Færdig"
@@ -1576,7 +1583,19 @@ msgstr "Færdig"
msgid "Full Text Search"
msgstr "Fuldtekst-søgning"
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr "ikke en reel pakke (virtuel)"
@@ -1643,8 +1662,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2735,82 +2754,82 @@ msgstr "Kunne ikke tolke pakkefilen %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Kunne ikke tolke pakkefilen %s (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] kunne ikke fortolkes)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] for kort)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Ugyldig linje %lu i kildelisten %s ([%s] er ikke en opgave)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Ugyldig linje %lu i kildelisten %s ([%s] har ingen nøgle)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Ugyldig linje %lu i kildelisten %s ([%s] nøgle %s har ingen værdi)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Ugyldig linje %lu i kildelisten %s (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Ugyldig linje %lu i kildelisten %s (dist)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Ugyldig linje %lu i kildelisten %s (absolut dist)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Åbner %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linjen %u er for lang i kildelisten %s."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Ugyldig linje %u i kildelisten %s (type)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typen »%s« er ukendt på linje %u i kildelisten %s"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "Typen »%s« er ukendt på linje %u i kildelisten %s"
@@ -3425,34 +3444,38 @@ msgstr "Gør klar til at fjerne %s helt"
msgid "Completely removed %s"
msgstr "Fjernede %s helt"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, c-format
msgid "Can not write log (%s)"
msgstr "Kan ikke skrive log (%s)"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr "Er /dev/pts monteret?"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr "Er standardud en terminal?"
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "Handling blev afbrudt før den kunne afsluttes"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Ingen apportrapport skrevet da MaxReports (maks rapporter) allerede er nået"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "afhængighedsproblemer - efterlader ukonfigureret"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3460,14 +3483,14 @@ msgstr ""
"Ingen apportrapport skrevet da fejlbeskeden indikerer, at det er en "
"opfølgningsfejl fra en tidligere fejl."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
"Ingen apportrapport skrevet da fejlbeskeden indikerer en fuld disk-fejl"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3475,7 +3498,7 @@ msgstr ""
"Ingen apportrapport skrevet da fejlbeskeden indikerer en ikke nok "
"hukommelsesfejl"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
@@ -3483,7 +3506,7 @@ msgstr ""
"Ingen apportrapport skrevet da fejlbeskeden indikerer en fejl på det lokale "
"system"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr "Ingen apportrapport skrevet da fejlbeskeden indikerer en dpkg I/O-fejl"
diff --git a/po/de.po b/po/de.po
index 10bca6f83..062c446e9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.2\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-06-27 10:55+0200\n"
"Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
"Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -94,7 +94,7 @@ msgid "Total space accounted for: "
msgstr "Gesamtmenge an Speicher: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Paketdatei %s ist nicht synchronisiert."
@@ -102,7 +102,7 @@ msgstr "Paketdatei %s ist nicht synchronisiert."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Keine Pakete gefunden"
@@ -675,7 +675,7 @@ msgstr "Die Halten-Markierung für %s wurde bereits entfernt.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Es wurde auf %s gewartet, war jedoch nicht vorhanden"
@@ -695,6 +695,7 @@ msgid "Executing dpkg failed. Are you root?"
msgstr "Ausführen von dpkg fehlgeschlagen. Sind Sie root?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -704,6 +705,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -751,7 +757,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -790,11 +797,11 @@ msgstr "Datei nicht gefunden"
# looks like someone hardcoded English grammar
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Abfrage mit »stat« fehlgeschlagen"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Änderungszeitpunkt kann nicht gesetzt werden."
@@ -883,7 +890,7 @@ msgstr "Socket konnte nicht erzeugt werden."
msgid "Could not connect data socket, connection timed out"
msgstr "Daten-Socket konnte wegen Zeitüberschreitung nicht verbunden werden."
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Fehlgeschlagen"
@@ -1589,16 +1596,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Der Befehl »update« akzeptiert keine Argumente."
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Paketaktualisierung (Upgrade) wird berechnet... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Interner Fehler, AllUpgrade hat etwas beschädigt."
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Fertig"
@@ -1606,7 +1613,19 @@ msgstr "Fertig"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1674,8 +1693,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2788,83 +2807,83 @@ msgstr "Paketdatei %s konnte nicht verarbeitet werden (1)."
msgid "Unable to parse package file %s (2)"
msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)."
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] nicht auswertbar)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] zu kurz)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s ([%s] ist keine Zuweisung)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s ([%s] hat keinen Schlüssel)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Missgestaltete Zeile %lu in Quellliste %s ([%s] Schlüssel %s hat keinen Wert)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "%s wird geöffnet."
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Zeile %u in Quellliste %s zu lang."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt."
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt."
@@ -3510,35 +3529,39 @@ msgstr "Vollständiges Entfernen von %s wird vorbereitet."
msgid "Completely removed %s"
msgstr "%s vollständig entfernt"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Schreiben nach %s nicht möglich"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "Operation wurde unterbrochen, bevor sie beendet werden konnte."
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Es wurde kein Apport-Bericht verfasst, da das Limit MaxReports bereits "
"erreicht ist."
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "Abhängigkeitsprobleme - verbleibt unkonfiguriert"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3546,7 +3569,7 @@ msgstr ""
"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung darauf "
"hindeutet, dass dies lediglich ein Folgefehler eines vorherigen Problems ist."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3554,7 +3577,7 @@ msgstr ""
"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
"wegen voller Festplatte hindeutet."
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3562,7 +3585,7 @@ msgstr ""
"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
"wegen erschöpftem Arbeitsspeicher hindeutet."
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3571,7 +3594,7 @@ msgstr ""
"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
"wegen voller Festplatte hindeutet."
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/dz.po b/po/dz.po
index fcd13c1a3..5c9a2cfcf 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po.pot\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2006-09-19 09:49+0530\n"
"Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n"
"Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -96,7 +96,7 @@ msgid "Total space accounted for: "
msgstr "གི་དོན་ལུ་རྩིས་ཐོ་བཏོན་ཡོད་པའི་བར་སྟོང:"
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "ཐུམ་སྒྲིལ་ཡིག་སྣོད་ %sའདི་མཉམ་འབྱུང་གི་ཕྱི་ཁར་ཨིན་པས།"
@@ -104,7 +104,7 @@ msgstr "ཐུམ་སྒྲིལ་ཡིག་སྣོད་ %sའདི་
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "ཐུམ་སྒྲིལ་ཚུ་མ་ཐོབ།"
@@ -644,7 +644,7 @@ msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རི
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག"
@@ -673,6 +673,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -700,7 +705,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -737,11 +743,11 @@ msgid "File not found"
msgstr "ཡིག་སྣོད་འཚོལ་མ་ཐོབ།"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབཐ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
@@ -830,7 +836,7 @@ msgstr "སོ་ཀེཊི་ཅིག་གསར་བསྐྲུན་འ
msgid "Could not connect data socket, connection timed out"
msgstr "གནད་སྡུད་སོ་ཀེཊི་མཐུད་མ་ཚུགས་པར་ཡོདཔ་ཨིན་ མཐུད་ལམ་ངལ་མཚམས།"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
@@ -1514,16 +1520,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "ནང་འགོད་འཛོལ་བ་ ཡར་བསྐྱེད་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་ཐལ་ཡོད།"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "འབད་ཚར་ཡི།"
@@ -1531,7 +1537,19 @@ msgstr "འབད་ཚར་ཡི།"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1594,8 +1612,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2693,82 +2711,82 @@ msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་
msgid "Unable to parse package file %s (2)"
msgstr "%s (༢་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu འབྱུང་ཁུངས་ཐོ་ཡིག་ %s (ཡུ་ཨར་ཨའི་)གི་ནང་ན།"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(ཡང་དག་ dist)གི་ནང་ན།"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "%s་ཁ་ཕྱེ་དོ།"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "གྲལ་ཐིག་%u་འདི་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་ནང་ལུ་གནམ་མེད་ས་མེད་རིངམོ་འདུག"
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (དབྱེ་བ)་ནང་ན།"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།"
@@ -3371,57 +3389,61 @@ msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བས
msgid "Completely removed %s"
msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr " %sལུ་འབྲི་མ་ཚུགས།"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/el.po b/po/el.po
index 4ad135c9c..3c723313c 100644
--- a/po/el.po
+++ b/po/el.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_el\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2008-08-26 18:25+0300\n"
"Last-Translator: Θανάσης Νάτσης <natsisthanasis@gmail.com>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -102,7 +102,7 @@ msgid "Total space accounted for: "
msgstr "Συνολικός Καταμετρημένος Χώρος: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Το αρχείο πακέτου %s δεν είναι ενημερωμένο."
@@ -110,7 +110,7 @@ msgstr "Το αρχείο πακέτου %s δεν είναι ενημερωμέ
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Δε βρέθηκαν πακέτα"
@@ -656,7 +656,7 @@ msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί"
@@ -685,6 +685,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -712,7 +717,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -748,11 +754,11 @@ msgid "File not found"
msgstr "Το αρχείο Δε Βρέθηκε"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Αποτυχία εύρεσης της κατάστασης"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης"
@@ -841,7 +847,7 @@ msgstr "Αδύνατη η δημιουργία μιας υποδοχής (socket
msgid "Could not connect data socket, connection timed out"
msgstr "Αδύνατη η σύνδεση υποδοχής δεδομένων, λήξη χρόνου σύνδεσης"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Απέτυχε"
@@ -1534,16 +1540,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Η εντολή update δεν παίρνει ορίσματα"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Υπολογισμός της αναβάθμισης... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Εσωτερικό Σφάλμα, η διαδικασία αναβάθμισης χάλασε"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Ετοιμο"
@@ -1551,7 +1557,19 @@ msgstr "Ετοιμο"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1614,8 +1632,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2716,82 +2734,82 @@ msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s
msgid "Unable to parse package file %s (2)"
msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Απόλυτο dist)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Άνοιγμα του %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος "
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος "
@@ -3400,57 +3418,61 @@ msgstr "Προετοιμασία πλήρης αφαίρεσης του %s"
msgid "Completely removed %s"
msgstr "Το %s διαγράφηκε πλήρως"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Αδύνατη η εγγραφή στο %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/es.po b/po/es.po
index 7ae80ff02..c8f2f05e4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -33,7 +33,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.10\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2011-01-24 11:47+0100\n"
"Last-Translator: Javier Fernández-Sanguino Peña <jfs@debian.org>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -147,7 +147,7 @@ msgid "Total space accounted for: "
msgstr "Espacio registrado total: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "El archivo de paquetes %s está desincronizado."
@@ -155,7 +155,7 @@ msgstr "El archivo de paquetes %s está desincronizado."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "No se encontró ningún paquete"
@@ -716,7 +716,7 @@ msgstr "%s ya está en su versión más reciente.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperaba %s pero no estaba allí"
@@ -745,6 +745,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -772,7 +777,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -808,11 +814,11 @@ msgid "File not found"
msgstr "Fichero no encontrado"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "No pude leer"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "No pude poner el tiempo de modificación"
@@ -901,7 +907,7 @@ msgstr "No pude crear un socket"
msgid "Could not connect data socket, connection timed out"
msgstr "No pude conectar el socket de datos, expiró el tiempo de conexión"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Falló"
@@ -1596,16 +1602,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "El comando de actualización no toma argumentos"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Calculando la actualización... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Error Interno, AllUpgrade rompió cosas"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Listo"
@@ -1613,7 +1619,19 @@ msgstr "Listo"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1680,8 +1698,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2788,88 +2806,88 @@ msgstr "No se pudo tratar el archivo de paquetes %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "No se pudo tratar el archivo de paquetes %s (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de URI)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Línea %lu mal formada en la lista de fuentes %s ([opción] no parseable)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"Línea %lu mal formada en la lista de fuentes %s ([opción] demasiado corta)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Línea %lu mal formada en la lista de fuentes %s ([%s] no es una asignación)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
"Línea %lu mal formada en la lista de fuentes %s (no hay clave para [%s])"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Línea %lu mal formada en la lista de fuentes %s ([%s] la clave %s no tiene "
"asociado un valor)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Línea %lu mal formada en la lista de fuentes %s (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Línea %lu mal formada en la lista de fuentes %s (dist)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de URI)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Línea %lu mal formada en la lista de fuentes %s (dist absoluta)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de dist)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Abriendo %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Línea %u demasiado larga en la lista de fuentes %s."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Línea %u mal formada en la lista de fuentes %s (tipo)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s"
@@ -3500,35 +3518,39 @@ msgstr "Preparándose para eliminar completamente %s"
msgid "Completely removed %s"
msgstr "Se borró completamente %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "No se puede escribir en %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"No se escribió ningún informe «apport» porque ya se ha alcanzado el valor de "
"«MaxReports»"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "problemas de dependencias - dejando sin instalar"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3536,7 +3558,7 @@ msgstr ""
"No se escribió un informe «apport» porque el mensaje de error indica que es "
"un mensaje de error asociado a un fallo previo."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3544,7 +3566,7 @@ msgstr ""
"No se escribió un informe «apport» porque el mensaje de error indica que el "
"error es de disco lleno"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3552,7 +3574,7 @@ msgstr ""
"No se escribió un informe «apport» porque el mensaje de error indica un "
"error de memoria excedida"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3561,7 +3583,7 @@ msgstr ""
"No se escribió un informe «apport» porque el mensaje de error indica que el "
"error es de disco lleno"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/eu.po b/po/eu.po
index b07f1a948..222cd7fa1 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_eu\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2009-05-17 00:41+0200\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
@@ -93,7 +93,7 @@ msgid "Total space accounted for: "
msgstr "Guztira erregistratutako lekua: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "%s pakete fitxategia ez dago sinkronizatuta."
@@ -101,7 +101,7 @@ msgstr "%s pakete fitxategia ez dago sinkronizatuta."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Ez da paketerik aurkitu"
@@ -643,7 +643,7 @@ msgstr "%s bertsiorik berriena da jada.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s espero zen baina ez zegoen han"
@@ -672,6 +672,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -699,7 +704,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -736,11 +742,11 @@ msgid "File not found"
msgstr "Ez da fitxategia aurkitu"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Huts egin du atzitzean"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Huts egin du aldaketa ordua ezartzean"
@@ -832,7 +838,7 @@ msgid "Could not connect data socket, connection timed out"
msgstr ""
"Ezin izan da datu-socketa konektatu; konexioak denbora muga gainditu du"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Huts egin du"
@@ -1522,16 +1528,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Eguneratzeko komandoak ez du argumenturik hartzen"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Berriketak kalkulatzen... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Eginda"
@@ -1539,7 +1545,19 @@ msgstr "Eginda"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1602,8 +1620,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2695,82 +2713,82 @@ msgstr "Ezin da %s pakete fitxategia analizatu (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Ezin da %s pakete fitxategia analizatu (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (banaketa orokorra)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "%s irekitzen"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "%2$s iturburu zerrendako %1$u lerroa luzeegia da."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan"
@@ -3370,57 +3388,61 @@ msgstr "%s guztiz ezabatzeko prestatzen"
msgid "Completely removed %s"
msgstr "%s guztiz ezabatu da"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "%s : ezin da idatzi"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 958fc756c..4b8c34ab5 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2008-12-11 14:52+0200\n"
"Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -93,7 +93,7 @@ msgid "Total space accounted for: "
msgstr "Käytetty tila yhteensä: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Pakettitiedosto %s ei ole ajan tasalla."
@@ -101,7 +101,7 @@ msgstr "Pakettitiedosto %s ei ole ajan tasalla."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Yhtään pakettia ei löytynyt"
@@ -638,7 +638,7 @@ msgstr "%s on jo uusin versio.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Odotettiin %s, mutta sitä ei ollut"
@@ -667,6 +667,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -694,7 +699,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -730,11 +736,11 @@ msgid "File not found"
msgstr "Tiedostoa ei löydy"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Komento stat ei toiminut"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua"
@@ -823,7 +829,7 @@ msgstr "Pistoketta ei voitu luoda"
msgid "Could not connect data socket, connection timed out"
msgstr "Pistoketta ei voitu kytkeä, yhteys aikakatkaistiin"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Ei onnistunut"
@@ -1514,16 +1520,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Komento update ei käytä parametreja"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Käsitellään päivitystä ... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Valmis"
@@ -1531,7 +1537,19 @@ msgstr "Valmis"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1594,8 +1612,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2686,82 +2704,82 @@ msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
msgid "Unable to parse package file %s (2)"
msgstr "Pakettitiedostoa %s (2) ei voi jäsentää"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (Absoluuttinen dist)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Avataan %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Rivi %u on liian pitkä lähdeluettelossa %s."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s"
@@ -3362,57 +3380,61 @@ msgstr "Valmistaudutaan poistamaan %s kokonaan"
msgid "Completely removed %s"
msgstr "%s poistettiin kokonaan"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 64ce07802..bb644f8d5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2013-08-17 07:57+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -93,7 +93,7 @@ msgid "Total space accounted for: "
msgstr "Total de l'espace attribué : "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Fichier %s désynchronisé."
@@ -101,7 +101,7 @@ msgstr "Fichier %s désynchronisé."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Aucun paquet n'a été trouvé"
@@ -675,7 +675,7 @@ msgstr "%s était déjà marqué comme non figé.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "A attendu %s mais il n'était pas présent"
@@ -697,6 +697,7 @@ msgstr ""
"superutilisateur ?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -706,6 +707,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -755,7 +761,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -793,11 +800,11 @@ msgid "File not found"
msgstr "Fichier non trouvé"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Impossible de statuer"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Impossible de modifier l'heure "
@@ -888,7 +895,7 @@ msgid "Could not connect data socket, connection timed out"
msgstr ""
"Impossible de se connecter sur le port de données, délai de connexion dépassé"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Échec"
@@ -1597,16 +1604,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "La commande de mise à jour ne prend pas de paramètre"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Calcul de la mise à jour... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Erreur interne, AllUpgrade a cassé le boulot !"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Fait"
@@ -1614,7 +1621,19 @@ msgstr "Fait"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1683,8 +1702,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2795,93 +2814,93 @@ msgstr "Impossible de traiter le fichier %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Impossible de traiter le fichier %s (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Ligne %lu mal formée dans la liste des sources %s (impossible d'analyser "
"[option])"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"Ligne %lu mal formée dans la liste de sources %s ([option] trop courte)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Ligne %lu mal formée dans la liste des sources %s ([%s] n'est pas une "
"affectation)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
"Ligne %lu mal formée dans la liste des sources %s ([%s] n'a pas de clé)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Ligne %lu mal formée dans la liste des sources %s ([%s] la clé %s n'a pas de "
"valeur)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Ligne %lu mal formée dans le fichier de source %s (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Ligne %lu mal formée dans la liste de sources %s (distribution)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
"Ligne %lu mal formée dans la liste des sources %s (distribution absolue)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
"Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Ouverture de %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "La ligne %u du fichier des listes de sources %s est trop longue."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Ligne %u mal formée dans la liste des sources %s (type)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr ""
@@ -3532,33 +3551,37 @@ msgstr "Préparation de la suppression complète de %s"
msgid "Completely removed %s"
msgstr "%s complètement supprimé"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Impossible d'écrire sur %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "L'opération a été interrompue avant de se terminer"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr "Aucun rapport « apport » écrit car MaxReports a déjà été atteint"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "problème de dépendances : laissé non configuré"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3566,14 +3589,14 @@ msgstr ""
"Aucun rapport « apport » n'a été créé car le message d'erreur indique une "
"erreur consécutive à un échec précédent."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
"Aucun rapport « apport » n'a été créé car un disque plein a été signalé"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3581,7 +3604,7 @@ msgstr ""
"Aucun « apport » n'a été créé car une erreur de dépassement de capacité "
"mémoire a été signalée"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3589,7 +3612,7 @@ msgid ""
msgstr ""
"Aucun rapport « apport » n'a été créé car un disque plein a été signalé"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 57343335a..a3f6596a0 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_gl\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2011-05-12 15:28+0100\n"
"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
"Language-Team: galician <proxecto@trasno.net>\n"
@@ -96,7 +96,7 @@ msgid "Total space accounted for: "
msgstr "Espazo total contabilizado: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "O ficheiro de paquete %s está sen sincronizar."
@@ -104,7 +104,7 @@ msgstr "O ficheiro de paquete %s está sen sincronizar."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Non se atopou ningún paquete"
@@ -661,7 +661,7 @@ msgstr "%s xa é a versión máis recente.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Agardouse por %s pero non estaba alí"
@@ -690,6 +690,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -717,7 +722,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -753,11 +759,11 @@ msgid "File not found"
msgstr "Non se atopou o ficheiro"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Non foi posíbel determinar o estado"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Non foi posíbel estabelecer a hora de modificación"
@@ -847,7 +853,7 @@ msgid "Could not connect data socket, connection timed out"
msgstr ""
"Non é posíbel conectar o socket de datos, o tempo esgotouse para a conexión"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Fallou"
@@ -1546,16 +1552,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "A orde «update» non toma argumentos"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Calculando a anovación... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Produciuse un erro interno, AllUpgrade estragou cousas"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Feito"
@@ -1563,7 +1569,19 @@ msgstr "Feito"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1631,8 +1649,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2735,86 +2753,86 @@ msgstr "Non é posíbel analizar o ficheiro de paquetes %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Non é posíbel analizar o ficheiro de paquetes %s (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "Liña %lu mal construída na lista de orixes %s (análise de URI)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Liña %lu mal construída na lista de fontes %s ([opción] non analizábel)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"Liña %lu mal construída na lista de fontes %s ([opción] demasiado curta)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Liña %lu mal construída na lista de fontes %s ([%s] non é unha asignación)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Liña %lu mal construída na lista de fontes %s ([%s] non ten chave)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Liña %lu mal construída na lista de fontes %s ([%s] a chave %s non ten valor)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Liña %lu mal construída na lista de orixes %s (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Liña %lu mal construída na lista de orixes %s (dist)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Liña %lu mal construída na lista de orixes %s (análise de URI)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Liña %lu mal construída na lista de orixes %s (dist absoluta)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Liña %lu mal construída na lista de orixes %s (análise de dist)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Abrindo %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Liña %u longa de máis na lista de orixes %s."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Liña %u mal construída na lista de orixes %s (tipo)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s"
@@ -3442,35 +3460,39 @@ msgstr "Preparándose para retirar %s completamente"
msgid "Completely removed %s"
msgstr "Retirouse %s completamente"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Non é posíbel escribir en %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Non se escribiu ningún informe de Apport porque xa se acadou o nivel "
"MaxReports"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "problemas de dependencias - déixase sen configurar"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3478,7 +3500,7 @@ msgstr ""
"Non se escribiu ningún informe de Apport porque a mensaxe de erro indica que "
"é un error provinte dun fallo anterior."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3486,7 +3508,7 @@ msgstr ""
"Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un "
"erro de disco cheo."
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3494,7 +3516,7 @@ msgstr ""
"Non se escribiu un informe de contribución porque a mensaxe de erro indica "
"un erro de falta de memoria"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3503,7 +3525,7 @@ msgstr ""
"Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un "
"erro de disco cheo."
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/hu.po b/po/hu.po
index a70700de7..238737cd3 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt trunk\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-06-25 17:09+0200\n"
"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
@@ -95,7 +95,7 @@ msgid "Total space accounted for: "
msgstr "Nyilvántartott terület összesen: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "%s csomagfájl nincs szinkronban."
@@ -103,7 +103,7 @@ msgstr "%s csomagfájl nincs szinkronban."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Nem találhatók csomagok"
@@ -656,7 +656,7 @@ msgstr "%s eddig sem volt visszafogva.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Nem található a(z) %s, a várakozás után sem"
@@ -676,6 +676,7 @@ msgid "Executing dpkg failed. Are you root?"
msgstr "A dpkg futtatása sikertelen. Van root jogosultsága?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -685,6 +686,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -732,7 +738,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -769,11 +776,11 @@ msgid "File not found"
msgstr "A fájl nem található"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Nem érhető el"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "A módosítási idő beállítása sikertelen"
@@ -865,7 +872,7 @@ msgid "Could not connect data socket, connection timed out"
msgstr ""
"Nem lehet kapcsolódni az adatfoglalathoz, a kapcsolat túllépte az időkorlátot"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Sikertelen"
@@ -1551,16 +1558,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Az update parancsnak nincsenek argumentumai"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Frissítés kiszámítása... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Belső hiba, az AllUpgrade megsértett valamit"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Kész"
@@ -1568,7 +1575,19 @@ msgstr "Kész"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1635,8 +1654,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2735,92 +2754,92 @@ msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI-feldolgozás)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] "
"feldolgozhatatlan)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] túl "
"rövid)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] nem "
"érvényes hozzárendelés)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] nem "
"tartalmaz kulcsot)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] %s kulcsnak "
"nincs értéke)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (dist)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI-feldolgozás)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (Abszolút dist)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (dist feldolgozás)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "%s megnyitása"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "A(z) %u. sor túl hosszú a(z) %s forráslistában."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "A(z) %u. sor hibás a(z) %s forráslistában (típus)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában"
@@ -3440,33 +3459,37 @@ msgstr "%s teljes eltávolításának előkészítése"
msgid "Completely removed %s"
msgstr "%s teljesen eltávolítva"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Nem lehet írni ebbe: %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "A művelet megszakadt, mielőtt befejeződhetett volna"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr "Nem került írásra apport jelentés, mivel a MaxReports már elérve"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "függőségi hibák - a csomag beállítatlan maradt"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3474,7 +3497,7 @@ msgstr ""
"Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint ez a hiba "
"egy korábbi hiba következménye."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3482,7 +3505,7 @@ msgstr ""
"Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint megtelt a "
"lemez"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3490,7 +3513,7 @@ msgstr ""
"Nem került kiírásra apport jelentés, mivel a hibaüzenet memóriaelfogyási "
"hibát jelez"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
@@ -3498,7 +3521,7 @@ msgstr ""
"Nem került kiírásra apport jelentés, mert a hibaüzenet a helyi rendszeren "
"lévő hibát jelez"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/it.po b/po/it.po
index 6f0d90f13..d566d7de7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2013-08-27 22:06+0200\n"
"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -94,7 +94,7 @@ msgid "Total space accounted for: "
msgstr "Totale spazio occupato: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Il file dei pacchetti %s non è sincronizzato."
@@ -102,7 +102,7 @@ msgstr "Il file dei pacchetti %s non è sincronizzato."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Nessun pacchetto trovato"
@@ -669,7 +669,7 @@ msgstr "%s era già non bloccato.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "In attesa di %s ma non era presente"
@@ -689,6 +689,7 @@ msgid "Executing dpkg failed. Are you root?"
msgstr "Esecuzione di dpkg non riuscita. È stato lanciato come root?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -698,6 +699,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -746,7 +752,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -782,11 +789,11 @@ msgid "File not found"
msgstr "File non trovato"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Esecuzione di stat non riuscita"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Impostazione della data di modifica non riuscita"
@@ -877,7 +884,7 @@ msgid "Could not connect data socket, connection timed out"
msgstr ""
"Impossibile connettersi al socket dati, tempo esaurito per la connessione"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Non riuscito"
@@ -1580,16 +1587,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Il comando update non accetta argomenti"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Calcolo dell'aggiornamento... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Errore interno, AllUpgrade ha rovinato qualche cosa"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Eseguito"
@@ -1597,7 +1604,19 @@ msgstr "Eseguito"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1665,8 +1684,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2777,92 +2796,92 @@ msgstr "Impossibile analizzare il file di pacchetto %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Impossibile analizzare il file di pacchetto %s (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "La riga %lu nel file %s non è corretta (URI parse)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"La riga %lu nel file delle sorgenti %s non è corretta ([opzione] non "
"analizzabile)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"La riga %lu nel file delle sorgenti %s non è corretta ([opzione] troppo "
"corta)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"La riga %lu nel file delle sorgenti %s non è corretta ([%s] non è "
"un'assegnazione)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
"La riga %lu nel file delle sorgenti %s non è corretta ([%s] non ha una "
"chiave)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"La riga %lu nel file delle sorgenti %s non è corretta ([%s] la chiave %s non "
"ha un valore)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "La riga %lu nel file %s non è corretta (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "La riga %lu nel file %s non è corretta (dist)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "La riga %lu nel file %s non è corretta (URI parse)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "La riga %lu nel file %s non è corretta (absolute dist)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "La riga %lu nel file %s non è corretta (dist parse)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Apertura di %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Riga %u troppo lunga nel file %s."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "La riga %u nel file %s non è corretta (type)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s"
@@ -3502,35 +3521,39 @@ msgstr "Preparazione alla rimozione completa di %s"
msgid "Completely removed %s"
msgstr "Pacchetto %s rimosso completamente"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Impossibile scrivere in %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "L'operazione è stata interrotta prima di essere completata"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Segnalazione apport non scritta poiché è stato raggiunto il valore massimo "
"di MaxReports"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "Problemi con le dipendenze - Viene lasciato non configurato"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3538,7 +3561,7 @@ msgstr ""
"Segnalazione apport non scritta poiché il messaggio di errore indica la "
"presenza di un fallimento precedente."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3546,7 +3569,7 @@ msgstr ""
"Segnalazione apport non scritta poiché il messaggio di errore indica un "
"errore per disco pieno."
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3554,7 +3577,7 @@ msgstr ""
"Segnalazione apport non scritta poiché il messaggio di errore indica un "
"errore di memoria esaurita"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3563,7 +3586,7 @@ msgstr ""
"Segnalazione apport non scritta poiché il messaggio di errore indica un "
"errore per disco pieno."
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 3ef58b94c..02984f34a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.9.4\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2013-08-11 19:39+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -92,7 +92,7 @@ msgid "Total space accounted for: "
msgstr "総占有容量: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Package ファイル %s が同期していません。"
@@ -100,7 +100,7 @@ msgstr "Package ファイル %s が同期していません。"
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "パッケージが見つかりません"
@@ -661,7 +661,7 @@ msgstr "%s はすでに保留されていません。\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s を待ちましたが、そこにはありませんでした"
@@ -681,6 +681,7 @@ msgid "Executing dpkg failed. Are you root?"
msgstr "dpkg の実行に失敗しました。root 権限で実行していますか?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -690,6 +691,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -736,7 +742,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -772,11 +779,11 @@ msgid "File not found"
msgstr "ファイルが見つかりません"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "状態の取得に失敗しました"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "変更時刻の設定に失敗しました"
@@ -865,7 +872,7 @@ msgstr "ソケットを作成できません"
msgid "Could not connect data socket, connection timed out"
msgstr "データソケットへ接続できませんでした。接続がタイムアウトしました"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "失敗"
@@ -1550,16 +1557,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "update コマンドは引数をとりません"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "アップグレードパッケージを検出しています ... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "内部エラー、AllUpgrade が何かを破壊しました"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "完了"
@@ -1567,7 +1574,18 @@ msgstr "完了"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1634,8 +1652,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2724,86 +2742,86 @@ msgstr "パッケージファイル %s を解釈することができません (
msgid "Unable to parse package file %s (2)"
msgstr "パッケージファイル %s を解釈することができません (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"ソースリスト %2$s の %1$lu 行目が不正です ([オプション] を解釈できません)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"ソースリスト %2$s の %1$lu 行目が不正です ([オプション] が短かすぎます)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] は割り当てられていません)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s にキーがありません)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] キー %4$s に値がありません)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "ソースリスト %2$s の %1$lu 行目が不正です (absolute dist)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist parse)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "%s をオープンしています"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "ソースリスト %2$s の %1$u 行目が長すぎます。"
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です"
@@ -3430,33 +3448,37 @@ msgstr "%s を完全に削除する準備をしています"
msgid "Completely removed %s"
msgstr "%s を完全に削除しました"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "%s に書き込めません"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "操作はそれが完了する前に中断されました"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr "MaxReports にすでに達しているため、レポートは書き込まれません"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "依存関係の問題 - 未設定のままにしています"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3464,7 +3486,7 @@ msgstr ""
"エラーメッセージは前の失敗から続くエラーであることを示しているので、レポート"
"は書き込まれません。"
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3472,7 +3494,7 @@ msgstr ""
"エラーメッセージはディスクフルエラーであることを示しているので、レポートは書"
"き込まれません。"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3480,7 +3502,7 @@ msgstr ""
"エラーメッセージはメモリ超過エラーであることを示しているので、レポートは書き"
"込まれません。"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3489,7 +3511,7 @@ msgstr ""
"エラーメッセージはディスクフルエラーであることを示しているので、レポートは書"
"き込まれません。"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/km.po b/po/km.po
index e0944fa9f..c76ef42d3 100644
--- a/po/km.po
+++ b/po/km.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_km\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2006-10-10 09:48+0700\n"
"Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
"Language-Team: Khmer <support@khmeros.info>\n"
@@ -97,7 +97,7 @@ msgid "Total space accounted for: "
msgstr "ទំហំ​សរុប​ដែល​ទុក​សម្រាប់ ៖ "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "ឯកសារ​កញ្ចប់ %s នៅ​ខាងក្រៅ​ការ​ធ្វើសមកាលកម្ម ។"
@@ -105,7 +105,7 @@ msgstr "ឯកសារ​កញ្ចប់ %s នៅ​ខាងក្រៅ
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "រក​កញ្ចប់​មិន​ឃើញ"
@@ -636,7 +636,7 @@ msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទ
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "រង់ចាំប់​ %s ប៉ុន្តែ ​វា​មិន​នៅទីនោះ"
@@ -665,6 +665,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -692,7 +697,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -728,11 +734,11 @@ msgid "File not found"
msgstr "រកឯកសារ​មិន​ឃើញ​"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "បរាជ័យ​ក្នុងការថ្លែង"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "បរាជ័យក្នុងការកំណត់​ពេលវេលា​ការកែប្រែ​"
@@ -820,7 +826,7 @@ msgstr "មិន​អាច​បង្កើត​រន្ធបានឡើ
msgid "Could not connect data socket, connection timed out"
msgstr "មិន​អាច​តភ្ជាប់​​រន្ធទិន្នន័យ​បានឡើយ អស់​ពេល​ក្នុងការតភ្ជាប់​"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "បាន​បរាជ័យ"
@@ -1496,16 +1502,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម័យ​គ្មាន​អាគុយម៉ង់​ទេ"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "កំហុស​ខាងក្នុង ការធ្វើឲ្យប្រសើរ​ទាំងអស់បានធ្វើឲ្យ​ឧបករណ៍​ខូច"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "ធ្វើរួច​"
@@ -1513,7 +1519,19 @@ msgstr "ធ្វើរួច​"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1576,8 +1594,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2665,82 +2683,82 @@ msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1
msgid "Unable to parse package file %s (2)"
msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់​ %s (2) បានឡើយ"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "បន្ទាត់​ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​ញ្ជី​ប្រភព​ %s (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "បន្ទាត់​ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist លែងប្រើ)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "កំពុង​បើក​ %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "បន្ទាត់​ %u មាន​ប្រវែង​វែងពេកនៅ​ក្នុង​បញ្ជី​ប្រភព​ %s ។"
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "បន្ទាត់​ Malformed %u ក្នុង​បញ្ជី​ប្រភព​ %s (ប្រភេទ​)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ"
@@ -3335,57 +3353,61 @@ msgstr "កំពុង​រៀបចំ​យក %s ចេញ​ទាំង
msgid "Completely removed %s"
msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "មិន​អាច​សរសេរ​ទៅ %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/ko.po b/po/ko.po
index f768cb179..5d88f7e89 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2010-08-30 02:31+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -89,7 +89,7 @@ msgid "Total space accounted for: "
msgstr "차지하는 전체 용량: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "패키지 파일 %s 파일이 동기화되지 않았습니다."
@@ -97,7 +97,7 @@ msgstr "패키지 파일 %s 파일이 동기화되지 않았습니다."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "패키지가 없습니다"
@@ -643,7 +643,7 @@ msgstr "%s 패키지는 이미 최신 버전입니다.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다"
@@ -672,6 +672,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -699,7 +704,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -735,11 +741,11 @@ msgid "File not found"
msgstr "파일이 없습니다"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "파일 정보를 읽는데 실패했습니다"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "파일 변경 시각을 설정하는데 실패했습니다"
@@ -828,7 +834,7 @@ msgstr "소켓을 만들 수 없습니다"
msgid "Could not connect data socket, connection timed out"
msgstr "데이터 소켓을 연결할 수 없습니다. 연결 시간이 초과되었습니다"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "실패"
@@ -1508,16 +1514,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "update 명령은 인수를 받지 않습니다"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "업그레이드를 계산하는 중입니다... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "내부 오류, AllUpgrade 프로그램이 무언가를 망가뜨렸습니다"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "완료"
@@ -1525,7 +1531,18 @@ msgstr "완료"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1592,8 +1609,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2681,83 +2698,83 @@ msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (1)"
msgid "Unable to parse package file %s (2)"
msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 파싱 불가)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 너무 짧음)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 대입이 아님)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 키가 없음)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] %4$s 키에 값이 없음)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (절대 dist)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파싱)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "%s 파일을 여는 중입니다"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "소스 리스트 %2$s의 %1$u번 줄이 너무 깁니다."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다"
@@ -3361,33 +3378,37 @@ msgstr "%s 패키지를 완전히 지울 준비를 하는 중입니다"
msgid "Completely removed %s"
msgstr "%s 패키지를 완전히 지웠습니다"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "%s에 쓸 수 없습니다"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr "보고서를 작성하지 않습니다. 이미 MaxReports 값에 도달했습니다."
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "의존성 문제 - 설정하지 않은 상태로 남겨둡니다"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3395,20 +3416,20 @@ msgstr ""
"보고서를 작성하지 않습니다. 오류 메시지에 따르면 예전의 실패 때문에 생긴 부수"
"적인 오류입니다."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
"보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다."
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr "보고서를 작성하지 않습니다. 오류 메시지에 따르면 메모리가 부족합니다."
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3416,7 +3437,7 @@ msgid ""
msgstr ""
"보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다."
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/ku.po b/po/ku.po
index fc762aff0..d982977f3 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-ku\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2008-05-08 12:48+0200\n"
"Last-Translator: Erdal Ronahi <erdal dot ronahi at gmail dot com>\n"
"Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n"
@@ -96,7 +96,7 @@ msgid "Total space accounted for: "
msgstr "Cihê giştî yê veqetandî: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Pakêta dosya %s li derveyî demê ye."
@@ -104,7 +104,7 @@ msgstr "Pakêta dosya %s li derveyî demê ye."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Pakêt nayên dîtin"
@@ -558,7 +558,7 @@ msgstr "%s jixwe guhertoya nûtirîn e.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -587,6 +587,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -614,7 +619,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -648,12 +654,12 @@ msgid "File not found"
msgstr "Pel nehate dîtin"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
#, fuzzy
msgid "Failed to stat"
msgstr "%s venebû"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr ""
@@ -740,7 +746,7 @@ msgstr ""
msgid "Could not connect data socket, connection timed out"
msgstr ""
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Serneket"
@@ -1404,15 +1410,15 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr ""
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Bilindkirin tê hesibandin..."
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
msgid "Internal error, Upgrade broke stuff"
msgstr ""
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Temam"
@@ -1420,7 +1426,19 @@ msgstr "Temam"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1480,8 +1498,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2508,82 +2526,82 @@ msgstr "Pakêt nehate dîtin %s"
msgid "Unable to parse package file %s (2)"
msgstr "Pakêt nehate dîtin %s"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "%s tê vekirin"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr ""
@@ -3163,57 +3181,61 @@ msgstr "Bi tevahî rakirina %s tê amadekirin"
msgid "Completely removed %s"
msgstr "%s bi tevahî hatine rakirin"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Nivîsandin ji bo %s ne pêkane"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 46e7f2c13..390ab5cb6 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2008-08-02 01:47-0400\n"
"Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -95,7 +95,7 @@ msgid "Total space accounted for: "
msgstr ""
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr ""
@@ -103,7 +103,7 @@ msgstr ""
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Paketų nerasta"
@@ -562,7 +562,7 @@ msgstr "%s ir taip jau yra naujausias.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -591,6 +591,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -618,7 +623,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -652,11 +658,11 @@ msgid "File not found"
msgstr "Failas nerastas"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr ""
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr ""
@@ -743,7 +749,7 @@ msgstr ""
msgid "Could not connect data socket, connection timed out"
msgstr ""
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Nepavyko"
@@ -1418,16 +1424,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Atnaujinimo komandai argumentų nereikia"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Skaičiuojami atnaujinimai... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Vidinė klaida, problemos sprendimas kažką sugadino"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Įvykdyta"
@@ -1435,7 +1441,19 @@ msgstr "Įvykdyta"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1498,8 +1516,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2597,82 +2615,82 @@ msgstr ""
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Atveriama %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr ""
@@ -3258,57 +3276,61 @@ msgstr "Ruošiamasi visiškai pašalinti %s"
msgid "Completely removed %s"
msgstr "Visiškai pašalintas %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Nepavyko įrašyti į %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/mr.po b/po/mr.po
index f77866298..fc382d9bc 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2008-11-20 23:27+0530\n"
"Last-Translator: Sampada <sampadanakhare@gmail.com>\n"
"Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India "
@@ -91,7 +91,7 @@ msgid "Total space accounted for: "
msgstr "हिशेबात घेतलेली एकूण अवकाश(जागा):"
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "पॅकेज संचिका %s सिंक्रोनाइज नाहीत"
@@ -99,7 +99,7 @@ msgstr "पॅकेज संचिका %s सिंक्रोनाइज
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "पॅकेजेस सापडले नाहीत"
@@ -632,7 +632,7 @@ msgstr "%s ही आधीच नविन आवृत्ती आहे.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s साठी थांबलो पण ते तेथे नव्हते"
@@ -661,6 +661,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -688,7 +693,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -724,11 +730,11 @@ msgid "File not found"
msgstr "फाईल सापडली नाही"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "स्टॅट करण्यास असमर्थ"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "बदलण्याचा वेळ निश्चित करण्यास असमर्थ"
@@ -817,7 +823,7 @@ msgstr "सॉकेट तयार करू शकत नाही"
msgid "Could not connect data socket, connection timed out"
msgstr "डेटा सॉकेट जोडू शकत नाही,जोडणी वेळेअभावी बंद केली"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "असमर्थ"
@@ -1500,16 +1506,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ शकत नाही."
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "पुढिल आवृत्तीची गणती करीत आहे..."
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "अंतर्गत त्रुटी,ऑलअपग्रेडने स्टफला तोडले"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "झाले"
@@ -1517,7 +1523,19 @@ msgstr "झाले"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1580,8 +1598,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2669,82 +2687,82 @@ msgstr "%s (1) पॅकेज फाईल पार्स करण्या
msgid "Unable to parse package file %s (2)"
msgstr "%s (२) पॅकेज फाईल पार्स करण्यात असमर्थ"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "स्त्रोत सुची %s (यूआरआय) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "स्त्रोत सुची %s (absolute dist) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "%s उघडत आहे"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "%s स्त्रोत सुचीमध्ये ओळ %u खूप लांब आहे."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "स्त्रोत सुची %s (प्रकार) मध्ये %u वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही "
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही "
@@ -3347,57 +3365,61 @@ msgstr "%s संपूर्ण काढून टाकण्याची त
msgid "Completely removed %s"
msgstr "%s संपूर्ण काढून टाकले"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "%s मध्ये लिहिण्यास असमर्थ "
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/nb.po b/po/nb.po
index bdd00052d..835cd4d15 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2010-09-01 21:10+0200\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -96,7 +96,7 @@ msgid "Total space accounted for: "
msgstr "Samlet mengde redegjort plass: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Pakkefila %s er ikke oppdatert."
@@ -104,7 +104,7 @@ msgstr "Pakkefila %s er ikke oppdatert."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Fant ingen pakker"
@@ -647,7 +647,7 @@ msgstr "%s er allerede nyeste versjon.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Ventet på %s, men den ble ikke funnet"
@@ -676,6 +676,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -703,7 +708,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -741,11 +747,11 @@ msgid "File not found"
msgstr "Fant ikke fila"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Klarte ikke å få status"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Klarte ikke å sette endringstidspunkt"
@@ -834,7 +840,7 @@ msgstr "Klarte ikke å opprette en sokkel"
msgid "Could not connect data socket, connection timed out"
msgstr "Klarte ikke å kople til datasokkelen, tidsavbrudd på forbindelsen"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Mislyktes"
@@ -1521,16 +1527,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Oppdaterings-kommandoen tar ingen argumenter"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Beregner oppgradering... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Intern feil - «AllUpgrade» ødela noe"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Utført"
@@ -1538,7 +1544,19 @@ msgstr "Utført"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1605,8 +1623,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2699,82 +2717,82 @@ msgstr "Klarer ikke å fortolke pakkefila %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Klarer ikke å fortolke pakkefila %s (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Feil på linje %lu i kildelista %s ([valg] ikke tolkbar)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Feil på linje %lu i kildelista %s ([valg] for kort)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Feil på linje %lu i kildelista %s ([%s] er ingen tilordning)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Feil på linje %lu i kildelista %s ([%s] har ingen nøkkel)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Feil på linje %lu i kildelista %s ([%s] nøkkel %s har ingen verdi)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Feil på linje %lu i kildelista %s (nettadresse)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Feil på linje %lu i kildelista %s (dist)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Feil på %lu i kildelista %s (Absolutt dist)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Feil på %lu i kildelista %s (dist fortolking)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Åpner %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linje %u i kildelista %s er for lang"
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Feil på %u i kildelista %s (type)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typen «%s» er ukjent i linje %u i kildelista %s"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "Typen «%s» er ukjent i linje %u i kildelista %s"
@@ -3386,33 +3404,37 @@ msgstr "Forbereder å fullstendig slette %s"
msgid "Completely removed %s"
msgstr "Fjernet %s fullstendig"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Kan ikke skrive til %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr "Ingen apport-rapport skrevet for MaxReports allerede er nådd"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "avhengighetsproblemer - lar den være uoppsatt"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3420,7 +3442,7 @@ msgstr ""
"Ingen apport-rapport skrevet fordi feilmeldingen indikerer at den er en "
"følgefeil fra en tidligere feil."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3428,7 +3450,7 @@ msgstr ""
"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-"
"feil"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3436,7 +3458,7 @@ msgstr ""
"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «tom for "
"minne»-feil"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3445,7 +3467,7 @@ msgstr ""
"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-"
"feil"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/ne.po b/po/ne.po
index 3d9ecee00..a64e22bab 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2006-06-12 14:35+0545\n"
"Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n"
"Language-Team: Nepali <info@mpp.org.np>\n"
@@ -94,7 +94,7 @@ msgid "Total space accounted for: "
msgstr "को लागि कूल खाली ठाऊँ लेखांकन:"
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "प्याकेज फाइल %s sync भन्दा बाहिर छ ।"
@@ -102,7 +102,7 @@ msgstr "प्याकेज फाइल %s sync भन्दा बाहि
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "कुनै प्याकेजहरू फेला परेन"
@@ -634,7 +634,7 @@ msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन"
@@ -663,6 +663,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -690,7 +695,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -726,11 +732,11 @@ msgid "File not found"
msgstr "फाइल फेला परेन "
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "स्थिर गर्न असफल भयो"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "परिमार्जन समय सेट असफल भयो"
@@ -819,7 +825,7 @@ msgstr "एउटा सकेट सिर्जना गर्न सके
msgid "Could not connect data socket, connection timed out"
msgstr "डेटा सकेट जडान गर्न सकिएन, जडान समय सकियो"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "असफल भयो"
@@ -1497,16 +1503,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "स्तर वृद्धि गणना गरिदैछ..."
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "आन्तरिक त्रुटि,सबै स्तरवृद्धिले उत्तम गुण नष्ट गर्दछ"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "काम भयो"
@@ -1514,7 +1520,19 @@ msgstr "काम भयो"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1577,8 +1595,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2667,82 +2685,82 @@ msgstr "प्याकेज फाइल पद वर्णन गर्न
msgid "Unable to parse package file %s (2)"
msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (२)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (पूर्ण dist)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "%s खोलिदैछ"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "लाइन %u स्रोत सूचि %s मा अति लामो छ ।"
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (प्रकार)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन"
@@ -3338,57 +3356,61 @@ msgstr " %s पूर्ण रुपले हटाउन तयार गर
msgid "Completely removed %s"
msgstr " %s पूर्ण रुपले हट्यो"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr " %s मा लेख्न असक्षम"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index b9b9794ee..3ae34ade3 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.15.9\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2011-12-05 17:10+0100\n"
"Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -95,7 +95,7 @@ msgid "Total space accounted for: "
msgstr "Totale hoeveelheid verantwoorde ruimte: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Pakketbestand %s is niet meer gesynchroniseerd."
@@ -103,7 +103,7 @@ msgstr "Pakketbestand %s is niet meer gesynchroniseerd."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Geen pakketten gevonden"
@@ -659,7 +659,7 @@ msgstr "%s is reeds de nieuwste versie.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Er is gewacht op %s, maar die kwam niet"
@@ -688,6 +688,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -715,7 +720,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -752,11 +758,11 @@ msgid "File not found"
msgstr "Bestand niet gevonden"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "stat is mislukt"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Instellen van de aanpassingstijd is mislukt"
@@ -845,7 +851,7 @@ msgstr "Kon geen socket aanmaken"
msgid "Could not connect data socket, connection timed out"
msgstr "Kon de datasocket niet verbinden, de verbinding verliep"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Mislukt"
@@ -1541,16 +1547,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "De opdracht 'update' aanvaard geen argumenten"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Opwaardering wordt doorgerekend... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Klaar"
@@ -1558,7 +1564,19 @@ msgstr "Klaar"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1625,8 +1643,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2733,83 +2751,83 @@ msgstr "Kon pakketbestand %s niet ontleden (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Kon pakketbestand %s niet ontleden (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "Misvormde regel %lu in bronlijst %s (URI parse)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Misvormde regel %lu in bronlijst %s ([optie] onbegrijpelijk)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Misvormde regel %lu in bronlijst %s ([optie] te kort)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Misvormde regel %lu in bronlijst %s ([%s] is geen toekenning)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Misvormde regel %lu in bronlijst %s ([%s] heeft geen sleutel)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Misvormde regel %lu in bronlijst %s ([%s] sleutel %s heeft geen waarde)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Misvormde regel %lu in bronlijst %s (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Misvormde regel %lu in bronlijst %s (dist)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Misvormde regel %lu in bronlijst %s (URI parse)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Misvormde regel %lu in bronlijst %s (absolute dist)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Misvormde regel %lu in bronlijst %s (dist parse)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "%s wordt geopend"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Regel %u van de bronlijst %s is te lang."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Misvormde regel %u in bronlijst %s (type)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Type '%s' op regel %u in bronlijst %s is onbekend"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "Type '%s' op regel %u in bronlijst %s is onbekend"
@@ -3440,35 +3458,39 @@ msgstr "Volledige verwijdering van %s wordt voorbereid"
msgid "Completely removed %s"
msgstr "%s is volledig verwijderd"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Kan niet naar %s schrijven"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Er is geen apport-verslag weggeschreven omdat het maximum aantal verslagen "
"(MaxReports) al is bereikt"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "problemen met vereisten - wordt niet geconfigureerd"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3476,7 +3498,7 @@ msgstr ""
"Er is geen apport-verslag weggeschreven omdat de foutmelding volgt op een "
"eerdere mislukking."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3484,7 +3506,7 @@ msgstr ""
"Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is "
"over een volle schijf."
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3492,7 +3514,7 @@ msgstr ""
"Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is "
"over onvoldoende-geheugen."
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3501,7 +3523,7 @@ msgstr ""
"Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is "
"over een volle schijf."
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/nn.po b/po/nn.po
index 6ae106e38..937597248 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_nn\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2005-02-14 23:30+0100\n"
"Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
"Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -96,7 +96,7 @@ msgid "Total space accounted for: "
msgstr "Brukt plass i alt: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Pakkefila %s er ute av takt."
@@ -104,7 +104,7 @@ msgstr "Pakkefila %s er ute av takt."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Fann ingen pakkar"
@@ -641,7 +641,7 @@ msgstr "Den nyaste versjonen av %s er installert fr fr.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Venta p %s, men den fanst ikkje"
@@ -670,6 +670,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -697,7 +702,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -735,11 +741,11 @@ msgid "File not found"
msgstr "Fann ikkje fila"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Klarte ikkje f status"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Klarte ikkje setja endringstidspunkt"
@@ -828,7 +834,7 @@ msgstr "Klarte ikkje oppretta sokkel"
msgid "Could not connect data socket, connection timed out"
msgstr "Klarte ikkje kopla til datasokkel, tidsavbrot p sambandet"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Mislukkast"
@@ -1508,16 +1514,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Oppdateringskommandoen tek ingen argument"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Reknar ut oppgradering ... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Intern feil. AllUpgrade ydelagde noko"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Ferdig"
@@ -1525,7 +1531,19 @@ msgstr "Ferdig"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1588,8 +1606,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2673,82 +2691,82 @@ msgstr "Klarte ikkje tolka pakkefila %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Klarte ikkje tolka pakkefila %s (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Misforma linje %lu i kjeldelista %s (dist)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Misforma linje %lu i kjeldelista %s (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Misforma linje %lu i kjeldelista %s (dist)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Misforma linje %lu i kjeldelista %s (absolutt dist)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Opnar %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linja %u i kjeldelista %s er for lang."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Misforma linje %u i kjeldelista %s (type)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, fuzzy, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typen %s er ukjend i linja %u i kjeldelista %s"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "Typen %s er ukjend i linja %u i kjeldelista %s"
@@ -3351,57 +3369,61 @@ msgstr "Opnar oppsettsfila %s"
msgid "Completely removed %s"
msgstr "Klarte ikkje fjerna %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Klarte ikkje skriva til %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 537f2b12c..832a17000 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-07-28 21:53+0200\n"
"Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
"Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -97,7 +97,7 @@ msgid "Total space accounted for: "
msgstr "Całkowity rozmiar: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Plik pakietu %s jest przestarzały."
@@ -105,7 +105,7 @@ msgstr "Plik pakietu %s jest przestarzały."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Nie znaleziono żadnych pakietów"
@@ -663,7 +663,7 @@ msgstr "%s został już odznaczony jako zatrzymany.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Oczekiwano na proces %s, ale nie było go"
@@ -685,6 +685,7 @@ msgstr ""
"Uruchomienie dpkg nie powiodło się. Czy użyto uprawnień administratora?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -694,6 +695,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -742,7 +748,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -778,11 +785,11 @@ msgid "File not found"
msgstr "Nie odnaleziono pliku"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Nie udało się wykonać operacji stat"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Nie udało się ustawić czasu modyfikacji"
@@ -873,7 +880,7 @@ msgstr "Nie udało się utworzyć gniazda"
msgid "Could not connect data socket, connection timed out"
msgstr "Nie udało się połączyć gniazda danych, przekroczenie czasu połączenia"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Nie udało się"
@@ -1578,16 +1585,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Polecenie update nie wymaga żadnych argumentów"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Obliczanie aktualizacji..."
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Błąd wewnętrzny spowodowany przez AllUpgrade"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Gotowe"
@@ -1595,7 +1602,20 @@ msgstr "Gotowe"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1665,8 +1685,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2766,84 +2786,84 @@ msgstr "Nie udało się zanalizować pliku pakietu %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Nie udało się zanalizować pliku pakietu %s (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza URI)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Nieprawidłowa linia %lu w liście źródeł %s ([opcja] nie dająca się sparsować)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([opcja] zbyt krótka)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([%s] nie jest przypisane)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([%s] nie ma klucza)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Nieprawidłowa linia %lu w liście źródeł %s ([%s] klucz %s nie ma wartości)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s (dystrybucja)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza URI)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s (bezwzględna dystrybucja)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza dystrybucji)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Otwieranie %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linia %u w liście źródeł %s jest zbyt długa."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s"
@@ -3468,33 +3488,37 @@ msgstr "Przygotowywanie do całkowitego usunięcia %s"
msgid "Completely removed %s"
msgstr "Pakiet %s został całkowicie usunięty"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Nie udało się pisać do %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "Operacja została przerwana, zanim mogła zostać zakończona"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr "Brak raportu programu apport, ponieważ osiągnięto limit MaxReports"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "problemy z zależnościami - pozostawianie nieskonfigurowanego"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3502,7 +3526,7 @@ msgstr ""
"Brak raportu programu apport, ponieważ komunikat błędu wskazuje, że "
"przyczyna niepowodzenia leży w poprzednim błędzie."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3510,7 +3534,7 @@ msgstr ""
"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na "
"przepełnienie dysku"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3518,7 +3542,7 @@ msgstr ""
"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd "
"braku wolnej pamięci"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3527,7 +3551,7 @@ msgstr ""
"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na "
"przepełnienie dysku"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/pt.po b/po/pt.po
index b114db28d..3618f52ec 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-06-29 15:45+0100\n"
"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -92,7 +92,7 @@ msgid "Total space accounted for: "
msgstr "Espaço total contabilizado: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "O ficheiro do pacote %s está dessincronizado."
@@ -100,7 +100,7 @@ msgstr "O ficheiro do pacote %s está dessincronizado."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Não foi encontrado nenhum pacote"
@@ -659,7 +659,7 @@ msgstr "%s já estava para não manter.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperou por %s mas não estava lá"
@@ -679,6 +679,7 @@ msgid "Executing dpkg failed. Are you root?"
msgstr "Falhou executar dpkg. É root?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -688,6 +689,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -735,7 +741,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -771,11 +778,11 @@ msgid "File not found"
msgstr "Ficheiro não encontrado"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Falhou o stat"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Falhou definir hora de modificação"
@@ -864,7 +871,7 @@ msgstr "Não foi possível criar um socket"
msgid "Could not connect data socket, connection timed out"
msgstr "Não foi possível ligar socket de dados, a ligação expirou"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Falhou"
@@ -1554,16 +1561,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "O comando update não leva argumentos"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "A calcular a actualização... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Erro Interno, AllUpgrade estragou algo"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Pronto"
@@ -1571,7 +1578,19 @@ msgstr "Pronto"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1638,8 +1657,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2743,85 +2762,85 @@ msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Não foi possível fazer parse ao ficheiro de pacote %s (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "Linha mal formada %lu na lista de fontes %s (parse de URI)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Linha mal formada %lu na lista de fontes %s ([opção] não interpretável)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Linha mal formada %lu na lista de fontes %s ([opção] demasiado curta)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Linha mal formada %lu na lista de fontes %s ([%s] não é uma atribuição)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Linha mal formada %lu na lista de fontes %s ([%s] não tem chave)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Linha mal formada %lu na lista de fontes %s ([%s] chave %s não tem valor)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Linha mal formada %lu na lista de fontes %s (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Linha mal formada %lu na lista de fontes %s (distribuição)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Linha mal formada %lu na lista de fontes %s (parse de URI)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Linha mal formada %lu na lista de fontes %s (distribuição absoluta)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Linha mal formada %lu na lista de fontes %s (dist parse)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "A abrir %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linha %u é demasiado longa na lista de fontes %s."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Linha mal formada %u na lista de fontes %s (tipo)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s"
@@ -3459,33 +3478,37 @@ msgstr "A preparar para remover completamente %s"
msgid "Completely removed %s"
msgstr "Remoção completa de %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Não conseguiu escrever para %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "A operação foi interrompida antes de poder terminar"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr "Nenhum relatório apport escrito pois MaxReports já foi atingido"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "problemas de dependências - deixando por configurar"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3493,7 +3516,7 @@ msgstr ""
"Nenhum relatório apport escrito pois a mensagem de erro indica que é um erro "
"de seguimento de um erro anterior."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3501,7 +3524,7 @@ msgstr ""
"Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco "
"cheio"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3509,7 +3532,7 @@ msgstr ""
"Nenhum relatório apport escrito pois a mensagem de erro indica um erro de "
"memória esgotada"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3518,7 +3541,7 @@ msgstr ""
"Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco "
"cheio"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9e5a5c2d0..1e7596ba2 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2008-11-17 02:33-0200\n"
"Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -92,7 +92,7 @@ msgid "Total space accounted for: "
msgstr "Total de espaço contabilizado para: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "O arquivo de pacote %s está fora de sincronia."
@@ -100,7 +100,7 @@ msgstr "O arquivo de pacote %s está fora de sincronia."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Nenhum pacote encontrado"
@@ -651,7 +651,7 @@ msgstr "%s já é a versão mais nova.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperado %s mas este não estava lá"
@@ -680,6 +680,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -707,7 +712,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -743,11 +749,11 @@ msgid "File not found"
msgstr "Arquivo não encontrado"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Falhou ao executar \"stat\""
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Falhou ao definir hora de modificação"
@@ -836,7 +842,7 @@ msgstr "Não foi possível criar um socket"
msgid "Could not connect data socket, connection timed out"
msgstr "Não foi possível conectar um socket de dados, conexão expirou"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Falhou"
@@ -1531,16 +1537,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "O comando update não leva argumentos"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Calculando atualização... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Erro interno, AllUpgrade quebrou coisas"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Pronto"
@@ -1548,7 +1554,19 @@ msgstr "Pronto"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1611,8 +1629,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2711,87 +2729,87 @@ msgstr "Impossível analisar arquivo de pacote %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Impossível analisar arquivo de pacote %s (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "Linha mal formada %lu no arquivo de fontes %s (análise de URI)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Linha mal formada %lu no arquivo de fontes %s (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Linha mal formada %lu no arquivo de fontes %s (análise de URI)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição absoluta)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Abrindo %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linha %u muito longa na lista de fontes %s."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Linha mal formada %u no arquivo de fontes %s (tipo)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s"
@@ -3403,57 +3421,61 @@ msgstr "Preparando para remover completamente %s"
msgid "Completely removed %s"
msgstr "%s completamente removido"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Impossível escrever para %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 90d46423a..af121cc95 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ro\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2008-11-15 02:21+0200\n"
"Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -94,7 +94,7 @@ msgid "Total space accounted for: "
msgstr "Total spațiu contorizat pentru: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Fișierul pachetului %s este desincronizat."
@@ -102,7 +102,7 @@ msgstr "Fișierul pachetului %s este desincronizat."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Nu s-au găsit pachete"
@@ -650,7 +650,7 @@ msgstr "%s este deja la cea mai nouă versiune.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Așteptat %s, dar n-a fost acolo"
@@ -679,6 +679,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -706,7 +711,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -742,11 +748,11 @@ msgid "File not found"
msgstr "Fișier negăsit"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Eșec la „stat”"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Eșec la ajustarea timpului de modificare"
@@ -837,7 +843,7 @@ msgstr ""
"Nu s-a putut realiza conectarea la socket-ul de date, timpul de conectare a "
"expirat"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Eșec"
@@ -1536,16 +1542,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Comanda de actualizare nu are argumente"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Calculez înnoirea... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Terminat"
@@ -1553,7 +1559,20 @@ msgstr "Terminat"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1616,8 +1635,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2720,82 +2739,82 @@ msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Nu s-a putut analiza fișierul pachet %s (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "Linie greșită %lu în lista sursă %s (analiza URI)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Linie greșită %lu în lista sursă %s (dist)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Linie greșită %lu în lista sursă %s (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Linie greșită %lu în lista sursă %s (dist)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Linie greșită %lu în lista sursă %s (analiza URI)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Linie greșită %lu în lista sursă %s (dist. absolută)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Deschidere %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linia %u prea lungă în lista sursă %s."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Linie greșită %u în lista sursă %s (tip)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s"
@@ -3408,57 +3427,61 @@ msgstr "Se pregătește ștergerea completă a %s"
msgid "Completely removed %s"
msgstr "Șters complet %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Nu s-a putut scrie în %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 02a5424e7..88e6d3a00 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt rev2227.1.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-06-30 08:47+0400\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -100,7 +100,7 @@ msgid "Total space accounted for: "
msgstr "Полное учтённое пространство: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Список пакетов %s рассинхронизирован."
@@ -108,7 +108,7 @@ msgstr "Список пакетов %s рассинхронизирован."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Не найдено ни одного пакета"
@@ -662,7 +662,7 @@ msgstr "%s уже помечен как не зафиксированный.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Ожидалось завершение процесса %s, но он не был запущен"
@@ -683,6 +683,7 @@ msgstr ""
"Выполнение dpkg завершилось с ошибкой. У вас есть права суперпользователя?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -692,6 +693,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -740,7 +746,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -776,11 +783,11 @@ msgid "File not found"
msgstr "Файл не найден"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Не удалось получить атрибуты"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Не удалось установить время модификации"
@@ -873,7 +880,7 @@ msgstr ""
"Не удалось присоединиться к сокету данных, время на установление соединения "
"истекло"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Неудачно"
@@ -1575,16 +1582,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Команде update не нужны аргументы"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Расчёт обновлений…"
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Внутренняя ошибка, AllUpgrade всё поломал"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Готово"
@@ -1592,7 +1599,20 @@ msgstr "Готово"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1659,8 +1679,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2767,86 +2787,86 @@ msgstr "Невозможно разобрать содержимое пакет
msgid "Unable to parse package file %s (2)"
msgstr "Невозможно разобрать содержимое пакета %s (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "Искажённая строка %lu в списке источников %s (анализ URI)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Искажённая строка %lu в списке источников %s ([параметр] неразбираем)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"Искажённая строка %lu в списке источников %s ([параметр] слишком короткий)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Искажённая строка %lu в списке источников %s (([%s] не назначаем)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Искажённая строка %lu в списке источников %s ([%s] не имеет ключа)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Искажённая строка %lu в списке источников %s (([%s] ключ %s не имеет "
"значения)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Искажённая строка %lu в списке источников %s (проблема в URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
"Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Искажённая строка %lu в списке источников %s (анализ URI)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Искажённая строка %lu в списке источников %s (absolute dist)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Искажённая строка %lu в списке источников %s (dist parse)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Открытие %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Строка %u в списке источников %s слишком длинна."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Искажённая строка %u в списке источников %s (тип)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Неизвестный тип «%s» в строке %u в списке источников %s"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "Неизвестный тип «%s» в строке %u в списке источников %s"
@@ -3472,33 +3492,37 @@ msgstr "Подготовка к полному удалению %s"
msgid "Completely removed %s"
msgstr "%s полностью удалён"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Невозможно записать в %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "Действие прервано до его завершения"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr "Отчёты apport не записаны, так достигнут MaxReports"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "проблемы с зависимостями — оставляем ненастроенным"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3506,7 +3530,7 @@ msgstr ""
"Отчёты apport не записаны, так как сообщение об ошибке указывает на "
"повторную ошибку от предыдущего отказа."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3514,7 +3538,7 @@ msgstr ""
"Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
"места на диске"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3522,7 +3546,7 @@ msgstr ""
"Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
"памяти"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3531,7 +3555,7 @@ msgstr ""
"Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
"места на диске"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/sk.po b/po/sk.po
index 350d1e7a7..e4f6f1180 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-06-28 20:49+0100\n"
"Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -94,7 +94,7 @@ msgid "Total space accounted for: "
msgstr "Celkom priradeného miesta: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Súbor balíkov %s je neaktuálny."
@@ -102,7 +102,7 @@ msgstr "Súbor balíkov %s je neaktuálny."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Neboli nájdené žiadne balíky"
@@ -651,7 +651,7 @@ msgstr "%s bol už nastavený na nepodržanie.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Čakalo sa na %s, ale nebolo to tam"
@@ -671,6 +671,7 @@ msgid "Executing dpkg failed. Are you root?"
msgstr "Vykonanie dpkg zlyhalo. Ste root?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -680,6 +681,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -726,7 +732,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -762,11 +769,11 @@ msgid "File not found"
msgstr "Súbor sa nenašiel"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Vyhodnotenie zlyhalo"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Zlyhalo nastavenie času zmeny"
@@ -855,7 +862,7 @@ msgstr "Nedá sa vytvoriť socket"
msgid "Could not connect data socket, connection timed out"
msgstr "Nedá sa pripojiť dátový socket, uplynul čas spojenia"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Chyba"
@@ -1549,16 +1556,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Príkaz update neprijíma žiadne argumenty"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Prepočítava sa aktualizácia... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Hotovo"
@@ -1566,7 +1573,20 @@ msgstr "Hotovo"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1633,8 +1653,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2722,83 +2742,83 @@ msgstr "Súbor %s sa nedá spracovať (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Súbor %s sa nedá spracovať (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Skomolený riadok %lu v zozname zdrojov %s (nie je možné spracovať [option])"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s ([option] je príliš krátke)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nie je priradenie)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nemá kľúč)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] kľúč %s nemá hodnotu)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (dist)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (absolútny dist)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie dist)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Otvára sa %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Riadok %u v zozname zdrojov %s je príliš dlhý."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s"
@@ -3413,33 +3433,37 @@ msgstr "Pripravuje sa úplné odstránenie %s"
msgid "Completely removed %s"
msgstr "Balík „%s“ je úplne odstránený"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Do %s sa nedá zapisovať"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "Operácia bola prerušená predtým, než sa stihla dokončiť"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr "Nezapíše sa správa apport, pretože už bol dosiahnutý limit MaxReports"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "problém so závislosťami - ponecháva sa nenakonfigurované"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3447,7 +3471,7 @@ msgstr ""
"Nezapíše sa správa apport, pretože chybová správa indikuje, že je to chyba v "
"nadväznosti na predošlé zlyhanie."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3455,7 +3479,7 @@ msgstr ""
"Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk "
"zaplnený"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3463,7 +3487,7 @@ msgstr ""
"Nezapíše sa správa apport, pretože chybová správa indikuje chybu nedostatku "
"pamäte"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3472,7 +3496,7 @@ msgstr ""
"Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk "
"zaplnený"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 41f2d8266..bab9da29c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-06-27 21:29+0000\n"
"Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -94,7 +94,7 @@ msgid "Total space accounted for: "
msgstr "Celotna velikost, izračunana za: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Datoteka paketa %s ni usklajena."
@@ -102,7 +102,7 @@ msgstr "Datoteka paketa %s ni usklajena."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Noben paket ni bil najden"
@@ -647,7 +647,7 @@ msgstr "paket %s je bil že nastavljen kot ne na čakanju.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Program je čakal na %s a ga ni bilo tam"
@@ -667,6 +667,7 @@ msgid "Executing dpkg failed. Are you root?"
msgstr "Izvajanje dpkg je spodletelo. Ali ste skrbnik?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -676,6 +677,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -721,7 +727,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -757,11 +764,11 @@ msgid "File not found"
msgstr "Datoteke ni mogoče najti"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Določitev ni uspela"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Nastavitev časa spremembe je spodletela"
@@ -850,7 +857,7 @@ msgstr "Ni mogoče ustvariti vtiča"
msgid "Could not connect data socket, connection timed out"
msgstr "Ni mogoče povezati podatkovnega vtiča. Povezava je zakasnela."
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Spodletelo"
@@ -1548,16 +1555,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Ukaz update ne sprejema argumentov"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Preračunavanje nadgradnje ... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Notranja napaka zaradi AllUpgrade."
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Opravljeno"
@@ -1565,7 +1572,21 @@ msgstr "Opravljeno"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1632,8 +1653,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2723,88 +2744,88 @@ msgstr "Ni mogoče razčleniti datoteke paketa %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Ni mogoče razčleniti datoteke paketa %s (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Slabo oblikovana vrstica %lu na seznamu virov %s ([možnosti] ni mogoče "
"razčleniti)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Slabo oblikovana vrstica %lu na seznamu virov %s ([možnost] prekratka)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Slabo oblikovana vrstica %lu na seznamu vrstic %s ([%s] ni dodelitev)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] nima ključa)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] ključ %s nima "
"vrednosti)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (distribucija)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
"Slabo oblikovana vrstica %lu v seznamu virov %s (absolutna distribucija)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
"Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev distribucije)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Odpiranje %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Vrstica %u v seznamu virov %s je predolga."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Slabo oblikovana vrstica %u v seznamu virov %s (vrsta)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana"
@@ -3418,34 +3439,38 @@ msgstr "Pripravljanje na popolno odstranitev %s"
msgid "Completely removed %s"
msgstr "%s je bil popolnoma odstranjen"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Ni mogoče pisati na %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "Opravilo je bilo prekinjeno preden se je lahko končalo"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Poročilo apport ni bilo napisano, ker je bilo število MaxReports že doseženo"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "težave odvisnosti - puščanje nenastavljenega"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3453,7 +3478,7 @@ msgstr ""
"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na "
"navezujočo napako iz predhodne napake."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3461,7 +3486,7 @@ msgstr ""
"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako "
"polnega diska"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3469,7 +3494,7 @@ msgstr ""
"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako "
"zaradi pomanjkanja pomnilnika"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
@@ -3477,7 +3502,7 @@ msgstr ""
"Poročilo apport je bilo napisano, ker sporočilo o napaki nakazuje na težavo "
"na krajevnem sistemu"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 07fbf7078..29731acea 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2010-08-24 21:18+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <debian-l10n-swedish@debian.org>\n"
@@ -94,7 +94,7 @@ msgid "Total space accounted for: "
msgstr "Totalt utrymme som kan redogöras för: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Paketfilen %s är inte synkroniserad."
@@ -102,7 +102,7 @@ msgstr "Paketfilen %s är inte synkroniserad."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Inga paket hittades"
@@ -650,7 +650,7 @@ msgstr "%s är redan den senaste versionen.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Väntade på %s men den fanns inte där"
@@ -679,6 +679,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -706,7 +711,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -742,11 +748,11 @@ msgid "File not found"
msgstr "Filen hittades inte"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Kunde inte ta status"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Misslyckades ställa in ändringstid"
@@ -835,7 +841,7 @@ msgstr "Kunde inte skapa ett uttag (socket)"
msgid "Could not connect data socket, connection timed out"
msgstr "Kunde inte ansluta datauttaget (socket), inget svar inom tidsgräns"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Misslyckades"
@@ -1533,16 +1539,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Uppdateringskommandot tar inga argument"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Beräknar uppgradering... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Internt fel, AllUpgrade förstörde något"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Färdig"
@@ -1550,7 +1556,19 @@ msgstr "Färdig"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1622,8 +1640,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2724,82 +2742,82 @@ msgstr "Kunde inte tolka paketfilen %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Kunde inte tolka paketfilen %s (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Rad %lu i källistan %s har fel format ([option] ej tolkningsbar)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Rad %lu i källistan %s har fel format ([option] för kort)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Rad %lu i källistan %s har fel format ([%s] är inte en tilldelning)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Rad %lu i källistan %s har fel format ([%s] saknar nyckel)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Rad %lu i källistan %s har fel format ([%s] nyckeln %s saknar värde)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Rad %lu i källistan %s har (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Rad %lu i källistan %s har fel format (dist)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Rad %lu i källistan %s har fel format (Absolut dist)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Rad %lu i källistan %s har fel format (dist-tolkning)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Öppnar %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Rad %u är för lång i källistan %s."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Rad %u i källistan %s har fel format (typ)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s"
@@ -3417,33 +3435,37 @@ msgstr "Förbereder borttagning av hela %s"
msgid "Completely removed %s"
msgstr "Tog bort hela %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Kunde inte skriva till %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr "Ingen apport-rapport skrevs därför att MaxReports redan har uppnåtts"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "beroendeproblem - lämnar okonfigurerad"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3451,7 +3473,7 @@ msgstr ""
"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att det är "
"ett efterföljande fel från ett tidigare problem."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3459,7 +3481,7 @@ msgstr ""
"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att "
"diskutrymmet är slut"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3467,7 +3489,7 @@ msgstr ""
"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att minnet "
"är slut"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3476,7 +3498,7 @@ msgstr ""
"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att "
"diskutrymmet är slut"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/th.po b/po/th.po
index d15bb3ce8..0fc6417db 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-10-27 22:44+0700\n"
"Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
"Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -92,7 +92,7 @@ msgid "Total space accounted for: "
msgstr "พื้นที่ที่นับรวมทั้งหมด: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "ข้อมูลแฟ้ม Package %s ไม่ตรงกับความเป็นจริง"
@@ -100,7 +100,7 @@ msgstr "ข้อมูลแฟ้ม Package %s ไม่ตรงกับค
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "ไม่พบแพกเกจ"
@@ -635,7 +635,7 @@ msgstr "%s ไม่ได้คงรุ่นอยู่ก่อนแล้
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่"
@@ -655,6 +655,7 @@ msgid "Executing dpkg failed. Are you root?"
msgstr "เรียกทำงาน dpkg ไม่สำเร็จ คุณเป็น root หรือเปล่า?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -664,6 +665,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -708,7 +714,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -743,11 +750,11 @@ msgid "File not found"
msgstr "ไม่พบแฟ้ม"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "stat ไม่สำเร็จ"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "กำหนดเวลาแก้ไขไม่สำเร็จ"
@@ -834,7 +841,7 @@ msgstr "ไม่สามารถสร้างซ็อกเก็ต"
msgid "Could not connect data socket, connection timed out"
msgstr "ไม่สามารถเชื่อมต่อซ็อกเก็ตข้อมูล เนื่องจากหมดเวลาคอย"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "ล้มเหลว"
@@ -1505,16 +1512,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "กำลังคำนวณการปรับรุ่น... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "เกิดข้อผิดพลาดภายใน: AllUpgrade ทำความเสียหาย"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "เสร็จแล้ว"
@@ -1522,7 +1529,18 @@ msgstr "เสร็จแล้ว"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1589,8 +1607,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2666,82 +2684,82 @@ msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1
msgid "Unable to parse package file %s (2)"
msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] แจงไม่ผ่าน)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] สั้นเกินไป)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่ใช่การกำหนดค่า)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่มีคีย์)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] คีย์ %s ไม่มีค่า)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist แบบสัมบูรณ์)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง dist)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "กำลังเปิด %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ยาวเกินไป"
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ชนิด)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
@@ -3341,59 +3359,63 @@ msgstr "กำลังเตรียมถอดถอน %s อย่าง
msgid "Completely removed %s"
msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "ไม่สามารถเขียนลงแฟ้ม %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "ปฏิบัติการถูกขัดจังหวะก่อนที่จะสามารถทำงานเสร็จ"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr "ไม่มีการเขียนรายงาน apport เพราะถึงขีดจำกัด MaxReports แล้ว"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "มีปัญหาความขึ้นต่อกัน - จะทิ้งไว้โดยไม่ตั้งค่า"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
"ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเป็นสิ่งที่ตามมาจากข้อผิดพลาดก่อนหน้า"
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากดิสก์เต็ม"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากหน่วยความจำเต็ม"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากดิสก์เต็ม"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/tl.po b/po/tl.po
index 84ddfdc76..6fd552706 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2007-03-29 21:36+0800\n"
"Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
"Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -97,7 +97,7 @@ msgid "Total space accounted for: "
msgstr "Kabuuan ng puwang na napag-tuosan: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Wala sa sync ang talaksan ng paketeng %s."
@@ -105,7 +105,7 @@ msgstr "Wala sa sync ang talaksan ng paketeng %s."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Walang nahanap na mga pakete"
@@ -647,7 +647,7 @@ msgstr "%s ay pinakabagong bersyon na.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Naghintay, para sa %s ngunit wala nito doon"
@@ -676,6 +676,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -703,7 +708,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -739,11 +745,11 @@ msgid "File not found"
msgstr "Hindi Nahanap ang Talaksan"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Bigo ang pag-stat"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Bigo ang pagtakda ng oras ng pagbago"
@@ -832,7 +838,7 @@ msgstr "Hindi maka-likha ng socket"
msgid "Could not connect data socket, connection timed out"
msgstr "Hindi maka-konekta sa socket ng datos, nag-time-out ang koneksyon"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Bigo"
@@ -1520,16 +1526,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Sinusuri ang pag-upgrade... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Tapos"
@@ -1537,7 +1543,19 @@ msgstr "Tapos"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1600,8 +1618,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2704,82 +2722,82 @@ msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Hindi ma-parse ang talaksang pakete %s (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (absolute dist)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Binubuksan %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s"
@@ -3391,57 +3409,61 @@ msgstr "Naghahanda upang tanggalin ng lubusan ang %s"
msgid "Completely removed %s"
msgstr "Natanggal ng lubusan ang %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Hindi makapagsulat sa %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/tr.po b/po/tr.po
index bc4947160..dcef63cc9 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2013-02-18 03:41+0200\n"
"Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
"Language-Team: Debian l10n Turkish\n"
@@ -94,7 +94,7 @@ msgid "Total space accounted for: "
msgstr "Hesaplanan toplam alan: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "%s paket dosyası eşzamansız."
@@ -102,7 +102,7 @@ msgstr "%s paket dosyası eşzamansız."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Hiç paket bulunamadı"
@@ -653,7 +653,7 @@ msgstr "%s zaten tutulmayacak şekilde ayarlanmış.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s için beklenildi ama o gelmedi"
@@ -673,6 +673,7 @@ msgid "Executing dpkg failed. Are you root?"
msgstr "'dpkg' çalıştırılamadı. root olduğunuzdan emin misiniz?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -682,6 +683,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -728,7 +734,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -764,11 +771,11 @@ msgid "File not found"
msgstr "Dosya bulunamadı"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Durum bilgisi okunamadı"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Değişiklik zamanı ayarlanamadı"
@@ -857,7 +864,7 @@ msgstr "Bir soket oluşturulamadı"
msgid "Could not connect data socket, connection timed out"
msgstr "Veri soketine bağlanılamadı, bağlantı zaman aşımına uğradı"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Başarısız"
@@ -1547,16 +1554,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "'update' komutu bağımsız değişken almamaktadır"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Yükseltme hesaplanıyor... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "İç hata, AllUpgrade bazı şeyleri bozdu"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Bitti"
@@ -1564,7 +1571,19 @@ msgstr "Bitti"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1631,8 +1650,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2733,94 +2752,94 @@ msgstr "Paket dosyası %s ayrıştırılamadı (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Paket dosyası %s ayrıştırılamadı (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr ""
"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI ayrıştırma)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([seçenek] "
"ayrıştırılamıyor)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([seçenek] çok kısa)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] bir atama "
"değil)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] seçeneğinin "
"anahtarı yok)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] %4$s "
"anahtarına değer atanmamış)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dist)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI ayrıştırma)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (mutlak dist)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dağıtım ayrıştırma)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "%s Açılıyor"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı çok uzun."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı hatalı (tür)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "'%s' türü bilinmiyor. (Satır: %u, Kaynak Listesi: %s)"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "'%s' türü bilinmiyor. (Satır: %u, Kaynak Listesi: %s)"
@@ -3435,34 +3454,38 @@ msgstr "%s paketinin tamamen kaldırılmasına hazırlanılıyor"
msgid "Completely removed %s"
msgstr "%s tamamen kaldırıldı"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "%s dosyasına yazılamıyor"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "İşlem yarıda kesildi"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"En fazla rapor miktarına (MaxReports) ulaşıldığı için apport raporu yazılmadı"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "bağımlılık sorunları - yapılandırılmamış durumda bırakılıyor"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3470,14 +3493,14 @@ msgstr ""
"Apport raporu yazılmadı çünkü hata iletisi bu durumun bir önceki hatadan "
"kaynaklanan bir hata olduğunu belirtiyor."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
"Hata iletisi diskin dolu olduğunu belirttiği için apport raporu yazılamadı"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3485,7 +3508,7 @@ msgstr ""
"Hata iletisi bir bellek yetersizliği hatasına işaret ettiği için apport "
"raporu yazılamadı"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3493,7 +3516,7 @@ msgid ""
msgstr ""
"Hata iletisi diskin dolu olduğunu belirttiği için apport raporu yazılamadı"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/uk.po b/po/uk.po
index c90ad239b..058a451e0 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-all\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2012-09-25 20:19+0300\n"
"Last-Translator: A. Bondarenko <artem.brz@gmail.com>\n"
"Language-Team: Українська <uk@li.org>\n"
@@ -101,7 +101,7 @@ msgid "Total space accounted for: "
msgstr "Загальний простір полічений для: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Перелік пакунків %s розсинхронізований."
@@ -109,7 +109,7 @@ msgstr "Перелік пакунків %s розсинхронізований.
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Не знайдено жодного пакунка"
@@ -663,7 +663,7 @@ msgstr "%s вже був незафіксований.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Очікував на %s, але його там не було"
@@ -683,6 +683,7 @@ msgid "Executing dpkg failed. Are you root?"
msgstr "Не вдалося виконати dpkg. Ви root?"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -692,6 +693,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -738,7 +744,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -775,12 +782,12 @@ msgid "File not found"
msgstr "Файл не знайдено"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
#, fuzzy
msgid "Failed to stat"
msgstr "Не вдалося одержати атрибути (stat)"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Не вдалося встановити час модифікації"
@@ -869,7 +876,7 @@ msgstr "Неможливо створити сокет (socket)"
msgid "Could not connect data socket, connection timed out"
msgstr "Неможливо під'єднати сокет (socket) з даними, час з'єднання вичерпався"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Невдача"
@@ -1567,16 +1574,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "Команді update не потрібні аргументи"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Обчислення оновлень... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Внутрішня помилка, AllUpgrade щось поламав"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Виконано"
@@ -1584,7 +1591,20 @@ msgstr "Виконано"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1651,8 +1671,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2767,84 +2787,84 @@ msgstr "Неможливо проаналізувати файл пакунку
msgid "Unable to parse package file %s (2)"
msgstr "Неможливо проаналізувати файл пакунку %s (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Спотворений рядок %lu у переліку джерел %s (нечитабельний [параметр])"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"Спотворений рядок %lu у переліку джерел %s ([параметр] занадто короткий)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не є призначенням)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не має ключа)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Спотворений рядок %lu у переліку джерел %s ([%s] ключ %s не має значення)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Спотворений рядок %lu у переліку джерел %s (проблема з URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Спотворений рядок %lu у переліку джерел %s (dist)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Спотворений рядок %lu у переліку джерел %s (absolute dist)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Спотворений рядок %lu у переліку джерел %s (dist parse)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Відкриття %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Рядок %u є занадто довгим у переліку джерел %s."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Спотворений рядок %u у переліку джерел %s (тип)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s"
@@ -3467,35 +3487,39 @@ msgstr "Підготовка до повного видалення %s"
msgid "Completely removed %s"
msgstr "Повністю видалено %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Неможливо записати в %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "Операцію було перервано до того, як вона мала завершитися"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Звіт apport не був записаний, тому що параметр MaxReports вже досягнув "
"максимальної величини"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "проблеми з залежностями - залишено неналаштованим"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3503,7 +3527,7 @@ msgstr ""
"Звіт apport не був записаний, тому що повідомлення про помилку вказує на те, "
"що ця помилка є наслідком попередньої невдачі."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3511,7 +3535,7 @@ msgstr ""
"Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
"відсутність вільного місця на диску"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3519,7 +3543,7 @@ msgstr ""
"Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
"відсутність вільного місця у пам'яті"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3528,7 +3552,7 @@ msgstr ""
"Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
"відсутність вільного місця на диску"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 5f3ab193e..9453cc2de 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.14.2\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2014-01-01 13:45+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -96,7 +96,7 @@ msgid "Total space accounted for: "
msgstr "Tổng chỗ đã tính dành cho: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Tập tin gói %s không đồng bộ được."
@@ -104,7 +104,7 @@ msgstr "Tập tin gói %s không đồng bộ được."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Không tìm thấy gói"
@@ -669,7 +669,7 @@ msgstr "%s đã sẵn được đặt là không giữ lại.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Cần %s nhưng mà không thấy nó ở đây"
@@ -691,6 +691,7 @@ msgstr ""
"việc này"
#: cmdline/apt-mark.cc:381
+#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -700,6 +701,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -748,7 +754,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -797,11 +804,11 @@ msgid "File not found"
msgstr "Không tìm thấy tập tin"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "Gặp lỗi khi lấy thống kê"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "Gặp lỗi khi đặt giờ sửa đổi"
@@ -890,7 +897,7 @@ msgstr "Không thể tạo ổ cắm"
msgid "Could not connect data socket, connection timed out"
msgstr "Không thể kết nối ổ cắm dữ liệu, kết nối đã quá giờ"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "Gặp lỗi"
@@ -1573,15 +1580,15 @@ msgstr "Đang sắp xếp"
msgid "The update command takes no arguments"
msgstr "Lệnh cập nhật không chấp nhận đối số"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "Đang tính toán nâng cấp... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
msgid "Internal error, Upgrade broke stuff"
msgstr "Lỗi nội bộ: Upgrade (Nâng cấp) đã làm hỏng thứ gì đó"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Xong"
@@ -1589,7 +1596,18 @@ msgstr "Xong"
msgid "Full Text Search"
msgstr "Tìm kiếm toàn văn"
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr "không là gói thật (ảo)"
@@ -1656,8 +1674,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2771,91 +2789,91 @@ msgstr "Không thể phân tích tập tin gói %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Không thể phân tích tập tin gói %s (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Gặp dòng có sai dạng %lu trong danh sách nguồn %s ([tùy chọn] không thể phân "
"tích được)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([tùy chọn] quá ngắn)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không phải là một phép "
"gán)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không có khoá nào)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Gặp dòng sai dạng %lu trong danh sách nguồn %s (khoá [%s] %s không có giá "
"trị)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (địa chỉ URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
"Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
"Gặp dòng sai dạng %lu trong danh sách nguồn %s (phân tách bản phân phối)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "Đang mở %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Dòng %u quá dài trong danh sách nguồn %s."
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Gặp dòng sai dạng %u trong danh sách nguồn %s (kiểu)."
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s."
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s."
@@ -3476,34 +3494,38 @@ msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s"
msgid "Completely removed %s"
msgstr "Gỡ bỏ hoàn toàn %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, c-format
msgid "Can not write log (%s)"
msgstr "Không thể ghi nhật ký (%s)"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr "/dev/pts đã gắn chưa?"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr "Đầu ra là thiết bị cuối?"
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr "Hệ điều hành đã ngắt trước khi nó kịp hoàn thành"
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Không ghi báo cáo apport, vì đã tới giới hạn số các báo cáo (MaxReports)"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "gặp vấn đề về quan hệ phụ thuộc nên để lại không cấu hình"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3511,14 +3533,14 @@ msgstr ""
"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi kế tiếp "
"do một sự thất bại trước đó."
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “đĩa đầy”"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3526,7 +3548,7 @@ msgstr ""
"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “không đủ "
"bộ nhớ”"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
@@ -3534,7 +3556,7 @@ msgstr ""
"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi trên hệ "
"thống nội bộ"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7d3269753..13fb44f8c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.0~pre1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2010-08-26 14:42+0800\n"
"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -93,7 +93,7 @@ msgid "Total space accounted for: "
msgstr "总占用空间:"
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "软件包文件 %s 尚未同步。"
@@ -101,7 +101,7 @@ msgstr "软件包文件 %s 尚未同步。"
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "没有发现匹配的软件包"
@@ -639,7 +639,7 @@ msgstr "%s 已经是最新的版本了。\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待子进程 %s 的退出,但是它并不存在"
@@ -668,6 +668,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -695,7 +700,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -731,11 +737,11 @@ msgid "File not found"
msgstr "无法找到该文件"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "无法读取状态"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "无法设置文件的修改日期"
@@ -823,7 +829,7 @@ msgstr "无法创建套接字"
msgid "Could not connect data socket, connection timed out"
msgstr "无法连接上数据套接字,连接超时"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "失败"
@@ -1491,16 +1497,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr " update 命令不需要参数"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "正在对升级进行计算... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "内部错误,全部升级工具坏事了"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "完成"
@@ -1508,7 +1514,18 @@ msgstr "完成"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1574,8 +1591,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2656,82 +2673,82 @@ msgstr "无法解析软件包文件 %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "无法解析软件包文件 %s (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 不是一个任务)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 没有键)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 键 %4$s 没有值)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "正在打开 %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "源列表 %2$s 的第 %1$u 行太长了。"
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "无法识别在源列表 %3$s 里,第 %2$u 行中的软件包类别“%1$s”"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "无法识别在源列表 %3$s 里,第 %2$u 行中的软件包类别“%1$s”"
@@ -3332,58 +3349,62 @@ msgstr "正在准备完全删除 %s"
msgid "Completely removed %s"
msgstr "完全删除了 %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "无法写入 %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr "由于已经达到 MaxReports 限制,没有写入 apport 报告。"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr "依赖问题 - 保持未配置"
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr "因为错误消息指示这是由于上一个问题导致的错误,没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr "因为错误消息指示这是由于磁盘已满,没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr "因为错误消息指示这是由于内存不足,没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr "因为错误消息指示这是由于磁盘已满,没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr "因为错误消息指示这是一个 dpkg I/O 错误,没有写入 apport 报告。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 52f96ab81..cbf0f314d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.5.4\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-01-24 23:31+0100\n"
"PO-Revision-Date: 2009-01-28 10:41+0800\n"
"Last-Translator: Tetralet <tetralet@gmail.com>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
@@ -93,7 +93,7 @@ msgid "Total space accounted for: "
msgstr "統計後的空間合計:"
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "套件檔 %s 未同步。"
@@ -101,7 +101,7 @@ msgstr "套件檔 %s 未同步。"
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "未找到套件"
@@ -632,7 +632,7 @@ msgstr "%s 已經是最新版本了。\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:1183
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待 %s 但是它並不存在"
@@ -661,6 +661,11 @@ msgid ""
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -688,7 +693,8 @@ msgid ""
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -723,11 +729,11 @@ msgid "File not found"
msgstr "找不到檔案"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/rred.cc:618 methods/rred.cc:627
msgid "Failed to stat"
msgstr "無法取得狀態"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
msgid "Failed to set modification time"
msgstr "無法設定修改時間"
@@ -815,7 +821,7 @@ msgstr "無法建立 Socket"
msgid "Could not connect data socket, connection timed out"
msgstr "無法和 data socket 連線,連線逾時"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
msgid "Failed"
msgstr "失敗"
@@ -1491,16 +1497,16 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr "update 指令不需任何參數"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
msgid "Calculating upgrade... "
msgstr "籌備升級中... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "內部錯誤,AllUpgrade 造成了損壞"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "完成"
@@ -1508,7 +1514,19 @@ msgstr "完成"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
@@ -1571,8 +1589,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:265
+#: apt-pkg/sourcelist.cc:271 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -2655,82 +2673,82 @@ msgstr "無法辨識套件檔 %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "無法辨識套件檔 %s (2)"
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/sourcelist.cc:112
#, fuzzy, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(URI 分析)"
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/sourcelist.cc:155
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版分析)"
-#: apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版)"
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:169
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版分析)"
-#: apt-pkg/sourcelist.cc:164
+#: apt-pkg/sourcelist.cc:175
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版分析)"
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/sourcelist.cc:178
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版分析)"
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤 (URI)"
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/sourcelist.cc:193
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版)"
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/sourcelist.cc:196
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(URI 分析)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(絕對發行版)"
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/sourcelist.cc:209
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版分析)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:320
#, c-format
msgid "Opening %s"
msgstr "正在開啟 %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:332 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "來源列表 %2$s 中的第 %1$u 行太長。"
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/sourcelist.cc:356
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤(類型)"
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/sourcelist.cc:360
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "未知的類型 '%1$s',位於在來源列表 %3$s 中的第 %2$u 行"
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/sourcelist.cc:401
#, fuzzy, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
msgstr "未知的類型 '%1$s',位於在來源列表 %3$s 中的第 %2$u 行"
@@ -3320,57 +3338,61 @@ msgstr "正在準備完整移除 %s"
msgid "Completely removed %s"
msgstr "已完整移除 %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "無法寫入 %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1050
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1071
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1559
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1621
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1626
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1628
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1641
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1675
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/test/integration/test-apt-cli-show b/test/integration/test-apt-cli-show
index 0ab3d2e56..91cc9a3c0 100755
--- a/test/integration/test-apt-cli-show
+++ b/test/integration/test-apt-cli-show
@@ -10,20 +10,23 @@ configarchitecture "i386"
DESCR='Some description
That has multiple lines'
insertpackage 'unstable' 'foo' 'all' '1.0' '' '' "$DESCR"
+insertinstalledpackage 'foo' 'all' '1.0'
setupaptarchive
APTARCHIVE=$(readlink -f ./aptarchive)
# note that we do not display Description-md5 with the "apt" cmd
+# and also show some additional fields that are calculated
testequal "Package: foo
Priority: optional
Section: other
-Installed-Size: 42
+Installed-Size: 43.0 kB
Maintainer: Joe Sixpack <joe@example.org>
-Architecture: all
Version: 1.0
-Filename: pool/main/foo/foo_1.0_all.deb
+Download-Size: unknown
+APT-Manual-Installed: yes
+APT-Sources: file:$APTARCHIVE/ unstable/main i386 Packages
Description: Some description
That has multiple lines
" apt show foo
diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822
index 723796018..742adb5e2 100755
--- a/test/integration/test-apt-sources-deb822
+++ b/test/integration/test-apt-sources-deb822
@@ -10,15 +10,14 @@ configarchitecture 'i386'
SOURCES='rootdir/etc/apt/sources.list'
BASE='# some comment
# that contains a : as well
-#Type: meep
+#Types: meep
-Type: deb
-URI: http://ftp.debian.org/debian
+Types: deb
+URIs: http://ftp.debian.org/debian
Suites: stable
Sections: main
-Comment: Some random string
- that can be very long'
-
+Description: summay
+ and the long part'
msgtest 'Test old-style sources.list'
echo "deb http://ftp.debian.org/debian stable main" > $SOURCES
@@ -33,15 +32,6 @@ testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/P
'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris
-msgtest 'Test deb822 with two sections' 'seperated by comma'
-echo "$BASE" | sed 's/main/main contrib/' > $SOURCES
-testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 :
-'http://ftp.debian.org/debian/dists/stable/contrib/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_contrib_binary-i386_Packages 0 :
-'http://ftp.debian.org/debian/dists/stable/contrib/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_contrib_i18n_Translation-en 0 :
-'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 :
-'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris
-
-
msgtest 'Test deb822 with' 'two entries'
# Two entries
echo "$BASE" > $SOURCES
@@ -78,10 +68,32 @@ echo "deb http://ftp.debian.org" > $SOURCES
testequal --nomsg "E: Malformed line 1 in source list $TMPWORKINGDIRECTORY/rootdir/etc/apt/sources.list (dist)
E: The list of sources could not be read." aptget update --print-uris
-
msgtest 'Test deb822 sources.list file which has' 'malformed URI'
-echo "Type: deb
+echo "Types: deb
Suites: stable
" > $SOURCES
testequal --nomsg "E: Malformed stanza 0 in source list $TMPWORKINGDIRECTORY/rootdir/etc/apt/sources.list (URI parse)
E: The list of sources could not be read." aptget update --print-uris
+
+# with Enabled: false
+echo "$BASE" > $SOURCES
+echo "Enabled: no" >> $SOURCES
+testempty aptget update --print-uris
+
+# multiple URIs
+msgtest 'Test deb822 sources.list file which has' 'Multiple URIs work'
+echo "$BASE" | sed -e 's#http://ftp.debian.org/debian#http://ftp.debian.org/debian http://ftp.de.debian.org/debian#' > $SOURCES
+testequal --nomsg "'http://ftp.de.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.de.debian.org_debian_dists_stable_main_binary-i386_Packages 0 :
+'http://ftp.de.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.de.debian.org_debian_dists_stable_main_i18n_Translation-en 0 :
+'http://ftp.de.debian.org/debian/dists/stable/InRelease' ftp.de.debian.org_debian_dists_stable_InRelease 0
+'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 :
+'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 :
+'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris
+
+# multiple Type in one field
+msgtest 'Test deb822 sources.list file which has' 'Multiple Types work'
+echo "$BASE" | sed -e 's#Types: deb#Types: deb deb-src#' > $SOURCES
+testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/source/Sources.bz2' ftp.debian.org_debian_dists_stable_main_source_Sources 0 :
+'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 :
+'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 :
+'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris
diff --git a/test/libapt/sourcelist_test.cc b/test/libapt/sourcelist_test.cc
index 701eeeaa7..0300ce929 100644
--- a/test/libapt/sourcelist_test.cc
+++ b/test/libapt/sourcelist_test.cc
@@ -21,18 +21,20 @@ void remove_tmpfile(void)
int main(int argc, char *argv[])
{
+ _config->Set("APT::Sources::Use-Deb822", true);
+
const char contents[] = ""
- "Type: deb\n"
- "URI: http://ftp.debian.org/debian\n"
+ "Types: deb\n"
+ "URIs: http://ftp.debian.org/debian\n"
"Suites: stable\n"
"Sections: main\n"
- "Comment: Some random string\n"
- " that can be very long\n"
+ "Description: short\n"
+ " long description that can be very long\n"
"\n"
- "Type: deb\n"
- "URI: http://ftp.debian.org/debian\n"
- "Suite: unstable\n"
- "Section: main non-free\n"
+ "Types: deb\n"
+ "URIs: http://ftp.debian.org/debian\n"
+ "Suites: unstable\n"
+ "Sections: main non-free\n"
;
FileFd fd;