diff -Nru synaptic-0.62.1ubuntu2~ppa1/aclocal.m4 synaptic-0.62.1ubuntu10/aclocal.m4 --- synaptic-0.62.1ubuntu2~ppa1/aclocal.m4 2008-06-17 08:58:27.000000000 +0100 +++ synaptic-0.62.1ubuntu10/aclocal.m4 2008-10-21 18:33:59.000000000 +0100 @@ -454,9 +454,10 @@ dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 36 IT_PROG_INTLTOOL -AC_DEFUN([IT_PROG_INTLTOOL], -[AC_PREREQ([2.50])dnl +# serial 40 IT_PROG_INTLTOOL +AC_DEFUN([IT_PROG_INTLTOOL], [ +AC_PREREQ([2.50])dnl +AC_REQUIRE([AM_NLS])dnl case "$am__api_version" in 1.[01234]) @@ -470,14 +471,21 @@ AC_MSG_CHECKING([for intltool >= $1]) INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` - [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in` + INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` + [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` ] AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) fi +AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) +AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) +AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) +if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then + AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) +fi + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' @@ -522,6 +530,7 @@ AC_PATH_PROG(XGETTEXT, xgettext) AC_PATH_PROG(MSGMERGE, msgmerge) AC_PATH_PROG(MSGFMT, msgfmt) +AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) fi @@ -532,12 +541,7 @@ AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) fi -# Use the tools built into the package, not the ones that are installed. -AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') -AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge') -AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update') - -AC_PATH_PROG(INTLTOOL_PERL, perl) +AC_PATH_PROG(INTLTOOL_PERL, [perl]) if test -z "$INTLTOOL_PERL"; then AC_MSG_ERROR([perl not found; required for intltool]) fi @@ -583,42 +587,6 @@ IT_PO_SUBDIR([po]) -dnl The following is very similar to -dnl -dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update]) -dnl -dnl with the following slight differences: -dnl - the *.in files are in ac_aux_dir, -dnl - if the file haven't changed upon reconfigure, it's not touched, -dnl - the evaluation of the third parameter enables a hack which computes -dnl the actual value of $libdir, -dnl - the user sees "executing intltool commands", instead of -dnl "creating intltool-extract" and such. -dnl -dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were -dnl a reason for it. - -AC_CONFIG_COMMANDS([intltool], [ - -for file in intltool-extract intltool-merge intltool-update; do - sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ - -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ - -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ - < ${ac_aux_dir}/${file}.in > ${file}.out - if cmp -s ${file} ${file}.out 2>/dev/null; then - rm -f ${file}.out - else - mv -f ${file}.out ${file} - fi - chmod ugo+x ${file} - chmod u+w ${file} -done - -], -[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' -prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" -INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}']) - ]) @@ -634,6 +602,9 @@ dnl of config.status. AC_CONFIG_COMMANDS_PRE([ AC_CONFIG_COMMANDS([$1/stamp-it], [ + if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then + AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) + fi rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" >"$1/stamp-it.tmp" [sed '/^#/d @@ -642,22 +613,17 @@ '"s|^| $ac_top_srcdir/|" \ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" ] - if test ! -f "$1/Makefile"; then - AC_MSG_ERROR([$1/Makefile is not ready.]) - fi - mv "$1/Makefile" "$1/Makefile.tmp" [sed '/^POTFILES =/,/[^\\]$/ { /^POTFILES =/!d r $1/POTFILES } - ' "$1/Makefile.tmp" >"$1/Makefile"] + ' "$1/Makefile.in" >"$1/Makefile"] rm -f "$1/Makefile.tmp" mv "$1/stamp-it.tmp" "$1/stamp-it" ]) ])dnl ]) - # deprecated macros AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) # A hint is needed for aclocal from Automake <= 1.9.4: @@ -674,14 +640,36 @@ AC_SUBST(LIBEPT_LIBS) ]) -# LIBTAGCOLL_DEFS([LIBTAGCOLL_REQS=libtagcoll]) -# --------------------------------------- -AC_DEFUN([LIBTAGCOLL_DEFS], +# nls.m4 serial 3 (gettext-0.15) +dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. + +AC_PREREQ(2.50) + +AC_DEFUN([AM_NLS], [ - dnl Import libtagcoll data - PKG_CHECK_MODULES(LIBTAGCOLL,m4_default([$1], libtagcoll)) - AC_SUBST(LIBTAGCOLL_CFLAGS) - AC_SUBST(LIBTAGCOLL_LIBS) + AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE(nls, + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT($USE_NLS) + AC_SUBST(USE_NLS) ]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/common/Makefile.am /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/common/Makefile.am --- synaptic-0.62.1ubuntu2~ppa1/common/Makefile.am 2008-06-12 15:16:40.000000000 +0100 +++ synaptic-0.62.1ubuntu10/common/Makefile.am 2008-08-22 11:39:49.000000000 +0100 @@ -16,6 +16,8 @@ rinstallprogress.h\ rpackage.cc\ rpackage.h\ + rpackagestatus.cc\ + rpackagestatus.h\ rpackagecache.cc\ rpackagecache.h\ rpackagefilter.cc\ diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/common/Makefile.in /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/common/Makefile.in --- synaptic-0.62.1ubuntu2~ppa1/common/Makefile.in 2008-06-17 08:58:29.000000000 +0100 +++ synaptic-0.62.1ubuntu10/common/Makefile.in 2008-10-21 18:34:03.000000000 +0100 @@ -47,11 +47,12 @@ libsynaptic_a_LIBADD = am_libsynaptic_a_OBJECTS = pkg_acqfile.$(OBJEXT) \ rconfiguration.$(OBJEXT) rinstallprogress.$(OBJEXT) \ - rpackage.$(OBJEXT) rpackagecache.$(OBJEXT) \ - rpackagefilter.$(OBJEXT) rpackagelister.$(OBJEXT) \ - rpackageview.$(OBJEXT) rcdscanner.$(OBJEXT) \ - indexcopy.$(OBJEXT) rpmindexcopy.$(OBJEXT) \ - raptoptions.$(OBJEXT) rsources.$(OBJEXT) rcacheactor.$(OBJEXT) \ + rpackage.$(OBJEXT) rpackagestatus.$(OBJEXT) \ + rpackagecache.$(OBJEXT) rpackagefilter.$(OBJEXT) \ + rpackagelister.$(OBJEXT) rpackageview.$(OBJEXT) \ + rcdscanner.$(OBJEXT) indexcopy.$(OBJEXT) \ + rpmindexcopy.$(OBJEXT) raptoptions.$(OBJEXT) \ + rsources.$(OBJEXT) rcacheactor.$(OBJEXT) \ rpackagelistactor.$(OBJEXT) rtagcollbuilder.$(OBJEXT) \ rtagcollfilter.$(OBJEXT) ruserdialog.$(OBJEXT) \ sections_trans.$(OBJEXT) @@ -142,8 +143,6 @@ LIBEPT_LIBS = @LIBEPT_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -LIBTAGCOLL_CFLAGS = @LIBTAGCOLL_CFLAGS@ -LIBTAGCOLL_LIBS = @LIBTAGCOLL_LIBS@ LP_CFLAGS = @LP_CFLAGS@ LP_LIBS = @LP_LIBS@ LTLIBOBJS = @LTLIBOBJS@ @@ -238,6 +237,8 @@ rinstallprogress.h\ rpackage.cc\ rpackage.h\ + rpackagestatus.cc\ + rpackagestatus.h\ rpackagecache.cc\ rpackagecache.h\ rpackagefilter.cc\ @@ -330,6 +331,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpackagefilter.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpackagelistactor.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpackagelister.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpackagestatus.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpackageview.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpmindexcopy.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rsources.Po@am__quote@ diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/common/rpackage.cc /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/common/rpackage.cc --- synaptic-0.62.1ubuntu2~ppa1/common/rpackage.cc 2008-06-12 14:45:39.000000000 +0100 +++ synaptic-0.62.1ubuntu10/common/rpackage.cc 2008-10-21 14:18:23.000000000 +0100 @@ -867,13 +867,15 @@ string RPackage::getCanidateOrigin() { - for(pkgCache::VerIterator Ver = _package->VersionList(); Ver.end() == false; Ver++) { - // we always take the first available version - pkgCache::VerFileIterator VF = Ver.FileList(); - if(!VF.end()) { - return VF.File().Site(); - } - } + pkgCache::VerIterator Ver = (*_depcache)[*_package].CandidateVerIter(*_depcache); + + if(Ver.end()) + return ""; + + pkgCache::VerFileIterator VF = Ver.FileList(); + if(!VF.end()) + return VF.File().Site(); + return ""; } @@ -1292,127 +1294,56 @@ return res; } - -// class that finds out what do display to get user -void RPackageStatus::init() +static pkgCache::PkgFileIterator +_searchPkgFileIter(pkgCache::PkgIterator *Pkg, string label, string release) { - const char *status_short[N_STATUS_COUNT] = { - "install", "reinstall", "upgrade", "downgrade", "remove", - "purge", "available", "available-locked", - "installed-updated", "installed-outdated", "installed-locked", - "broken", "new" - }; - memcpy(PackageStatusShortString, status_short, sizeof(status_short)); - - char *status_long[N_STATUS_COUNT] = { - _("Marked for installation"), - _("Marked for re-installation"), - _("Marked for upgrade"), - _("Marked for downgrade"), - _("Marked for removal"), - _("Marked for complete removal"), - _("Not installed"), - _("Not installed (locked)"), - _("Installed"), - _("Installed (upgradable)"), - _("Installed (locked to the current version)"), - _("Broken"), - _("Not installed (new in repository)") - }; - memcpy(PackageStatusLongString, status_long, sizeof(status_long)); - - - // check for unsupported stuff - if(_config->FindB("Synaptic::mark-unsupported",true)) { - string s, labels, components; - markUnsupported = true; - - // read supported labels - labels = _config->Find("Synaptic::supported-label", "Debian Debian-Security"); - stringstream sst1(labels); - while(!sst1.eof()) { - sst1 >> s; - supportedLabels.push_back(s); - } - - // read supported components - components = _config->Find("Synaptic::supported-components", "main updates/main"); - stringstream sst2(components); - while(!sst2.eof()) { - sst2 >> s; - supportedComponents.push_back(s); - } - } - -} - -bool RPackageStatus::isSupported(RPackage *pkg) -{ - bool res = true; - - if(markUnsupported) { - bool sc, sl; - - sc=sl=false; - - string component = pkg->component(); - string label = pkg->label(); - - for(unsigned int i=0;iVersionList();!Ver.end();Ver++) { + for(VF = Ver.FileList();!VF.end(); VF++) { + for(PF = VF.File(); !PF.end(); PF++) { + if(!PF.end() && + PF.Label() && string(PF.Label()) == label && + PF.Origin() && string(PF.Origin()) == label && + PF.Archive() && PF.Archive() == release) { + //cerr << "found: " << PF.FileName() << endl; + return PF; + } } } - res = (sc & sl & pkg->isTrusted()); } - - return res; + PF = pkgCache::PkgFileIterator(*Pkg->Cache()); + return PF; } -int RPackageStatus::getStatus(RPackage *pkg) +// look for a release file that matches the given label and origin string +string RPackage::getReleaseFileForOrigin(string label, string release) { - int flags = pkg->getFlags(); - int ret = NotInstalled; - - if (pkg->wouldBreak()) { - ret = IsBroken; - } else if (flags & RPackage::FNewInstall) { - ret = ToInstall; - } else if (flags & RPackage::FUpgrade) { - ret = ToUpgrade; - } else if (flags & RPackage::FReInstall) { - ret = ToReInstall; - } else if (flags & RPackage::FDowngrade) { - ret = ToDowngrade; - } else if (flags & RPackage::FPurge) { - ret = ToPurge; - } else if (flags & RPackage::FRemove) { - ret = ToRemove; - } else if (flags & RPackage::FInstalled) { - if (flags & RPackage::FPinned) - ret = InstalledLocked; - else if (flags & RPackage::FOutdated) - ret = InstalledOutdated; - else - ret = InstalledUpdated; - } else { - if (flags & RPackage::FPinned) - ret = NotInstalledLocked; - else if (flags & RPackage::FNew) - ret = IsNew; - else - ret = NotInstalled; + pkgIndexFile *index; + pkgCache::PkgFileIterator found = _searchPkgFileIter(_package, label, string(release)); + if (found.end()) + return ""; + + // search for the matching meta-index + pkgSourceList *list = _lister->getCache()->list(); + if(list->FindIndex(found, index)) { + vector::const_iterator I; + for(I=list->begin(); I != list->end(); I++) { + vector *ifv = (*I)->GetIndexFiles(); + if(find(ifv->begin(), ifv->end(), index) != ifv->end()) { + string uri = _config->FindDir("Dir::State::lists"); + uri += URItoFileName((*I)->GetURI()); + uri += "dists_"; + uri += (*I)->GetDist(); + uri += "_Release"; + return uri; + } + } } - return ret; + return ""; } - // vim:ts=3:sw=3:et diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/common/rpackagefilter.cc /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/common/rpackagefilter.cc --- synaptic-0.62.1ubuntu2~ppa1/common/rpackagefilter.cc 2008-06-12 14:45:39.000000000 +0100 +++ synaptic-0.62.1ubuntu10/common/rpackagefilter.cc 2008-08-19 20:59:27.000000000 +0100 @@ -40,7 +40,7 @@ using namespace std; -char *RPatternPackageFilter::TypeName[] = { +const char *RPatternPackageFilter::TypeName[] = { N_("Name"), N_("Description"), N_("Maintainer"), diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/common/rpackagefilter.h /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/common/rpackagefilter.h --- synaptic-0.62.1ubuntu2~ppa1/common/rpackagefilter.h 2008-06-12 14:45:39.000000000 +0100 +++ synaptic-0.62.1ubuntu10/common/rpackagefilter.h 2008-08-19 20:59:27.000000000 +0100 @@ -142,7 +142,7 @@ public: - static char *TypeName[]; + static const char *TypeName[]; RPatternPackageFilter() : and_mode(true) {}; RPatternPackageFilter(RPatternPackageFilter &f); diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/common/rpackage.h /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/common/rpackage.h --- synaptic-0.62.1ubuntu2~ppa1/common/rpackage.h 2008-06-12 14:45:39.000000000 +0100 +++ synaptic-0.62.1ubuntu10/common/rpackage.h 2008-09-19 23:48:30.000000000 +0100 @@ -145,6 +145,9 @@ // get origin of the package string getCanidateOrigin(); + // get the release file for the givel origin label string + string getReleaseFileForOrigin(string label, string release); + // get installed component (like main, contrib, non-free) string component(); @@ -213,57 +216,6 @@ }; -class RPackageStatus { - public: - enum PkgStatus { - ToInstall, ToReInstall, ToUpgrade, ToDowngrade, ToRemove, ToPurge, - NotInstalled, NotInstalledLocked, - InstalledUpdated, InstalledOutdated, InstalledLocked, - IsBroken, IsNew, - N_STATUS_COUNT - }; - - protected: - // the supported archive-labels and components - vector supportedLabels; - vector supportedComponents; - bool markUnsupported; - - // this is the short string to load the icons - const char *PackageStatusShortString[N_STATUS_COUNT]; - // this is the long string for the gui description of the state - const char *PackageStatusLongString[N_STATUS_COUNT]; - - - // this does the actual work - int getStatus(RPackage *pkg); - - - public: - RPackageStatus() : markUnsupported(false) {}; - virtual ~RPackageStatus() {}; - - // this reads the pixmaps and the colors - virtual void init(); - - // here we get the description for the States - const char *getLongStatusString(int i) { - return PackageStatusLongString[i]; - }; - const char *getLongStatusString(RPackage *pkg) { - return PackageStatusLongString[getStatus(pkg)]; - }; - - const char *getShortStatusString(int i) { - return PackageStatusShortString[i]; - }; - - bool isSupported(RPackage *pkg); - -}; - - - #endif // vim:ts=3:sw=3:et diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/common/rpackagelister.cc /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/common/rpackagelister.cc --- synaptic-0.62.1ubuntu2~ppa1/common/rpackagelister.cc 2008-06-12 15:16:40.000000000 +0100 +++ synaptic-0.62.1ubuntu10/common/rpackagelister.cc 2008-10-21 14:33:13.000000000 +0100 @@ -36,6 +36,7 @@ #include #include #include +#include #include "rpackagelister.h" #include "rpackagecache.h" @@ -429,6 +430,7 @@ bool RPackageLister::xapianIndexNeedsUpdate() { struct stat buf; + int xapian_age; // check the xapian index if(FileExists("/usr/sbin/update-apt-xapian-index") && @@ -438,7 +440,8 @@ } else { // we default to rebuild at most once a day stat(_config->FindFile("Dir::Cache::pkgcache").c_str(), &buf); - if((_textsearch->timestamp()*60*60*24) < buf.st_mtime) { + xapian_age = _config->FindI("Synaptic::xapianMaxAge",48); + if((_textsearch->timestamp()+(60*60*xapian_age)) < buf.st_mtime) { //std::cerr << "xapian outdated" << std::endl; return true; } @@ -1478,7 +1481,7 @@ serverError = getServerErrorMessage(errm); - _error->Warning(tmp.str().c_str()); + _error->Warning("%s", tmp.str().c_str()); Failed = true; } @@ -1964,13 +1967,33 @@ bool RPackageLister::xapianSearch(string unsplitSearchString) { - const int qualityCutoff = 50; + //std::cerr << "RPackageLister::xapianSearch()" << std::endl; + string s; + ept::textsearch::TextSearch *ts = _textsearch; if(!ts || !ts->hasData()) return false; Xapian::Enquire enquire(ts->db()); + // a '-' is a legal part of a package name but also a special + // term for xapian, we apply the following heuristic: + // if the term is embedded into a word it gets quoted: + // multisync-tools -> multisync"-"tools + // + // if its on its own, nothing is done, e.g.: + // multisync -tools + size_t found = unsplitSearchString.find("-"); + while (found != string::npos) { + if (unsplitSearchString[found-1] != ' ' && + unsplitSearchString[found+1] != ' ') { + unsplitSearchString.insert(found,"\""); + unsplitSearchString.insert(found+2,"\""); + found+=2; + } + found = unsplitSearchString.find("-", found+1); + } + // Set up the base query Xapian::Query query = ts->makeORQuery(unsplitSearchString); enquire.set_query(query); @@ -1978,6 +2001,39 @@ // Get a set of tags to expand the query vector expand = ts->expand(enquire); + // now expand the query by adding the searching string as a package + // name so that those searches appear erlier + for (int i=0;i 0) + expand.push_back("XP"+s); + s=""; + } else + s+=unsplitSearchString[i]; + } + + // the last string is always expanded to get better search as you + // type results + if (s.size() > 0) { + Xapian::TermIterator I; + int j=0; + + for(I=_textsearch->db().allterms_begin(s); + I != _textsearch->db().allterms_end(s); + I++) { + //std::cerr << "expanded terms: " << *I << std::endl; + expand.push_back(*I); + expand.push_back("XP"+*I); + // do not expand all alt terms, they can be huge > 100 + // and make the search very slow + j++; + if (j > maxAltTerms) + break; + } + } + + // Build the expanded query Xapian::Query expansion(Xapian::Query::OP_OR, expand.begin(), expand.end()); enquire.set_query(Xapian::Query(Xapian::Query::OP_OR, query, expansion)); diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/common/rpackagelister.h /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/common/rpackagelister.h --- synaptic-0.62.1ubuntu2~ppa1/common/rpackagelister.h 2008-06-12 15:16:40.000000000 +0100 +++ synaptic-0.62.1ubuntu10/common/rpackagelister.h 2008-09-19 14:55:27.000000000 +0100 @@ -42,6 +42,7 @@ #include "rpackagecache.h" #include "rpackage.h" +#include "rpackagestatus.h" #include "rpackageview.h" #include "ruserdialog.h" #include "config.h" @@ -141,8 +142,10 @@ RPackageViewSearch *_searchView; // the package view that does the (simple) search // helper for the limitBySearch() code + static const int qualityCutoff = 25; + static const int maxAltTerms = 15; bool xapianSearch(string searchString); - + public: unsigned int _viewMode; diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/common/rpackagestatus.cc /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/common/rpackagestatus.cc --- synaptic-0.62.1ubuntu2~ppa1/common/rpackagestatus.cc 1970-01-01 01:00:00.000000000 +0100 +++ synaptic-0.62.1ubuntu10/common/rpackagestatus.cc 2008-10-21 14:18:23.000000000 +0100 @@ -0,0 +1,204 @@ +/* rpackagestatus.cc - wrapper for accessing packagestatus information + * + * Copyright (c) 2000-2003 Conectiva S/A + * 2002-2008 Michael Vogt + * + * Author: Alfredo K. Kojima + * Michael Vogt + * + * Portions Taken from Gnome APT + * Copyright (C) 1998 Havoc Pennington + * + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#include +#include +#include "rpackagestatus.h" + +// init the static release array so that we need to +// run lsb_release only once +char RPackageStatus::release[255] = {0,}; + +// class that finds out what do display to get user +void RPackageStatus::init() +{ + const char *status_short[N_STATUS_COUNT] = { + "install", "reinstall", "upgrade", "downgrade", "remove", + "purge", "available", "available-locked", + "installed-updated", "installed-outdated", "installed-locked", + "broken", "new" + }; + memcpy(PackageStatusShortString, status_short, sizeof(status_short)); + + const char *status_long[N_STATUS_COUNT] = { + _("Marked for installation"), + _("Marked for re-installation"), + _("Marked for upgrade"), + _("Marked for downgrade"), + _("Marked for removal"), + _("Marked for complete removal"), + _("Not installed"), + _("Not installed (locked)"), + _("Installed"), + _("Installed (upgradable)"), + _("Installed (locked to the current version)"), + _("Broken"), + _("Not installed (new in repository)") + }; + memcpy(PackageStatusLongString, status_long, sizeof(status_long)); + + + // check for unsupported stuff + if(_config->FindB("Synaptic::mark-unsupported",true)) { + string s, labels, components; + markUnsupported = true; + + // read supported labels + labels = _config->Find("Synaptic::supported-label", "Debian Debian-Security"); + stringstream sst1(labels); + while(!sst1.eof()) { + sst1 >> s; + supportedLabels.push_back(s); + } + + // read supported components + components = _config->Find("Synaptic::supported-components", "main updates/main"); + stringstream sst2(components); + while(!sst2.eof()) { + sst2 >> s; + supportedComponents.push_back(s); + } + } + + // init the static release once + FILE *fp = popen("lsb_release -c -s","r"); + if(fp) { + fgets((char *)RPackageStatus::release, 255, fp); + pclose(fp); + _strstrip(release); + } +} + +bool RPackageStatus::isSupported(RPackage *pkg) +{ + bool res = true; + + if(markUnsupported) { + bool sc, sl; + + sc=sl=false; + + string component = pkg->component(); + string label = pkg->label(); + + for(unsigned int i=0;iisTrusted()); + } + + return res; +} + +int RPackageStatus::getStatus(RPackage *pkg) +{ + int flags = pkg->getFlags(); + int ret = NotInstalled; + + if (pkg->wouldBreak()) { + ret = IsBroken; + } else if (flags & RPackage::FNewInstall) { + ret = ToInstall; + } else if (flags & RPackage::FUpgrade) { + ret = ToUpgrade; + } else if (flags & RPackage::FReInstall) { + ret = ToReInstall; + } else if (flags & RPackage::FDowngrade) { + ret = ToDowngrade; + } else if (flags & RPackage::FPurge) { + ret = ToPurge; + } else if (flags & RPackage::FRemove) { + ret = ToRemove; + } else if (flags & RPackage::FInstalled) { + if (flags & RPackage::FPinned) + ret = InstalledLocked; + else if (flags & RPackage::FOutdated) + ret = InstalledOutdated; + else + ret = InstalledUpdated; + } else { + if (flags & RPackage::FPinned) + ret = NotInstalledLocked; + else if (flags & RPackage::FNew) + ret = IsNew; + else + ret = NotInstalled; + } + + return ret; +} + +bool RPackageStatus::maintenanceEndTime(RPackage *pkg, struct tm *res) +{ + //cerr << "RPackageStatus::maintenanceEndTime()" << std::endl; + + pkgTagSection sec; + time_t release_date = -1; + + string distro = _config->Find("Synaptic::supported-label"); + string releaseFile = pkg->getReleaseFileForOrigin(distro, release); + if(!FileExists(releaseFile)) { + // happens e.g. when there is no release file and is harmless + //cerr << "mainenanceEndTime(): can not find file: " << releaseFile << endl; + return false; + } + + // read the relase file + FileFd fd(releaseFile, FileFd::ReadOnly); + pkgTagFile t(&fd); + t.Step(sec); + + // get the time_t form the string + if(!StrToTime(sec.FindS("Date"), release_date)) + return false; + + // if its not a supported package, return 0 + if(!isSupported(pkg)) + return false; + + // now calculate the time until there is support + gmtime_r(&release_date, res); + + const int support_time =_config->FindI("Synaptic::supported-month", 0); + if (support_time <= 0) + return false; + + res->tm_year += (support_time / 12) + ((res->tm_mon + support_time % 12) / 12); + res->tm_mon = (res->tm_mon + support_time) % 12; + + return true; +} diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/common/rpackagestatus.h /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/common/rpackagestatus.h --- synaptic-0.62.1ubuntu2~ppa1/common/rpackagestatus.h 1970-01-01 01:00:00.000000000 +0100 +++ synaptic-0.62.1ubuntu10/common/rpackagestatus.h 2008-09-22 18:29:50.000000000 +0100 @@ -0,0 +1,95 @@ +/* rpackagestatus.h - wrapper for accessing packagestatus information + * + * Copyright (c) 2000, 2001 Conectiva S/A + * 2002-2008 Michael Vogt + * + * Author: Alfredo K. Kojima + * Michael Vogt + * + * Portions Taken from Gnome APT + * Copyright (C) 1998 Havoc Pennington + * + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#ifndef _RPACKAGESTATUS_H_ +#define _RPACKAGESTATUS_H_ + +#include +#include +#include +#include +#include + +#include "i18n.h" +#include "rpackage.h" + +using namespace std; + +class RPackageStatus { + public: + enum PkgStatus { + ToInstall, ToReInstall, ToUpgrade, ToDowngrade, ToRemove, ToPurge, + NotInstalled, NotInstalledLocked, + InstalledUpdated, InstalledOutdated, InstalledLocked, + IsBroken, IsNew, + N_STATUS_COUNT + }; + + protected: + static char release[255]; + + // the supported archive-labels and components + vector supportedLabels; + vector supportedComponents; + bool markUnsupported; + + // this is the short string to load the icons + const char *PackageStatusShortString[N_STATUS_COUNT]; + // this is the long string for the gui description of the state + const char *PackageStatusLongString[N_STATUS_COUNT]; + + // this does the actual work + int getStatus(RPackage *pkg); + + + public: + RPackageStatus() : markUnsupported(false) {}; + virtual ~RPackageStatus() {}; + + // this reads the pixmaps and the colors + virtual void init(); + + // here we get the description for the States + const char *getLongStatusString(int i) { + return PackageStatusLongString[i]; + }; + const char *getLongStatusString(RPackage *pkg) { + return PackageStatusLongString[getStatus(pkg)]; + }; + + const char *getShortStatusString(int i) { + return PackageStatusShortString[i]; + }; + + bool isSupported(RPackage *pkg); + + // return the time until the package is supported + bool maintenanceEndTime(RPackage *pkg, struct tm *support_end_tm); +}; + +#endif diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/common/rpackageview.cc /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/common/rpackageview.cc --- synaptic-0.62.1ubuntu2~ppa1/common/rpackageview.cc 2008-06-12 15:16:40.000000000 +0100 +++ synaptic-0.62.1ubuntu10/common/rpackageview.cc 2008-08-19 20:59:27.000000000 +0100 @@ -505,7 +505,13 @@ "Ubuntu", false); filter->pattern.setAndMode(true); filter->status.setStatus(RStatusPackageFilter::Installed); - filter->setName(_("Community Supported (installed)")); + filter->setName("Community Maintained (installed)"); _("Community Maintained (installed)"); + registerFilter(filter); + + filter = new RFilter(); + filter->preset = true; + filter->status.setStatus(RStatusPackageFilter::NowPolicyBroken); + filter->setName("Missing Recommends"); _("Missing Recommends"); registerFilter(filter); } diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/configure /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/configure --- synaptic-0.62.1ubuntu2~ppa1/configure 2008-06-17 08:58:28.000000000 +0100 +++ synaptic-0.62.1ubuntu10/configure 2008-10-21 18:34:02.000000000 +0100 @@ -718,6 +718,9 @@ POSUB MKINSTALLDIRS GETTEXT_PACKAGE +INTLTOOL_UPDATE +INTLTOOL_MERGE +INTLTOOL_EXTRACT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE @@ -738,9 +741,6 @@ INTLTOOL_SERVICE_RULE INTLTOOL_POLICY_RULE MSGMERGE -INTLTOOL_EXTRACT -INTLTOOL_MERGE -INTLTOOL_UPDATE INTLTOOL_PERL ALL_LINGUAS synapticlocaledir @@ -761,8 +761,6 @@ CXXCPP VTE_CFLAGS VTE_LIBS -LIBTAGCOLL_CFLAGS -LIBTAGCOLL_LIBS LIBOBJS LTLIBOBJS' ac_subst_files='' @@ -787,9 +785,7 @@ LIBEPT_LIBS CXXCPP VTE_CFLAGS -VTE_LIBS -LIBTAGCOLL_CFLAGS -LIBTAGCOLL_LIBS' +VTE_LIBS' # Initialize some variables set by options. @@ -1367,6 +1363,7 @@ (and sometimes confusing) to the casual installer --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors + --disable-nls do not use Native Language Support --enable-scripts enable the extension system --enable-ept enable libept functionality @@ -1404,10 +1401,6 @@ CXXCPP C++ preprocessor VTE_CFLAGS C compiler flags for VTE, overriding pkg-config VTE_LIBS linker flags for VTE, overriding pkg-config - LIBTAGCOLL_CFLAGS - C compiler flags for LIBTAGCOLL, overriding pkg-config - LIBTAGCOLL_LIBS - linker flags for LIBTAGCOLL, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -2169,7 +2162,7 @@ # Define the identity of the package. PACKAGE=synaptic - VERSION=0.62.1ubuntu2~ppa1 + VERSION=0.62.1ubuntu10 cat >>confdefs.h <<_ACEOF @@ -7844,6 +7837,21 @@ _ACEOF + { echo "$as_me:$LINENO: checking whether NLS is requested" >&5 +echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; } + # Check whether --enable-nls was given. +if test "${enable_nls+set}" = set; then + enableval=$enable_nls; USE_NLS=$enableval +else + USE_NLS=yes +fi + + { echo "$as_me:$LINENO: result: $USE_NLS" >&5 +echo "${ECHO_T}$USE_NLS" >&6; } + + + + case "$am__api_version" in 1.01234) { { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5 @@ -7859,8 +7867,8 @@ echo $ECHO_N "checking for intltool >= 0.23... $ECHO_C" >&6; } INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.23 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` - INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in` + INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` + INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5 echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; } @@ -7870,6 +7878,132 @@ { (exit 1); exit 1; }; } fi +# Extract the first word of "intltool-update", so it can be a program name with args. +set dummy intltool-update; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $INTLTOOL_UPDATE in + [\\/]* | ?:[\\/]*) + ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE +if test -n "$INTLTOOL_UPDATE"; then + { echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5 +echo "${ECHO_T}$INTLTOOL_UPDATE" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +# Extract the first word of "intltool-merge", so it can be a program name with args. +set dummy intltool-merge; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $INTLTOOL_MERGE in + [\\/]* | ?:[\\/]*) + ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE +if test -n "$INTLTOOL_MERGE"; then + { echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5 +echo "${ECHO_T}$INTLTOOL_MERGE" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +# Extract the first word of "intltool-extract", so it can be a program name with args. +set dummy intltool-extract; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $INTLTOOL_EXTRACT in + [\\/]* | ?:[\\/]*) + ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT +if test -n "$INTLTOOL_EXTRACT"; then + { echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5 +echo "${ECHO_T}$INTLTOOL_EXTRACT" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then + { { echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5 +echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;} + { (exit 1); exit 1; }; } +fi + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -8031,6 +8165,47 @@ fi +# Extract the first word of "gmsgfmt", so it can be a program name with args. +set dummy gmsgfmt; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_GMSGFMT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $GMSGFMT in + [\\/]* | ?:[\\/]*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" + ;; +esac +fi +GMSGFMT=$ac_cv_path_GMSGFMT +if test -n "$GMSGFMT"; then + { echo "$as_me:$LINENO: result: $GMSGFMT" >&5 +echo "${ECHO_T}$GMSGFMT" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} @@ -8045,14 +8220,6 @@ { (exit 1); exit 1; }; } fi -# Use the tools built into the package, not the ones that are installed. -INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract' - -INTLTOOL_MERGE='$(top_builddir)/intltool-merge' - -INTLTOOL_UPDATE='$(top_builddir)/intltool-update' - - # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -8265,10 +8432,6 @@ -ac_config_commands="$ac_config_commands intltool" - - - synapticlocaledir='${prefix}/${DATADIRNAME}/locale' @@ -10443,121 +10606,7 @@ #define HAVE_DEBTAGS 1 _ACEOF - - -pkg_failed=no -{ echo "$as_me:$LINENO: checking for LIBTAGCOLL" >&5 -echo $ECHO_N "checking for LIBTAGCOLL... $ECHO_C" >&6; } - -if test -n "$PKG_CONFIG"; then - if test -n "$LIBTAGCOLL_CFLAGS"; then - pkg_cv_LIBTAGCOLL_CFLAGS="$LIBTAGCOLL_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libtagcoll\"") >&5 - ($PKG_CONFIG --exists --print-errors "libtagcoll") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_LIBTAGCOLL_CFLAGS=`$PKG_CONFIG --cflags "libtagcoll" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$LIBTAGCOLL_LIBS"; then - pkg_cv_LIBTAGCOLL_LIBS="$LIBTAGCOLL_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libtagcoll\"") >&5 - ($PKG_CONFIG --exists --print-errors "libtagcoll") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_LIBTAGCOLL_LIBS=`$PKG_CONFIG --libs "libtagcoll" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - LIBTAGCOLL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libtagcoll"` - else - LIBTAGCOLL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libtagcoll"` - fi - # Put the nasty error message in config.log where it belongs - echo "$LIBTAGCOLL_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements (libtagcoll) were not met: - -$LIBTAGCOLL_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables LIBTAGCOLL_CFLAGS -and LIBTAGCOLL_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements (libtagcoll) were not met: - -$LIBTAGCOLL_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables LIBTAGCOLL_CFLAGS -and LIBTAGCOLL_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } -elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables LIBTAGCOLL_CFLAGS -and LIBTAGCOLL_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&5 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables LIBTAGCOLL_CFLAGS -and LIBTAGCOLL_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else - LIBTAGCOLL_CFLAGS=$pkg_cv_LIBTAGCOLL_CFLAGS - LIBTAGCOLL_LIBS=$pkg_cv_LIBTAGCOLL_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - : -fi - - - + LIBTAGCOLL_DEFS fi @@ -11449,9 +11498,6 @@ # AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" -INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' -prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" -INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' _ACEOF @@ -11464,7 +11510,6 @@ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; - "intltool") CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;; "common/Makefile") CONFIG_FILES="$CONFIG_FILES common/Makefile" ;; "gtk/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/Makefile" ;; "gtk/glade/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/glade/Makefile" ;; @@ -11695,6 +11740,9 @@ POSUB!$POSUB$ac_delim MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim +INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim +INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim +INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim @@ -11715,9 +11763,6 @@ INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim MSGMERGE!$MSGMERGE$ac_delim -INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim -INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim -INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim ALL_LINGUAS!$ALL_LINGUAS$ac_delim synapticlocaledir!$synapticlocaledir$ac_delim @@ -11738,13 +11783,11 @@ CXXCPP!$CXXCPP$ac_delim VTE_CFLAGS!$VTE_CFLAGS$ac_delim VTE_LIBS!$VTE_LIBS$ac_delim -LIBTAGCOLL_CFLAGS!$LIBTAGCOLL_CFLAGS$ac_delim -LIBTAGCOLL_LIBS!$LIBTAGCOLL_LIBS$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 55; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 53; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -12314,25 +12357,13 @@ "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*) sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile esac ;; - "intltool":C) - -for file in intltool-extract intltool-merge intltool-update; do - sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ - -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ - -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ - < ${ac_aux_dir}/${file}.in > ${file}.out - if cmp -s ${file} ${file}.out 2>/dev/null; then - rm -f ${file}.out - else - mv -f ${file}.out ${file} - fi - chmod ugo+x ${file} - chmod u+w ${file} -done - - ;; "default":C) sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile ;; "po/stamp-it":C) + if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; then + { { echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5 +echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;} + { (exit 1); exit 1; }; } + fi rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" >"po/stamp-it.tmp" sed '/^#/d @@ -12341,17 +12372,11 @@ '"s|^| $ac_top_srcdir/|" \ "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES" - if test ! -f "po/Makefile"; then - { { echo "$as_me:$LINENO: error: po/Makefile is not ready." >&5 -echo "$as_me: error: po/Makefile is not ready." >&2;} - { (exit 1); exit 1; }; } - fi - mv "po/Makefile" "po/Makefile.tmp" sed '/^POTFILES =/,/[^\\]$/ { /^POTFILES =/!d r po/POTFILES } - ' "po/Makefile.tmp" >"po/Makefile" + ' "po/Makefile.in" >"po/Makefile" rm -f "po/Makefile.tmp" mv "po/stamp-it.tmp" "po/stamp-it" ;; diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/configure.in /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/configure.in --- synaptic-0.62.1ubuntu2~ppa1/configure.in 2008-06-17 08:58:22.000000000 +0100 +++ synaptic-0.62.1ubuntu10/configure.in 2008-10-21 14:20:24.000000000 +0100 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(configure.in) -AM_INIT_AUTOMAKE(synaptic, 0.62.1ubuntu2~ppa1) +AM_INIT_AUTOMAKE(synaptic, 0.62.1ubuntu10) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/data/Makefile.in /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/data/Makefile.in --- synaptic-0.62.1ubuntu2~ppa1/data/Makefile.in 2008-06-17 08:58:29.000000000 +0100 +++ synaptic-0.62.1ubuntu10/data/Makefile.in 2008-10-21 18:34:03.000000000 +0100 @@ -122,8 +122,6 @@ LIBEPT_LIBS = @LIBEPT_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -LIBTAGCOLL_CFLAGS = @LIBTAGCOLL_CFLAGS@ -LIBTAGCOLL_LIBS = @LIBTAGCOLL_LIBS@ LP_CFLAGS = @LP_CFLAGS@ LP_LIBS = @LP_LIBS@ LTLIBOBJS = @LTLIBOBJS@ diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/debian/changelog /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/debian/changelog --- synaptic-0.62.1ubuntu2~ppa1/debian/changelog 2008-06-17 08:58:20.000000000 +0100 +++ synaptic-0.62.1ubuntu10/debian/changelog 2008-10-21 14:35:07.000000000 +0100 @@ -1,9 +1,103 @@ -synaptic (0.62.1ubuntu2~ppa1) intrepid; urgency=low +synaptic (0.62.1ubuntu10) intrepid; urgency=low + + * common/rpackagelister.cc: + - add special handling for "-" char in the xapian + search (thanks to kiko) + - fix hang in quick search for huge result lists + (like "li") LP: #282188 + + -- Michael Vogt Tue, 21 Oct 2008 15:19:02 +0200 + +synaptic (0.62.1ubuntu9) intrepid; urgency=low + + * gtk/rgmainwindow.cc: + - only xapian search when more than one char is used + in the search querry (LP: #260739) + * common/rpackagelister.{cc,h}: + - expand partial strings in search as you type so that + "ged" finds "gedit" (LP: #261423) + * 10_ubuntu_maintenance_gui.dpatch: + - make sure to look only for immutable release files + when calculating the support time + + -- Michael Vogt Mon, 22 Sep 2008 15:57:58 +0200 + +synaptic (0.62.1ubuntu8) intrepid; urgency=low + + * common/rpackageview.cc: + - add new "Missing Recommends" default filter + * common/rpackage.cc: + - fix code to get candidate origin + - support getting the candidate release file name + * common/rpackagestatus.cc: + - support maintenanceEndTime() (if the distro supports that) + * 10_ubuntu_maintenance_gui.dpatch: + - add support for displaying when the maintaince ends + + -- Michael Vogt Fri, 22 Aug 2008 12:40:10 +0200 + +synaptic (0.62.1ubuntu7) intrepid; urgency=low + + * debian/control: + - add apt-xapian-index to the recommends again, we have some + space on the CDs again (thanks to Steve Langasek) + + -- Michael Vogt Thu, 19 Jun 2008 14:45:42 +0200 + +synaptic (0.62.1ubuntu6) intrepid; urgency=low + + * gtk/rgdebinstallprogress.cc: + - make sure that SIGCHLD is not blocked to work around + kdesudo (LP: #156041) + * common/rpackageview.cc: + - add new "Missing Recommends" default filter + - fix incorrect display of the "Community Maintained" filter + + -- Michael Vogt Thu, 14 Aug 2008 12:01:56 +0200 + +synaptic (0.62.1ubuntu5) intrepid; urgency=low + + * debian/control: + - make deborphan and apt-xapian-index suggests instead of recommends + to save space on the CD - this means we loose the quick search + feature in the default install + * po/es.po: + - updated spanish translation (thanks to + Francisco Javier Cuadrado) + * gtk/glade/dialog_upgrade.glade: + - provide a mnemonics in the upgrade dialog, + closes: #491179 (thanks to Matt Kraai) + * gtk/glade/window_fetch.glade: + - dialog fix (thanks to Oded Arbel) (LP: #228127) + * gtk/rgdebinstallprogress.cc: + - intercept ctrl-c in the terminal window and ask + if that is really the desired action + * gtk/rgmainwindow.cc: + - fix "Gtk-CRITICAL **: gtk_tree_view_unref_tree_helper" + assertion failure error (LP: #38397, closes: #341645) + + -- Michael Vogt Fri, 01 Aug 2008 13:50:48 +0200 + +synaptic (0.62.1ubuntu4) intrepid; urgency=low + + * improve the search as you type to weight packagename in the + search heigher + + -- Michael Vogt Wed, 16 Jul 2008 16:00:26 +0100 + +synaptic (0.62.1ubuntu3) intrepid; urgency=low + + * do not run the index update when called in backend + (non-interactive) mode + + -- Michael Vogt Thu, 03 Jul 2008 21:58:28 +0200 + +synaptic (0.62.1ubuntu2) intrepid; urgency=low * added support for quick search using xapian (thanks to Enrico Zini for his help) - -- Michael Vogt Tue, 17 Jun 2008 09:56:55 +0200 + -- Michael Vogt Tue, 17 Jun 2008 14:37:19 +0200 synaptic (0.62.1ubuntu1) intrepid; urgency=low @@ -24,10 +118,35 @@ * gtk/rgmainwindow.cc: - do not loose the keyboard focus after a package action in the listview + * debian/control: + - switch bzr branch to bzr.debian.org -- Michael Vogt Thu, 12 Jun 2008 15:57:44 +0200 +synaptic (0.62.1ubuntu1) intrepid; urgency=low + + * po/es.po: + - updated Spanish translation (thanks to + Francisco Javier Cuadrado) + * debian/control: + - added "menu" to the recommends (closes: #478250) + * gtk/glade/window_main.glade: + - make the main vpane shinkable + * gtk/rgmainwindow.cc: + - do not loose the keyboard focus after a package + action in the listview + * debian/control: + - switch bzr branch to bzr.debian.org + + -- Michael Vogt Tue, 18 Jun 2008 10:17:31 +0200 + + synaptic (0.62) unstable; urgency=low + + [ Michael Vogt] + * debian/rules, debian/control: + - use dh_icons and add appropriate b-d on debhelper + * g++ 4.3 fixes (closes: #456044) * desktop-file-validate does not complain anymore (LP: #33598) * gtk/rgmainwindow.cc: diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/debian/control /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/debian/control --- synaptic-0.62.1ubuntu2~ppa1/debian/control 2008-06-17 08:56:15.000000000 +0100 +++ synaptic-0.62.1ubuntu10/debian/control 2008-08-19 20:59:27.000000000 +0100 @@ -6,6 +6,7 @@ Build-Depends: debhelper (>= 5.0.51), libapt-pkg-dev (>= 0.7.9ubuntu3), gettext, libgtk2.0-dev, libvte-dev (>= 0.11.11), libglade2-dev, libxft2-dev, scrollkeeper, intltool, xmlto, libsm-dev , sharutils, dpatch, lsb-release, dpkg (>= 1.13.9), liblaunchpad-integration-dev, libept-dev Standards-Version: 3.7.2.2 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/synaptic/ubuntu/ +XS-Original-Vcs-Bzr: http://bzr.debian.org/synaptic/synaptic/debian-sid Package: synaptic Architecture: any @@ -13,8 +14,8 @@ Provides: gsynaptic Replaces: gsynaptic Conflicts: gsynaptic, menu (<< 2.1.11) -Recommends: gksu, deborphan, libgnome2-perl, software-properties-gtk, apt-xapian-index -Suggests: dwww, menu +Recommends: gksu, libgnome2-perl, software-properties-gtk, apt-xapian-index +Suggests: dwww, menu, deborphan Description: Graphical package manager Synaptic is a graphical package management tool based on GTK+ and APT. Synaptic enables you to install, upgrade and remove software packages in diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/debian/patches/00list /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/debian/patches/00list --- synaptic-0.62.1ubuntu2~ppa1/debian/patches/00list 2008-06-17 08:58:39.000000000 +0100 +++ synaptic-0.62.1ubuntu10/debian/patches/00list 2008-10-21 18:34:14.000000000 +0100 @@ -3,3 +3,4 @@ 03_hide_browse_documentation 04_ubuntu_lpi 06_ubuntu_su_to_root +10_ubuntu_maintenance_gui diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/debian/patches/00list.Ubuntu /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/debian/patches/00list.Ubuntu --- synaptic-0.62.1ubuntu2~ppa1/debian/patches/00list.Ubuntu 2008-06-12 15:16:30.000000000 +0100 +++ synaptic-0.62.1ubuntu10/debian/patches/00list.Ubuntu 2008-08-22 15:02:02.000000000 +0100 @@ -3,3 +3,4 @@ 03_hide_browse_documentation 04_ubuntu_lpi 06_ubuntu_su_to_root +10_ubuntu_maintenance_gui diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/debian/patches/01_ubuntu_changelog.dpatch /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/debian/patches/01_ubuntu_changelog.dpatch --- synaptic-0.62.1ubuntu2~ppa1/debian/patches/01_ubuntu_changelog.dpatch 2008-06-12 14:45:39.000000000 +0100 +++ synaptic-0.62.1ubuntu10/debian/patches/01_ubuntu_changelog.dpatch 2008-08-22 11:48:33.000000000 +0100 @@ -5,10 +5,10 @@ ## DP: No description. @DPATCH@ -diff -urNad synaptic-0.56/common/rpackage.cc /tmp/dpep.Ri9fRS/synaptic-0.56/common/rpackage.cc ---- synaptic-0.56/common/rpackage.cc 2005-02-18 13:28:43.000000000 +0100 -+++ /tmp/dpep.Ri9fRS/synaptic-0.56/common/rpackage.cc 2005-02-18 14:39:17.005309176 +0100 -@@ -810,7 +810,7 @@ +diff -urNad ubuntu~/common/rpackage.cc ubuntu/common/rpackage.cc +--- ubuntu~/common/rpackage.cc 2008-08-22 12:39:49.000000000 +0200 ++++ ubuntu/common/rpackage.cc 2008-08-22 12:46:58.000000000 +0200 +@@ -843,7 +843,7 @@ if(verstr.find(':')!=verstr.npos) verstr=string(verstr, verstr.find(':')+1); char uri[512]; @@ -17,7 +17,10 @@ src_section.c_str(), prefix.c_str(), srcpkg.c_str(), -@@ -1293,7 +1293,7 @@ +diff -urNad ubuntu~/common/rpackagestatus.cc ubuntu/common/rpackagestatus.cc +--- ubuntu~/common/rpackagestatus.cc 2008-08-22 12:39:49.000000000 +0200 ++++ ubuntu/common/rpackagestatus.cc 2008-08-22 12:48:22.000000000 +0200 +@@ -65,7 +65,7 @@ markUnsupported = true; // read supported labels @@ -26,7 +29,7 @@ stringstream sst1(labels); while(!sst1.eof()) { sst1 >> s; -@@ -1301,7 +1301,7 @@ +@@ -73,7 +73,7 @@ } // read supported components diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/debian/patches/10_ubuntu_maintenance_gui.dpatch /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/debian/patches/10_ubuntu_maintenance_gui.dpatch --- synaptic-0.62.1ubuntu2~ppa1/debian/patches/10_ubuntu_maintenance_gui.dpatch 1970-01-01 01:00:00.000000000 +0100 +++ synaptic-0.62.1ubuntu10/debian/patches/10_ubuntu_maintenance_gui.dpatch 2008-09-22 18:29:50.000000000 +0100 @@ -0,0 +1,144 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_foo.dpatch +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad ubuntu~/common/rpackagestatus.cc ubuntu/common/rpackagestatus.cc +--- ubuntu~/common/rpackagestatus.cc 2008-09-22 16:38:15.000000000 +0200 ++++ ubuntu/common/rpackagestatus.cc 2008-09-22 16:42:56.000000000 +0200 +@@ -169,7 +169,8 @@ + pkgTagSection sec; + time_t release_date = -1; + +- string distro = _config->Find("Synaptic::supported-label"); ++ // FIXME: make this use the "labels" vector in the future ++ string distro = _config->Find("Synaptic::supported-label","Ubuntu"); + string releaseFile = pkg->getReleaseFileForOrigin(distro, release); + if(!FileExists(releaseFile)) { + // happens e.g. when there is no release file and is harmless +@@ -193,7 +194,7 @@ + // now calculate the time until there is support + gmtime_r(&release_date, res); + +- const int support_time =_config->FindI("Synaptic::supported-month", 0); ++ const int support_time =_config->FindI("Synaptic::supported-month", 18); + if (support_time <= 0) + return false; + +diff -urNad ubuntu~/gtk/glade/window_main.glade ubuntu/gtk/glade/window_main.glade +--- ubuntu~/gtk/glade/window_main.glade 2008-09-22 16:38:15.000000000 +0200 ++++ ubuntu/gtk/glade/window_main.glade 2008-09-22 16:38:17.000000000 +0200 +@@ -1351,8 +1351,8 @@ + 3 + 3 + 0 +- 3 +- 3 ++ 12 ++ 12 + 0 + + +diff -urNad ubuntu~/gtk/rgpkgdetails.cc ubuntu/gtk/rgpkgdetails.cc +--- ubuntu~/gtk/rgpkgdetails.cc 2008-09-22 16:38:04.000000000 +0200 ++++ ubuntu/gtk/rgpkgdetails.cc 2008-09-22 16:38:17.000000000 +0200 +@@ -24,6 +24,8 @@ + #include "config.h" + + #include ++#include ++ + #include "rgwindow.h" + #include "rgmainwindow.h" + #include "rgpkgdetails.h" +@@ -148,37 +150,68 @@ + "scale", 1.1, + NULL); + } ++ if(gtk_text_tag_table_lookup(tag_table, "gray") == NULL) { ++ gtk_text_buffer_create_tag(buf, "gray", ++ "foreground", "darkgray", ++ NULL); ++ } ++ + // set summary + s = utf8(pkg->summary()); + gtk_text_buffer_get_start_iter(buf, &it); + gtk_text_buffer_insert(buf, &it, s, -1); + gtk_text_buffer_get_start_iter(buf, &start); + gtk_text_buffer_apply_tag_by_name(buf, "bold", &start, &it); +- // set emblems +- GdkPixbuf *pixbuf = RGPackageStatus::pkgStatus.getSupportedPix(pkg); +- if(pixbuf != NULL) { +- // insert space +- gtk_text_buffer_insert(buf, &it, " ", 1); +- // make image +- emblem = gtk_image_new_from_pixbuf(pixbuf); +- gtk_image_set_pixel_size(GTK_IMAGE(emblem), 16); +- // set eventbox and tooltip +- GtkWidget *event = gtk_event_box_new(); +- GtkStyle *style = gtk_widget_get_style(textview); +- gtk_widget_modify_bg(event, GTK_STATE_NORMAL, +- &style->base[GTK_STATE_NORMAL]); +- gtk_container_add(GTK_CONTAINER(event), emblem); +- gtk_tooltips_set_tip(tips, event, _("This application is supported by the distribution"), ""); +- // create anchor +- GtkTextChildAnchor *anchor = gtk_text_buffer_create_child_anchor(buf, &it); +- gtk_text_view_add_child_at_anchor(GTK_TEXT_VIEW(textview), event, anchor); +- gtk_widget_show_all(event); +- } + // show the rest of the description + gtk_text_buffer_insert(buf, &it, "\n", 1); + s = utf8(pkg->description()); + gtk_text_buffer_insert(buf, &it, s, -1); + ++ // now check if we have a support time ++ gchar *maint_str = NULL; ++ struct tm end_time; ++ if(pkg->label() == "Ubuntu") { ++ if(RGPackageStatus::pkgStatus.maintenanceEndTime(pkg, &end_time)) { ++ if (pkg->component() == "main") ++ maint_str = g_strdup_printf(_("\n\n" ++ "Canonical provides critical updates for %s " ++ "until %s %i."), ++ pkg->name(), ++ nl_langinfo(MON_1+end_time.tm_mon), ++ end_time.tm_year + 1900); ++ else if (pkg->component() == "restricted") ++ maint_str = g_strdup_printf(_("\n\n" ++ "Canonical provides critical updates " ++ "supplied by the developers of %s " ++ "until %s %i."), ++ pkg->name(), ++ nl_langinfo(MON_1+end_time.tm_mon), ++ end_time.tm_year + 1900); ++ } else { ++ if (pkg->component() == "main") ++ maint_str = g_strdup_printf(_("\n\n" ++ "Canonical provides critical updates for %s."), ++ pkg->name()); ++ else if (pkg->component() == "restricted") ++ maint_str = g_strdup_printf(_("\n\n" ++ "Canonical provides critical updates " ++ "supplied by the developers of %s."), ++ pkg->name()); ++ else if (pkg->component() == "universe" || ++ pkg->component() == "multiverse") ++ maint_str = g_strdup_printf(_("\n\n" ++ "Canonical does not provide " ++ "updates for %s. " ++ "Some updates may be provided " ++ "by the Ubuntu community."), ++ pkg->name()); ++ } ++ } ++ if(maint_str) ++ gtk_text_buffer_insert_with_tags_by_name(buf, ++ &it, maint_str, -1, ++ "gray", NULL); ++ g_free(maint_str); + + // build dependency lists + vector deps; diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/doc/html/C/Makefile.in /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/doc/html/C/Makefile.in --- synaptic-0.62.1ubuntu2~ppa1/doc/html/C/Makefile.in 2008-06-17 08:58:30.000000000 +0100 +++ synaptic-0.62.1ubuntu10/doc/html/C/Makefile.in 2008-10-21 18:34:03.000000000 +0100 @@ -122,8 +122,6 @@ LIBEPT_LIBS = @LIBEPT_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -LIBTAGCOLL_CFLAGS = @LIBTAGCOLL_CFLAGS@ -LIBTAGCOLL_LIBS = @LIBTAGCOLL_LIBS@ LP_CFLAGS = @LP_CFLAGS@ LP_LIBS = @LP_LIBS@ LTLIBOBJS = @LTLIBOBJS@ diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/doc/html/es/Makefile.in /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/doc/html/es/Makefile.in --- synaptic-0.62.1ubuntu2~ppa1/doc/html/es/Makefile.in 2008-06-17 08:58:30.000000000 +0100 +++ synaptic-0.62.1ubuntu10/doc/html/es/Makefile.in 2008-10-21 18:34:03.000000000 +0100 @@ -119,8 +119,6 @@ LIBEPT_LIBS = @LIBEPT_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -LIBTAGCOLL_CFLAGS = @LIBTAGCOLL_CFLAGS@ -LIBTAGCOLL_LIBS = @LIBTAGCOLL_LIBS@ LP_CFLAGS = @LP_CFLAGS@ LP_LIBS = @LP_LIBS@ LTLIBOBJS = @LTLIBOBJS@ diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/doc/html/Makefile.in /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/doc/html/Makefile.in --- synaptic-0.62.1ubuntu2~ppa1/doc/html/Makefile.in 2008-06-17 08:58:30.000000000 +0100 +++ synaptic-0.62.1ubuntu10/doc/html/Makefile.in 2008-10-21 18:34:03.000000000 +0100 @@ -123,8 +123,6 @@ LIBEPT_LIBS = @LIBEPT_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -LIBTAGCOLL_CFLAGS = @LIBTAGCOLL_CFLAGS@ -LIBTAGCOLL_LIBS = @LIBTAGCOLL_LIBS@ LP_CFLAGS = @LP_CFLAGS@ LP_LIBS = @LP_LIBS@ LTLIBOBJS = @LTLIBOBJS@ diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/doc/html/sv/Makefile.in /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/doc/html/sv/Makefile.in --- synaptic-0.62.1ubuntu2~ppa1/doc/html/sv/Makefile.in 2008-06-17 08:58:30.000000000 +0100 +++ synaptic-0.62.1ubuntu10/doc/html/sv/Makefile.in 2008-10-21 18:34:04.000000000 +0100 @@ -111,8 +111,6 @@ LIBEPT_LIBS = @LIBEPT_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -LIBTAGCOLL_CFLAGS = @LIBTAGCOLL_CFLAGS@ -LIBTAGCOLL_LIBS = @LIBTAGCOLL_LIBS@ LP_CFLAGS = @LP_CFLAGS@ LP_LIBS = @LP_LIBS@ LTLIBOBJS = @LTLIBOBJS@ diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/doc/Makefile.in /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/doc/Makefile.in --- synaptic-0.62.1ubuntu2~ppa1/doc/Makefile.in 2008-06-17 08:58:29.000000000 +0100 +++ synaptic-0.62.1ubuntu10/doc/Makefile.in 2008-10-21 18:34:03.000000000 +0100 @@ -123,8 +123,6 @@ LIBEPT_LIBS = @LIBEPT_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -LIBTAGCOLL_CFLAGS = @LIBTAGCOLL_CFLAGS@ -LIBTAGCOLL_LIBS = @LIBTAGCOLL_LIBS@ LP_CFLAGS = @LP_CFLAGS@ LP_LIBS = @LP_LIBS@ LTLIBOBJS = @LTLIBOBJS@ diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/glade/dialog_upgrade.glade /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/glade/dialog_upgrade.glade --- synaptic-0.62.1ubuntu2~ppa1/gtk/glade/dialog_upgrade.glade 2008-06-12 14:45:39.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/glade/dialog_upgrade.glade 2008-08-19 20:59:27.000000000 +0100 @@ -49,7 +49,7 @@ True True True - Default Upgrade + _Default Upgrade True GTK_RELIEF_NORMAL True @@ -63,7 +63,7 @@ True True True - Smart Upgrade + _Smart Upgrade True GTK_RELIEF_NORMAL True diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/glade/Makefile.in /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/glade/Makefile.in --- synaptic-0.62.1ubuntu2~ppa1/gtk/glade/Makefile.in 2008-06-17 08:58:30.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/glade/Makefile.in 2008-10-21 18:34:04.000000000 +0100 @@ -121,8 +121,6 @@ LIBEPT_LIBS = @LIBEPT_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -LIBTAGCOLL_CFLAGS = @LIBTAGCOLL_CFLAGS@ -LIBTAGCOLL_LIBS = @LIBTAGCOLL_LIBS@ LP_CFLAGS = @LP_CFLAGS@ LP_LIBS = @LP_LIBS@ LTLIBOBJS = @LTLIBOBJS@ diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/glade/window_fetch.glade /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/glade/window_fetch.glade --- synaptic-0.62.1ubuntu2~ppa1/gtk/glade/window_fetch.glade 2008-06-12 14:45:39.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/glade/window_fetch.glade 2008-08-19 20:59:27.000000000 +0100 @@ -160,7 +160,7 @@ True - Show progress of single files + Show for individual files False False GTK_JUSTIFY_LEFT diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/gsynaptic.cc /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/gsynaptic.cc --- synaptic-0.62.1ubuntu2~ppa1/gtk/gsynaptic.cc 2008-06-12 15:16:30.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/gsynaptic.cc 2008-08-22 11:39:49.000000000 +0100 @@ -49,7 +49,8 @@ #include "rguserdialog.h" #include "locale.h" #include "stdio.h" -#include "rgmisc.h" +#include "rgutils.h" +#include "rgpackagestatus.h" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/gtkpkglist.cc /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/gtkpkglist.cc --- synaptic-0.62.1ubuntu2~ppa1/gtk/gtkpkglist.cc 2008-06-12 14:45:39.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/gtkpkglist.cc 2008-08-22 11:39:49.000000000 +0100 @@ -23,7 +23,8 @@ #include #include #include "gtkpkglist.h" -#include "rgmisc.h" +#include "rgutils.h" +#include "rgpackagestatus.h" #include "rpackagelister.h" using namespace std; @@ -498,6 +499,7 @@ cout << "iter_next() " << endl; cout << "old: " << oldpkg->name() << " [" << old << "] " << endl; cout << "new: " << pkg->name() << " [" << i << "] " << endl; + cout << "viewPackagesSize: " << pkg_list->_lister->viewPackagesSize() << endl; #endif iter->stamp = 140677; diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/gtkpkglist.h /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/gtkpkglist.h --- synaptic-0.62.1ubuntu2~ppa1/gtk/gtkpkglist.h 2008-06-12 14:45:39.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/gtkpkglist.h 2008-08-22 11:39:49.000000000 +0100 @@ -24,7 +24,7 @@ #include "rpackagelister.h" #include "rcacheactor.h" #include "rpackagelistactor.h" -#include "rgmisc.h" +#include "rgutils.h" #define GTK_TYPE_PKG_LIST (gtk_pkg_list_get_type ()) diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/gtktagtree.h /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/gtktagtree.h --- synaptic-0.62.1ubuntu2~ppa1/gtk/gtktagtree.h 2008-06-12 14:45:39.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/gtktagtree.h 2008-08-22 11:39:49.000000000 +0100 @@ -39,7 +39,7 @@ #include "rcacheactor.h" #include "rpackagelistactor.h" #include "rtagcollbuilder.h" -#include "rgmisc.h" +#include "rgutils.h" using namespace std; diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/Makefile.am /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/Makefile.am --- synaptic-0.62.1ubuntu2~ppa1/gtk/Makefile.am 2008-06-12 15:16:40.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/Makefile.am 2008-08-22 11:39:49.000000000 +0100 @@ -42,8 +42,10 @@ rgiconlegend.cc\ rglogview.cc\ rglogview.h\ - rgmisc.cc\ - rgmisc.h\ + rgutils.cc\ + rgutils.h\ + rgpackagestatus.cc\ + rgpackagestatus.h\ rgsetoptwindow.cc\ rgsetoptwindow.h\ rgdummyinstallprogress.cc\ diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/Makefile.in /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/Makefile.in --- synaptic-0.62.1ubuntu2~ppa1/gtk/Makefile.in 2008-06-17 08:58:30.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/Makefile.in 2008-10-21 18:34:04.000000000 +0100 @@ -49,7 +49,8 @@ rgpkgcdrom.$(OBJEXT) rgpreferenceswindow.$(OBJEXT) \ rgfetchprogress.$(OBJEXT) rgfiltermanager.$(OBJEXT) \ rgfindwindow.$(OBJEXT) rgiconlegend.$(OBJEXT) \ - rglogview.$(OBJEXT) rgmisc.$(OBJEXT) rgsetoptwindow.$(OBJEXT) \ + rglogview.$(OBJEXT) rgutils.$(OBJEXT) \ + rgpackagestatus.$(OBJEXT) rgsetoptwindow.$(OBJEXT) \ rgdummyinstallprogress.$(OBJEXT) \ rgdebinstallprogress.$(OBJEXT) rgterminstallprogress.$(OBJEXT) \ rginstallprogress.$(OBJEXT) rgslideshow.$(OBJEXT) \ @@ -159,8 +160,6 @@ LIBEPT_LIBS = @LIBEPT_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -LIBTAGCOLL_CFLAGS = @LIBTAGCOLL_CFLAGS@ -LIBTAGCOLL_LIBS = @LIBTAGCOLL_LIBS@ LP_CFLAGS = @LP_CFLAGS@ LP_LIBS = @LP_LIBS@ LTLIBOBJS = @LTLIBOBJS@ @@ -280,8 +279,10 @@ rgiconlegend.cc\ rglogview.cc\ rglogview.h\ - rgmisc.cc\ - rgmisc.h\ + rgutils.cc\ + rgutils.h\ + rgpackagestatus.cc\ + rgpackagestatus.h\ rgsetoptwindow.cc\ rgsetoptwindow.h\ rgdummyinstallprogress.cc\ @@ -400,7 +401,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rginstallprogress.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rglogview.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rgmainwindow.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rgmisc.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rgpackagestatus.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rgpkgcdrom.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rgpkgdetails.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rgpreferenceswindow.Po@am__quote@ @@ -411,6 +412,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rgtaskswin.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rgterminstallprogress.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rguserdialog.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rgutils.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rgvendorswindow.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rgwindow.Po@am__quote@ diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/rgcacheprogress.cc /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/rgcacheprogress.cc --- synaptic-0.62.1ubuntu2~ppa1/gtk/rgcacheprogress.cc 2008-06-12 14:45:39.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/rgcacheprogress.cc 2008-08-22 11:39:49.000000000 +0100 @@ -23,7 +23,7 @@ #include "config.h" #include "rgcacheprogress.h" -#include "rgmisc.h" +#include "rgutils.h" #include "i18n.h" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/rgdebinstallprogress.cc /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/rgdebinstallprogress.cc --- synaptic-0.62.1ubuntu2~ppa1/gtk/rgdebinstallprogress.cc 2008-06-12 14:45:39.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/rgdebinstallprogress.cc 2008-08-19 20:59:27.000000000 +0100 @@ -382,6 +382,11 @@ _config->FindB("Synaptic::closeZvt", false)); //_image = glade_xml_get_widget(_gladeXML, "image"); + // work around for kdesudo blocking our SIGCHLD (LP: #156041) + sigset_t sset; + sigemptyset(&sset); + sigaddset(&sset, SIGCHLD); + sigprocmask(SIG_UNBLOCK, &sset, NULL); _term = vte_terminal_new(); vte_terminal_set_size(VTE_TERMINAL(_term),80,23); @@ -396,6 +401,9 @@ vte_terminal_set_font_from_string(VTE_TERMINAL(_term), "monospace 8"); } gtk_box_pack_start(GTK_BOX(glade_xml_get_widget(_gladeXML,"hbox_vte")), _term, TRUE, TRUE, 0); + g_signal_connect(G_OBJECT(_term), "key-press-event", G_CALLBACK(key_press_event), this); + + gtk_widget_show(_term); gtk_box_pack_end(GTK_BOX(glade_xml_get_widget(_gladeXML,"hbox_vte")), scrollbar, FALSE, FALSE, 0); gtk_widget_show(scrollbar); @@ -434,6 +442,35 @@ me->last_term_action = time(NULL); } +gboolean RGDebInstallProgress::key_press_event(GtkWidget *widget, + GdkEventKey *event, + gpointer user_data) +{ + RGDebInstallProgress *me = (RGDebInstallProgress *)user_data; + + // user pressed ctrl-c + if (strlen(event->string) == 1 && event->string[0] == 3) { + gchar *summary = _("Ctrl-c pressed"); + char *msg = _("This will abort the operation and may leave the system " + "in a broken state. Are you sure you want to do that?"); + GtkWidget *dia = gtk_message_dialog_new (GTK_WINDOW(me->_win), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_YES_NO, + summary); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(dia), msg); + int res = gtk_dialog_run (GTK_DIALOG (dia)); + gtk_widget_destroy (dia); + switch(res) { + case GTK_RESPONSE_YES: + return false; + case GTK_RESPONSE_NO: + return true; + } + } + return false; +} + void RGDebInstallProgress::updateInterface() { char buf[2]; @@ -687,7 +724,7 @@ // build a meaningfull dialog int installed, broken, toInstall, toReInstall, toRemove; double sizeChange; - gchar *p = "Should never be displayed, please report"; + const gchar *p = "Should never be displayed, please report"; string s = _config->Find("Volatile::InstallProgressStr", _("The marked changes are now being applied. " "This can take some time. Please wait.")); diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/rgdebinstallprogress.h /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/rgdebinstallprogress.h --- synaptic-0.62.1ubuntu2~ppa1/gtk/rgdebinstallprogress.h 2008-06-12 14:45:39.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/rgdebinstallprogress.h 2008-08-19 20:59:27.000000000 +0100 @@ -127,6 +127,9 @@ static void content_changed(GObject *object, gpointer user_data); static void expander_callback(GObject *object,GParamSpec *param_spec, gpointer user_data); + static gboolean key_press_event(GtkWidget *widget, + GdkEventKey *event, + gpointer user_data); public: RGDebInstallProgress(RGMainWindow *main, RPackageLister *lister); diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/rgdummyinstallprogress.cc /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/rgdummyinstallprogress.cc --- synaptic-0.62.1ubuntu2~ppa1/gtk/rgdummyinstallprogress.cc 2008-06-12 14:45:39.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/rgdummyinstallprogress.cc 2008-08-22 11:39:49.000000000 +0100 @@ -23,7 +23,7 @@ #include "config.h" #include "rgdummyinstallprogress.h" -#include "rgmisc.h" +#include "rgutils.h" #include #include diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/rgfetchprogress.cc /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/rgfetchprogress.cc --- synaptic-0.62.1ubuntu2~ppa1/gtk/rgfetchprogress.cc 2008-06-12 15:16:30.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/rgfetchprogress.cc 2008-08-22 11:39:49.000000000 +0100 @@ -31,7 +31,7 @@ #include "rgfetchprogress.h" #include "rguserdialog.h" -#include "rgmisc.h" +#include "rgutils.h" #include #include diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/rgfiltermanager.h /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/rgfiltermanager.h --- synaptic-0.62.1ubuntu2~ppa1/gtk/rgfiltermanager.h 2008-06-12 14:45:39.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/rgfiltermanager.h 2008-08-22 11:39:49.000000000 +0100 @@ -28,7 +28,7 @@ #include #include "rggladewindow.h" #include "rpackagefilter.h" -#include "rgmisc.h" +#include "rgutils.h" #include "i18n.h" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/rgfindwindow.cc /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/rgfindwindow.cc --- synaptic-0.62.1ubuntu2~ppa1/gtk/rgfindwindow.cc 2008-06-12 14:45:39.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/rgfindwindow.cc 2008-08-22 11:39:49.000000000 +0100 @@ -26,7 +26,7 @@ #include #include "rgfindwindow.h" -#include "rgmisc.h" +#include "rgutils.h" #include "i18n.h" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/rggladewindow.h /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/rggladewindow.h --- synaptic-0.62.1ubuntu2~ppa1/gtk/rggladewindow.h 2008-06-12 14:45:39.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/rggladewindow.h 2008-08-22 11:39:49.000000000 +0100 @@ -30,9 +30,10 @@ #include #include #include +#include #include "rgwindow.h" -#include "rgmisc.h" +#include "rgutils.h" using namespace std; diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/rgiconlegend.cc /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/rgiconlegend.cc --- synaptic-0.62.1ubuntu2~ppa1/gtk/rgiconlegend.cc 2008-06-12 14:45:39.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/rgiconlegend.cc 2008-08-22 11:39:49.000000000 +0100 @@ -23,7 +23,8 @@ #include #include "config.h" #include "rgiconlegend.h" -#include "rgmisc.h" +#include "rgutils.h" +#include "rgpackagestatus.h" #include "i18n.h" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/rglogview.cc /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/rglogview.cc --- synaptic-0.62.1ubuntu2~ppa1/gtk/rglogview.cc 2008-06-12 14:45:39.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/rglogview.cc 2008-08-22 11:39:49.000000000 +0100 @@ -23,9 +23,12 @@ #include #include #include +#include + #include "config.h" #include "rglogview.h" -#include "rgmisc.h" +#include "rgutils.h" +#include "rconfiguration.h" #include "i18n.h" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/rgmainwindow.cc /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/rgmainwindow.cc --- synaptic-0.62.1ubuntu2~ppa1/gtk/rgmainwindow.cc 2008-06-13 11:08:37.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/rgmainwindow.cc 2008-10-21 14:18:23.000000000 +0100 @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -74,7 +75,7 @@ #include "rgdummyinstallprogress.h" #include "rgdebinstallprogress.h" #include "rgterminstallprogress.h" -#include "rgmisc.h" +#include "rgutils.h" #include "sections_trans.h" // icons and pixmaps @@ -113,6 +114,13 @@ _blockActions = TRUE; gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(_viewButtons[view]), TRUE); + + // we need to set a empty model first so that gtklistview + // can do its cleanup, if we do not do that, then the cleanup + // code in gtktreeview gets confused and throws + // Gtk-CRITICAL **: gtk_tree_view_unref_tree_helper: assertion `node != NULL' failed + // at us, see LP: #38397 for more information + gtk_tree_view_set_model(GTK_TREE_VIEW(_treeView), NULL); RPackage *pkg = selectedPackage(); @@ -289,9 +297,8 @@ selectedPkg != NULL ? selectedPkg->name() : "(no pkg)", setAdjustment); - // const gchar *str = gtk_entry_get_text(GTK_ENTRY(_entry_fast_search)); - if(str != NULL && strlen(str) > 0) { + if(str != NULL && strlen(str) > 1) { if(_config->FindB("Debug::Synaptic::View",false)) cerr << "RGMainWindow::refreshTable: rerun limitBySearch" << endl; _lister->limitBySearch(str); @@ -716,8 +723,8 @@ refreshSubViewList(); _blockActions = FALSE; - refreshTable(pkg); setInterfaceLocked(FALSE); + refreshTable(pkg); } bool RGMainWindow::checkForFailedInst(vector instPkgs) @@ -809,7 +816,9 @@ g_value_unset(&value); #ifdef WITH_EPT - if(_lister->xapianIndexNeedsUpdate()) + // updated the index if needed and we run not non-interactive mode + if(_lister->xapianIndexNeedsUpdate() && + _config->FindB("Volatile::Non-Interactive", false) == false) xapianDoIndexUpdate(); #endif @@ -835,7 +844,7 @@ g_child_watch_add(pid, (GChildWatchFunc)xapianIndexUpdateFinished, this); gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(_gladeXML, "label_fast_search")), - _("Search index update running in the background")); + _("Rebuilding search index")); } } @@ -1107,6 +1116,12 @@ "fixed_height_mode", TRUE, NULL); + // we need to set a empty model first so that gtklistview + // can do its cleanup, if we do not do that, then the cleanup + // code in gtktreeview gets confused and throws + // Gtk-CRITICAL **: gtk_tree_view_unref_tree_helper: assertion `node != NULL' failed + // at us, see LP: #38397 for more information + gtk_tree_view_set_model(GTK_TREE_VIEW(_treeView), NULL); _pkgList = GTK_TREE_MODEL(gtk_pkg_list_new(_lister)); gtk_tree_view_set_model(GTK_TREE_VIEW(_treeView), _pkgList); gtk_tree_view_set_search_column(GTK_TREE_VIEW(_treeView), NAME_COLUMN); @@ -2671,6 +2686,13 @@ return; me->setBusyCursor(true); + // we need to set a empty model first so that gtklistview + // can do its cleanup, if we do not do that, then the cleanup + // code in gtktreeview gets confused and throws + // Gtk-CRITICAL **: gtk_tree_view_unref_tree_helper: assertion `node != NULL' failed + // at us, see LP: #38397 for more information + gtk_tree_view_set_model(GTK_TREE_VIEW(me->_treeView), NULL); + string selected = me->selectedSubView(); me->_lister->setSubView(utf8(selected.c_str())); me->refreshTable(NULL, false); @@ -2863,17 +2885,25 @@ { RGMainWindow *me = (RGMainWindow *) data; const gchar *str = gtk_entry_get_text(GTK_ENTRY(me->_entry_fast_search)); - me->_fastSearchEventID = -1; + me->_fastSearchEventID = -1; + me->setBusyCursor(true); + RGFlushInterface(); if(str == NULL || strlen(str) < 1) { + // if the user has cleared the search, refresh the view me->_lister->reapplyFilter(); me->refreshTable(); - return FALSE; + + me->setBusyCursor(false); + } else if(strlen(str) > 1) { + // only search when there is more than one char entered, single + // char searches tend to be very slow + me->setBusyCursor(true); + RGFlushInterface(); + me->refreshTable(); } + me->setBusyCursor(false); - me->_lister->limitBySearch(str); - me->_lister->limitBySearch(str); - me->refreshTable(); return FALSE; } diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/rgmisc.cc /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/rgmisc.cc --- synaptic-0.62.1ubuntu2~ppa1/gtk/rgmisc.cc 2008-06-12 14:45:39.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/rgmisc.cc 1970-01-01 01:00:00.000000000 +0100 @@ -1,281 +0,0 @@ -/* rgmisc.cc - * - * Copyright (c) 2003 Michael Vogt - * - * Author: Michael Vogt - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - */ - -#include -#include -#include -#include -#include "i18n.h" -#include "rgmisc.h" -#include -#include -#include - - -void RGFlushInterface() -{ - XSync(gdk_display, False); - - while (gtk_events_pending()) { - gtk_main_iteration(); - } -} - -/* - * SizeToStr: Converts a size long into a human-readable SI string - * ---------------------------------------------------- - * A maximum of four digits are shown before conversion to the next highest - * unit. The maximum length of the string will be five characters unless the - * size is more than ten yottabytes. - * - * mvo: we use out own SizeToStr function as the SI spec says we need a - * space between the number and the unit (this isn't the case in stock apt - */ -string SizeToStr(double Size) -{ - char S[300]; - double ASize; - if (Size >= 0) { - ASize = Size; - } else { - ASize = -1 * Size; - } - - /* Bytes, kilobytes, megabytes, gigabytes, terabytes, petabytes, exabytes, - * zettabytes, yottabytes. - */ - char Ext[] = { ' ', 'k', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y' }; - int I = 0; - while (I <= 8) { - if (ASize < 100 && I != 0) { - snprintf(S, 300, "%.1f %cB", ASize, Ext[I]); - break; - } - - if (ASize < 10000) { - snprintf(S, 300, "%.0f %cB", ASize, Ext[I]); - break; - } - ASize /= 1000.0; - I++; - } - return S; -} - - -bool is_binary_in_path(const char *program) -{ - gchar **path = g_strsplit(getenv("PATH"), ":", 0); - - for (int i = 0; path[i] != NULL; i++) { - char *s = g_strdup_printf("%s/%s", path[i], program); - if (FileExists(s)) { - g_free(s); - g_strfreev(path); - return true; - } - g_free(s); - } - g_strfreev(path); - return false; -} - -char *gtk_get_string_from_color(GdkColor * colp) -{ - static char *_str = NULL; - - g_free(_str); - if (colp == NULL) { - _str = g_strdup(""); - return _str; - } - _str = g_strdup_printf("#%4X%4X%4X", colp->red, colp->green, colp->blue); - for (char *ptr = _str; *ptr; ptr++) - if (*ptr == ' ') - *ptr = '0'; - - return _str; -} - -void gtk_get_color_from_string(const char *cpp, GdkColor **colp) -{ - GdkColor *new_color; - int result; - - // "" means no color - if (strlen(cpp) == 0) { - *colp = NULL; - return; - } - - GdkColormap *colormap = gdk_colormap_get_system(); - - new_color = g_new(GdkColor, 1); - result = gdk_color_parse(cpp, new_color); - gdk_colormap_alloc_color(colormap, new_color, FALSE, TRUE); - *colp = new_color; -} - -const char *utf8_to_locale(const char *str) -{ - static char *_str = NULL; - if (str == NULL) - return NULL; - if (g_utf8_validate(str, -1, NULL) == false) - return NULL; - g_free(_str); - _str = NULL; - _str = g_locale_from_utf8(str, -1, NULL, NULL, NULL); - return _str; -} - -const char *utf8(const char *str) -{ - static char *_str = NULL; - if (str == NULL) - return NULL; - if (g_utf8_validate(str, -1, NULL) == true) - return str; - g_free(_str); - _str = NULL; - _str = g_locale_to_utf8(str, -1, NULL, NULL, NULL); - return _str; -} - -static GdkPixbuf * -get_gdk_pixbuf(const gchar *name, int size=16) -{ - GtkIconTheme *theme; - GdkPixbuf *pixbuf; - GError *error = NULL; - - theme = gtk_icon_theme_get_default(); - pixbuf = gtk_icon_theme_load_icon(theme, name, size, - (GtkIconLookupFlags)0, &error); - if (pixbuf == NULL) - std::cerr << "Warning, failed to load: " << name - << error->message << std::endl; - - return pixbuf; -} - -GtkWidget *get_gtk_image(const gchar *name, int size) -{ - GdkPixbuf *buf; - buf = get_gdk_pixbuf(name, size); - if(!buf) - return NULL; - return gtk_image_new_from_pixbuf(buf); -} - - -// ------------------------------------------------------------------- -// RPackageStatus stuff -RGPackageStatus RGPackageStatus::pkgStatus; - -void RGPackageStatus::initColors() -{ - char *default_status_colors[N_STATUS_COUNT] = { - "#8ae234", // install - "#4e9a06", // re-install - "#fce94f", // upgrade - "#ad7fa8", // downgrade - "#ef2929", // remove - "#a40000", // purge - NULL, // available - "#a40000", // available-locked - NULL, // installed-updated - NULL, // installed-outdated - "#a40000", // installed-locked - NULL, // broken - NULL // new - }; - - gchar *config_string; - for (int i = 0; i < N_STATUS_COUNT; i++) { - config_string = g_strdup_printf("Synaptic::color-%s", - PackageStatusShortString[i]); - gtk_get_color_from_string(_config-> - Find(config_string, - default_status_colors[i]).c_str(), - &StatusColors[i]); - g_free(config_string); - } -} - -void RGPackageStatus::initPixbufs() -{ - gchar *s; - for (int i = 0; i < N_STATUS_COUNT; i++) { - s = g_strdup_printf("package-%s", PackageStatusShortString[i]); - StatusPixbuf[i] = get_gdk_pixbuf(s); - } - supportedPix = get_gdk_pixbuf("package-supported"); -} - -// class that finds out what do display to get user -void RGPackageStatus::init() -{ - RPackageStatus::init(); - - initColors(); - initPixbufs(); -} - - -GdkColor *RGPackageStatus::getBgColor(RPackage *pkg) -{ - return StatusColors[getStatus(pkg)]; -} - -GdkPixbuf *RGPackageStatus::getSupportedPix(RPackage *pkg) -{ - if(isSupported(pkg)) - return supportedPix; - else - return NULL; -} - -GdkPixbuf *RGPackageStatus::getPixbuf(RPackage *pkg) -{ - return StatusPixbuf[getStatus(pkg)]; -} - -void RGPackageStatus::setColor(int i, GdkColor * new_color) -{ - StatusColors[i] = new_color; -} - -void RGPackageStatus::saveColors() -{ - gchar *color_string, *config_string; - for (int i = 0; i < N_STATUS_COUNT; i++) { - color_string = gtk_get_string_from_color(StatusColors[i]); - config_string = g_strdup_printf("Synaptic::color-%s", - PackageStatusShortString[i]); - - _config->Set(config_string, color_string); - g_free(config_string); - } -} - -// vim:ts=3:sw=3:et diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/rgmisc.h /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/rgmisc.h --- synaptic-0.62.1ubuntu2~ppa1/gtk/rgmisc.h 2008-06-12 14:45:39.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/rgmisc.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,92 +0,0 @@ -/* rgmisc.h - * - * Copyright (c) 2003 Michael Vogt - * - * Author: Michael Vogt - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - */ - -#ifndef _RGMISC_H_ -#define _RGMISC_H_ - -#include -#include "rpackage.h" - -enum { - PIXMAP_COLUMN, - SUPPORTED_COLUMN, - NAME_COLUMN, - COMPONENT_COLUMN, - SECTION_COLUMN, - PKG_SIZE_COLUMN, - PKG_DOWNLOAD_SIZE_COLUMN, - INSTALLED_VERSION_COLUMN, - AVAILABLE_VERSION_COLUMN, - DESCR_COLUMN, - COLOR_COLUMN, - PKG_COLUMN, - N_COLUMNS -}; - -void RGFlushInterface(); - -bool is_binary_in_path(const char *program); - -char *gtk_get_string_from_color(GdkColor * colp); -void gtk_get_color_from_string(const char *cpp, GdkColor ** colp); - -const char *utf8_to_locale(const char *str); -const char *utf8(const char *str); - -GtkWidget *get_gtk_image(const char *name, int size=16); - -string SizeToStr(double Bytes); - -class RGPackageStatus : public RPackageStatus { - protected: - GdkPixbuf *StatusPixbuf[N_STATUS_COUNT]; - GdkColor *StatusColors[N_STATUS_COUNT]; - - GdkPixbuf *supportedPix; - - void initColors(); - void initPixbufs(); - - public: - // this static object is used for all access - static RGPackageStatus pkgStatus; - - virtual void init(); - - // this is what the package listers use - GdkColor *getBgColor(RPackage *pkg); - GdkPixbuf *getSupportedPix(RPackage *pkg); - GdkPixbuf *getPixbuf(RPackage *pkg); - GdkPixbuf *getPixbuf(int i) { - return StatusPixbuf[i]; - } - - // this is for the configuration of the colors - void setColor(int i, GdkColor * new_color); - GdkColor *getColor(int i) { - return StatusColors[i]; - }; - // save color configuration to disk - void saveColors(); -}; - -#endif diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/rgpackagestatus.cc /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/rgpackagestatus.cc --- synaptic-0.62.1ubuntu2~ppa1/gtk/rgpackagestatus.cc 1970-01-01 01:00:00.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/rgpackagestatus.cc 2008-08-22 11:39:49.000000000 +0100 @@ -0,0 +1,147 @@ +/* rgpackagestatus.cc - package status UI stuff + * + * Copyright (c) 2003 Michael Vogt + * + * Author: Michael Vogt + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#include +#include +#include +#include +#include +#include + +#include "rgutils.h" +#include "rgpackagestatus.h" + +// helper +static GdkPixbuf * +get_gdk_pixbuf(const gchar *name, int size=16) +{ + GtkIconTheme *theme; + GdkPixbuf *pixbuf; + GError *error = NULL; + + theme = gtk_icon_theme_get_default(); + pixbuf = gtk_icon_theme_load_icon(theme, name, size, + (GtkIconLookupFlags)0, &error); + if (pixbuf == NULL) + std::cerr << "Warning, failed to load: " << name + << error->message << std::endl; + + return pixbuf; +} + +GtkWidget *get_gtk_image(const gchar *name, int size) +{ + GdkPixbuf *buf; + buf = get_gdk_pixbuf(name, size); + if(!buf) + return NULL; + return gtk_image_new_from_pixbuf(buf); +} + +// RPackageStatus stuff +RGPackageStatus RGPackageStatus::pkgStatus; + +void RGPackageStatus::initColors() +{ + char *default_status_colors[N_STATUS_COUNT] = { + "#8ae234", // install + "#4e9a06", // re-install + "#fce94f", // upgrade + "#ad7fa8", // downgrade + "#ef2929", // remove + "#a40000", // purge + NULL, // available + "#a40000", // available-locked + NULL, // installed-updated + NULL, // installed-outdated + "#a40000", // installed-locked + NULL, // broken + NULL // new + }; + + gchar *config_string; + for (int i = 0; i < N_STATUS_COUNT; i++) { + config_string = g_strdup_printf("Synaptic::color-%s", + PackageStatusShortString[i]); + gtk_get_color_from_string(_config-> + Find(config_string, + default_status_colors[i]).c_str(), + &StatusColors[i]); + g_free(config_string); + } +} + +void RGPackageStatus::initPixbufs() +{ + gchar *s; + for (int i = 0; i < N_STATUS_COUNT; i++) { + s = g_strdup_printf("package-%s", PackageStatusShortString[i]); + StatusPixbuf[i] = get_gdk_pixbuf(s); + } + supportedPix = get_gdk_pixbuf("package-supported"); +} + +// class that finds out what do display to get user +void RGPackageStatus::init() +{ + RPackageStatus::init(); + + initColors(); + initPixbufs(); +} + + +GdkColor *RGPackageStatus::getBgColor(RPackage *pkg) +{ + return StatusColors[getStatus(pkg)]; +} + +GdkPixbuf *RGPackageStatus::getSupportedPix(RPackage *pkg) +{ + if(isSupported(pkg)) + return supportedPix; + else + return NULL; +} + +GdkPixbuf *RGPackageStatus::getPixbuf(RPackage *pkg) +{ + return StatusPixbuf[getStatus(pkg)]; +} + +void RGPackageStatus::setColor(int i, GdkColor * new_color) +{ + StatusColors[i] = new_color; +} + +void RGPackageStatus::saveColors() +{ + gchar *color_string, *config_string; + for (int i = 0; i < N_STATUS_COUNT; i++) { + color_string = gtk_get_string_from_color(StatusColors[i]); + config_string = g_strdup_printf("Synaptic::color-%s", + PackageStatusShortString[i]); + + _config->Set(config_string, color_string); + g_free(config_string); + } +} diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/rgpackagestatus.h /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/rgpackagestatus.h --- synaptic-0.62.1ubuntu2~ppa1/gtk/rgpackagestatus.h 1970-01-01 01:00:00.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/rgpackagestatus.h 2008-08-22 11:39:49.000000000 +0100 @@ -0,0 +1,64 @@ +/* rgpackagestatus.h - UI elements for the package status + * + * Copyright (c) 2003 Michael Vogt + * + * Author: Michael Vogt + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#ifndef _RGPACKAGESTATUS_H_ +#define _RGPACKAGESTATUS_H_ + + +#include "rpackage.h" +#include "rpackagestatus.h" + +class RGPackageStatus : public RPackageStatus { + protected: + GdkPixbuf *StatusPixbuf[N_STATUS_COUNT]; + GdkColor *StatusColors[N_STATUS_COUNT]; + + GdkPixbuf *supportedPix; + + void initColors(); + void initPixbufs(); + + public: + // this static object is used for all access + static RGPackageStatus pkgStatus; + + virtual void init(); + + // this is what the package listers use + GdkColor *getBgColor(RPackage *pkg); + GdkPixbuf *getSupportedPix(RPackage *pkg); + GdkPixbuf *getPixbuf(RPackage *pkg); + GdkPixbuf *getPixbuf(int i) { + return StatusPixbuf[i]; + } + + // this is for the configuration of the colors + void setColor(int i, GdkColor * new_color); + GdkColor *getColor(int i) { + return StatusColors[i]; + }; + // save color configuration to disk + void saveColors(); +}; + + +#endif diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/rgpkgdetails.cc /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/rgpkgdetails.cc --- synaptic-0.62.1ubuntu2~ppa1/gtk/rgpkgdetails.cc 2008-06-12 14:45:39.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/rgpkgdetails.cc 2008-10-21 14:18:23.000000000 +0100 @@ -29,6 +29,7 @@ #include "rgpkgdetails.h" #include "rggladewindow.h" #include "rpackage.h" +#include "rgpackagestatus.h" #include "sections_trans.h" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/rgpreferenceswindow.cc /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/rgpreferenceswindow.cc --- synaptic-0.62.1ubuntu2~ppa1/gtk/rgpreferenceswindow.cc 2008-06-12 14:45:39.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/rgpreferenceswindow.cc 2008-08-22 11:39:49.000000000 +0100 @@ -35,6 +35,7 @@ #include "rgpreferenceswindow.h" #include "rguserdialog.h" #include "gsynaptic.h" +#include "rgpackagestatus.h" #include "i18n.h" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/rgrepositorywin.cc /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/rgrepositorywin.cc --- synaptic-0.62.1ubuntu2~ppa1/gtk/rgrepositorywin.cc 2008-06-12 14:45:39.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/rgrepositorywin.cc 2008-08-22 11:39:49.000000000 +0100 @@ -30,7 +30,7 @@ #include #include "rgrepositorywin.h" #include "rguserdialog.h" -#include "rgmisc.h" +#include "rgutils.h" #include "config.h" #include "i18n.h" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/rguserdialog.cc /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/rguserdialog.cc --- synaptic-0.62.1ubuntu2~ppa1/gtk/rguserdialog.cc 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/rguserdialog.cc 2008-08-22 11:39:49.000000000 +0100 @@ -28,7 +28,7 @@ #include #include "i18n.h" #include "rguserdialog.h" -#include "rgmisc.h" +#include "rgutils.h" static void actionResponse(GtkDialog *dialog, gint id, gpointer user_data) { diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/rgutils.cc /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/rgutils.cc --- synaptic-0.62.1ubuntu2~ppa1/gtk/rgutils.cc 1970-01-01 01:00:00.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/rgutils.cc 2008-08-22 11:39:49.000000000 +0100 @@ -0,0 +1,168 @@ +/* rgmisc.cc + * + * Copyright (c) 2003 Michael Vogt + * + * Author: Michael Vogt + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "i18n.h" +#include "rgutils.h" + + +void RGFlushInterface() +{ + XSync(gdk_display, False); + + while (gtk_events_pending()) { + gtk_main_iteration(); + } +} + +/* + * SizeToStr: Converts a size long into a human-readable SI string + * ---------------------------------------------------- + * A maximum of four digits are shown before conversion to the next highest + * unit. The maximum length of the string will be five characters unless the + * size is more than ten yottabytes. + * + * mvo: we use out own SizeToStr function as the SI spec says we need a + * space between the number and the unit (this isn't the case in stock apt + */ +string SizeToStr(double Size) +{ + char S[300]; + double ASize; + if (Size >= 0) { + ASize = Size; + } else { + ASize = -1 * Size; + } + + /* Bytes, kilobytes, megabytes, gigabytes, terabytes, petabytes, exabytes, + * zettabytes, yottabytes. + */ + char Ext[] = { ' ', 'k', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y' }; + int I = 0; + while (I <= 8) { + if (ASize < 100 && I != 0) { + snprintf(S, 300, "%.1f %cB", ASize, Ext[I]); + break; + } + + if (ASize < 10000) { + snprintf(S, 300, "%.0f %cB", ASize, Ext[I]); + break; + } + ASize /= 1000.0; + I++; + } + return S; +} + + +bool is_binary_in_path(const char *program) +{ + gchar **path = g_strsplit(getenv("PATH"), ":", 0); + + for (int i = 0; path[i] != NULL; i++) { + char *s = g_strdup_printf("%s/%s", path[i], program); + if (FileExists(s)) { + g_free(s); + g_strfreev(path); + return true; + } + g_free(s); + } + g_strfreev(path); + return false; +} + +char *gtk_get_string_from_color(GdkColor * colp) +{ + static char *_str = NULL; + + g_free(_str); + if (colp == NULL) { + _str = g_strdup(""); + return _str; + } + _str = g_strdup_printf("#%4X%4X%4X", colp->red, colp->green, colp->blue); + for (char *ptr = _str; *ptr; ptr++) + if (*ptr == ' ') + *ptr = '0'; + + return _str; +} + +void gtk_get_color_from_string(const char *cpp, GdkColor **colp) +{ + GdkColor *new_color; + int result; + + // "" means no color + if (strlen(cpp) == 0) { + *colp = NULL; + return; + } + + GdkColormap *colormap = gdk_colormap_get_system(); + + new_color = g_new(GdkColor, 1); + result = gdk_color_parse(cpp, new_color); + gdk_colormap_alloc_color(colormap, new_color, FALSE, TRUE); + *colp = new_color; +} + +const char *utf8_to_locale(const char *str) +{ + static char *_str = NULL; + if (str == NULL) + return NULL; + if (g_utf8_validate(str, -1, NULL) == false) + return NULL; + g_free(_str); + _str = NULL; + _str = g_locale_from_utf8(str, -1, NULL, NULL, NULL); + return _str; +} + +const char *utf8(const char *str) +{ + static char *_str = NULL; + if (str == NULL) + return NULL; + if (g_utf8_validate(str, -1, NULL) == true) + return str; + g_free(_str); + _str = NULL; + _str = g_locale_to_utf8(str, -1, NULL, NULL, NULL); + return _str; +} + + + + +// vim:ts=3:sw=3:et diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/gtk/rgutils.h /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/gtk/rgutils.h --- synaptic-0.62.1ubuntu2~ppa1/gtk/rgutils.h 1970-01-01 01:00:00.000000000 +0100 +++ synaptic-0.62.1ubuntu10/gtk/rgutils.h 2008-08-22 11:39:49.000000000 +0100 @@ -0,0 +1,60 @@ +/* rgmisc.h + * + * Copyright (c) 2003 Michael Vogt + * + * Author: Michael Vogt + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#ifndef _RGMISC_H_ +#define _RGMISC_H_ + +#include +#include + +enum { + PIXMAP_COLUMN, + SUPPORTED_COLUMN, + NAME_COLUMN, + COMPONENT_COLUMN, + SECTION_COLUMN, + PKG_SIZE_COLUMN, + PKG_DOWNLOAD_SIZE_COLUMN, + INSTALLED_VERSION_COLUMN, + AVAILABLE_VERSION_COLUMN, + DESCR_COLUMN, + COLOR_COLUMN, + PKG_COLUMN, + N_COLUMNS +}; + +void RGFlushInterface(); + +bool is_binary_in_path(const char *program); + +char *gtk_get_string_from_color(GdkColor * colp); +void gtk_get_color_from_string(const char *cpp, GdkColor ** colp); + +const char *utf8_to_locale(const char *str); +const char *utf8(const char *str); + +GtkWidget *get_gtk_image(const char *name, int size=16); + +string SizeToStr(double Bytes); + + +#endif diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/help/C/Makefile.in /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/help/C/Makefile.in --- synaptic-0.62.1ubuntu2~ppa1/help/C/Makefile.in 2008-06-17 08:58:30.000000000 +0100 +++ synaptic-0.62.1ubuntu10/help/C/Makefile.in 2008-10-21 18:34:04.000000000 +0100 @@ -174,8 +174,6 @@ LIBEPT_LIBS = @LIBEPT_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -LIBTAGCOLL_CFLAGS = @LIBTAGCOLL_CFLAGS@ -LIBTAGCOLL_LIBS = @LIBTAGCOLL_LIBS@ LP_CFLAGS = @LP_CFLAGS@ LP_LIBS = @LP_LIBS@ LTLIBOBJS = @LTLIBOBJS@ diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/help/es/Makefile.in /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/help/es/Makefile.in --- synaptic-0.62.1ubuntu2~ppa1/help/es/Makefile.in 2008-06-17 08:58:30.000000000 +0100 +++ synaptic-0.62.1ubuntu10/help/es/Makefile.in 2008-10-21 18:34:04.000000000 +0100 @@ -174,8 +174,6 @@ LIBEPT_LIBS = @LIBEPT_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -LIBTAGCOLL_CFLAGS = @LIBTAGCOLL_CFLAGS@ -LIBTAGCOLL_LIBS = @LIBTAGCOLL_LIBS@ LP_CFLAGS = @LP_CFLAGS@ LP_LIBS = @LP_LIBS@ LTLIBOBJS = @LTLIBOBJS@ diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/help/Makefile.in /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/help/Makefile.in --- synaptic-0.62.1ubuntu2~ppa1/help/Makefile.in 2008-06-17 08:58:30.000000000 +0100 +++ synaptic-0.62.1ubuntu10/help/Makefile.in 2008-10-21 18:34:04.000000000 +0100 @@ -123,8 +123,6 @@ LIBEPT_LIBS = @LIBEPT_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -LIBTAGCOLL_CFLAGS = @LIBTAGCOLL_CFLAGS@ -LIBTAGCOLL_LIBS = @LIBTAGCOLL_LIBS@ LP_CFLAGS = @LP_CFLAGS@ LP_LIBS = @LP_LIBS@ LTLIBOBJS = @LTLIBOBJS@ diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/help/sv/Makefile.in /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/help/sv/Makefile.in --- synaptic-0.62.1ubuntu2~ppa1/help/sv/Makefile.in 2008-06-17 08:58:30.000000000 +0100 +++ synaptic-0.62.1ubuntu10/help/sv/Makefile.in 2008-10-21 18:34:04.000000000 +0100 @@ -174,8 +174,6 @@ LIBEPT_LIBS = @LIBEPT_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -LIBTAGCOLL_CFLAGS = @LIBTAGCOLL_CFLAGS@ -LIBTAGCOLL_LIBS = @LIBTAGCOLL_LIBS@ LP_CFLAGS = @LP_CFLAGS@ LP_LIBS = @LP_LIBS@ LTLIBOBJS = @LTLIBOBJS@ diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/intltool-extract.in /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/intltool-extract.in --- synaptic-0.62.1ubuntu2~ppa1/intltool-extract.in 2008-06-17 08:58:24.000000000 +0100 +++ synaptic-0.62.1ubuntu10/intltool-extract.in 2008-10-21 18:33:57.000000000 +0100 @@ -1,875 +0,0 @@ -#!@INTLTOOL_PERL@ -w -# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- - -# -# The Intltool Message Extractor -# -# Copyright (C) 2000-2001, 2003 Free Software Foundation. -# -# Intltool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# Intltool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. -# -# Authors: Kenneth Christiansen -# Darin Adler -# - -## Release information -my $PROGRAM = "intltool-extract"; -my $PACKAGE = "intltool"; -my $VERSION = "0.37.1"; - -## Loaded modules -use strict; -use File::Basename; -use Getopt::Long; - -## Scalars used by the option stuff -my $TYPE_ARG = "0"; -my $LOCAL_ARG = "0"; -my $HELP_ARG = "0"; -my $VERSION_ARG = "0"; -my $UPDATE_ARG = "0"; -my $QUIET_ARG = "0"; -my $SRCDIR_ARG = "."; - -my $FILE; -my $OUTFILE; - -my $gettext_type = ""; -my $input; -my %messages = (); -my %loc = (); -my %count = (); -my %comments = (); -my $strcount = 0; - -my $XMLCOMMENT = ""; - -## Use this instead of \w for XML files to handle more possible characters. -my $w = "[-A-Za-z0-9._:]"; - -## Always print first -$| = 1; - -## Handle options -GetOptions ( - "type=s" => \$TYPE_ARG, - "local|l" => \$LOCAL_ARG, - "help|h" => \$HELP_ARG, - "version|v" => \$VERSION_ARG, - "update" => \$UPDATE_ARG, - "quiet|q" => \$QUIET_ARG, - "srcdir=s" => \$SRCDIR_ARG, - ) or &error; - -&split_on_argument; - - -## Check for options. -## This section will check for the different options. - -sub split_on_argument { - - if ($VERSION_ARG) { - &version; - - } elsif ($HELP_ARG) { - &help; - - } elsif ($LOCAL_ARG) { - &place_local; - &extract; - - } elsif ($UPDATE_ARG) { - &place_normal; - &extract; - - } elsif (@ARGV > 0) { - &place_normal; - &message; - &extract; - - } else { - &help; - - } -} - -sub place_normal { - $FILE = $ARGV[0]; - $OUTFILE = "$FILE.h"; - - my $dirname = dirname ($OUTFILE); - if (! -d "$dirname" && $dirname ne "") { - system ("mkdir -p $dirname"); - } -} - -sub place_local { - $FILE = $ARGV[0]; - $OUTFILE = fileparse($FILE, ()); - if (!-e "tmp/") { - system("mkdir tmp/"); - } - $OUTFILE = "./tmp/$OUTFILE.h" -} - -sub determine_type { - if ($TYPE_ARG =~ /^gettext\/(.*)/) { - $gettext_type=$1 - } -} - -## Sub for printing release information -sub version{ - print <<_EOF_; -${PROGRAM} (${PACKAGE}) $VERSION -Copyright (C) 2000, 2003 Free Software Foundation, Inc. -Written by Kenneth Christiansen, 2000. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -_EOF_ - exit; -} - -## Sub for printing usage information -sub help { - print <<_EOF_; -Usage: ${PROGRAM} [OPTION]... [FILENAME] -Generates a header file from an XML source file. - -It grabs all strings between <_translatable_node> and its end tag in -XML files. Read manpage (man ${PROGRAM}) for more info. - - --type=TYPE Specify the file type of FILENAME. Currently supports: - "gettext/glade", "gettext/ini", "gettext/keys" - "gettext/rfc822deb", "gettext/schemas", - "gettext/scheme", "gettext/xml", "gettext/quoted", - "gettext/quotedxml" - -l, --local Writes output into current working directory - (conflicts with --update) - --update Writes output into the same directory the source file - reside (conflicts with --local) - --srcdir Root of the source tree - -v, --version Output version information and exit - -h, --help Display this help and exit - -q, --quiet Quiet mode - -Report bugs to http://bugzilla.gnome.org/ (product name "$PACKAGE") -or send email to . -_EOF_ - exit; -} - -## Sub for printing error messages -sub error{ - print STDERR "Try `${PROGRAM} --help' for more information.\n"; - exit; -} - -sub message { - print "Generating C format header file for translation.\n" unless $QUIET_ARG; -} - -sub extract { - &determine_type; - - &convert; - - open OUT, ">$OUTFILE"; - binmode (OUT) if $^O eq 'MSWin32'; - &msg_write; - close OUT; - - print "Wrote $OUTFILE\n" unless $QUIET_ARG; -} - -sub convert { - - ## Reading the file - { - local (*IN); - local $/; #slurp mode - open (IN, "<$SRCDIR_ARG/$FILE") || die "can't open $SRCDIR_ARG/$FILE: $!"; - $input = ; - } - - &type_ini if $gettext_type eq "ini"; - &type_keys if $gettext_type eq "keys"; - &type_xml if $gettext_type eq "xml"; - &type_glade if $gettext_type eq "glade"; - &type_scheme if $gettext_type eq "scheme"; - &type_schemas if $gettext_type eq "schemas"; - &type_rfc822deb if $gettext_type eq "rfc822deb"; - &type_quoted if $gettext_type eq "quoted"; - &type_quotedxml if $gettext_type eq "quotedxml"; -} - -sub entity_decode_minimal -{ - local ($_) = @_; - - s/'/'/g; # ' - s/"/"/g; # " - s/&/&/g; - - return $_; -} - -sub entity_decode -{ - local ($_) = @_; - - s/'/'/g; # ' - s/"/"/g; # " - s/<//g; - s/&/&/g; - - return $_; -} - -sub escape_char -{ - return '\"' if $_ eq '"'; - return '\n' if $_ eq "\n"; - return '\\\\' if $_ eq '\\'; - - return $_; -} - -sub escape -{ - my ($string) = @_; - return join "", map &escape_char, split //, $string; -} - -sub type_ini { - ### For generic translatable desktop files ### - while ($input =~ /^(#(.+)\n)?^_.*=(.*)$/mg) { - if (defined($2)) { - $comments{$3} = $2; - } - $messages{$3} = []; - } -} - -sub type_keys { - ### For generic translatable mime/keys files ### - while ($input =~ /^\s*_\w+=(.*)$/mg) { - $messages{$1} = []; - } -} - -sub type_xml { - ### For generic translatable XML files ### - my $tree = readXml($input); - parseTree(0, $tree); -} - -sub print_var { - my $var = shift; - my $vartype = ref $var; - - if ($vartype =~ /ARRAY/) { - my @arr = @{$var}; - print "[ "; - foreach my $el (@arr) { - print_var($el); - print ", "; - } - print "] "; - } elsif ($vartype =~ /HASH/) { - my %hash = %{$var}; - print "{ "; - foreach my $key (keys %hash) { - print "$key => "; - print_var($hash{$key}); - print ", "; - } - print "} "; - } else { - print $var; - } -} - -# Same syntax as getAttributeString in intltool-merge.in.in, similar logic (look for ## differences comment) -sub getAttributeString -{ - my $sub = shift; - my $do_translate = shift || 1; - my $language = shift || ""; - my $translate = shift; - my $result = ""; - foreach my $e (reverse(sort(keys %{ $sub }))) { - my $key = $e; - my $string = $sub->{$e}; - my $quote = '"'; - - $string =~ s/^[\s]+//; - $string =~ s/[\s]+$//; - - if ($string =~ /^'.*'$/) - { - $quote = "'"; - } - $string =~ s/^['"]//g; - $string =~ s/['"]$//g; - - ## differences from intltool-merge.in.in - if ($key =~ /^_/) { - $comments{entity_decode($string)} = $XMLCOMMENT if $XMLCOMMENT; - $messages{entity_decode($string)} = []; - $$translate = 2; - } - ## differences end here from intltool-merge.in.in - $result .= " $key=$quote$string$quote"; - } - return $result; -} - -# Verbatim copy from intltool-merge.in.in -sub getXMLstring -{ - my $ref = shift; - my $spacepreserve = shift || 0; - my @list = @{ $ref }; - my $result = ""; - - my $count = scalar(@list); - my $attrs = $list[0]; - my $index = 1; - - $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/)); - $spacepreserve = 0 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?default["']?$/)); - - while ($index < $count) { - my $type = $list[$index]; - my $content = $list[$index+1]; - if (! $type ) { - # We've got CDATA - if ($content) { - # lets strip the whitespace here, and *ONLY* here - $content =~ s/\s+/ /gs if (!$spacepreserve); - $result .= $content; - } - } elsif ( "$type" ne "1" ) { - # We've got another element - $result .= "<$type"; - $result .= getAttributeString(@{$content}[0], 0); # no nested translatable elements - if ($content) { - my $subresult = getXMLstring($content, $spacepreserve); - if ($subresult) { - $result .= ">".$subresult . ""; - } else { - $result .= "/>"; - } - } else { - $result .= "/>"; - } - } - $index += 2; - } - return $result; -} - -# Verbatim copy from intltool-merge.in.in, except for MULTIPLE_OUTPUT handling removed -# Translate list of nodes if necessary -sub translate_subnodes -{ - my $fh = shift; - my $content = shift; - my $language = shift || ""; - my $singlelang = shift || 0; - my $spacepreserve = shift || 0; - - my @nodes = @{ $content }; - - my $count = scalar(@nodes); - my $index = 0; - while ($index < $count) { - my $type = $nodes[$index]; - my $rest = $nodes[$index+1]; - traverse($fh, $type, $rest, $language, $spacepreserve); - $index += 2; - } -} - -# Based on traverse() in intltool-merge.in.in -sub traverse -{ - my $fh = shift; # unused, to allow us to sync code between -merge and -extract - my $nodename = shift; - my $content = shift; - my $language = shift || ""; - my $spacepreserve = shift || 0; - - if ($nodename && "$nodename" eq "1") { - $XMLCOMMENT = $content; - } elsif ($nodename) { - # element - my @all = @{ $content }; - my $attrs = shift @all; - my $translate = 0; - my $outattr = getAttributeString($attrs, 1, $language, \$translate); - - if ($nodename =~ /^_/) { - $translate = 1; - $nodename =~ s/^_//; - } - my $lookup = ''; - - $spacepreserve = 0 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?default["']?$/)); - $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/)); - - if ($translate) { - $lookup = getXMLstring($content, $spacepreserve); - if (!$spacepreserve) { - $lookup =~ s/^\s+//s; - $lookup =~ s/\s+$//s; - } - - if ($lookup && $translate != 2) { - $comments{$lookup} = $XMLCOMMENT if $XMLCOMMENT; - $messages{$lookup} = []; - } elsif ($translate == 2) { - translate_subnodes($fh, \@all, $language, 1, $spacepreserve); - } - } else { - $XMLCOMMENT = ""; - my $count = scalar(@all); - if ($count > 0) { - my $index = 0; - while ($index < $count) { - my $type = $all[$index]; - my $rest = $all[$index+1]; - traverse($fh, $type, $rest, $language, $spacepreserve); - $index += 2; - } - } - } - $XMLCOMMENT = ""; - } -} - - -# Verbatim copy from intltool-merge.in.in, $fh for compatibility -sub parseTree -{ - my $fh = shift; - my $ref = shift; - my $language = shift || ""; - - my $name = shift @{ $ref }; - my $cont = shift @{ $ref }; - - while (!$name || "$name" eq "1") { - $name = shift @{ $ref }; - $cont = shift @{ $ref }; - } - - my $spacepreserve = 0; - my $attrs = @{$cont}[0]; - $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/)); - - traverse($fh, $name, $cont, $language, $spacepreserve); -} - -# Verbatim copy from intltool-merge.in.in -sub intltool_tree_comment -{ - my $expat = shift; - my $data = $expat->original_string(); - my $clist = $expat->{Curlist}; - my $pos = $#$clist; - - $data =~ s/^$//s; - push @$clist, 1 => $data; -} - -# Verbatim copy from intltool-merge.in.in -sub intltool_tree_cdatastart -{ - my $expat = shift; - my $clist = $expat->{Curlist}; - my $pos = $#$clist; - - push @$clist, 0 => $expat->original_string(); -} - -# Verbatim copy from intltool-merge.in.in -sub intltool_tree_cdataend -{ - my $expat = shift; - my $clist = $expat->{Curlist}; - my $pos = $#$clist; - - $clist->[$pos] .= $expat->original_string(); -} - -# Verbatim copy from intltool-merge.in.in -sub intltool_tree_char -{ - my $expat = shift; - my $text = shift; - my $clist = $expat->{Curlist}; - my $pos = $#$clist; - - # Use original_string so that we retain escaped entities - # in CDATA sections. - # - if ($pos > 0 and $clist->[$pos - 1] eq '0') { - $clist->[$pos] .= $expat->original_string(); - } else { - push @$clist, 0 => $expat->original_string(); - } -} - -# Verbatim copy from intltool-merge.in.in -sub intltool_tree_start -{ - my $expat = shift; - my $tag = shift; - my @origlist = (); - - # Use original_string so that we retain escaped entities - # in attribute values. We must convert the string to an - # @origlist array to conform to the structure of the Tree - # Style. - # - my @original_array = split /\x/, $expat->original_string(); - my $source = $expat->original_string(); - - # Remove leading tag. - # - $source =~ s|^\s*<\s*(\S+)||s; - - # Grab attribute key/value pairs and push onto @origlist array. - # - while ($source) - { - if ($source =~ /^\s*([\w:-]+)\s*[=]\s*["]/) - { - $source =~ s|^\s*([\w:-]+)\s*[=]\s*["]([^"]*)["]||s; - push @origlist, $1; - push @origlist, '"' . $2 . '"'; - } - elsif ($source =~ /^\s*([\w:-]+)\s*[=]\s*[']/) - { - $source =~ s|^\s*([\w:-]+)\s*[=]\s*[']([^']*)[']||s; - push @origlist, $1; - push @origlist, "'" . $2 . "'"; - } - else - { - last; - } - } - - my $ol = [ { @origlist } ]; - - push @{ $expat->{Lists} }, $expat->{Curlist}; - push @{ $expat->{Curlist} }, $tag => $ol; - $expat->{Curlist} = $ol; -} - -# Copied from intltool-merge.in.in and added comment handler. -sub readXml -{ - my $xmldoc = shift || return; - my $ret = eval 'require XML::Parser'; - if(!$ret) { - die "You must have XML::Parser installed to run $0\n\n"; - } - my $xp = new XML::Parser(Style => 'Tree'); - $xp->setHandlers(Char => \&intltool_tree_char); - $xp->setHandlers(Start => \&intltool_tree_start); - $xp->setHandlers(CdataStart => \&intltool_tree_cdatastart); - $xp->setHandlers(CdataEnd => \&intltool_tree_cdataend); - - ## differences from intltool-merge.in.in - $xp->setHandlers(Comment => \&intltool_tree_comment); - ## differences end here from intltool-merge.in.in - - my $tree = $xp->parse($xmldoc); - #print_var($tree); - -# Hello thereHowdydo -# would be: -# [foo, [{}, 1, "comment", head, [{id => "a"}, 0, "Hello ", em, [{}, 0, "there"]], bar, -# [{}, 0, "Howdy", ref, [{}]], 0, "do" ] ] - - return $tree; -} - -sub type_schemas { - ### For schemas XML files ### - - # FIXME: We should handle escaped < (less than) - while ($input =~ / - \s* - (\s*(?:\s*)?(.*?)\s*<\/default>\s*)? - (\s*(?:\s*)?(.*?)\s*<\/short>\s*)? - (\s*(?:\s*)?(.*?)\s*<\/long>\s*)? - <\/locale> - /sgx) { - my @totranslate = ($3,$6,$9); - my @eachcomment = ($2,$5,$8); - foreach (@totranslate) { - my $currentcomment = shift @eachcomment; - next if !$_; - s/\s+/ /g; - $messages{entity_decode_minimal($_)} = []; - $comments{entity_decode_minimal($_)} = $currentcomment if (defined($currentcomment)); - } - } -} - -sub type_rfc822deb { - ### For rfc822-style Debian configuration files ### - - my $lineno = 1; - my $type = ''; - while ($input =~ /\G(.*?)(^|\n)(_+)([^:]+):[ \t]*(.*?)(?=\n\S|$)/sg) - { - my ($pre, $newline, $underscore, $tag, $text) = ($1, $2, $3, $4, $5); - while ($pre =~ m/\n/g) - { - $lineno ++; - } - $lineno += length($newline); - my @str_list = rfc822deb_split(length($underscore), $text); - for my $str (@str_list) - { - $strcount++; - $messages{$str} = []; - $loc{$str} = $lineno; - $count{$str} = $strcount; - my $usercomment = ''; - while($pre =~ s/(^|\n)#([^\n]*)$//s) - { - $usercomment = "\n" . $2 . $usercomment; - } - $comments{$str} = $tag . $usercomment; - } - $lineno += ($text =~ s/\n//g); - } -} - -sub rfc822deb_split { - # Debian defines a special way to deal with rfc822-style files: - # when a value contain newlines, it consists of - # 1. a short form (first line) - # 2. a long description, all lines begin with a space, - # and paragraphs are separated by a single dot on a line - # This routine returns an array of all paragraphs, and reformat - # them. - # When first argument is 2, the string is a comma separated list of - # values. - my $type = shift; - my $text = shift; - $text =~ s/^[ \t]//mg; - return (split(/, */, $text, 0)) if $type ne 1; - return ($text) if $text !~ /\n/; - - $text =~ s/([^\n]*)\n//; - my @list = ($1); - my $str = ''; - for my $line (split (/\n/, $text)) - { - chomp $line; - if ($line =~ /^\.\s*$/) - { - # New paragraph - $str =~ s/\s*$//; - push(@list, $str); - $str = ''; - } - elsif ($line =~ /^\s/) - { - # Line which must not be reformatted - $str .= "\n" if length ($str) && $str !~ /\n$/; - $line =~ s/\s+$//; - $str .= $line."\n"; - } - else - { - # Continuation line, remove newline - $str .= " " if length ($str) && $str !~ /\n$/; - $str .= $line; - } - } - $str =~ s/\s*$//; - push(@list, $str) if length ($str); - return @list; -} - -sub type_quoted { - while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) { - my $message = $1; - my $before = $`; - $message =~ s/\\\"/\"/g; - $before =~ s/[^\n]//g; - $messages{$message} = []; - $loc{$message} = length ($before) + 2; - } -} - -sub type_quotedxml { - while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) { - my $message = $1; - my $before = $`; - $message =~ s/\\\"/\"/g; - $message = entity_decode($message); - $before =~ s/[^\n]//g; - $messages{$message} = []; - $loc{$message} = length ($before) + 2; - } -} - -sub type_glade { - ### For translatable Glade XML files ### - - my $tags = "label|title|text|format|copyright|comments|preview_text|tooltip|message"; - - while ($input =~ /<($tags)>([^<]+)<\/($tags)>/sg) { - # Glade sometimes uses tags that normally mark translatable things for - # little bits of non-translatable content. We work around this by not - # translating strings that only includes something like label4 or window1. - $messages{entity_decode($2)} = [] unless $2 =~ /^(window|label|dialog)[0-9]+$/; - } - - while ($input =~ /(..[^<]*)<\/items>/sg) { - for my $item (split (/\n/, $1)) { - $messages{entity_decode($item)} = []; - } - } - - ## handle new glade files - while ($input =~ /<(property|atkproperty|col)\s+[^>]*translatable\s*=\s*"yes"(?:\s+[^>]*comments\s*=\s*"([^"]*)")?[^>]*>([^<]+)<\/\1>/sg) { - $messages{entity_decode($3)} = [] unless $3 =~ /^(window|label)[0-9]+$/; - if (defined($2) and !($3 =~ /^(window|label)[0-9]+$/)) { - $comments{entity_decode($3)} = entity_decode($2) ; - } - } - while ($input =~ /]*)"\s+description="([^>]+)"\/>/sg) { - $messages{entity_decode_minimal($2)} = []; - } -} - -sub type_scheme { - my ($line, $i, $state, $str, $trcomment, $char); - for $line (split(/\n/, $input)) { - $i = 0; - $state = 0; # 0 - nothing, 1 - string, 2 - translatable string - while ($i < length($line)) { - if (substr($line,$i,1) eq "\"") { - if ($state == 2) { - $comments{$str} = $trcomment if ($trcomment); - $messages{$str} = []; - $str = ''; - $state = 0; $trcomment = ""; - } elsif ($state == 1) { - $str = ''; - $state = 0; $trcomment = ""; - } else { - $state = 1; - $str = ''; - if ($i>0 && substr($line,$i-1,1) eq '_') { - $state = 2; - } - } - } elsif (!$state) { - if (substr($line,$i,1) eq ";") { - $trcomment = substr($line,$i+1); - $trcomment =~ s/^;*\s*//; - $i = length($line); - } elsif ($trcomment && substr($line,$i,1) !~ /\s|\(|\)|_/) { - $trcomment = ""; - } - } else { - if (substr($line,$i,1) eq "\\") { - $char = substr($line,$i+1,1); - if ($char ne "\"" && $char ne "\\") { - $str = $str . "\\"; - } - $i++; - } - $str = $str . substr($line,$i,1); - } - $i++; - } - } -} - -sub msg_write { - my @msgids; - if (%count) - { - @msgids = sort { $count{$a} <=> $count{$b} } keys %count; - } - else - { - @msgids = sort keys %messages; - } - for my $message (@msgids) - { - my $offsetlines = 1; - $offsetlines++ if $message =~ /%/; - if (defined ($comments{$message})) - { - while ($comments{$message} =~ m/\n/g) - { - $offsetlines++; - } - } - print OUT "# ".($loc{$message} - $offsetlines). " \"$FILE\"\n" - if defined $loc{$message}; - print OUT "/* ".$comments{$message}." */\n" - if defined $comments{$message}; - print OUT "/* xgettext:no-c-format */\n" if $message =~ /%/; - - my @lines = split (/\n/, $message, -1); - for (my $n = 0; $n < @lines; $n++) - { - if ($n == 0) - { - print OUT "char *s = N_(\""; - } - else - { - print OUT " \""; - } - - print OUT escape($lines[$n]); - - if ($n < @lines - 1) - { - print OUT "\\n\"\n"; - } - else - { - print OUT "\");\n"; - } - } - } -} - diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/intltool-merge.in /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/intltool-merge.in --- synaptic-0.62.1ubuntu2~ppa1/intltool-merge.in 2008-06-17 08:58:24.000000000 +0100 +++ synaptic-0.62.1ubuntu10/intltool-merge.in 2008-10-21 18:33:57.000000000 +0100 @@ -1,1506 +0,0 @@ -#!@INTLTOOL_PERL@ -w -# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- - -# -# The Intltool Message Merger -# -# Copyright (C) 2000, 2003 Free Software Foundation. -# Copyright (C) 2000, 2001 Eazel, Inc -# -# Intltool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# version 2 published by the Free Software Foundation. -# -# Intltool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. -# -# Authors: Maciej Stachowiak -# Kenneth Christiansen -# Darin Adler -# -# Proper XML UTF-8'ification written by Cyrille Chepelov -# - -## Release information -my $PROGRAM = "intltool-merge"; -my $PACKAGE = "intltool"; -my $VERSION = "0.37.1"; - -## Loaded modules -use strict; -use Getopt::Long; -use Text::Wrap; -use File::Basename; - -my $must_end_tag = -1; -my $last_depth = -1; -my $translation_depth = -1; -my @tag_stack = (); -my @entered_tag = (); -my @translation_strings = (); -my $leading_space = ""; - -## Scalars used by the option stuff -my $HELP_ARG = 0; -my $VERSION_ARG = 0; -my $BA_STYLE_ARG = 0; -my $XML_STYLE_ARG = 0; -my $KEYS_STYLE_ARG = 0; -my $DESKTOP_STYLE_ARG = 0; -my $SCHEMAS_STYLE_ARG = 0; -my $RFC822DEB_STYLE_ARG = 0; -my $QUOTED_STYLE_ARG = 0; -my $QUOTEDXML_STYLE_ARG = 0; -my $QUIET_ARG = 0; -my $PASS_THROUGH_ARG = 0; -my $UTF8_ARG = 0; -my $MULTIPLE_OUTPUT = 0; -my $cache_file; - -## Handle options -GetOptions -( - "help" => \$HELP_ARG, - "version" => \$VERSION_ARG, - "quiet|q" => \$QUIET_ARG, - "oaf-style|o" => \$BA_STYLE_ARG, ## for compatibility - "ba-style|b" => \$BA_STYLE_ARG, - "xml-style|x" => \$XML_STYLE_ARG, - "keys-style|k" => \$KEYS_STYLE_ARG, - "desktop-style|d" => \$DESKTOP_STYLE_ARG, - "schemas-style|s" => \$SCHEMAS_STYLE_ARG, - "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG, - "quoted-style" => \$QUOTED_STYLE_ARG, - "quotedxml-style" => \$QUOTEDXML_STYLE_ARG, - "pass-through|p" => \$PASS_THROUGH_ARG, - "utf8|u" => \$UTF8_ARG, - "multiple-output|m" => \$MULTIPLE_OUTPUT, - "cache|c=s" => \$cache_file - ) or &error; - -my $PO_DIR; -my $FILE; -my $OUTFILE; - -my %po_files_by_lang = (); -my %translations = (); -my $iconv = $ENV{"ICONV"} || "iconv"; -my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null'); - -sub isProgramInPath -{ - my ($file) = @_; - # If either a file exists, or when run it returns 0 exit status - return 1 if ((-x $file) or (system("$file -l >$devnull") == 0)); - return 0; -} - -if (! isProgramInPath ("$iconv")) -{ - print STDERR " *** iconv is not found on this system!\n". - " *** Without it, intltool-merge can not convert encodings.\n"; - exit; -} - -# Use this instead of \w for XML files to handle more possible characters. -my $w = "[-A-Za-z0-9._:]"; - -# XML quoted string contents -my $q = "[^\\\"]*"; - -## Check for options. - -if ($VERSION_ARG) -{ - &print_version; -} -elsif ($HELP_ARG) -{ - &print_help; -} -elsif ($BA_STYLE_ARG && @ARGV > 2) -{ - &utf8_sanity_check; - &preparation; - &print_message; - &ba_merge_translations; - &finalize; -} -elsif ($XML_STYLE_ARG && @ARGV > 2) -{ - &utf8_sanity_check; - &preparation; - &print_message; - &xml_merge_output; - &finalize; -} -elsif ($KEYS_STYLE_ARG && @ARGV > 2) -{ - &utf8_sanity_check; - &preparation; - &print_message; - &keys_merge_translations; - &finalize; -} -elsif ($DESKTOP_STYLE_ARG && @ARGV > 2) -{ - &utf8_sanity_check; - &preparation; - &print_message; - &desktop_merge_translations; - &finalize; -} -elsif ($SCHEMAS_STYLE_ARG && @ARGV > 2) -{ - &utf8_sanity_check; - &preparation; - &print_message; - &schemas_merge_translations; - &finalize; -} -elsif ($RFC822DEB_STYLE_ARG && @ARGV > 2) -{ - &preparation; - &print_message; - &rfc822deb_merge_translations; - &finalize; -} -elsif (($QUOTED_STYLE_ARG || $QUOTEDXML_STYLE_ARG) && @ARGV > 2) -{ - &utf8_sanity_check; - &preparation; - &print_message; - "ed_merge_translations($QUOTEDXML_STYLE_ARG); - &finalize; -} -else -{ - &print_help; -} - -exit; - -## Sub for printing release information -sub print_version -{ - print <<_EOF_; -${PROGRAM} (${PACKAGE}) ${VERSION} -Written by Maciej Stachowiak, Darin Adler and Kenneth Christiansen. - -Copyright (C) 2000-2003 Free Software Foundation, Inc. -Copyright (C) 2000-2001 Eazel, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -_EOF_ - exit; -} - -## Sub for printing usage information -sub print_help -{ - print <<_EOF_; -Usage: ${PROGRAM} [OPTION]... PO_DIRECTORY FILENAME OUTPUT_FILE -Generates an output file that includes some localized attributes from an -untranslated source file. - -Mandatory options: (exactly one must be specified) - -b, --ba-style includes translations in the bonobo-activation style - -d, --desktop-style includes translations in the desktop style - -k, --keys-style includes translations in the keys style - -s, --schemas-style includes translations in the schemas style - -r, --rfc822deb-style includes translations in the RFC822 style - --quoted-style includes translations in the quoted string style - --quotedxml-style includes translations in the quoted xml string style - -x, --xml-style includes translations in the standard xml style - -Other options: - -u, --utf8 convert all strings to UTF-8 before merging - (default for everything except RFC822 style) - -p, --pass-through deprecated, does nothing and issues a warning - -m, --multiple-output output one localized file per locale, instead of - a single file containing all localized elements - -c, --cache=FILE specify cache file name - (usually \$top_builddir/po/.intltool-merge-cache) - -q, --quiet suppress most messages - --help display this help and exit - --version output version information and exit - -Report bugs to http://bugzilla.gnome.org/ (product name "$PACKAGE") -or send email to . -_EOF_ - exit; -} - - -## Sub for printing error messages -sub print_error -{ - print STDERR "Try `${PROGRAM} --help' for more information.\n"; - exit; -} - - -sub print_message -{ - print "Merging translations into $OUTFILE.\n" unless $QUIET_ARG; -} - - -sub preparation -{ - $PO_DIR = $ARGV[0]; - $FILE = $ARGV[1]; - $OUTFILE = $ARGV[2]; - - &gather_po_files; - &get_translation_database; -} - -# General-purpose code for looking up translations in .po files - -sub po_file2lang -{ - my ($tmp) = @_; - $tmp =~ s/^.*\/(.*)\.po$/$1/; - return $tmp; -} - -sub gather_po_files -{ - if (my $linguas = $ENV{"LINGUAS"}) - { - for my $lang (split / /, $linguas) { - my $po_file = $PO_DIR . "/" . $lang . ".po"; - if (-e $po_file) { - $po_files_by_lang{$lang} = $po_file; - } - } - } - else - { - if (open LINGUAS_FILE, "$PO_DIR/LINGUAS") - { - while () - { - next if /^#/; - - for my $lang (split) - { - chomp ($lang); - my $po_file = $PO_DIR . "/" . $lang . ".po"; - if (-e $po_file) { - $po_files_by_lang{$lang} = $po_file; - } - } - } - - close LINGUAS_FILE; - } - else - { - for my $po_file (glob "$PO_DIR/*.po") { - $po_files_by_lang{po_file2lang($po_file)} = $po_file; - } - } - } -} - -sub get_local_charset -{ - my ($encoding) = @_; - my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "@INTLTOOL_LIBDIR@/charset.alias"; - - # seek character encoding aliases in charset.alias (glib) - - if (open CHARSET_ALIAS, $alias_file) - { - while () - { - next if /^\#/; - return $1 if (/^\s*([-._a-zA-Z0-9]+)\s+$encoding\b/i) - } - - close CHARSET_ALIAS; - } - - # if not found, return input string - - return $encoding; -} - -sub get_po_encoding -{ - my ($in_po_file) = @_; - my $encoding = ""; - - open IN_PO_FILE, $in_po_file or die; - while () - { - ## example: "Content-Type: text/plain; charset=ISO-8859-1\n" - if (/Content-Type\:.*charset=([-a-zA-Z0-9]+)\\n/) - { - $encoding = $1; - last; - } - } - close IN_PO_FILE; - - if (!$encoding) - { - print STDERR "Warning: no encoding found in $in_po_file. Assuming ISO-8859-1\n" unless $QUIET_ARG; - $encoding = "ISO-8859-1"; - } - - system ("$iconv -f $encoding -t UTF-8 <$devnull 2>$devnull"); - if ($?) { - $encoding = get_local_charset($encoding); - } - - return $encoding -} - -sub utf8_sanity_check -{ - print STDERR "Warning: option --pass-through has been removed.\n" if $PASS_THROUGH_ARG; - $UTF8_ARG = 1; -} - -sub get_translation_database -{ - if ($cache_file) { - &get_cached_translation_database; - } else { - &create_translation_database; - } -} - -sub get_newest_po_age -{ - my $newest_age; - - foreach my $file (values %po_files_by_lang) - { - my $file_age = -M $file; - $newest_age = $file_age if !$newest_age || $file_age < $newest_age; - } - - $newest_age = 0 if !$newest_age; - - return $newest_age; -} - -sub create_cache -{ - print "Generating and caching the translation database\n" unless $QUIET_ARG; - - &create_translation_database; - - open CACHE, ">$cache_file" || die; - print CACHE join "\x01", %translations; - close CACHE; -} - -sub load_cache -{ - print "Found cached translation database\n" unless $QUIET_ARG; - - my $contents; - open CACHE, "<$cache_file" || die; - { - local $/; - $contents = ; - } - close CACHE; - %translations = split "\x01", $contents; -} - -sub get_cached_translation_database -{ - my $cache_file_age = -M $cache_file; - if (defined $cache_file_age) - { - if ($cache_file_age <= &get_newest_po_age) - { - &load_cache; - return; - } - print "Found too-old cached translation database\n" unless $QUIET_ARG; - } - - &create_cache; -} - -sub create_translation_database -{ - for my $lang (keys %po_files_by_lang) - { - my $po_file = $po_files_by_lang{$lang}; - - if ($UTF8_ARG) - { - my $encoding = get_po_encoding ($po_file); - - if (lc $encoding eq "utf-8") - { - open PO_FILE, "<$po_file"; - } - else - { - print "NOTICE: $po_file is not in UTF-8 but $encoding, converting...\n" unless $QUIET_ARG;; - - open PO_FILE, "$iconv -f $encoding -t UTF-8 $po_file|"; - } - } - else - { - open PO_FILE, "<$po_file"; - } - - my $nextfuzzy = 0; - my $inmsgid = 0; - my $inmsgstr = 0; - my $msgid = ""; - my $msgstr = ""; - - while () - { - $nextfuzzy = 1 if /^#, fuzzy/; - - if (/^msgid "((\\.|[^\\]+)*)"/ ) - { - $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr; - $msgid = ""; - $msgstr = ""; - - if ($nextfuzzy) { - $inmsgid = 0; - } else { - $msgid = unescape_po_string($1); - $inmsgid = 1; - } - $inmsgstr = 0; - $nextfuzzy = 0; - } - - if (/^msgstr "((\\.|[^\\]+)*)"/) - { - $msgstr = unescape_po_string($1); - $inmsgstr = 1; - $inmsgid = 0; - } - - if (/^"((\\.|[^\\]+)*)"/) - { - $msgid .= unescape_po_string($1) if $inmsgid; - $msgstr .= unescape_po_string($1) if $inmsgstr; - } - } - $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr; - } -} - -sub finalize -{ -} - -sub unescape_one_sequence -{ - my ($sequence) = @_; - - return "\\" if $sequence eq "\\\\"; - return "\"" if $sequence eq "\\\""; - return "\n" if $sequence eq "\\n"; - return "\r" if $sequence eq "\\r"; - return "\t" if $sequence eq "\\t"; - return "\b" if $sequence eq "\\b"; - return "\f" if $sequence eq "\\f"; - return "\a" if $sequence eq "\\a"; - return chr(11) if $sequence eq "\\v"; # vertical tab, see ascii(7) - - return chr(hex($1)) if ($sequence =~ /\\x([0-9a-fA-F]{2})/); - return chr(oct($1)) if ($sequence =~ /\\([0-7]{3})/); - - # FIXME: Is \0 supported as well? Kenneth and Rodney don't want it, see bug #48489 - - return $sequence; -} - -sub unescape_po_string -{ - my ($string) = @_; - - $string =~ s/(\\x[0-9a-fA-F]{2}|\\[0-7]{3}|\\.)/unescape_one_sequence($1)/eg; - - return $string; -} - -sub entity_decode -{ - local ($_) = @_; - - s/'/'/g; # ' - s/"/"/g; # " - s/<//g; - s/&/&/g; - - return $_; -} - -# entity_encode: (string) -# -# Encode the given string to XML format (encode '<' etc). - -sub entity_encode -{ - my ($pre_encoded) = @_; - - my @list_of_chars = unpack ('C*', $pre_encoded); - - # with UTF-8 we only encode minimalistic - return join ('', map (&entity_encode_int_minimalist, @list_of_chars)); -} - -sub entity_encode_int_minimalist -{ - return """ if $_ == 34; - return "&" if $_ == 38; - return "'" if $_ == 39; - return "<" if $_ == 60; - return ">" if $_ == 62; - return chr $_; -} - -sub entity_encoded_translation -{ - my ($lang, $string) = @_; - - my $translation = $translations{$lang, $string}; - return $string if !$translation; - return entity_encode ($translation); -} - -## XML (bonobo-activation specific) merge code - -sub ba_merge_translations -{ - my $source; - - { - local $/; # slurp mode - open INPUT, "<$FILE" or die "can't open $FILE: $!"; - $source = ; - close INPUT; - } - - open OUTPUT, ">$OUTFILE" or die "can't open $OUTFILE: $!"; - # Binmode so that selftest works ok if using a native Win32 Perl... - binmode (OUTPUT) if $^O eq 'MSWin32'; - - while ($source =~ s|^(.*?)([ \t]*<\s*$w+\s+($w+\s*=\s*"$q"\s*)+/?>)([ \t]*\n)?||s) - { - print OUTPUT $1; - - my $node = $2 . "\n"; - - my @strings = (); - $_ = $node; - while (s/(\s)_($w+\s*=\s*"($q)")/$1$2/s) { - push @strings, entity_decode($3); - } - print OUTPUT; - - my %langs; - for my $string (@strings) - { - for my $lang (keys %po_files_by_lang) - { - $langs{$lang} = 1 if $translations{$lang, $string}; - } - } - - for my $lang (sort keys %langs) - { - $_ = $node; - s/(\sname\s*=\s*)"($q)"/$1"$2-$lang"/s; - s/(\s)_($w+\s*=\s*")($q)"/$1 . $2 . entity_encoded_translation($lang, $3) . '"'/seg; - print OUTPUT; - } - } - - print OUTPUT $source; - - close OUTPUT; -} - - -## XML (non-bonobo-activation) merge code - - -# Process tag attributes -# Only parameter is a HASH containing attributes -> values mapping -sub getAttributeString -{ - my $sub = shift; - my $do_translate = shift || 0; - my $language = shift || ""; - my $result = ""; - my $translate = shift; - foreach my $e (reverse(sort(keys %{ $sub }))) { - my $key = $e; - my $string = $sub->{$e}; - my $quote = '"'; - - $string =~ s/^[\s]+//; - $string =~ s/[\s]+$//; - - if ($string =~ /^'.*'$/) - { - $quote = "'"; - } - $string =~ s/^['"]//g; - $string =~ s/['"]$//g; - - if ($do_translate && $key =~ /^_/) { - $key =~ s|^_||g; - if ($language) { - # Handle translation - my $decode_string = entity_decode($string); - my $translation = $translations{$language, $decode_string}; - if ($translation) { - $translation = entity_encode($translation); - $string = $translation; - } - $$translate = 2; - } else { - $$translate = 2 if ($translate && (!$$translate)); # watch not to "overwrite" $translate - } - } - - $result .= " $key=$quote$string$quote"; - } - return $result; -} - -# Returns a translatable string from XML node, it works on contents of every node in XML::Parser tree -sub getXMLstring -{ - my $ref = shift; - my $spacepreserve = shift || 0; - my @list = @{ $ref }; - my $result = ""; - - my $count = scalar(@list); - my $attrs = $list[0]; - my $index = 1; - - $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/)); - $spacepreserve = 0 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?default["']?$/)); - - while ($index < $count) { - my $type = $list[$index]; - my $content = $list[$index+1]; - if (! $type ) { - # We've got CDATA - if ($content) { - # lets strip the whitespace here, and *ONLY* here - $content =~ s/\s+/ /gs if (!$spacepreserve); - $result .= $content; - } - } elsif ( "$type" ne "1" ) { - # We've got another element - $result .= "<$type"; - $result .= getAttributeString(@{$content}[0], 0); # no nested translatable elements - if ($content) { - my $subresult = getXMLstring($content, $spacepreserve); - if ($subresult) { - $result .= ">".$subresult . ""; - } else { - $result .= "/>"; - } - } else { - $result .= "/>"; - } - } - $index += 2; - } - return $result; -} - -# Translate list of nodes if necessary -sub translate_subnodes -{ - my $fh = shift; - my $content = shift; - my $language = shift || ""; - my $singlelang = shift || 0; - my $spacepreserve = shift || 0; - - my @nodes = @{ $content }; - - my $count = scalar(@nodes); - my $index = 0; - while ($index < $count) { - my $type = $nodes[$index]; - my $rest = $nodes[$index+1]; - if ($singlelang) { - my $oldMO = $MULTIPLE_OUTPUT; - $MULTIPLE_OUTPUT = 1; - traverse($fh, $type, $rest, $language, $spacepreserve); - $MULTIPLE_OUTPUT = $oldMO; - } else { - traverse($fh, $type, $rest, $language, $spacepreserve); - } - $index += 2; - } -} - -sub isWellFormedXmlFragment -{ - my $ret = eval 'require XML::Parser'; - if(!$ret) { - die "You must have XML::Parser installed to run $0\n\n"; - } - - my $fragment = shift; - return 0 if (!$fragment); - - $fragment = "$fragment"; - my $xp = new XML::Parser(Style => 'Tree'); - my $tree = 0; - eval { $tree = $xp->parse($fragment); }; - return $tree; -} - -sub traverse -{ - my $fh = shift; - my $nodename = shift; - my $content = shift; - my $language = shift || ""; - my $spacepreserve = shift || 0; - - if (!$nodename) { - if ($content =~ /^[\s]*$/) { - $leading_space .= $content; - } - print $fh $content; - } else { - # element - my @all = @{ $content }; - my $attrs = shift @all; - my $translate = 0; - my $outattr = getAttributeString($attrs, 1, $language, \$translate); - - if ($nodename =~ /^_/) { - $translate = 1; - $nodename =~ s/^_//; - } - my $lookup = ''; - - $spacepreserve = 0 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?default["']?$/)); - $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/)); - - print $fh "<$nodename", $outattr; - if ($translate) { - $lookup = getXMLstring($content, $spacepreserve); - if (!$spacepreserve) { - $lookup =~ s/^\s+//s; - $lookup =~ s/\s+$//s; - } - - if ($lookup || $translate == 2) { - my $translation = $translations{$language, $lookup} if isWellFormedXmlFragment($translations{$language, $lookup}); - if ($MULTIPLE_OUTPUT && ($translation || $translate == 2)) { - $translation = $lookup if (!$translation); - print $fh " xml:lang=\"", $language, "\"" if $language; - print $fh ">"; - if ($translate == 2) { - translate_subnodes($fh, \@all, $language, 1, $spacepreserve); - } else { - print $fh $translation; - } - print $fh ""; - - return; # this means there will be no same translation with xml:lang="$language"... - # if we want them both, just remove this "return" - } else { - print $fh ">"; - if ($translate == 2) { - translate_subnodes($fh, \@all, $language, 1, $spacepreserve); - } else { - print $fh $lookup; - } - print $fh ""; - } - } else { - print $fh "/>"; - } - - for my $lang (sort keys %po_files_by_lang) { - if ($MULTIPLE_OUTPUT && $lang ne "$language") { - next; - } - if ($lang) { - # Handle translation - # - my $translate = 0; - my $localattrs = getAttributeString($attrs, 1, $lang, \$translate); - my $translation = $translations{$lang, $lookup} if isWellFormedXmlFragment($translations{$lang, $lookup}); - if ($translate && !$translation) { - $translation = $lookup; - } - - if ($translation || $translate) { - print $fh "\n"; - $leading_space =~ s/.*\n//g; - print $fh $leading_space; - print $fh "<", $nodename, " xml:lang=\"", $lang, "\"", $localattrs, ">"; - if ($translate == 2) { - translate_subnodes($fh, \@all, $lang, 1, $spacepreserve); - } else { - print $fh $translation; - } - print $fh ""; - } - } - } - - } else { - my $count = scalar(@all); - if ($count > 0) { - print $fh ">"; - my $index = 0; - while ($index < $count) { - my $type = $all[$index]; - my $rest = $all[$index+1]; - traverse($fh, $type, $rest, $language, $spacepreserve); - $index += 2; - } - print $fh ""; - } else { - print $fh "/>"; - } - } - } -} - -sub intltool_tree_comment -{ - my $expat = shift; - my $data = shift; - my $clist = $expat->{Curlist}; - my $pos = $#$clist; - - push @$clist, 1 => $data; -} - -sub intltool_tree_cdatastart -{ - my $expat = shift; - my $clist = $expat->{Curlist}; - my $pos = $#$clist; - - push @$clist, 0 => $expat->original_string(); -} - -sub intltool_tree_cdataend -{ - my $expat = shift; - my $clist = $expat->{Curlist}; - my $pos = $#$clist; - - $clist->[$pos] .= $expat->original_string(); -} - -sub intltool_tree_char -{ - my $expat = shift; - my $text = shift; - my $clist = $expat->{Curlist}; - my $pos = $#$clist; - - # Use original_string so that we retain escaped entities - # in CDATA sections. - # - if ($pos > 0 and $clist->[$pos - 1] eq '0') { - $clist->[$pos] .= $expat->original_string(); - } else { - push @$clist, 0 => $expat->original_string(); - } -} - -sub intltool_tree_start -{ - my $expat = shift; - my $tag = shift; - my @origlist = (); - - # Use original_string so that we retain escaped entities - # in attribute values. We must convert the string to an - # @origlist array to conform to the structure of the Tree - # Style. - # - my @original_array = split /\x/, $expat->original_string(); - my $source = $expat->original_string(); - - # Remove leading tag. - # - $source =~ s|^\s*<\s*(\S+)||s; - - # Grab attribute key/value pairs and push onto @origlist array. - # - while ($source) - { - if ($source =~ /^\s*([\w:-]+)\s*[=]\s*["]/) - { - $source =~ s|^\s*([\w:-]+)\s*[=]\s*["]([^"]*)["]||s; - push @origlist, $1; - push @origlist, '"' . $2 . '"'; - } - elsif ($source =~ /^\s*([\w:-]+)\s*[=]\s*[']/) - { - $source =~ s|^\s*([\w:-]+)\s*[=]\s*[']([^']*)[']||s; - push @origlist, $1; - push @origlist, "'" . $2 . "'"; - } - else - { - last; - } - } - - my $ol = [ { @origlist } ]; - - push @{ $expat->{Lists} }, $expat->{Curlist}; - push @{ $expat->{Curlist} }, $tag => $ol; - $expat->{Curlist} = $ol; -} - -sub readXml -{ - my $filename = shift || return; - if(!-f $filename) { - die "ERROR Cannot find filename: $filename\n"; - } - - my $ret = eval 'require XML::Parser'; - if(!$ret) { - die "You must have XML::Parser installed to run $0\n\n"; - } - my $xp = new XML::Parser(Style => 'Tree'); - $xp->setHandlers(Char => \&intltool_tree_char); - $xp->setHandlers(Start => \&intltool_tree_start); - $xp->setHandlers(CdataStart => \&intltool_tree_cdatastart); - $xp->setHandlers(CdataEnd => \&intltool_tree_cdataend); - my $tree = $xp->parsefile($filename); - -# Hello thereHowdydo -# would be: -# [foo, [{}, head, [{id => "a"}, 0, "Hello ", em, [{}, 0, "there"]], bar, [{}, -# 0, "Howdy", ref, [{}]], 0, "do" ] ] - - return $tree; -} - -sub print_header -{ - my $infile = shift; - my $fh = shift; - my $source; - - if(!-f $infile) { - die "ERROR Cannot find filename: $infile\n"; - } - - print $fh qq{\n}; - { - local $/; - open DOCINPUT, "<${FILE}" or die; - $source = ; - close DOCINPUT; - } - if ($source =~ /()/s) - { - print $fh "$1\n"; - } - elsif ($source =~ /(]*>)/s) - { - print $fh "$1\n"; - } -} - -sub parseTree -{ - my $fh = shift; - my $ref = shift; - my $language = shift || ""; - - my $name = shift @{ $ref }; - my $cont = shift @{ $ref }; - - while (!$name || "$name" eq "1") { - $name = shift @{ $ref }; - $cont = shift @{ $ref }; - } - - my $spacepreserve = 0; - my $attrs = @{$cont}[0]; - $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/)); - - traverse($fh, $name, $cont, $language, $spacepreserve); -} - -sub xml_merge_output -{ - my $source; - - if ($MULTIPLE_OUTPUT) { - for my $lang (sort keys %po_files_by_lang) { - if ( ! -d $lang ) { - mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n"; - } - open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n"; - binmode (OUTPUT) if $^O eq 'MSWin32'; - my $tree = readXml($FILE); - print_header($FILE, \*OUTPUT); - parseTree(\*OUTPUT, $tree, $lang); - close OUTPUT; - print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG; - } - if ( ! -d "C" ) { - mkdir "C" or -d "C" or die "Cannot create subdirectory C: $!\n"; - } - open OUTPUT, ">C/$OUTFILE" or die "Cannot open C/$OUTFILE: $!\n"; - binmode (OUTPUT) if $^O eq 'MSWin32'; - my $tree = readXml($FILE); - print_header($FILE, \*OUTPUT); - parseTree(\*OUTPUT, $tree); - close OUTPUT; - print "CREATED C/$OUTFILE\n" unless $QUIET_ARG; - } else { - open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n"; - binmode (OUTPUT) if $^O eq 'MSWin32'; - my $tree = readXml($FILE); - print_header($FILE, \*OUTPUT); - parseTree(\*OUTPUT, $tree); - close OUTPUT; - print "CREATED $OUTFILE\n" unless $QUIET_ARG; - } -} - -sub keys_merge_translation -{ - my ($lang) = @_; - - if ( ! -d $lang && $MULTIPLE_OUTPUT) - { - mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n"; - } - - open INPUT, "<${FILE}" or die "Cannot open ${FILE}: $!\n"; - open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n"; - binmode (OUTPUT) if $^O eq 'MSWin32'; - - while () - { - if (s/^(\s*)_(\w+=(.*))/$1$2/) - { - my $string = $3; - - if (!$MULTIPLE_OUTPUT) - { - print OUTPUT; - - my $non_translated_line = $_; - - for my $lang (sort keys %po_files_by_lang) - { - my $translation = $translations{$lang, $string}; - next if !$translation; - - $_ = $non_translated_line; - s/(\w+)=.*/[$lang]$1=$translation/; - print OUTPUT; - } - } - else - { - my $non_translated_line = $_; - my $translation = $translations{$lang, $string}; - $translation = $string if !$translation; - - $_ = $non_translated_line; - s/(\w+)=.*/$1=$translation/; - print OUTPUT; - } - } - else - { - print OUTPUT; - } - } - - close OUTPUT; - close INPUT; - - print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG; -} - -sub keys_merge_translations -{ - if ($MULTIPLE_OUTPUT) - { - for my $lang (sort keys %po_files_by_lang) - { - keys_merge_translation ($lang); - } - keys_merge_translation ("C"); - } - else - { - keys_merge_translation ("."); - } -} - -sub desktop_merge_translations -{ - open INPUT, "<${FILE}" or die; - open OUTPUT, ">${OUTFILE}" or die; - binmode (OUTPUT) if $^O eq 'MSWin32'; - - while () - { - if (s/^(\s*)_(\w+=(.*))/$1$2/) - { - my $string = $3; - - print OUTPUT; - - my $non_translated_line = $_; - - for my $lang (sort keys %po_files_by_lang) - { - my $translation = $translations{$lang, $string}; - next if !$translation; - - $_ = $non_translated_line; - s/(\w+)=.*/${1}[$lang]=$translation/; - print OUTPUT; - } - } - else - { - print OUTPUT; - } - } - - close OUTPUT; - close INPUT; -} - -sub schemas_merge_translations -{ - my $source; - - { - local $/; # slurp mode - open INPUT, "<$FILE" or die "can't open $FILE: $!"; - $source = ; - close INPUT; - } - - open OUTPUT, ">$OUTFILE" or die; - binmode (OUTPUT) if $^O eq 'MSWin32'; - - # FIXME: support attribute translations - - # Empty nodes never need translation, so unmark all of them. - # For example, <_foo/> is just replaced by . - $source =~ s|<\s*_($w+)\s*/>|<$1/>|g; - - while ($source =~ s/ - (.*?) - (\s+)((\s*) - (\s*(?:\s*)?(.*?)\s*<\/default>)?(\s*) - (\s*(?:\s*)?(.*?)\s*<\/short>)?(\s*) - (\s*(?:\s*)?(.*?)\s*<\/long>)?(\s*) - <\/locale>) - //sx) - { - print OUTPUT $1; - - my $locale_start_spaces = $2 ? $2 : ''; - my $default_spaces = $4 ? $4 : ''; - my $short_spaces = $7 ? $7 : ''; - my $long_spaces = $10 ? $10 : ''; - my $locale_end_spaces = $13 ? $13 : ''; - my $c_default_block = $3 ? $3 : ''; - my $default_string = $6 ? $6 : ''; - my $short_string = $9 ? $9 : ''; - my $long_string = $12 ? $12 : ''; - - print OUTPUT "$locale_start_spaces$c_default_block"; - - $default_string =~ s/\s+/ /g; - $default_string = entity_decode($default_string); - $short_string =~ s/\s+/ /g; - $short_string = entity_decode($short_string); - $long_string =~ s/\s+/ /g; - $long_string = entity_decode($long_string); - - for my $lang (sort keys %po_files_by_lang) - { - my $default_translation = $translations{$lang, $default_string}; - my $short_translation = $translations{$lang, $short_string}; - my $long_translation = $translations{$lang, $long_string}; - - next if (!$default_translation && !$short_translation && - !$long_translation); - - print OUTPUT "\n$locale_start_spaces"; - - print OUTPUT "$default_spaces"; - - if ($default_translation) - { - $default_translation = entity_encode($default_translation); - print OUTPUT "$default_translation"; - } - - print OUTPUT "$short_spaces"; - - if ($short_translation) - { - $short_translation = entity_encode($short_translation); - print OUTPUT "$short_translation"; - } - - print OUTPUT "$long_spaces"; - - if ($long_translation) - { - $long_translation = entity_encode($long_translation); - print OUTPUT "$long_translation"; - } - - print OUTPUT "$locale_end_spaces"; - } - } - - print OUTPUT $source; - - close OUTPUT; -} - -sub rfc822deb_merge_translations -{ - my %encodings = (); - for my $lang (keys %po_files_by_lang) { - $encodings{$lang} = ($UTF8_ARG ? 'UTF-8' : get_po_encoding($po_files_by_lang{$lang})); - } - - my $source; - - $Text::Wrap::huge = 'overflow'; - $Text::Wrap::break = qr/\n|\s(?=\S)/; - - { - local $/; # slurp mode - open INPUT, "<$FILE" or die "can't open $FILE: $!"; - $source = ; - close INPUT; - } - - open OUTPUT, ">${OUTFILE}" or die; - binmode (OUTPUT) if $^O eq 'MSWin32'; - - while ($source =~ /(^|\n+)(_*)([^:\s]+)(:[ \t]*)(.*?)(?=\n[\S\n]|$)/sg) - { - my $sep = $1; - my $non_translated_line = $3.$4; - my $string = $5; - my $underscore = length($2); - next if $underscore eq 0 && $non_translated_line =~ /^#/; - # Remove [] dummy strings - my $stripped = $string; - $stripped =~ s/\[\s[^\[\]]*\],/,/g if $underscore eq 2; - $stripped =~ s/\[\s[^\[\]]*\]$//; - $non_translated_line .= $stripped; - - print OUTPUT $sep.$non_translated_line; - - if ($underscore) - { - my @str_list = rfc822deb_split($underscore, $string); - - for my $lang (sort keys %po_files_by_lang) - { - my $is_translated = 1; - my $str_translated = ''; - my $first = 1; - - for my $str (@str_list) - { - my $translation = $translations{$lang, $str}; - - if (!$translation) - { - $is_translated = 0; - last; - } - - # $translation may also contain [] dummy - # strings, mostly to indicate an empty string - $translation =~ s/\[\s[^\[\]]*\]$//; - - if ($first) - { - if ($underscore eq 2) - { - $str_translated .= $translation; - } - else - { - $str_translated .= - Text::Tabs::expand($translation) . - "\n"; - } - } - else - { - if ($underscore eq 2) - { - $str_translated .= ', ' . $translation; - } - else - { - $str_translated .= Text::Tabs::expand( - Text::Wrap::wrap(' ', ' ', $translation)) . - "\n .\n"; - } - } - $first = 0; - - # To fix some problems with Text::Wrap::wrap - $str_translated =~ s/(\n )+\n/\n .\n/g; - } - next unless $is_translated; - - $str_translated =~ s/\n \.\n$//; - $str_translated =~ s/\s+$//; - - $_ = $non_translated_line; - s/^(\w+):\s*.*/$sep${1}-$lang.$encodings{$lang}: $str_translated/s; - print OUTPUT; - } - } - } - print OUTPUT "\n"; - - close OUTPUT; - close INPUT; -} - -sub rfc822deb_split -{ - # Debian defines a special way to deal with rfc822-style files: - # when a value contain newlines, it consists of - # 1. a short form (first line) - # 2. a long description, all lines begin with a space, - # and paragraphs are separated by a single dot on a line - # This routine returns an array of all paragraphs, and reformat - # them. - # When first argument is 2, the string is a comma separated list of - # values. - my $type = shift; - my $text = shift; - $text =~ s/^[ \t]//mg; - return (split(/, */, $text, 0)) if $type ne 1; - return ($text) if $text !~ /\n/; - - $text =~ s/([^\n]*)\n//; - my @list = ($1); - my $str = ''; - - for my $line (split (/\n/, $text)) - { - chomp $line; - if ($line =~ /^\.\s*$/) - { - # New paragraph - $str =~ s/\s*$//; - push(@list, $str); - $str = ''; - } - elsif ($line =~ /^\s/) - { - # Line which must not be reformatted - $str .= "\n" if length ($str) && $str !~ /\n$/; - $line =~ s/\s+$//; - $str .= $line."\n"; - } - else - { - # Continuation line, remove newline - $str .= " " if length ($str) && $str !~ /\n$/; - $str .= $line; - } - } - - $str =~ s/\s*$//; - push(@list, $str) if length ($str); - - return @list; -} - -sub quoted_translation -{ - my ($xml_mode, $lang, $string) = @_; - - $string = entity_decode($string) if $xml_mode; - $string =~ s/\\\"/\"/g; - - my $translation = $translations{$lang, $string}; - $translation = $string if !$translation; - $translation = entity_encode($translation) if $xml_mode; - $translation =~ s/\"/\\\"/g; - return $translation -} - -sub quoted_merge_translations -{ - my ($xml_mode) = @_; - - if (!$MULTIPLE_OUTPUT) { - print "Quoted only supports Multiple Output.\n"; - exit(1); - } - - for my $lang (sort keys %po_files_by_lang) { - if ( ! -d $lang ) { - mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n"; - } - open INPUT, "<${FILE}" or die; - open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n"; - binmode (OUTPUT) if $^O eq 'MSWin32'; - while () - { - s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($xml_mode, $lang, $1) . "\""/ge; - print OUTPUT; - } - close OUTPUT; - close INPUT; - } -} diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/intltool-update.in /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/intltool-update.in --- synaptic-0.62.1ubuntu2~ppa1/intltool-update.in 2008-06-17 08:58:24.000000000 +0100 +++ synaptic-0.62.1ubuntu10/intltool-update.in 2008-10-21 18:33:57.000000000 +0100 @@ -1,1166 +0,0 @@ -#!@INTLTOOL_PERL@ -w -# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- - -# -# The Intltool Message Updater -# -# Copyright (C) 2000-2003 Free Software Foundation. -# -# Intltool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# version 2 published by the Free Software Foundation. -# -# Intltool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. -# -# Authors: Kenneth Christiansen -# Maciej Stachowiak -# Darin Adler - -## Release information -my $PROGRAM = "intltool-update"; -my $VERSION = "0.37.1"; -my $PACKAGE = "intltool"; - -## Loaded modules -use strict; -use Getopt::Long; -use Cwd; -use File::Copy; -use File::Find; - -## Scalars used by the option stuff -my $HELP_ARG = 0; -my $VERSION_ARG = 0; -my $DIST_ARG = 0; -my $POT_ARG = 0; -my $HEADERS_ARG = 0; -my $MAINTAIN_ARG = 0; -my $REPORT_ARG = 0; -my $VERBOSE = 0; -my $GETTEXT_PACKAGE = ""; -my $OUTPUT_FILE = ""; - -my @languages; -my %varhash = (); -my %po_files_by_lang = (); - -# Regular expressions to categorize file types. -# FIXME: Please check if the following is correct - -my $xml_support = -"xml(?:\\.in)*|". # http://www.w3.org/XML/ (Note: .in is not required) -"ui|". # Bonobo specific - User Interface desc. files -"lang|". # ? -"glade2?(?:\\.in)*|". # Glade specific - User Interface desc. files (Note: .in is not required) -"scm(?:\\.in)*|". # ? (Note: .in is not required) -"oaf(?:\\.in)+|". # DEPRECATED: Replaces by Bonobo .server files -"etspec|". # ? -"server(?:\\.in)+|". # Bonobo specific -"sheet(?:\\.in)+|". # ? -"schemas(?:\\.in)+|". # GConf specific -"pong(?:\\.in)+|". # DEPRECATED: PONG is not used [by GNOME] any longer. -"kbd(?:\\.in)+|". # GOK specific. -"policy(?:\\.in)+"; # PolicyKit files - -my $ini_support = -"icon(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec -"desktop(?:\\.in)+|". # http://www.freedesktop.org/Standards/menu-spec -"caves(?:\\.in)+|". # GNOME Games specific -"directory(?:\\.in)+|". # http://www.freedesktop.org/Standards/menu-spec -"soundlist(?:\\.in)+|". # GNOME specific -"keys(?:\\.in)+|". # GNOME Mime database specific -"theme(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec -"service(?:\\.in)+"; # DBus specific - -my $buildin_gettext_support = -"c|y|cs|cc|cpp|c\\+\\+|h|hh|gob|py"; - -## Always flush buffer when printing -$| = 1; - -## Sometimes the source tree will be rooted somewhere else. -my $SRCDIR = $ENV{"srcdir"} || "."; -my $POTFILES_in; - -$POTFILES_in = "<$SRCDIR/POTFILES.in"; - -my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null'); - -## Handle options -GetOptions -( - "help" => \$HELP_ARG, - "version" => \$VERSION_ARG, - "dist|d" => \$DIST_ARG, - "pot|p" => \$POT_ARG, - "headers|s" => \$HEADERS_ARG, - "maintain|m" => \$MAINTAIN_ARG, - "report|r" => \$REPORT_ARG, - "verbose|x" => \$VERBOSE, - "gettext-package|g=s" => \$GETTEXT_PACKAGE, - "output-file|o=s" => \$OUTPUT_FILE, - ) or &Console_WriteError_InvalidOption; - -&Console_Write_IntltoolHelp if $HELP_ARG; -&Console_Write_IntltoolVersion if $VERSION_ARG; - -my $arg_count = ($DIST_ARG > 0) - + ($POT_ARG > 0) - + ($HEADERS_ARG > 0) - + ($MAINTAIN_ARG > 0) - + ($REPORT_ARG > 0); - -&Console_Write_IntltoolHelp if $arg_count > 1; - -my $PKGNAME = FindPackageName (); - -# --version and --help don't require a module name -my $MODULE = $GETTEXT_PACKAGE || $PKGNAME || "unknown"; - -if ($POT_ARG) -{ - &GenerateHeaders; - &GeneratePOTemplate; -} -elsif ($HEADERS_ARG) -{ - &GenerateHeaders; -} -elsif ($MAINTAIN_ARG) -{ - &FindLeftoutFiles; -} -elsif ($REPORT_ARG) -{ - &GenerateHeaders; - &GeneratePOTemplate; - &Console_Write_CoverageReport; -} -elsif ((defined $ARGV[0]) && $ARGV[0] =~ /^[a-z]/) -{ - my $lang = $ARGV[0]; - - ## Report error if the language file supplied - ## to the command line is non-existent - &Console_WriteError_NotExisting("$SRCDIR/$lang.po") - if ! -s "$SRCDIR/$lang.po"; - - if (!$DIST_ARG) - { - print "Working, please wait..." if $VERBOSE; - &GenerateHeaders; - &GeneratePOTemplate; - } - &POFile_Update ($lang, $OUTPUT_FILE); - &Console_Write_TranslationStatus ($lang, $OUTPUT_FILE); -} -else -{ - &Console_Write_IntltoolHelp; -} - -exit; - -######### - -sub Console_Write_IntltoolVersion -{ - print <<_EOF_; -${PROGRAM} (${PACKAGE}) $VERSION -Written by Kenneth Christiansen, Maciej Stachowiak, and Darin Adler. - -Copyright (C) 2000-2003 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -_EOF_ - exit; -} - -sub Console_Write_IntltoolHelp -{ - print <<_EOF_; -Usage: ${PROGRAM} [OPTION]... LANGCODE -Updates PO template files and merge them with the translations. - -Mode of operation (only one is allowed): - -p, --pot generate the PO template only - -s, --headers generate the header files in POTFILES.in - -m, --maintain search for left out files from POTFILES.in - -r, --report display a status report for the module - -d, --dist merge LANGCODE.po with existing PO template - -Extra options: - -g, --gettext-package=NAME override PO template name, useful with --pot - -o, --output-file=FILE write merged translation to FILE - -x, --verbose display lots of feedback - --help display this help and exit - --version output version information and exit - -Examples of use: -${PROGRAM} --pot just create a new PO template -${PROGRAM} xy create new PO template and merge xy.po with it - -Report bugs to http://bugzilla.gnome.org/ (product name "$PACKAGE") -or send email to . -_EOF_ - exit; -} - -sub echo_n -{ - my $str = shift; - my $ret = `echo "$str"`; - - $ret =~ s/\n$//; # do we need the "s" flag? - - return $ret; -} - -sub POFile_DetermineType ($) -{ - my $type = $_; - my $gettext_type; - - my $xml_regex = "(?:" . $xml_support . ")"; - my $ini_regex = "(?:" . $ini_support . ")"; - my $buildin_regex = "(?:" . $buildin_gettext_support . ")"; - - if ($type =~ /\[type: gettext\/([^\]].*)]/) - { - $gettext_type=$1; - } - elsif ($type =~ /schemas(\.in)+$/) - { - $gettext_type="schemas"; - } - elsif ($type =~ /glade2?(\.in)*$/) - { - $gettext_type="glade"; - } - elsif ($type =~ /scm(\.in)*$/) - { - $gettext_type="scheme"; - } - elsif ($type =~ /keys(\.in)+$/) - { - $gettext_type="keys"; - } - - # bucket types - - elsif ($type =~ /$xml_regex$/) - { - $gettext_type="xml"; - } - elsif ($type =~ /$ini_regex$/) - { - $gettext_type="ini"; - } - elsif ($type =~ /$buildin_regex$/) - { - $gettext_type="buildin"; - } - else - { - $gettext_type="unknown"; - } - - return "gettext\/$gettext_type"; -} - -sub TextFile_DetermineEncoding ($) -{ - my $gettext_code="ASCII"; # All files are ASCII by default - my $filetype=`file $_ | cut -d ' ' -f 2`; - - if ($? eq "0") - { - if ($filetype =~ /^(ISO|UTF)/) - { - chomp ($gettext_code = $filetype); - } - elsif ($filetype =~ /^XML/) - { - $gettext_code="UTF-8"; # We asume that .glade and other .xml files are UTF-8 - } - } - - return $gettext_code; -} - -sub isNotValidMissing -{ - my ($file) = @_; - - return if $file =~ /^\{arch\}\/.*$/; - return if $file =~ /^$varhash{"PACKAGE"}-$varhash{"VERSION"}\/.*$/; -} - -sub FindLeftoutFiles -{ - my (@buf_i18n_plain, - @buf_i18n_xml, - @buf_i18n_xml_unmarked, - @buf_i18n_ini, - @buf_potfiles, - @buf_potfiles_ignore, - @buf_allfiles, - @buf_allfiles_sorted, - @buf_potfiles_sorted, - @buf_potfiles_ignore_sorted - ); - - ## Search and find all translatable files - find sub { - push @buf_i18n_plain, "$File::Find::name" if /\.($buildin_gettext_support)$/; - push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/; - push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/; - push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/; - }, ".."; - find sub { - push @buf_i18n_plain, "$File::Find::name" if /\.($buildin_gettext_support)$/; - push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/; - push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/; - push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/; - }, "$SRCDIR/.." if "$SRCDIR" ne "."; - - open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n"; - @buf_potfiles = grep !/^(#|\s*$)/, ; - close POTFILES; - - foreach (@buf_potfiles) { - s/^\[.*]\s*//; - } - - print "Searching for missing translatable files...\n" if $VERBOSE; - - ## Check if we should ignore some found files, when - ## comparing with POTFILES.in - foreach my $ignore ("POTFILES.skip", "POTFILES.ignore") - { - (-s "$SRCDIR/$ignore") or next; - - if ("$ignore" eq "POTFILES.ignore") - { - print "The usage of POTFILES.ignore is deprecated. Please consider moving the\n". - "content of this file to POTFILES.skip.\n"; - } - - print "Found $ignore: Ignoring files...\n" if $VERBOSE; - open FILE, "<$SRCDIR/$ignore" or die "ERROR: Failed to open $SRCDIR/$ignore!\n"; - - while () - { - push @buf_potfiles_ignore, $_ unless /^(#|\s*$)/; - } - close FILE; - - @buf_potfiles_ignore_sorted = sort (@buf_potfiles_ignore); - } - - foreach my $file (@buf_i18n_plain) - { - my $in_comment = 0; - my $in_macro = 0; - - open FILE, "<$file"; - while () - { - # Handle continued multi-line comment. - if ($in_comment) - { - next unless s-.*\*/--; - $in_comment = 0; - } - - # Handle continued macro. - if ($in_macro) - { - $in_macro = 0 unless /\\$/; - next; - } - - # Handle start of macro (or any preprocessor directive). - if (/^\s*\#/) - { - $in_macro = 1 if /^([^\\]|\\.)*\\$/; - next; - } - - # Handle comments and quoted text. - while (m-(/\*|//|\'|\")-) # \' and \" keep emacs perl mode happy - { - my $match = $1; - if ($match eq "/*") - { - if (!s-/\*.*?\*/--) - { - s-/\*.*--; - $in_comment = 1; - } - } - elsif ($match eq "//") - { - s-//.*--; - } - else # ' or " - { - if (!s-$match([^\\]|\\.)*?$match-QUOTEDTEXT-) - { - warn "mismatched quotes at line $. in $file\n"; - s-$match.*--; - } - } - } - - if (/\w\.GetString *\(QUOTEDTEXT/) - { - if (defined isNotValidMissing (unpack("x3 A*", $file))) { - ## Remove the first 3 chars and add newline - push @buf_allfiles, unpack("x3 A*", $file) . "\n"; - } - last; - } - - ## C_ N_ Q_ and _ are the macros defined in gi8n.h - if (/[CNQ]?_ *\(QUOTEDTEXT/) - { - if (defined isNotValidMissing (unpack("x3 A*", $file))) { - ## Remove the first 3 chars and add newline - push @buf_allfiles, unpack("x3 A*", $file) . "\n"; - } - last; - } - } - close FILE; - } - - foreach my $file (@buf_i18n_xml) - { - open FILE, "<$file"; - - while () - { - # FIXME: share the pattern matching code with intltool-extract - if (/\s_[-A-Za-z0-9._:]+\s*=\s*\"([^"]+)\"/ || /<_[^>]+>/ || /translatable=\"yes\"/) - { - if (defined isNotValidMissing (unpack("x3 A*", $file))) { - push @buf_allfiles, unpack("x3 A*", $file) . "\n"; - } - last; - } - } - close FILE; - } - - foreach my $file (@buf_i18n_ini) - { - open FILE, "<$file"; - while () - { - if (/_(.*)=/) - { - if (defined isNotValidMissing (unpack("x3 A*", $file))) { - push @buf_allfiles, unpack("x3 A*", $file) . "\n"; - } - last; - } - } - close FILE; - } - - foreach my $file (@buf_i18n_xml_unmarked) - { - if (defined isNotValidMissing (unpack("x3 A*", $file))) { - push @buf_allfiles, unpack("x3 A*", $file) . "\n"; - } - } - - - @buf_allfiles_sorted = sort (@buf_allfiles); - @buf_potfiles_sorted = sort (@buf_potfiles); - - my %in2; - foreach (@buf_potfiles_sorted) - { - s#^$SRCDIR/../##; - s#^$SRCDIR/##; - $in2{$_} = 1; - } - - foreach (@buf_potfiles_ignore_sorted) - { - s#^$SRCDIR/../##; - s#^$SRCDIR/##; - $in2{$_} = 1; - } - - my @result; - - foreach (@buf_allfiles_sorted) - { - my $dummy = $_; - my $srcdir = $SRCDIR; - - $srcdir =~ s#^../##; - $dummy =~ s#^$srcdir/../##; - $dummy =~ s#^$srcdir/##; - $dummy =~ s#_build/##; - if (!exists($in2{$dummy})) - { - push @result, $dummy - } - } - - my @buf_potfiles_notexist; - - foreach (@buf_potfiles_sorted) - { - chomp (my $dummy = $_); - if ("$dummy" ne "" and !(-f "$SRCDIR/../$dummy" or -f "../$dummy")) - { - push @buf_potfiles_notexist, $_; - } - } - - ## Save file with information about the files missing - ## if any, and give information about this procedure. - if (@result + @buf_potfiles_notexist > 0) - { - if (@result) - { - print "\n" if $VERBOSE; - unlink "missing"; - open OUT, ">missing"; - print OUT @result; - close OUT; - warn "\e[1mThe following files contain translations and are currently not in use. Please\e[0m\n". - "\e[1mconsider adding these to the POTFILES.in file, located in the po/ directory.\e[0m\n\n"; - print STDERR @result, "\n"; - warn "If some of these files are left out on purpose then please add them to\n". - "POTFILES.skip instead of POTFILES.in. A file \e[1m'missing'\e[0m containing this list\n". - "of left out files has been written in the current directory.\n"; - } - if (@buf_potfiles_notexist) - { - unlink "notexist"; - open OUT, ">notexist"; - print OUT @buf_potfiles_notexist; - close OUT; - warn "\n" if ($VERBOSE or @result); - warn "\e[1mThe following files do not exist anymore:\e[0m\n\n"; - warn @buf_potfiles_notexist, "\n"; - warn "Please remove them from POTFILES.in. A file \e[1m'notexist'\e[0m\n". - "containing this list of absent files has been written in the current directory.\n"; - } - } - - ## If there is nothing to complain about, notify the user - else { - print "\nAll files containing translations are present in POTFILES.in.\n" if $VERBOSE; - } -} - -sub Console_WriteError_InvalidOption -{ - ## Handle invalid arguments - print STDERR "Try `${PROGRAM} --help' for more information.\n"; - exit 1; -} - -sub isProgramInPath -{ - my ($file) = @_; - # If either a file exists, or when run it returns 0 exit status - return 1 if ((-x $file) or (system("$file --version >$devnull") == 0)); - return 0; -} - -sub isGNUGettextTool -{ - my ($file) = @_; - # Check that we are using GNU gettext tools - if (isProgramInPath ($file)) - { - my $version = `$file --version`; - return 1 if ($version =~ m/.*\(GNU .*\).*/); - } - return 0; -} - -sub GenerateHeaders -{ - my $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} || "intltool-extract"; - - ## Generate the .h header files, so we can allow glade and - ## xml translation support - if (! isProgramInPath ("$EXTRACT")) - { - print STDERR "\n *** The intltool-extract script wasn't found!" - ."\n *** Without it, intltool-update can not generate files.\n"; - exit; - } - else - { - open (FILE, $POTFILES_in) or die "$PROGRAM: POTFILES.in not found.\n"; - - while () - { - chomp; - next if /^\[\s*encoding/; - - ## Find xml files in POTFILES.in and generate the - ## files with help from the extract script - - my $gettext_type= &POFile_DetermineType ($1); - - if (/\.($xml_support|$ini_support)$/ || /^\[/) - { - s/^\[[^\[].*]\s*//; - - my $filename = "../$_"; - - if ($VERBOSE) - { - system ($EXTRACT, "--update", "--srcdir=$SRCDIR", - "--type=$gettext_type", $filename); - } - else - { - system ($EXTRACT, "--update", "--type=$gettext_type", - "--srcdir=$SRCDIR", "--quiet", $filename); - } - } - } - close FILE; - } -} - -# -# Generate .pot file from POTFILES.in -# -sub GeneratePOTemplate -{ - my $XGETTEXT = $ENV{"XGETTEXT"} || "xgettext"; - my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || ''; - chomp $XGETTEXT; - - if (! isGNUGettextTool ("$XGETTEXT")) - { - print STDERR " *** GNU xgettext is not found on this system!\n". - " *** Without it, intltool-update can not extract strings.\n"; - exit; - } - - print "Building $MODULE.pot...\n" if $VERBOSE; - - open INFILE, $POTFILES_in; - unlink "POTFILES.in.temp"; - open OUTFILE, ">POTFILES.in.temp" or die("Cannot open POTFILES.in.temp for writing"); - - my $gettext_support_nonascii = 0; - - # checks for GNU gettext >= 0.12 - my $dummy = `$XGETTEXT --version --from-code=UTF-8 >$devnull 2>$devnull`; - if ($? == 0) - { - $gettext_support_nonascii = 1; - } - else - { - # urge everybody to upgrade gettext - print STDERR "WARNING: This version of gettext does not support extracting non-ASCII\n". - " strings. That means you should install a version of gettext\n". - " that supports non-ASCII strings (such as GNU gettext >= 0.12),\n". - " or have to let non-ASCII strings untranslated. (If there is any)\n"; - } - - my $encoding = "ASCII"; - my $forced_gettext_code; - my @temp_headers; - my $encoding_problem_is_reported = 0; - - while () - { - next if (/^#/ or /^\s*$/); - - chomp; - - my $gettext_code; - - if (/^\[\s*encoding:\s*(.*)\s*\]/) - { - $forced_gettext_code=$1; - } - elsif (/\.($xml_support|$ini_support)$/ || /^\[/) - { - s/^\[.*]\s*//; - print OUTFILE "../$_.h\n"; - push @temp_headers, "../$_.h"; - $gettext_code = &TextFile_DetermineEncoding ("../$_.h") if ($gettext_support_nonascii and not defined $forced_gettext_code); - } - else - { - print OUTFILE "$SRCDIR/../$_\n"; - $gettext_code = &TextFile_DetermineEncoding ("$SRCDIR/../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code); - } - - next if (! $gettext_support_nonascii); - - if (defined $forced_gettext_code) - { - $encoding=$forced_gettext_code; - } - elsif (defined $gettext_code and "$encoding" ne "$gettext_code") - { - if ($encoding eq "ASCII") - { - $encoding=$gettext_code; - } - elsif ($gettext_code ne "ASCII") - { - # Only report once because the message is quite long - if (! $encoding_problem_is_reported) - { - print STDERR "WARNING: You should use the same file encoding for all your project files,\n". - " but $PROGRAM thinks that most of the source files are in\n". - " $encoding encoding, while \"$_\" is (likely) in\n". - " $gettext_code encoding. If you are sure that all translatable strings\n". - " are in same encoding (say UTF-8), please \e[1m*prepend*\e[0m the following\n". - " line to POTFILES.in:\n\n". - " [encoding: UTF-8]\n\n". - " and make sure that configure.in/ac checks for $PACKAGE >= 0.27 .\n". - "(such warning message will only be reported once.)\n"; - $encoding_problem_is_reported = 1; - } - } - } - } - - close OUTFILE; - close INFILE; - - unlink "$MODULE.pot"; - my @xgettext_argument=("$XGETTEXT", - "--add-comments", - "--directory\=.", - "--default-domain\=$MODULE", - "--flag\=g_strdup_printf:1:c-format", - "--flag\=g_string_printf:2:c-format", - "--flag\=g_string_append_printf:2:c-format", - "--flag\=g_error_new:3:c-format", - "--flag\=g_set_error:4:c-format", - "--flag\=g_markup_printf_escaped:1:c-format", - "--flag\=g_log:3:c-format", - "--flag\=g_print:1:c-format", - "--flag\=g_printerr:1:c-format", - "--flag\=g_printf:1:c-format", - "--flag\=g_fprintf:2:c-format", - "--flag\=g_sprintf:2:c-format", - "--flag\=g_snprintf:3:c-format", - "--flag\=g_scanner_error:2:c-format", - "--flag\=g_scanner_warn:2:c-format", - "--output\=$MODULE\.pot", - "--files-from\=\.\/POTFILES\.in\.temp"); - my $XGETTEXT_KEYWORDS = &FindPOTKeywords; - push @xgettext_argument, $XGETTEXT_KEYWORDS; - my $MSGID_BUGS_ADDRESS = &FindMakevarsBugAddress; - push @xgettext_argument, "--msgid-bugs-address\=\"$MSGID_BUGS_ADDRESS\"" if $MSGID_BUGS_ADDRESS; - push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii); - push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS; - my $xgettext_command = join ' ', @xgettext_argument; - - # intercept xgettext error message - print "Running $xgettext_command\n" if $VERBOSE; - my $xgettext_error_msg = `$xgettext_command 2>\&1`; - my $command_failed = $?; - - unlink "POTFILES.in.temp"; - - print "Removing generated header (.h) files..." if $VERBOSE; - unlink foreach (@temp_headers); - print "done.\n" if $VERBOSE; - - if (! $command_failed) - { - if (! -e "$MODULE.pot") - { - print "None of the files in POTFILES.in contain strings marked for translation.\n" if $VERBOSE; - } - else - { - print "Wrote $MODULE.pot\n" if $VERBOSE; - } - } - else - { - if ($xgettext_error_msg =~ /--from-code/) - { - # replace non-ASCII error message with a more useful one. - print STDERR "ERROR: xgettext failed to generate PO template file because there is non-ASCII\n". - " string marked for translation. Please make sure that all strings marked\n". - " for translation are in uniform encoding (say UTF-8), then \e[1m*prepend*\e[0m the\n". - " following line to POTFILES.in and rerun $PROGRAM:\n\n". - " [encoding: UTF-8]\n\n"; - } - else - { - print STDERR "$xgettext_error_msg"; - if (-e "$MODULE.pot") - { - # is this possible? - print STDERR "ERROR: xgettext failed but still managed to generate PO template file.\n". - " Please consult error message above if there is any.\n"; - } - else - { - print STDERR "ERROR: xgettext failed to generate PO template file. Please consult\n". - " error message above if there is any.\n"; - } - } - exit (1); - } -} - -sub POFile_Update -{ - -f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n"; - - my $MSGMERGE = $ENV{"MSGMERGE"} || "msgmerge"; - my ($lang, $outfile) = @_; - - if (! isGNUGettextTool ("$MSGMERGE")) - { - print STDERR " *** GNU msgmerge is not found on this system!\n". - " *** Without it, intltool-update can not extract strings.\n"; - exit; - } - - print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE; - - my $infile = "$SRCDIR/$lang.po"; - $outfile = "$SRCDIR/$lang.po" if ($outfile eq ""); - - # I think msgmerge won't overwrite old file if merge is not successful - system ("$MSGMERGE", "-o", $outfile, $infile, "$MODULE.pot"); -} - -sub Console_WriteError_NotExisting -{ - my ($file) = @_; - - ## Report error if supplied language file is non-existing - print STDERR "$PROGRAM: $file does not exist!\n"; - print STDERR "Try '$PROGRAM --help' for more information.\n"; - exit; -} - -sub GatherPOFiles -{ - my @po_files = glob ("./*.po"); - - @languages = map (&POFile_GetLanguage, @po_files); - - foreach my $lang (@languages) - { - $po_files_by_lang{$lang} = shift (@po_files); - } -} - -sub POFile_GetLanguage ($) -{ - s/^(.*\/)?(.+)\.po$/$2/; - return $_; -} - -sub Console_Write_TranslationStatus -{ - my ($lang, $output_file) = @_; - my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt"; - - if (! isGNUGettextTool ("$MSGFMT")) - { - print STDERR " *** GNU msgfmt is not found on this system!\n". - " *** Without it, intltool-update can not extract strings.\n"; - exit; - } - - $output_file = "$SRCDIR/$lang.po" if ($output_file eq ""); - - system ("$MSGFMT", "-o", "$devnull", "--verbose", $output_file); -} - -sub Console_Write_CoverageReport -{ - my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt"; - - if (! isGNUGettextTool ("$MSGFMT")) - { - print STDERR " *** GNU msgfmt is not found on this system!\n". - " *** Without it, intltool-update can not extract strings.\n"; - exit; - } - - &GatherPOFiles; - - foreach my $lang (@languages) - { - print STDERR "$lang: "; - &POFile_Update ($lang, ""); - } - - print STDERR "\n\n * Current translation support in $MODULE \n\n"; - - foreach my $lang (@languages) - { - print STDERR "$lang: "; - system ("$MSGFMT", "-o", "$devnull", "--verbose", "$SRCDIR/$lang.po"); - } -} - -sub SubstituteVariable -{ - my ($str) = @_; - - # always need to rewind file whenever it has been accessed - seek (CONF, 0, 0); - - # cache each variable. varhash is global to we can add - # variables elsewhere. - while () - { - if (/^(\w+)=(.*)$/) - { - ($varhash{$1} = $2) =~ s/^["'](.*)["']$/$1/; - } - } - - if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/) - { - my $rest = $3; - my $untouched = $1; - my $sub = ""; - # Ignore recursive definitions of variables - $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/; - - return SubstituteVariable ("$untouched$sub$rest"); - } - - # We're using Perl backticks ` and "echo -n" here in order to - # expand any shell escapes (such as backticks themselves) in every variable - return echo_n ($str); -} - -sub CONF_Handle_Open -{ - my $base_dirname = getcwd(); - $base_dirname =~ s@.*/@@; - - my ($conf_in, $src_dir); - - if ($base_dirname =~ /^po(-.+)?$/) - { - if (-f "Makevars") - { - my $makefile_source; - - local (*IN); - open (IN, ") - { - if (/^top_builddir[ \t]*=/) - { - $src_dir = $_; - $src_dir =~ s/^top_builddir[ \t]*=[ \t]*([^ \t\n\r]*)/$1/; - - chomp $src_dir; - if (-f "$src_dir" . "/configure.ac") { - $conf_in = "$src_dir" . "/configure.ac" . "\n"; - } else { - $conf_in = "$src_dir" . "/configure.in" . "\n"; - } - last; - } - } - close IN; - - $conf_in || die "Cannot find top_builddir in Makevars."; - } - elsif (-f "$SRCDIR/../configure.ac") - { - $conf_in = "$SRCDIR/../configure.ac"; - } - elsif (-f "$SRCDIR/../configure.in") - { - $conf_in = "$SRCDIR/../configure.in"; - } - else - { - my $makefile_source; - - local (*IN); - open (IN, ") - { - if (/^top_srcdir[ \t]*=/) - { - $src_dir = $_; - $src_dir =~ s/^top_srcdir[ \t]*=[ \t]*([^ \t\n\r]*)/$1/; - - chomp $src_dir; - $conf_in = "$src_dir" . "/configure.in" . "\n"; - - last; - } - } - close IN; - - $conf_in || die "Cannot find top_srcdir in Makefile."; - } - - open (CONF, "<$conf_in"); - } - else - { - print STDERR "$PROGRAM: Unable to proceed.\n" . - "Make sure to run this script inside the po directory.\n"; - exit; - } -} - -sub FindPackageName -{ - my $version; - my $domain = &FindMakevarsDomain; - my $name = $domain || "untitled"; - - &CONF_Handle_Open; - - my $conf_source; { - local (*IN); - open (IN, "<&CONF") || return $name; - seek (IN, 0, 0); - local $/; # slurp mode - $conf_source = ; - close IN; - } - - # priority for getting package name: - # 1. GETTEXT_PACKAGE - # 2. first argument of AC_INIT (with >= 2 arguments) - # 3. first argument of AM_INIT_AUTOMAKE (with >= 2 argument) - - # /^AM_INIT_AUTOMAKE\([\s\[]*([^,\)\s\]]+)/m - # the \s makes this not work, why? - if ($conf_source =~ /^AM_INIT_AUTOMAKE\(([^,\)]+),([^,\)]+)/m) - { - ($name, $version) = ($1, $2); - $name =~ s/[\[\]\s]//g; - $version =~ s/[\[\]\s]//g; - $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); - $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); - $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); - $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); - } - - if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)/m) - { - ($name, $version) = ($1, $2); - $name =~ s/[\[\]\s]//g; - $version =~ s/[\[\]\s]//g; - $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); - $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); - $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); - $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); - } - - # \s makes this not work, why? - $name = $1 if $conf_source =~ /^GETTEXT_PACKAGE=\[?([^\n\]]+)/m; - - # m4 macros AC_PACKAGE_NAME, AC_PACKAGE_VERSION etc. have same value - # as corresponding $PACKAGE_NAME, $PACKAGE_VERSION etc. shell variables. - $name =~ s/\bAC_PACKAGE_/\$PACKAGE_/g; - - $name = $domain if $domain; - - $name = SubstituteVariable ($name); - $name =~ s/^["'](.*)["']$/$1/; - - return $name if $name; -} - - -sub FindPOTKeywords -{ - - my $keywords = "--keyword\=\_ --keyword\=N\_ --keyword\=U\_ --keyword\=Q\_"; - my $varname = "XGETTEXT_OPTIONS"; - my $make_source; { - local (*IN); - open (IN, "; - close IN; - } - - # unwrap lines split with a trailing \ - $make_source =~ s/\\ $ \n/ /mxg; - $keywords = $1 if $make_source =~ /^$varname[ ]*=\[?([^\n\]]+)/m; - - return $keywords; -} - -sub FindMakevarsDomain -{ - - my $domain = ""; - my $makevars_source; { - local (*IN); - open (IN, "; - close IN; - } - - $domain = $1 if $makevars_source =~ /^DOMAIN[ ]*=\[?([^\n\]\$]+)/m; - $domain =~ s/^\s+//; - $domain =~ s/\s+$//; - - return $domain; -} - -sub FindMakevarsBugAddress -{ - - my $address = ""; - my $makevars_source; { - local (*IN); - open (IN, "; - close IN; - } - - $address = $1 if $makevars_source =~ /^MSGID_BUGS_ADDRESS[ ]*=\[?([^\n\]\$]+)/m; - $address =~ s/^\s+//; - $address =~ s/\s+$//; - - return $address; -} diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/Makefile.in /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/Makefile.in --- synaptic-0.62.1ubuntu2~ppa1/Makefile.in 2008-06-17 08:58:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/Makefile.in 2008-10-21 18:34:04.000000000 +0100 @@ -140,8 +140,6 @@ LIBEPT_LIBS = @LIBEPT_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -LIBTAGCOLL_CFLAGS = @LIBTAGCOLL_CFLAGS@ -LIBTAGCOLL_LIBS = @LIBTAGCOLL_LIBS@ LP_CFLAGS = @LP_CFLAGS@ LP_LIBS = @LP_LIBS@ LTLIBOBJS = @LTLIBOBJS@ diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/man/Makefile.in /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/man/Makefile.in --- synaptic-0.62.1ubuntu2~ppa1/man/Makefile.in 2008-06-17 08:58:30.000000000 +0100 +++ synaptic-0.62.1ubuntu10/man/Makefile.in 2008-10-21 18:34:04.000000000 +0100 @@ -115,8 +115,6 @@ LIBEPT_LIBS = @LIBEPT_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -LIBTAGCOLL_CFLAGS = @LIBTAGCOLL_CFLAGS@ -LIBTAGCOLL_LIBS = @LIBTAGCOLL_LIBS@ LP_CFLAGS = @LP_CFLAGS@ LP_LIBS = @LP_LIBS@ LTLIBOBJS = @LTLIBOBJS@ diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/pixmaps/hicolor/16x16/Makefile.in /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/pixmaps/hicolor/16x16/Makefile.in --- synaptic-0.62.1ubuntu2~ppa1/pixmaps/hicolor/16x16/Makefile.in 2008-06-17 08:58:30.000000000 +0100 +++ synaptic-0.62.1ubuntu10/pixmaps/hicolor/16x16/Makefile.in 2008-10-21 18:34:04.000000000 +0100 @@ -121,8 +121,6 @@ LIBEPT_LIBS = @LIBEPT_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -LIBTAGCOLL_CFLAGS = @LIBTAGCOLL_CFLAGS@ -LIBTAGCOLL_LIBS = @LIBTAGCOLL_LIBS@ LP_CFLAGS = @LP_CFLAGS@ LP_LIBS = @LP_LIBS@ LTLIBOBJS = @LTLIBOBJS@ diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/pixmaps/hicolor/24x24/Makefile.in /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/pixmaps/hicolor/24x24/Makefile.in --- synaptic-0.62.1ubuntu2~ppa1/pixmaps/hicolor/24x24/Makefile.in 2008-06-17 08:58:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/pixmaps/hicolor/24x24/Makefile.in 2008-10-21 18:34:04.000000000 +0100 @@ -121,8 +121,6 @@ LIBEPT_LIBS = @LIBEPT_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -LIBTAGCOLL_CFLAGS = @LIBTAGCOLL_CFLAGS@ -LIBTAGCOLL_LIBS = @LIBTAGCOLL_LIBS@ LP_CFLAGS = @LP_CFLAGS@ LP_LIBS = @LP_LIBS@ LTLIBOBJS = @LTLIBOBJS@ diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/pixmaps/hicolor/Makefile.in /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/pixmaps/hicolor/Makefile.in --- synaptic-0.62.1ubuntu2~ppa1/pixmaps/hicolor/Makefile.in 2008-06-17 08:58:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/pixmaps/hicolor/Makefile.in 2008-10-21 18:34:04.000000000 +0100 @@ -123,8 +123,6 @@ LIBEPT_LIBS = @LIBEPT_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -LIBTAGCOLL_CFLAGS = @LIBTAGCOLL_CFLAGS@ -LIBTAGCOLL_LIBS = @LIBTAGCOLL_LIBS@ LP_CFLAGS = @LP_CFLAGS@ LP_LIBS = @LP_LIBS@ LTLIBOBJS = @LTLIBOBJS@ diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/pixmaps/Makefile.in /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/pixmaps/Makefile.in --- synaptic-0.62.1ubuntu2~ppa1/pixmaps/Makefile.in 2008-06-17 08:58:30.000000000 +0100 +++ synaptic-0.62.1ubuntu10/pixmaps/Makefile.in 2008-10-21 18:34:04.000000000 +0100 @@ -141,8 +141,6 @@ LIBEPT_LIBS = @LIBEPT_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -LIBTAGCOLL_CFLAGS = @LIBTAGCOLL_CFLAGS@ -LIBTAGCOLL_LIBS = @LIBTAGCOLL_LIBS@ LP_CFLAGS = @LP_CFLAGS@ LP_LIBS = @LP_LIBS@ LTLIBOBJS = @LTLIBOBJS@ diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/pixmaps/synaptic.xpm /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/pixmaps/synaptic.xpm --- synaptic-0.62.1ubuntu2~ppa1/pixmaps/synaptic.xpm 2008-06-12 14:45:40.000000000 +0100 +++ synaptic-0.62.1ubuntu10/pixmaps/synaptic.xpm 2008-08-19 20:59:27.000000000 +0100 @@ -1,5 +1,5 @@ /* XPM */ -static char * synaptic_xpm[] = { +static const char * synaptic_xpm[] = { "48 48 809 2", " c None", ". c #F3F3F3", diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/ar.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/ar.po --- synaptic-0.62.1ubuntu2~ppa1/po/ar.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/ar.po 2008-08-19 20:59:27.000000000 +0100 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: synaptic-ar\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2005-09-06 00:29+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" @@ -918,9 +918,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "لا يمكن قراءة %s" @@ -1137,36 +1137,49 @@ msgid "Applying Changes" msgstr "تطبيق التغييرات" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"إزالة هذه الحزمة يجعل النظام غير قابل للاستخدام.\n" +"هل أنت متأكد من عمل ذلك؟" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "خطأ في الحزمة %s" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "تم تطبيق التغييرات" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." msgstr "" "يتم الآن تطبيق التغييرات المحددة. قد يستغرق هذا بعض الوقت. الرجاء الانتظار." -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "تثبيت وإزالة البرامج" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "إزالة البرامج" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "تثبيت البرامج" @@ -1552,37 +1565,37 @@ msgid "%s Changelog" msgstr "سجل تغييرات %s" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "هل تريد إضافة قرص مدمج آخر؟" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "افتح التغييرات" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "لا يمكن كتابة %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 #, fuzzy msgid "Save changes" msgstr "افتح التغييرات" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "احفظ الحالة بالكامل، ليس التغييرات فقط" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "المستودعات تغيرت" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" @@ -1590,20 +1603,20 @@ "لقد تغيرت معلومات المستودعات. عليك بالضغط على زر \"إعادة التحميل\" كي يسري " "مفعول تغييراتك" -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "عدم عرض هذه الرسالة مجدداً" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "عثر على %i حزمة" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "تشغيل مستعرض المساعدة..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1621,7 +1634,7 @@ "بدلاً من ذلك يمكن فتح صفحة دليل man باستخدام 'man synaptic' من سطر الأوامر أو " "عرض نسخة html الموجودة في المجلد 'synaptic/html'." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1629,22 +1642,22 @@ "تعذر تشغيل أداة التهيئة!\n" "يجب تثبيت الحزمة المطلوبة 'libgnome2-perl'." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "تشغيل أداة تهيئة الحزم..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "تشغيل مستعرض وثائق الحزم..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" msgstr "يجب تثبيت الحزمة \"dwww\" لاستعراض وثائق أي حزمة" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1652,44 +1665,44 @@ "تعذر تطبيق التغييرات!\n" "يجب إصلاح الحزم المعطوبة أولاً." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "تطبيق التغييرات المحددة. قد يستغرق هذا بعض الوقت..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "تنزيل ملفات الحزم" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "هل تريد الخروج من Synaptic؟" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "تنزيل معلومات الحزم" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." msgstr "" "سيتم التحقق من المستودعات لوجود أية حزم برامج جديدة، أو مُزالة أو مرقاة." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "إعادة تحميل معلومات الحزم..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "تعذر حلّ مشاكل المعتمدات!" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "تم إصلاح مشاكل المعتمدات بنجاح" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1697,29 +1710,29 @@ "تعذرت ترقية النظام!\n" "يجب إصلاح الحزم المعطوبة أولاً." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "تحديد جميع الترقيات المتوفرة..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "تم تحديد الترقيات المتوفرة بنجاح" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "تعذر تحديد جميع الترقيات المتوفرة!" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "الوصف" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "البحث في السجل" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 msgid "Please select a directory" msgstr "" @@ -2443,7 +2456,8 @@ msgstr "_بحث" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "إظهار تقدّم الملفات المفردة" #: ../gtk/glade/window_changes.glade.h:1 @@ -2597,7 +2611,6 @@ msgstr "اعتبار الحزم المستحسنة كمعتمدات" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "الترقية الافتراضية" @@ -2743,7 +2756,6 @@ msgstr "إظهار خصائص الحزمة في النافذة الرئيسية" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "الترقية الذكية" @@ -3352,14 +3364,24 @@ "\n" "ملاحظة: سيتم فقط تحديد الترقيات. يجب تطبيقها بعد ذلك." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "تذكر جوابي للترقيات المستقبلية" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "يمكن تغيير هذا التصرّف في التفضيلات لاحقاً." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "الترقية الافتراضية" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "الترقية الذكية" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "ثبّت، أزل وحدّث حزم البرامج" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/be@latin.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/be@latin.po --- synaptic-0.62.1ubuntu2~ppa1/po/be@latin.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/be@latin.po 2008-08-19 20:59:27.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: synaptic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2004-12-31 11:37+0200\n" "Last-Translator: Ihar Hrachyshka \n" "Language-Team: Belarusian Latin \n" @@ -923,9 +923,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "Niemahčyma pračytać %s" @@ -1145,21 +1145,34 @@ msgid "Applying Changes" msgstr "Prymianieńnie źmienaŭ" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"Paśla vydaleńnia hetaha pakunku systema moža stać niepracoŭnaj.\n" +"Ty sapraŭdy chočaš zrabić heta?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "Pamyłka ŭ pakunku %s" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "Źmieny prymienienyja" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." @@ -1167,15 +1180,15 @@ "Ciapier prymianiajucca paznačanyja źmieny. Heta moža zaniać peŭny čas. Kali " "łaska, pačakaj." -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "Instalacyja j vydaleńnie prahramaŭ" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "Vydaleńnie prahramaŭ" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "Instalacyja prahramaŭ" @@ -1556,37 +1569,37 @@ msgid "%s Changelog" msgstr "Časopis źmienaŭ dla %s" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Chočaš dadać inšy CD-ROM?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Pakažy źmieny" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "Niemahčyma zapisać %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 #, fuzzy msgid "Save changes" msgstr "Pakažy źmieny" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Zachoŭvaj uvieś stan, a nia tolki źmieny" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "Schoviščy źmianilisia" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" @@ -1594,20 +1607,20 @@ "Źviestki ab schoviščy źmianilisia. Kab prymianić źmieny, naciśni knopku " "\"Pieračytaj\"" -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "Nikoli bolš nie pakazvaj hetaha paviedamleńnia" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "Znojdziena %i pakunkaŭ" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "Uruchamleńnie prahladalnika dapamohi..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1626,7 +1639,7 @@ "prahladzieć versiju ŭ farmacie HTML, jakaja znachodzicca ŭ katalohu " "\"synaptic/html\"." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1634,22 +1647,22 @@ "Niemahčyma ŭklučyć pryładu kanfihuravańnia!\n" "Treba zainstalavać pakunak \"libgnome2-perl\"." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "Uklučeńnie pryłady dziela kanfihuravańnia pakunkaŭ..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "Uklučeńnie prahladalnika dakumentacyi pakunkaŭ..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" msgstr "Kab hartać dakumentacyju pakunka, treba zainstalavać pakunak \"dwww\"" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1657,25 +1670,25 @@ "Niemahčyma prymianić źmieny!\n" "Śpiarša vypraŭ papsavanyja pakunki." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "Prymianieńnie paznačanych źmienaŭ. Heta moža zaniać peŭny čas..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "Zahruzka fajłaŭ pakunkaŭ" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Chočaš vyjści z Synaptica?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "Zahruzka źviestak ab pakunku" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." @@ -1683,19 +1696,19 @@ "Schoviščy buduć pravieranyja na najaŭnaść novych, vydalenych ci " "aktualniejšych prahramnych pakunkaŭ." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "Pieračytvańnie źviestak pakunkaŭ..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "Niaŭdałaje raźviazańnie prablemaŭ zaležnaściaŭ!" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "Prablemy zaležnaściaŭ paśpiachova raźviazanyja" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1703,29 +1716,29 @@ "Niemahčyma aktualizavać systemu!\n" "Śpiarša vypraŭ papsavanyja pakunki." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "Paznačeńnie ŭsich mahčymych aktualizacyjaŭ..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "Usie mahčymyja aktualizacyi paśpiachova paznačanyja" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "Niaŭdałaje paznačeńnie mahčymych aktualizacyjaŭ!" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "Apisańnie" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "Historyja pošuku" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 msgid "Please select a directory" msgstr "" @@ -2447,7 +2460,8 @@ msgstr "_Šukaj" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "Pakazvaj prahres dla asobnych fajłaŭ" #: ../gtk/glade/window_changes.glade.h:1 @@ -2604,7 +2618,6 @@ msgstr "Ličy rekamendavanyja pakunki zaležnaściami" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Zmoŭčanaja aktualizacyja" @@ -2753,7 +2766,6 @@ msgstr "Pakazvaj ułaścivaści pakunku ŭ hałoŭnym aknie" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Razumnaja aktualizacyja" @@ -3385,14 +3397,24 @@ "Zaciem: Aktualizacyi buduć tolki paznačanyja. Paśla ich treba jašče " "prymianić." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "Zapomni moj adkaz dla budučych aktualizacyj" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "Hetyja pavodziny možna źmianić paśla ŭ naładach." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Zmoŭčanaja aktualizacyja" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Razumnaja aktualizacyja" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Instaluj, vydalaj i aktualizuj prahramnyja pakunki" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/be.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/be.po --- synaptic-0.62.1ubuntu2~ppa1/po/be.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/be.po 2008-08-19 20:59:27.000000000 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: synaptic-be\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2004-12-31 11:37+0200\n" "Last-Translator: Vital Khilko \n" "Language-Team: Belarusian \n" @@ -921,9 +921,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "Немагчыма прачытаць %s" @@ -1130,37 +1130,50 @@ msgid "Applying Changes" msgstr "Ужываньне зьменаў" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"Выдаленьне гэтага пакету можа прывесьці сыстэму ў непрацоўны стан.\n" +"Вы сапраўды жадаеце гэта зрабіць?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, fuzzy, c-format msgid "Error in package %s" msgstr "Прапаноўвае пакеты" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 #, fuzzy msgid "Changes applied" msgstr "Зьмяніць выгляд: " -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." msgstr "" -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 #, fuzzy msgid "Installing and removing software" msgstr "Усталёўвае, выдаляе і абнаўляе пакеты" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 #, fuzzy msgid "Installing software" msgstr "Усталяваць прапанаванае" @@ -1548,29 +1561,29 @@ msgid "%s Changelog" msgstr "Часопіс зьменаў для %s" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Жадаеце дадаць іншы CD-ROM?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Адкрыць зьмены" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "Немагчыма запісаць %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 msgid "Save changes" msgstr "Захаваць зьмены" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Захаваць поўны стан (не толькі зьмены)" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 #, fuzzy msgid "Repositories changed" msgstr "Сховішчы" @@ -1578,26 +1591,26 @@ #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" msgstr "" -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "Маецца %i пакетаў" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "Запуск праглядальніку дапамогі..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 #, fuzzy msgid "" "No help viewer is installed!\n" @@ -1617,7 +1630,7 @@ "ці прагледзіць вэрсію ў фармаце html, якая знаходзіцца ў тэчцы 'synaptic/" "html'." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1625,22 +1638,22 @@ "Немагчыма выканаць праграму наладкі!\n" "Вы мусіце усталяваць пакет 'libgnome2-perl'." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "Выкананьне праграмы наладкі пакету..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "Выкананьне праглядальніку дакумэнтацыі пакету..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" msgstr "Вы мусіце усталяваць пакет \"dwww\" каб гартаць дакумэнтацыю пакету" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1648,25 +1661,25 @@ "Немагчыма ужыць зьмены!\n" "Сьпярша выпраўце сапсаваныя пакеты." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "Выконваюцца выбраныя зьмены. Гэта можа заняць пэўны час." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "Загрузка файлаў пакету" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Жадаеце выйсьці з Synaptic?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "Загрузка зьвестак аб пакеце" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." @@ -1674,19 +1687,19 @@ "Сховішча будзе праверана на наяўнасьць новых , выдаленых і абноўленых " "пакетаў." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "Перазагрузка зьвестак аб пакетах..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "Збой разьвязаньня праблемаў залежнасьцяў!" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "Праблемы залежнасьцяў пасьпяхова разьвязаныя" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1694,29 +1707,29 @@ "Немагчыма абнавіць сыстэму!\n" "Сьпярша выпраўце сапсаваныя пакеты." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "Пазначэньне усіх магчымых абнаўленьняў..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "Усе магчымыя абнаўленьні пасьпяхова пазначаны" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "Збой пазначэньня абнаўленьняў!" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "Апісаньне" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "Гісторыя пошуку" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 #, fuzzy msgid "Please select a directory" msgstr "Устаўце дыск ў прыладу." @@ -2441,7 +2454,8 @@ msgstr "_Пошук" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "Адлюстроўваць прагрэс асобных файлаў" #: ../gtk/glade/window_changes.glade.h:1 @@ -2599,7 +2613,6 @@ msgstr "Разглядаць рэкамэндаваныя пакеты як залежнасьці" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Дапомнае абнаўленьне" @@ -2751,7 +2764,6 @@ msgstr "Адлюстраваць уласьцівасьці пакету ў асноўным акне" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Разумнае абнаўленьне" @@ -3351,15 +3363,25 @@ "afterwards." msgstr "" -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 #, fuzzy msgid "Remember my answer for future upgrades" msgstr "Запомніць адказ для далейшых абнаўленьняў" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "Гэтыя паводзіны могуць быць зьмененыя пазьней у перавагах." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Дапомнае абнаўленьне" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Разумнае абнаўленьне" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Усталёўвае, выдаляе і абнаўляе пакеты" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/bg.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/bg.po --- synaptic-0.62.1ubuntu2~ppa1/po/bg.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/bg.po 2008-08-19 20:59:27.000000000 +0100 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: synaptic trunk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2005-10-21 16:23+0300\n" "Last-Translator: Yavor Doganov \n" "Language-Team: Bulgarian \n" @@ -923,9 +923,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "Не може да бъде прочетен %s" @@ -1145,21 +1145,34 @@ msgid "Applying Changes" msgstr "Прилагане на промените" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"Премахването на този пакет може де направи системата нестабилна.\n" +"Сигурни ли сте, че искате да направите това?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "Грешка в пакет %s" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "Промените са приложени" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." @@ -1167,15 +1180,15 @@ "В момента се прилагат отбелязаните промени. Това може да отнеме известно " "време, изчакайте." -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "Инсталиране и премахване на пакети" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "Премахване на пакети" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "Инсталиране на пакети" @@ -1558,37 +1571,37 @@ msgid "%s Changelog" msgstr "Дневник с промените на %s" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Искате ли да добавите друг CD-ROM?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Отваряне на промените" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "Не може да бъде запазен %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 #, fuzzy msgid "Save changes" msgstr "Отваряне на промените" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Запазване на пълното състояние, не само на промените" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "Хранилищата са променени" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" @@ -1596,20 +1609,20 @@ "Информацията за хранилищата е променена. Трябва да натиснете бутона " "„Презареждане“, за да имат ефект промените." -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "Това съобщение да не бъде показвано отново" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "Намерени са %i пакета" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "Стартиране на програмата за помощ..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1629,7 +1642,7 @@ "командния интерпретатор или да прегледате html версията, намираща се в " "папката „synaptic/html“." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1637,16 +1650,16 @@ "Инструментът за настройки не може да бъде стартиран!\n" "Трябва да инсталирате пакета „libgnome2-perl“." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "Стартиране на инструмента за настройки..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "Стартиране на пакета за преглед на документацията..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" @@ -1654,7 +1667,7 @@ "Трябва да инсталирате пакета „dwww“, за да разгледате документацията на " "даден пакет" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1662,44 +1675,44 @@ "Промените не могат да бъдат приложени!\n" "Първо трябва да поправите развалените пакети." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "Прилагане на избраните промени. Това може да отнеме известно време..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "Изтегляне на пакетите" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Искате ли да излезете от Synaptic?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "Изтегляне на информация за пакетите" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." msgstr "" "Хранилищата ще бъдат проверени за нови, премахнати или актуализирани пакети." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "Презареждане на информацията за пакетите..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "Неуспех при решаването на проблемите със зависимостите!" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "Проблемите със зависимостите са поправени успешно" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1707,29 +1720,29 @@ "Системата не може да бъде актуализирана!\n" "Първо поправете развалените пакети." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "Избиране на всички налични пакети за актуализиране..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "Всички налични актуализации са избрани успешно" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "Неуспех при избирането на всички налични пакети за актуализиране!" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "Описание" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "История на търсенето" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 #, fuzzy msgid "Please select a directory" msgstr "Поставете диск в устройството." @@ -2444,7 +2457,8 @@ msgstr "_Търсене" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "Показване прогреса на отделни файлове" #: ../gtk/glade/window_changes.glade.h:1 @@ -2600,7 +2614,6 @@ msgstr "Разглежда препоръчителните пакети като зависимости" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Стандартно актуализиране" @@ -2745,7 +2758,6 @@ msgstr "Показване на подробностите за пакетите в основния прозорец" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Интелигентно актуализиране" @@ -3375,15 +3387,25 @@ "Забележка: Пакетите за актуализиране само ще бъдат отбелязани. Трябва " "да приложите промените след това." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "Запомняне на този отговор за бъдещи актуализации" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "" "Това поведение може да бъде променено по-късно в настройките на програмата." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Стандартно актуализиране" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Интелигентно актуализиране" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Инсталиране, премахване и актуализиране на софтуерни пакети" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/ca.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/ca.po --- synaptic-0.62.1ubuntu2~ppa1/po/ca.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/ca.po 2008-08-19 20:59:27.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: synaptic 0.58\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2005-10-23 22:23+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -926,9 +926,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "No es pot llegir %s" @@ -1152,21 +1152,34 @@ msgid "Applying Changes" msgstr "S'estan aplicant els canvis" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"L'eliminació d'aquest paquet pot fer que el sistema siga inutilitzable.\n" +"Esteu segur que voleu fer això?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "S'ha trobat un error al paquet %s" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "S'han aplicat els canvis" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." @@ -1174,15 +1187,15 @@ "Ara s'estan aplicant els canvis marcats. Això pot trigar un temps. Si us " "plau, espereu." -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "S'està instal·lant i eliminant programari" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "S'està eliminant programari" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "S'està instal·lant programari" @@ -1568,36 +1581,36 @@ msgid "%s Changelog" msgstr "Registre de canvis del paquet %s" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Voleu afegir un altre CD-ROM" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Obre els canvis" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "No es pot escriure %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 msgid "Save changes" msgstr "Desa els canvis" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Desa l'estat sencer, no només els canvis" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "Han canviat els dipòsits" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" @@ -1605,20 +1618,20 @@ "Ha canviat la informació dels dipòsits. Heu de fer clic al botó «Refresca» " "per a que els vostres canvis tinguen efecte" -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "No mostres aquest missatge mai més" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "S'han trobat %i paquets" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "S'està iniciant el visualitzador d'ajuda..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1637,7 +1650,7 @@ "línia d'ordres o veure la versió en html ubicada en la carpeta «synaptic/" "html»." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1645,16 +1658,16 @@ "No s'ha pogut iniciar l'eina de configuració!\n" "Heu d'instal·lar el paquet requerit «libgnome2-perl»." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "S'està iniciant l'eina de configuració de paquets..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "S'està iniciant el visualitzador de la documentació del paquets..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" @@ -1662,7 +1675,7 @@ "Heu d'instal·lar el paquet «dwww» per a navegar per la documentació d'un " "paquet" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1670,25 +1683,25 @@ "No s'ha pogut aplicar els canvis!\n" "Corregiu els paquets trencats primer." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "S'estan aplicant els canvis marcats. Això pot trigar una mica..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "S'estan descarregant els fitxers de paquets" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Voleu sortir de Synaptic?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "S'esta descarregant la informació dels paquets" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." @@ -1696,19 +1709,19 @@ "Es comprovaran els dipòsits per a paquets de programari nous, eliminats o " "actualitzats." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "S'està refrescant la informació dels paquets..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "No s'han pogut resoldre els problemes de dependències!" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "S'han corregit amb èxit els problemes de dependències!" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1716,29 +1729,29 @@ "No s'ha pogut actualitzar el sistema!\n" "Corregiu els paquets trencats primer." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "S'estan marcant totes les actualitzacions disponibles..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "S'han marcat amb èxit les actualitzacions disponibles" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "No s'han pogut marcar totes les actualitzacions disponibles!" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "Descripció" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "Històric de la cerca" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 #, fuzzy msgid "Please select a directory" msgstr "Inseriu un disc en la unitat." @@ -2445,7 +2458,8 @@ msgstr "_Cerca" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "Mostra el progrés per als fitxers individuals" #: ../gtk/glade/window_changes.glade.h:1 @@ -2601,7 +2615,6 @@ msgstr "Considera els paquets recomanats com dependències" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Actualització normal" @@ -2749,7 +2762,6 @@ msgstr "Mostra les propietats del paquet a la finestra principal" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Actualització intel·ligent" @@ -3389,14 +3401,24 @@ "Nota: Les actualitzacions només es marcaran. Encara tindreu que " "aplicar-les més endavant." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "Recorda la resposta per a properes actualitzacions" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "Aquest comportament es pot canviar a les preferències més tard." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Actualització normal" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Actualització intel·ligent" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Instal·la, elimina i actualitza paquets de programari" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/cs.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/cs.po --- synaptic-0.62.1ubuntu2~ppa1/po/cs.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/cs.po 2008-08-19 20:59:27.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: synaptic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2008-04-02 15:51+0100\n" "Last-Translator: Kamil Páral \n" "Language-Team: cs \n" @@ -917,9 +917,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "Nemůžu číst %s" @@ -1139,37 +1139,50 @@ msgid "Applying Changes" msgstr "Realizuji změny" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"Odstraněním tohoto balíku můžete destabilizovat váš systém.\n" +"Opravdu tak chcete učinit?" + # depends, predepends etc #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "Chyba v balíku %s" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "Instalace balíku selhala. Zkouším zotavení:" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "Změny provedeny" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." msgstr "" "Vybrané změny jsou prováděny. Může to nějakou dobu trvat. Prosím čekejte." -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "Instaluji a odstraňuji software" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "Odstraňuji software" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "Instaluji software" @@ -1557,36 +1570,36 @@ msgid "%s Changelog" msgstr "Přehled změn pro %s" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Chcete přidat další CD?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Otevřít změny" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "Nemůžu zapsat %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 msgid "Save changes" msgstr "Uložit změny" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Uložit kompletní stav, ne jen změny" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "Zdroje změněny" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" @@ -1594,20 +1607,20 @@ "Informace o zdrojích byly změněny. Aby se změny projevily, musíte kliknout " "na tlačítko \"Obnovit\"." -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "Tuto zprávu již nezobrazovat" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "Nalezeno %i balíků" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "Spouštím prohlížeč nápovědy..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1627,7 +1640,7 @@ "v příkazové řádce nebo si prohlídnout jejich html verzi umístěnou ve složce " "'synaptic/html'." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1635,17 +1648,17 @@ "Nemohu spustit konfigurační nástroj!\n" "Musíte nejdříve nainstalovat balík 'libgnome2-perl'." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "Spouštím nástroj pro konfiguraci balíků..." # cout << "RGMainWindow::pkgHelpClicked()" << endl; #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "Spouštím prohlížeč dokumentace balíků..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" @@ -1653,7 +1666,7 @@ "Pro prohlížení dokumentace k balíkům musíte nejdřív nainstalovat balík \"dwww" "\"" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1661,44 +1674,44 @@ "Nemohu realizovat změny!\n" "Vyřešte nejdřív problémové balíky." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "Realizuji označené změny. Může to chvíli trvat..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "Probíhá stahování balíků" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Chcete ukončit Synaptic?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "Probíhá stahování informací o balících" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." msgstr "" "Zdroje budou zkontrolovány pro nové, odstraněné nebo aktualizované balíky." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "Obnovuji informace o balících..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "Nelze vyřešit problémy se závislostmi!" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "Problémy se závislostmi byly úspěšně vyřešeny" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1706,27 +1719,27 @@ "Nemohu aktualizovat systém!\n" "Nejprve vyřešte problémové balíky." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "Označuji všechny dostupné aktualizace..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "Všechny dostupné aktualizace byly úspěšně označeny." -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "Označení všech dostupných aktualizací selhalo!" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 msgid "Save script" msgstr "Uložit skript" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 msgid "Select directory" msgstr "Vyberte adresář" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 msgid "Please select a directory" msgstr "Prosím vyberte adresář" @@ -2448,7 +2461,8 @@ msgstr "_Najít" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "Zobrazit průběh jednotlivých souborů" #: ../gtk/glade/window_changes.glade.h:1 @@ -2601,7 +2615,6 @@ msgstr "Považovat doporučené balíky za závislé" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Výchozí aktualizace" @@ -2746,7 +2759,6 @@ msgstr "Zobrazovat vlastnosti balíků v hlavním okně" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Chytrá aktualizace" @@ -3375,14 +3387,24 @@ "Poznámka: Aktualizace budou pouze označeny. Stále je poté musíte " "realizovat." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "Zapamatovat odpověď pro budoucí aktualizace" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "Toto chování může být později upraveno v nastavení." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Výchozí aktualizace" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Chytrá aktualizace" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Nainstalovat, odstranit a aktualizovat balíky" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/da.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/da.po --- synaptic-0.62.1ubuntu2~ppa1/po/da.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/da.po 2008-08-19 20:59:27.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: synaptic 0.56\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2005-02-26 14:58+0200\n" "Last-Translator: Morten Brix Pedersen \n" "Language-Team: Danish \n" @@ -916,9 +916,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "Kunne ikke læse %s" @@ -1137,36 +1137,49 @@ msgid "Applying Changes" msgstr "Anvender ændringer" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"Fjernelse af denne pakke kan gøre dit system ubrugeligt.\n" +"Er du sikker på at du ønsker at fjerne pakken?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "Fejl i pakke %s" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "Ændringer gennemført" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." msgstr "" "De markerede ændringer gennemføres nu. Dette kan tage et stykke tid. Vent." -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "Installerer og fjerner software" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "Fjerner software" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "Installerer software" @@ -1543,37 +1556,37 @@ msgid "%s Changelog" msgstr "Ændringsfil for %s" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Vil du tilføje en anden cdrom?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Vis ændringer" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "Kunne ikke skrive %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 #, fuzzy msgid "Save changes" msgstr "Vis ændringer" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Gem fuld tilstand, ikke kun ændringer" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "Arkiver ændret" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" @@ -1581,20 +1594,20 @@ "Arkivoplysningerne er blevet ændret. Du skal klikke på \"Genindlæs\" knappen " "for aktivere dine ændringer." -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "Vis aldrig denne besked igen" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "Fandt %i pakker" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "Starter hjælpeviser..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1612,7 +1625,7 @@ "Alternativt kan du åbne manualsiden med 'man synaptic' fra kommandolinjen " "eller vise HTML-versionen i 'synaptic/html'-mappen." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1620,16 +1633,16 @@ "Kunne ikke starte opsætningsværktøj!\n" "Du skal installere den krævede pakke 'libgnome2-perl'." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "Starter værktøj til pakkeopsætning..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "Starter dokumentationsviser til pakke..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" @@ -1637,7 +1650,7 @@ "Du skal have installeret pakken \"dwww\" for at vise dokumentationen for en " "pakke" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1645,25 +1658,25 @@ "Kunne ikke gennemføre ændringerne!\n" "Ret fejl på de ødelagte pakker først." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "Anvender markerede ændringer. Dette kan tage et stykke tid..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "Henter pakkefiler" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Vil du afslutte Synaptic?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "Henter pakkeoplysninger" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." @@ -1671,19 +1684,19 @@ "Arkiverne vil blive undersøgt efter nye, fjernede eller opgraderede " "softwarepakker." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "Genindlæser pakkeoplysninger..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "Kunne ikke løse afhængighedsproblemer!" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "Afhængighedsproblemer løst korrekt" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1691,30 +1704,30 @@ "Kunne ikke opgradere systemet!\n" "Ret fejl på ødelagte pakker først." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "Markerer alle tilgængelige opgraderinger..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "Markerede alle tilgængelige opgraderinger med succes" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "Kunne ikke markere alle tilgængelige opgraderinger!" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "Beskrivelse" # -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "Søgehistorik" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 #, fuzzy msgid "Please select a directory" msgstr "Indsæt en disk i drevet." @@ -2433,7 +2446,8 @@ msgstr "_Søg" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "Vis fremgang for enkelte filer" #: ../gtk/glade/window_changes.glade.h:1 @@ -2588,7 +2602,6 @@ msgstr "Se anbefalede pakker som afhængigheder" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Standardopgradering" @@ -2734,7 +2747,6 @@ msgstr "Vis pakkeegenskaber i hovedvinduet" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Smart opgradering" @@ -3362,14 +3374,24 @@ "Bemærk: Opgraderingerne vil kun blive markeret. Du skal selv sætte " "dem i kraft bagefter." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "Husk mit svar til fremtidige opgraderinger" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "Denne opførsel kan ændres i indstillinger senere." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Standardopgradering" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Smart opgradering" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Installér, fjern og opgradér softwarepakker" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/de.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/de.po --- synaptic-0.62.1ubuntu2~ppa1/po/de.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/de.po 2008-08-19 20:59:27.000000000 +0100 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: synaptic TRUNK\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2005-01-21 16:36+0100\n" "Last-Translator: Hendrik Brandt \n" "Language-Team: German \n" @@ -937,9 +937,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "»%s« konnte nicht gelesen werden" @@ -1165,21 +1165,34 @@ msgid "Applying Changes" msgstr "Änderungen anwenden" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"Das Löschen dieses Paketes kann Ihr System unbenutzbar machen.\n" +"Sind Sie sicher, dass Sie das möchten?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "Fehler im Paket »%s«" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "Änderungen angewendet" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." @@ -1187,15 +1200,15 @@ "Die ausgewählten Änderungen werden nun angewendet. Dies kann einige Zeit " "dauern. Bitte haben Sie etwas Geduld." -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "Software-Pakete werden installiert und entfernt" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "Software-Pakete werden entfernt" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "Software-Pakete werden installiert" @@ -1582,37 +1595,37 @@ msgid "%s Changelog" msgstr "Änderungsprotokoll von %s" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Wollen Sie eine weitere CD als Quelle hinzufügen?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Änderungen öffnen" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "»%s« konnte nicht gespeichert werden" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 #, fuzzy msgid "Save changes" msgstr "Änderungen öffnen" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Gesamte Paketauswahl und nicht nur Änderungen sichern" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "Paketquellen wurden geändert" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" @@ -1620,20 +1633,20 @@ "Die Informationen der Paketquellen haben sich geändert. Um die Änderungen zu " "übernehmen klicken Sie bitte »Neu laden« an." -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "Diese Meldung nicht erneut anzeigen" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "%i Pakete wurden gefunden" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "Hilfe wird gestartet..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1653,7 +1666,7 @@ "geöffnet werden. Die HTML Version des Handbuchs befindet sich im Ordner " "»synaptic/html«." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1661,16 +1674,16 @@ "Das Konfigurationswerkzeugs konnte nicht ausgeführt werden.\n" "Bitte installieren Sie das hierfür erforderliche Paket »libgnome2-perl«." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "Konfigurationswerkzeug wird gestartet..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "Dokumentationsbetrachter wird gestartet..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" @@ -1678,7 +1691,7 @@ "Sie müssen das Paket »dwww« installieren, um die Dokumentation zu einem Paket " "durchsuchen zu können." -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1686,26 +1699,26 @@ "Die Änderungen konnten nicht angewendet werden!\n" "Beheben Sie zunächst die Probleme mit defekten Paketen." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "" "Vorgemerkte Änderungen werden angewendet - dies kann einige Zeit dauern..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "Paketdateien werden heruntergeladen" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Wollen Sie Synaptic wirklich beenden?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "Paketinformationen werden heruntergeladen" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." @@ -1713,19 +1726,19 @@ "Die Paketquellen werden auf neue, entfernte oder aktualisierte Software-" "Pakete überprüft." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "Paketinformationen werden neu geladen..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "Einige Abhängigkeitsprobleme konnten nicht gelöst werden!" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "Problematische Abhängigkeiten wurden erfolgreich aufgelöst" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1733,29 +1746,29 @@ "Aktualisierung konnte nicht durchgeführt werden!\n" "Beheben Sie zunächst die Probleme mit defekten Paketen." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "Alle verfügbaren Aktualisierungen werden vorgemerkt..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "Verfügbare Aktualisierungen wurden erfolgreich vorgemerkt" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "Vormerken der Aktualisierungen war nicht möglich!" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "Beschreibung" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "Suchchronik" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 #, fuzzy msgid "Please select a directory" msgstr "Bitte legen Sie den Datenträger in das Laufwerk ein." @@ -2473,7 +2486,8 @@ msgstr "_Suchen" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "Fortschritt der einzelnen Dateien anzeigen" #: ../gtk/glade/window_changes.glade.h:1 @@ -2628,7 +2642,6 @@ msgstr "Empfohlene Pakete als Abhängigkeiten ansehen" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Normale Aktualisierung" @@ -2774,7 +2787,6 @@ msgstr "Paketeigenschaften im Hauptfenster anzeigen" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Intelligente Aktualisierung" @@ -3411,15 +3423,25 @@ "Hinweis: Die Aktualisierungen werden lediglich vorgemerkt. Sie müssen " "sie danach noch anwenden." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "Antwort für zukünftige Aktualisierungen beibehalten" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "" "Dieses Verhalten kann nachträglich in den Einstellungen geändert werden." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Normale Aktualisierung" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Intelligente Aktualisierung" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Software-Pakete installieren, entfernen und aktualisieren" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/el.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/el.po --- synaptic-0.62.1ubuntu2~ppa1/po/el.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/el.po 2008-08-19 20:59:27.000000000 +0100 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2006-02-18 13:27+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -930,9 +930,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "Αδυναμία ανάγνωσης %s" @@ -1153,21 +1153,34 @@ msgid "Applying Changes" msgstr "Εφαρμογή αλλαγών" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"Η απομάκρυνση αυτού του πακέτου πιθανώς να κάνει το σύστημα σας άχρηστο.\n" +"Είστε σίγουροι ότι θέλετε να το κάνετε;" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "Σφάλμα στο πακέτο %s" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "Έγινε εφαρμογή των αλλαγών" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." @@ -1175,15 +1188,15 @@ "Εφαρμόζονται τώρα οι σημειωμένες αλλαγές. Αυτό μπορεί να διαρκέσει κάποιο " "χρόνο. Παρακαλώ περιμένετε." -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "Εγκατάσταση και απομάκρυνση πακέτων λογισμικού" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "Απομάκρυνση λογισμικού" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "Εγκατάσταση λογισμικού" @@ -1567,36 +1580,36 @@ msgid "%s Changelog" msgstr "%s Changelog" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Θέλετε να προσθέσετε ένα ακόμα CD-ROM;" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Άνοιγμα αλλαγών" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "Αδυναμία εγγραφής %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 msgid "Save changes" msgstr "Αποθήκευση αλλαγών" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Αποθήκευση πλήρους κατάστασης, όχι μόνο αλλαγές" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "Τα repositories αλλάχθηκαν" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" @@ -1604,20 +1617,20 @@ "Οι πληροφορίες του repository έχουν αλλάξει. Πρέπει να πατήσετε το κουμπί " "\"Ανανέωση\"για να πραγματοποιηθούν οι αλλαγές σας." -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "Να μην εμφανιστεί αυτό το μήνυμα ξανά" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "Βρέθηκαν %i πακέτα" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "Εκκινείται προβολής βοήθειας..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1636,7 +1649,7 @@ "synaptic' ή να δείτε την html έκδοση που βρίσκεται στο φάκελο 'synaptic/" "html'." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1644,16 +1657,16 @@ "Αδυναμία εκκίνησης εργαλείου ρύθμισης!\n" "Θα πρέπει να εγκαταστήσετε το πακέτο 'libgnome2-perl'." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "Εκκίνηση εργαλείου ρύθμισης πακέτων...." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "Εκκίνηση εφαρμογής προβολής τεκμηρίωσης πακέτων...." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" @@ -1661,7 +1674,7 @@ "Θα πρέπει να εγκαταστήσετε το πακέτο \"dwww\" για να περιηγηθείτε στην " "τεκμηρίωσητου πακέτου." -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1669,25 +1682,25 @@ "Αδυναμία εφαρμογής αλλαγών!\n" "Διορθώστε πρώτα τα κατεστραμμένα πακέτα." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "Εφαρμογή σημειωμένων αλλαγών. Αυτό μπορεί να πάρει λίγο χρόνο..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "Λήψη αρχείων πακέτου" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Θέλετε έξοδο από το Synaptic;" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "Λήψη πληροφοριών πακέτου" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." @@ -1695,19 +1708,19 @@ "Θα γίνει έλεγχος των repositories, για νέα, αναβαθμισμένα ή απομακρυνθέντα " "πακέτα λογισμικού." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "Ανανέωση πληροφοριών πακέτου..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "Αποτυχία επίλυσης προβλημάτων εξάρτησης!" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "Επιτυχής επίλυση προβλημάτων εξαρτήσεων" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1715,27 +1728,27 @@ "Αδυναμία αναβάθμισης του συστήματος!\n" "Διορθώστε πρώτα τα κατεστραμμένα πακέτα." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "Σημείωση όλων των διαθέσιμων πακέτων..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "Επιτυχής σημείωση όλων των διαθέσιμων αναβαθμίσεων!" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "Αποτυχία σημείωσης όλων των διαθέσιμων αναβαθμίσεων!" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 msgid "Save script" msgstr "Αποθήκευση δέσμης ενεργειών" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 msgid "Select directory" msgstr "Επιλογή καταλόγου" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 msgid "Please select a directory" msgstr "Παρακαλώ επιλέξτε ένα κατάλογο" @@ -2441,7 +2454,8 @@ msgstr "Ανα_ζήτηση" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "Εμφάνιση προόδου μοναδικών αρχείων" #: ../gtk/glade/window_changes.glade.h:1 @@ -2596,7 +2610,6 @@ msgstr "Να θεωρούνται τα προτεινόμενα πακέτα ως εξαρτήσεις" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Προεπιλεγμένη αναβάθμιση" @@ -2741,7 +2754,6 @@ msgstr "Εμφάνιση ιδιότητων πακέτου στο κύριο παράθυρο" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Έξυπνη αναβάθμιση" @@ -3375,14 +3387,24 @@ "Σημείωση: Οι αναβαθμίσεις θα σημειωθούν μόνο. Θα χρειαστεί να τις " "εφαρμόσετε μετά." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "Απομνημόνευση της απάντησης μου για μελλοντικές αναβαθμίσεις" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "Αυτή η συμπεριφορά μπορεί να αλλαχθεί αργότερα μέσω των προτιμήσεων." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Προεπιλεγμένη αναβάθμιση" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Έξυπνη αναβάθμιση" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Εγκατάσταση, απομάκρυνση και αναβάθμιση πακέτων λογισμικού" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/es.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/es.po --- synaptic-0.62.1ubuntu2~ppa1/po/es.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/es.po 2008-08-19 20:59:27.000000000 +0100 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" -"PO-Revision-Date: 2008-05-20 18:47+0100\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" +"PO-Revision-Date: 2008-07-01 18:20+0100\n" "Last-Translator: Francisco Javier Cuadrado \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" @@ -185,8 +185,7 @@ msgstr "Varios - Gráficos" #. TRANSLATORS: The section of the package is not known -#: ../common/sections_trans.cc:78 -#: ../common/rpackage.cc:110 +#: ../common/sections_trans.cc:78 ../common/rpackage.cc:110 #: ../common/rpackageview.cc:501 msgid "Unknown" msgstr "Desconocido" @@ -204,33 +203,28 @@ #. TRANSLATORS: Alias for the Debian package section "non-US" #. Export to the outside of the USA is not allowed #. or restricted -#: ../common/sections_trans.cc:87 -#: ../common/sections_trans.cc:105 +#: ../common/sections_trans.cc:87 ../common/sections_trans.cc:105 #: ../common/sections_trans.cc:109 msgid "Restricted On Export" msgstr "Exportación restringida" #. TRANSLATORS: Alias for the Debian package section "non free" -#: ../common/sections_trans.cc:89 -#: ../common/sections_trans.cc:106 +#: ../common/sections_trans.cc:89 ../common/sections_trans.cc:106 msgid "non free" msgstr "no libres" #. TRANSLATORS: Alias for the Debian package section "contrib" #. Free software that depends on non-free software -#: ../common/sections_trans.cc:92 -#: ../common/sections_trans.cc:110 +#: ../common/sections_trans.cc:92 ../common/sections_trans.cc:110 msgid "contrib" msgstr "contribuciones" -#: ../common/indexcopy.cc:51 -#: ../common/rpmindexcopy.cc:75 +#: ../common/indexcopy.cc:51 ../common/rpmindexcopy.cc:75 #, c-format msgid "Stat failed for %s" msgstr "Falló la comprobación de %s" -#: ../common/indexcopy.cc:78 -#: ../common/rpmindexcopy.cc:107 +#: ../common/indexcopy.cc:78 ../common/rpmindexcopy.cc:107 msgid "Unable to create a tmp file" msgstr "No se ha podido crear un archivo temporal" @@ -242,10 +236,8 @@ msgid "Failed to reopen fd" msgstr "Falló al reabrir fd" -#: ../common/indexcopy.cc:218 -#: ../common/indexcopy.cc:242 -#: ../common/rpmindexcopy.cc:169 -#: ../common/rpmindexcopy.cc:205 +#: ../common/indexcopy.cc:218 ../common/indexcopy.cc:242 +#: ../common/rpmindexcopy.cc:169 ../common/rpmindexcopy.cc:205 msgid "Failed to rename" msgstr "Falló al renombrar" @@ -261,20 +253,17 @@ msgid "Error parsing file record" msgstr "Error al analizar el registro de archivo" -#: ../common/rcdscanner.cc:112 -#: ../common/rcdscanner.cc:162 +#: ../common/rcdscanner.cc:112 ../common/rcdscanner.cc:162 #, c-format msgid "Failed to open %s.new" msgstr "Falló al abrir: %s.new" -#: ../common/rcdscanner.cc:137 -#: ../common/rcdscanner.cc:247 +#: ../common/rcdscanner.cc:137 ../common/rcdscanner.cc:247 #, c-format msgid "Failed to rename %s.new to %s" msgstr "Falló al renombrar %s.new a %s" -#: ../common/rcdscanner.cc:202 -#: ../common/rcdscanner.cc:235 +#: ../common/rcdscanner.cc:202 ../common/rcdscanner.cc:235 msgid "Internal error" msgstr "Error interno" @@ -287,8 +276,7 @@ msgid "Unable to read the cdrom database %s" msgstr "No se ha podido leer la base de datos %s del cdrom" -#: ../common/rcdscanner.cc:280 -#: ../common/rcdscanner.cc:322 +#: ../common/rcdscanner.cc:280 ../common/rcdscanner.cc:322 #: ../common/rcdscanner.cc:421 msgid "Unmounting CD-ROM..." msgstr "Desmontando el CD-ROM…" @@ -327,8 +315,11 @@ msgstr "Limpiando las listas de paquetes…" #: ../common/rcdscanner.cc:329 -msgid "Unable to locate any package files. Perhaps this is not an APT enabled disc." -msgstr "No se ha podido encontrar ningún archivo de paquetes. Quizá este disco no esté preparado para APT." +msgid "" +"Unable to locate any package files. Perhaps this is not an APT enabled disc." +msgstr "" +"No se ha podido encontrar ningún archivo de paquetes. Quizá este disco no " +"esté preparado para APT." #: ../common/rcdscanner.cc:380 msgid "Disc not successfully scanned." @@ -359,20 +350,17 @@ msgid "Failed to stat %s%s" msgstr "Falló al comprobar %s%s" -#: ../common/rcdscanner.cc:625 -#: ../common/rcdscanner.cc:721 +#: ../common/rcdscanner.cc:625 ../common/rcdscanner.cc:721 #, c-format msgid "Unable to change to %s" msgstr "No se puede cambiar a %s" -#: ../common/rcdscanner.cc:663 -#: ../common/rsources.cc:177 +#: ../common/rcdscanner.cc:663 ../common/rsources.cc:177 #, c-format msgid "Unable to read %s" msgstr "No se puede leer %s" -#: ../common/rconfiguration.cc:88 -#: ../common/rconfiguration.cc:241 +#: ../common/rconfiguration.cc:88 ../common/rconfiguration.cc:241 #, c-format msgid "ERROR: couldn't open %s for writing" msgstr "ERROR: No se ha podido abrir %s para escritura" @@ -417,22 +405,28 @@ #: ../common/rinstallprogress.cc:42 msgid "" "\n" -"Not all changes and updates succeeded. For further details of the the failure, please expand the 'terminal' panel below." +"Not all changes and updates succeeded. For further details of the the " +"failure, please expand the 'terminal' panel below." msgstr "" "\n" -"No se han realizado todos los cambios y actualizaciones. Para más detalles del fallo, por favor abra el panel «terminal»." +"No se han realizado todos los cambios y actualizaciones. Para más detalles " +"del fallo, por favor abra el panel «terminal»." #: ../common/rinstallprogress.cc:44 msgid "" "\n" -"Successfully installed all packages of the current medium. To continue the installation with the next medium close this window." +"Successfully installed all packages of the current medium. To continue the " +"installation with the next medium close this window." msgstr "" "\n" -"Se han instalado con éxito todos los paquetes del soporte actual. Para continuar la instalación con el siguiente soporte, cierre esta ventana." +"Se han instalado con éxito todos los paquetes del soporte actual. Para " +"continuar la instalación con el siguiente soporte, cierre esta ventana." #: ../common/rpackage.cc:203 msgid "The list of installed files is only available for installed packages" -msgstr "La lista de archivos instalados está disponible únicamente para paquetes instalados" +msgstr "" +"La lista de archivos instalados está disponible únicamente para paquetes " +"instalados" #: ../common/rpackage.cc:424 msgid "or dependency" @@ -443,11 +437,16 @@ msgid "" "\n" "Package %s has no available version, but exists in the database.\n" -"This typically means that the package was mentioned in a dependency and never uploaded, has been obsoleted or is not available with the contents of sources.list\n" +"This typically means that the package was mentioned in a dependency and " +"never uploaded, has been obsoleted or is not available with the contents of " +"sources.list\n" msgstr "" "\n" -"El paquete %s no tiene una versión disponible, pero existe en la base de datos.\n" -"Esto generalmente significa que el paquete fue mencionado en una dependencia y nunca fue subido, ha sido declarado obsoleto o no está disponible en el contenido de sources.list\n" +"El paquete %s no tiene una versión disponible, pero existe en la base de " +"datos.\n" +"Esto generalmente significa que el paquete fue mencionado en una dependencia " +"y nunca fue subido, ha sido declarado obsoleto o no está disponible en el " +"contenido de sources.list\n" #. TRANSLATORS: dependency error message, example: #. "apt 0.5.4 but 0.5.3 is to be installed" @@ -504,7 +503,8 @@ #: ../common/rpackage.cc:925 msgid "Invalid record in the preferences file, no Package header" -msgstr "Registro inválido en el archivo de preferencias, falta la cabecera Package" +msgstr "" +"Registro inválido en el archivo de preferencias, falta la cabecera Package" #: ../common/rpackage.cc:1308 msgid "Marked for installation" @@ -530,8 +530,7 @@ msgid "Marked for complete removal" msgstr "Marcado para eliminar completamente" -#: ../common/rpackage.cc:1314 -#: ../common/rpackageview.cc:136 +#: ../common/rpackage.cc:1314 ../common/rpackageview.cc:136 #: ../gtk/glade/window_filters.glade.h:39 msgid "Not installed" msgstr "No instalado" @@ -540,15 +539,12 @@ msgid "Not installed (locked)" msgstr "No instalado (bloqueado)" -#: ../common/rpackage.cc:1316 -#: ../common/rpackageview.cc:131 -#: ../gtk/gsynaptic.cc:564 -#: ../gtk/glade/window_filters.glade.h:30 +#: ../common/rpackage.cc:1316 ../common/rpackageview.cc:131 +#: ../gtk/gsynaptic.cc:564 ../gtk/glade/window_filters.glade.h:30 msgid "Installed" msgstr "Instalado" -#: ../common/rpackage.cc:1317 -#: ../common/rpackageview.cc:160 +#: ../common/rpackage.cc:1317 ../common/rpackageview.cc:160 #: ../gtk/gsynaptic.cc:553 msgid "Installed (upgradable)" msgstr "Instalados (actualizables)" @@ -557,8 +553,7 @@ msgid "Installed (locked to the current version)" msgstr "Instalado (bloqueado a la versión actual)" -#: ../common/rpackage.cc:1319 -#: ../common/rpackageview.cc:463 +#: ../common/rpackage.cc:1319 ../common/rpackageview.cc:463 #: ../gtk/glade/window_filters.glade.h:14 msgid "Broken" msgstr "Roto" @@ -567,8 +562,7 @@ msgid "Not installed (new in repository)" msgstr "No instalados (nuevos en el repositorio)" -#: ../common/rpackage.h:52 -#: ../common/rpackagefilter.cc:48 +#: ../common/rpackage.h:52 ../common/rpackagefilter.cc:48 msgid "Depends" msgstr "Depende" @@ -576,23 +570,19 @@ msgid "PreDepends" msgstr "PreDepende" -#: ../common/rpackage.h:52 -#: ../common/rpackagefilter.cc:53 +#: ../common/rpackage.h:52 ../common/rpackagefilter.cc:53 msgid "Suggests" msgstr "Sugiere" -#: ../common/rpackage.h:53 -#: ../common/rpackagefilter.cc:52 +#: ../common/rpackage.h:53 ../common/rpackagefilter.cc:52 msgid "Recommends" msgstr "Recomienda" -#: ../common/rpackage.h:53 -#: ../common/rpackagefilter.cc:50 +#: ../common/rpackage.h:53 ../common/rpackagefilter.cc:50 msgid "Conflicts" msgstr "Incompatibilidad" -#: ../common/rpackage.h:53 -#: ../common/rpackagefilter.cc:51 +#: ../common/rpackage.h:53 ../common/rpackagefilter.cc:51 msgid "Replaces" msgstr "Reemplaza" @@ -614,39 +604,33 @@ #: ../common/rpackagecache.cc:73 msgid "The package lists or status file could not be parsed or opened." -msgstr "Las listas de paquetes o el archivo de estado no se pueden analizar sintácticamente o abrir." +msgstr "" +"Las listas de paquetes o el archivo de estado no se pueden analizar " +"sintácticamente o abrir." #: ../common/rpackagecache.cc:108 msgid "Internal Error, non-zero counts" msgstr "Error Interno, contando no-cero" -#: ../common/rpackagefilter.cc:44 -#: ../gtk/rgpreferenceswindow.cc:1045 +#: ../common/rpackagefilter.cc:44 ../gtk/rgpreferenceswindow.cc:1045 #: ../gtk/glade/window_find.glade.h:5 msgid "Name" msgstr "Nombre" -#: ../common/rpackagefilter.cc:45 -#: ../gtk/rgpreferenceswindow.cc:50 -#: ../gtk/rgmainwindow.cc:1036 -#: ../gtk/rgvendorswindow.cc:62 -#: ../gtk/rgvendorswindow.cc:94 -#: ../gtk/glade/window_main.glade.h:21 +#: ../common/rpackagefilter.cc:45 ../gtk/rgpreferenceswindow.cc:50 +#: ../gtk/rgmainwindow.cc:1036 ../gtk/rgvendorswindow.cc:62 +#: ../gtk/rgvendorswindow.cc:94 ../gtk/glade/window_main.glade.h:21 #: ../gtk/glade/window_filters.glade.h:20 -#: ../gtk/glade/window_details.glade.h:16 -#: ../gtk/rgfiltermanager.h:69 +#: ../gtk/glade/window_details.glade.h:16 ../gtk/rgfiltermanager.h:69 msgid "Description" msgstr "Descripción" -#: ../common/rpackagefilter.cc:46 -#: ../gtk/glade/window_find.glade.h:4 -#: ../gtk/glade/window_filters.glade.h:36 -#: ../gtk/rgfiltermanager.h:70 +#: ../common/rpackagefilter.cc:46 ../gtk/glade/window_find.glade.h:4 +#: ../gtk/glade/window_filters.glade.h:36 ../gtk/rgfiltermanager.h:70 msgid "Maintainer" msgstr "Mantenedor" -#: ../common/rpackagefilter.cc:47 -#: ../gtk/glade/window_find.glade.h:8 +#: ../common/rpackagefilter.cc:47 ../gtk/glade/window_find.glade.h:8 msgid "Version" msgstr "Versión" @@ -659,41 +643,32 @@ msgstr "Depende inversamente" #. Reverse Depends -#: ../common/rpackagefilter.cc:55 -#: ../common/rpackageview.h:123 -#: ../gtk/glade/window_main.glade.h:36 -#: ../gtk/glade/window_filters.glade.h:43 +#: ../common/rpackagefilter.cc:55 ../common/rpackageview.h:123 +#: ../gtk/glade/window_main.glade.h:36 ../gtk/glade/window_filters.glade.h:43 #: ../gtk/rgfiltermanager.h:79 msgid "Origin" msgstr "Origen" #. Origin (e.g. security.debian.org) -#: ../common/rpackagefilter.cc:56 -#: ../gtk/rgpreferenceswindow.cc:49 -#: ../gtk/rgmainwindow.cc:929 -#: ../gtk/glade/window_filters.glade.h:15 +#: ../common/rpackagefilter.cc:56 ../gtk/rgpreferenceswindow.cc:49 +#: ../gtk/rgmainwindow.cc:929 ../gtk/glade/window_filters.glade.h:15 #: ../gtk/rgfiltermanager.h:80 msgid "Component" msgstr "Componente" -#: ../common/rpackagefilter.cc:61 -#: ../common/rpackageview.h:139 -#: ../gtk/rgpreferenceswindow.cc:48 -#: ../gtk/rgfetchprogress.cc:88 +#: ../common/rpackagefilter.cc:61 ../common/rpackageview.h:139 +#: ../gtk/rgpreferenceswindow.cc:48 ../gtk/rgfetchprogress.cc:88 #: ../gtk/glade/window_filters.glade.h:62 msgid "Status" msgstr "Estado" #. g_object_set(G_OBJECT(renderer), "editable", TRUE, NULL); -#: ../common/rpackagefilter.cc:62 -#: ../gtk/rgfiltermanager.cc:180 +#: ../common/rpackagefilter.cc:62 ../gtk/rgfiltermanager.cc:180 msgid "Pattern" msgstr "Patrón" -#: ../common/rpackagefilter.cc:63 -#: ../gtk/rgpreferenceswindow.cc:48 -#: ../gtk/rgmainwindow.cc:908 -#: ../gtk/glade/window_filters.glade.h:61 +#: ../common/rpackagefilter.cc:63 ../gtk/rgpreferenceswindow.cc:48 +#: ../gtk/rgmainwindow.cc:908 ../gtk/glade/window_filters.glade.h:61 msgid "Section" msgstr "Sección" @@ -714,8 +689,7 @@ msgid "Bad regular expression '%s' in ReducedView file." msgstr "Expresión regular errónea «%s» en el archivo de vista reducida." -#: ../common/rpackagelister.cc:317 -#: ../common/rpackagelister.cc:323 +#: ../common/rpackagelister.cc:317 ../common/rpackagelister.cc:323 #: ../common/rpackagelister.cc:333 #, c-format msgid "Internal error opening cache (%d). Please report." @@ -735,7 +709,9 @@ #: ../common/rpackagelister.cc:486 msgid "Internal Error, AllUpgrade broke stuff. Please report." -msgstr "Error interno, La actualización completa ha roto algo. Por favor, informe del error." +msgstr "" +"Error interno, La actualización completa ha roto algo. Por favor, informe " +"del error." #: ../common/rpackagelister.cc:504 msgid "dist upgrade Failed" @@ -746,11 +722,14 @@ msgstr "No se ha podido bloquear el directorio de listas" #: ../common/rpackagelister.cc:1288 -msgid "Release files for some repositories could not be retrieved or authenticated. Such repositories are being ignored." -msgstr "Los archivos de lanzamiento de algunos repositorios no se han podido obtener o autenticar. Estos repositorios serán ignorados." +msgid "" +"Release files for some repositories could not be retrieved or authenticated. " +"Such repositories are being ignored." +msgstr "" +"Los archivos de lanzamiento de algunos repositorios no se han podido obtener " +"o autenticar. Estos repositorios serán ignorados." -#: ../common/rpackagelister.cc:1379 -#: ../gtk/rgrepositorywin.cc:356 +#: ../common/rpackagelister.cc:1379 ../gtk/rgrepositorywin.cc:356 msgid "Ignoring invalid record(s) in sources.list file!" msgstr "Ignorando registro(s) inválido(s) en el archivo sources.list." @@ -853,8 +832,7 @@ msgid "Line %u too long in markings file." msgstr "La línea %u del archivo de selecciones es demasiado larga." -#: ../common/rpackagelister.cc:1774 -#: ../common/rpackagelister.cc:1778 +#: ../common/rpackagelister.cc:1774 ../common/rpackagelister.cc:1778 #, c-format msgid "Malformed line %u in markings file" msgstr "La línea %u del archivo de selecciones está mal formada" @@ -899,13 +877,11 @@ msgid "Broken dependencies" msgstr "Dependencias rotas" -#: ../common/rpackageview.cc:151 -#: ../gtk/glade/window_filters.glade.h:37 +#: ../common/rpackageview.cc:151 ../gtk/glade/window_filters.glade.h:37 msgid "New in repository" msgstr "Nuevo en el repositorio" -#: ../common/rpackageview.cc:153 -#: ../gtk/glade/window_filters.glade.h:53 +#: ../common/rpackageview.cc:153 ../gtk/glade/window_filters.glade.h:53 msgid "Pinned" msgstr "Clavados" @@ -929,8 +905,7 @@ msgid "Reduced View" msgstr "Vista reducida" -#: ../common/rpackageview.cc:472 -#: ../gtk/gsynaptic.cc:578 +#: ../common/rpackageview.cc:472 ../gtk/gsynaptic.cc:578 #: ../gtk/rgsummarywindow.cc:355 msgid "Marked Changes" msgstr "Cambios marcados" @@ -941,20 +916,17 @@ msgid "Package with Debconf" msgstr "Paquete con Debconf" -#: ../common/rpackageview.cc:490 -#: ../gtk/glade/window_filters.glade.h:66 +#: ../common/rpackageview.cc:490 ../gtk/glade/window_filters.glade.h:66 msgid "Upgradable (upstream)" msgstr "Actualizable (versión superior)" #: ../common/rpackageview.cc:499 msgid "Local" -msgstr "" +msgstr "Local" -#: ../common/rsources.cc:69 -#: ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 -#: ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "No se puede leer %s" @@ -986,8 +958,11 @@ msgstr "-f=? Usar un archivo de filtros alternativo\n" #: ../gtk/gsynaptic.cc:76 -msgid "-t Give an alternative main window title (e.g. hostname with `uname -n`)\n" -msgstr "-t Usar un título de ventana alternativo (por ejemplo el nombre de anfitrión con `uname -n`)\n" +msgid "" +"-t Give an alternative main window title (e.g. hostname with `uname -n`)\n" +msgstr "" +"-t Usar un título de ventana alternativo (por ejemplo el nombre de " +"anfitrión con `uname -n`)\n" #: ../gtk/gsynaptic.cc:77 msgid "-i=? Start with the initial Filter with given name\n" @@ -995,7 +970,8 @@ #: ../gtk/gsynaptic.cc:78 msgid "-o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" -msgstr "-o=? Poner una opción de configuración arbitraria, ej -o dir::cache=/tmp\n" +msgstr "" +"-o=? Poner una opción de configuración arbitraria, ej -o dir::cache=/tmp\n" #: ../gtk/gsynaptic.cc:79 msgid "--upgrade-mode Call Upgrade and display changes\n" @@ -1027,43 +1003,55 @@ #: ../gtk/gsynaptic.cc:86 msgid "--test-me-harder Run test in a loop\n" -msgstr "" +msgstr "--test-me-harder Ejecuta la comprobación en un bucle\n" -#: ../gtk/gsynaptic.cc:335 -#: ../gtk/gsynaptic.cc:341 +#: ../gtk/gsynaptic.cc:335 ../gtk/gsynaptic.cc:341 msgid "Another synaptic is running" msgstr "Ya hay otro synaptic en ejecución" #: ../gtk/gsynaptic.cc:336 -msgid "There is another synaptic running in interactive mode. Please close it first. " +msgid "" +"There is another synaptic running in interactive mode. Please close it " +"first. " msgstr "Hay otro synaptic funcionando en modo interactivo, ciérrelo primero. " #: ../gtk/gsynaptic.cc:342 -msgid "There is another synaptic running in non-interactive mode. Please wait for it to finish first." -msgstr "Hay otro synaptic funcionando en modo no interactivo, espere hasta que termine." +msgid "" +"There is another synaptic running in non-interactive mode. Please wait for " +"it to finish first." +msgstr "" +"Hay otro synaptic funcionando en modo no interactivo, espere hasta que " +"termine." #: ../gtk/gsynaptic.cc:367 msgid "Unable to get exclusive lock" msgstr "Incapaz de obtener un bloqueo exclusivo" #: ../gtk/gsynaptic.cc:368 -msgid "This usually means that another package management application (like apt-get or aptitude) is already running. Please close that application first." -msgstr "Esto normalmente significa que otro gestor de paquetes (como apt-get o aptitude) ya se está ejecutando. Cierre esta aplicación antes de continuar." +msgid "" +"This usually means that another package management application (like apt-get " +"or aptitude) is already running. Please close that application first." +msgstr "" +"Esto normalmente significa que otro gestor de paquetes (como apt-get o " +"aptitude) ya se está ejecutando. Cierre esta aplicación antes de continuar." #: ../gtk/gsynaptic.cc:411 msgid "Starting without administrative privileges" msgstr "Ejecutándose sin privilegios de administrador" #: ../gtk/gsynaptic.cc:413 -msgid "You will not be able to apply any changes. But you can still export the marked changes or create a download script for them." +msgid "" +"You will not be able to apply any changes. But you can still export the " +"marked changes or create a download script for them." msgstr "" +"No podrá aplicar ningún cambio. Pero puede exportar los cambios marcados o " +"generar un script de descarga para ellos." #: ../gtk/gsynaptic.cc:479 msgid "Synaptic Package Manager " msgstr "Gestor de paquetes Synaptic" -#: ../gtk/rgcdscanner.cc:63 -#: ../gtk/rgpkgcdrom.cc:86 +#: ../gtk/rgcdscanner.cc:63 ../gtk/rgpkgcdrom.cc:86 msgid "Scanning CD-ROM" msgstr "Inspeccionando CD-ROM" @@ -1071,19 +1059,16 @@ msgid "Invalid disc name!" msgstr "Nombre de disco inválido." -#: ../gtk/rgcdscanner.cc:121 -#: ../gtk/rgpkgcdrom.cc:122 +#: ../gtk/rgcdscanner.cc:121 ../gtk/rgpkgcdrom.cc:122 msgid "Disc Label" msgstr "Etiqueta del disco" -#: ../gtk/rgaboutpanel.cc:64 -#: ../gtk/glade/window_about.glade.h:5 +#: ../gtk/rgaboutpanel.cc:64 ../gtk/glade/window_about.glade.h:5 msgid "Credits" msgstr "Créditos" #. skipTaskbar(true); -#: ../gtk/rgaboutpanel.cc:82 -#: ../gtk/glade/window_about.glade.h:4 +#: ../gtk/rgaboutpanel.cc:82 ../gtk/glade/window_about.glade.h:4 msgid "About Synaptic" msgstr "Acerca de Synaptic" @@ -1091,18 +1076,21 @@ msgid "Package changes" msgstr "Cambios del paquete" -#: ../gtk/rgchangeswindow.cc:94 -#: ../gtk/rgsummarywindow.cc:79 +#: ../gtk/rgchangeswindow.cc:94 ../gtk/rgsummarywindow.cc:79 msgid "Warning" msgstr "Aviso" -#: ../gtk/rgchangeswindow.cc:95 -#: ../gtk/rgsummarywindow.cc:80 -msgid "You are about to install software that can't be authenticated! Doing this could allow a malicious individual to damage or take control of your system." -msgstr "Está a punto de instalar software que no puede ser autenticado. Esto puede permitir que un individuo malicioso dañe o tome el control de su sistema." +#: ../gtk/rgchangeswindow.cc:95 ../gtk/rgsummarywindow.cc:80 +msgid "" +"You are about to install software that can't be authenticated! Doing " +"this could allow a malicious individual to damage or take control of your " +"system." +msgstr "" +"Está a punto de instalar software que no puede ser autenticado. Esto " +"puede permitir que un individuo malicioso dañe o tome el control de su " +"sistema." -#: ../gtk/rgchangeswindow.cc:106 -#: ../gtk/rgsummarywindow.cc:92 +#: ../gtk/rgchangeswindow.cc:106 ../gtk/rgsummarywindow.cc:92 msgid "NOT AUTHENTICATED" msgstr "NO AUTENTICADO" @@ -1115,18 +1103,15 @@ msgid "To be downgraded" msgstr "Para ser desactualizado" -#: ../gtk/rgchangeswindow.cc:146 -#: ../gtk/rgsummarywindow.cc:173 +#: ../gtk/rgchangeswindow.cc:146 ../gtk/rgsummarywindow.cc:173 msgid "To be installed" msgstr "Para ser instalado" -#: ../gtk/rgchangeswindow.cc:158 -#: ../gtk/rgsummarywindow.cc:161 +#: ../gtk/rgchangeswindow.cc:158 ../gtk/rgsummarywindow.cc:161 msgid "To be upgraded" msgstr "Para ser actualizado" -#: ../gtk/rgchangeswindow.cc:170 -#: ../gtk/rgsummarywindow.cc:185 +#: ../gtk/rgchangeswindow.cc:170 ../gtk/rgsummarywindow.cc:185 msgid "To be re-installed" msgstr "Para ser reinstalado" @@ -1145,43 +1130,66 @@ #: ../gtk/rgdebinstallprogress.cc:215 #, c-format -msgid "The configuration file %s was modified (by you or by a script). An updated version is shipped in this package. If you want to keep your current version say 'Keep'. Do you want to replace the current file and install the new package maintainers version? " -msgstr "El archivo de configuración %s ha sido modificado (por usted o algún script). En este paquete se incluye una versión actualizada. Si quiere conservar su versión actual pulse «Conservar». ¿Quiere reemplazar el archivo actual e instalar la versión nueva del mantenedor del paquete? " +msgid "" +"The configuration file %s was modified (by you or by a script). An updated " +"version is shipped in this package. If you want to keep your current version " +"say 'Keep'. Do you want to replace the current file and install the new " +"package maintainers version? " +msgstr "" +"El archivo de configuración %s ha sido modificado (por usted o algún " +"script). En este paquete se incluye una versión actualizada. Si quiere " +"conservar su versión actual pulse «Conservar». ¿Quiere reemplazar el archivo " +"actual e instalar la versión nueva del mantenedor del paquete? " -#: ../gtk/rgdebinstallprogress.cc:366 -#: ../gtk/rginstallprogress.cc:286 +#: ../gtk/rgdebinstallprogress.cc:366 ../gtk/rginstallprogress.cc:286 #: ../gtk/rgterminstallprogress.cc:62 msgid "Applying Changes" msgstr "Aplicando los cambios" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"Eliminar este paquete puede hacer que el sistema sea inutilizable.\n" +"¿Seguro que quiere hacer eso?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "Error en el paquete %s" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" -msgstr "" +msgstr "Un paquete no se pudo instalar. Tratando de recuperarlo:" -#: ../gtk/rgdebinstallprogress.cc:623 -#: ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "Cambios aplicados" -#: ../gtk/rgdebinstallprogress.cc:682 -msgid "The marked changes are now being applied. This can take some time. Please wait." -msgstr "Los cambios marcados se están aplicando ahora. Esto puede llevar algo de tiempo. Por favor, espere." +#: ../gtk/rgdebinstallprogress.cc:714 +msgid "" +"The marked changes are now being applied. This can take some time. Please " +"wait." +msgstr "" +"Los cambios marcados se están aplicando ahora. Esto puede llevar algo de " +"tiempo. Por favor, espere." -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "Instalar y quitar los paquetes de software" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "Quitando software" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "Instalar software" @@ -1189,13 +1197,11 @@ msgid "Supported" msgstr "Soportado" -#: ../gtk/rgpreferenceswindow.cc:48 -#: ../gtk/glade/window_filters.glade.h:45 +#: ../gtk/rgpreferenceswindow.cc:48 ../gtk/glade/window_filters.glade.h:45 msgid "Package Name" msgstr "Nombre del paquete" -#: ../gtk/rgpreferenceswindow.cc:49 -#: ../gtk/rgmainwindow.cc:951 +#: ../gtk/rgpreferenceswindow.cc:49 ../gtk/rgmainwindow.cc:951 msgid "Installed Version" msgstr "Versión instalada" @@ -1211,8 +1217,7 @@ msgid "Download Size" msgstr "Tamaño de descarga" -#: ../gtk/rgpreferenceswindow.cc:406 -#: ../gtk/rgmainwindow.cc:1765 +#: ../gtk/rgpreferenceswindow.cc:406 ../gtk/rgmainwindow.cc:1765 #: ../gtk/rgterminstallprogress.cc:151 msgid "An error occurred while saving configurations." msgstr "Se ha producido un error mientras se guardaban las configuraciones." @@ -1226,16 +1231,33 @@ msgstr "Selección de color" #: ../gtk/rgpreferenceswindow.cc:986 -msgid "Prefer package versions from the selected distribution when upgrading packages. If you manually force a version from a different distribution, the package version will follow that distribution until it enters the default distribution." -msgstr "Preferir versiones de paquetes de la distribución seleccionada al actualizar. Si fuerza manualmente una versión de una distribución diferente, la versión del paquete seguirá a esa distribución hasta que entre en la distribución predeterminada." +msgid "" +"Prefer package versions from the selected distribution when upgrading " +"packages. If you manually force a version from a different distribution, the " +"package version will follow that distribution until it enters the default " +"distribution." +msgstr "" +"Preferir versiones de paquetes de la distribución seleccionada al " +"actualizar. Si fuerza manualmente una versión de una distribución diferente, " +"la versión del paquete seguirá a esa distribución hasta que entre en la " +"distribución predeterminada." #: ../gtk/rgpreferenceswindow.cc:994 -msgid "Never upgrade to a new version automatically. Be _very_ careful with this option as you will not get security updates automatically! If you manually force a version the package version will follow the chosen distribution." -msgstr "Nunca actualizar a una nueva versión automáticamente. Sea _muy_ cuidadoso con esta opción ya que no tendrá actualizaciones automáticas de seguridad. Si fuerza una versión manualmente, la versión del paquete seguirá la distribución elegida." +msgid "" +"Never upgrade to a new version automatically. Be _very_ careful with this " +"option as you will not get security updates automatically! If you manually " +"force a version the package version will follow the chosen distribution." +msgstr "" +"Nunca actualizar a una nueva versión automáticamente. Sea _muy_ cuidadoso " +"con esta opción ya que no tendrá actualizaciones automáticas de seguridad. " +"Si fuerza una versión manualmente, la versión del paquete seguirá la " +"distribución elegida." #: ../gtk/rgpreferenceswindow.cc:1002 msgid "Let synaptic pick the best version for you. If unsure use this option. " -msgstr "Deje a synaptic escoger la mejor versión para usted. Si no está seguro use esta opción. " +msgstr "" +"Deje a synaptic escoger la mejor versión para usted. Si no está seguro use " +"esta opción. " #: ../gtk/rgpreferenceswindow.cc:1039 msgid "Visible" @@ -1246,18 +1268,15 @@ msgid "Preferences" msgstr "Preferencias" -#: ../gtk/rgfetchprogress.cc:100 -#: ../gtk/rgmainwindow.cc:993 +#: ../gtk/rgfetchprogress.cc:100 ../gtk/rgmainwindow.cc:993 msgid "Size" msgstr "Tamaño" -#: ../gtk/rgfetchprogress.cc:107 -#: ../gtk/rgmainwindow.cc:886 +#: ../gtk/rgfetchprogress.cc:107 ../gtk/rgmainwindow.cc:886 msgid "Package" msgstr "Paquete" -#: ../gtk/rgfetchprogress.cc:114 -#: ../gtk/rgrepositorywin.cc:181 +#: ../gtk/rgfetchprogress.cc:114 ../gtk/rgrepositorywin.cc:181 msgid "URI" msgstr "URI" @@ -1302,8 +1321,7 @@ msgid "Failed" msgstr "Falló" -#: ../gtk/rgfiltermanager.cc:40 -#: ../gtk/glade/window_filters.glade.h:24 +#: ../gtk/rgfiltermanager.cc:40 ../gtk/glade/window_filters.glade.h:24 msgid "Filters" msgstr "Filtros" @@ -1361,8 +1379,11 @@ msgstr "No encontrado" #: ../gtk/rglogview.cc:281 -msgid "Expression was found, please see the list on the left for matching entries." -msgstr "Se encontró una expresión, busque las entradas correspondientes en la lista de la izquierda." +msgid "" +"Expression was found, please see the list on the left for matching entries." +msgstr "" +"Se encontró una expresión, busque las entradas correspondientes en la lista " +"de la izquierda." #: ../gtk/rgpkgdetails.cc:105 #, c-format @@ -1370,8 +1391,9 @@ msgstr "Propiedades de %s" #: ../gtk/rgpkgdetails.cc:170 +#, fuzzy msgid "This application is supported by the distribution" -msgstr "" +msgstr "Esta aplicación está soportada por la distribución" #. TRANSLATORS: this the format of the available versions in #. the "Properties/Available versions" window @@ -1386,8 +1408,7 @@ msgid "All" msgstr "Todo" -#: ../gtk/rgmainwindow.cc:358 -#: ../gtk/glade/window_main.glade.h:34 +#: ../gtk/rgmainwindow.cc:358 ../gtk/glade/window_main.glade.h:34 #: ../gtk/glade/window_details.glade.h:19 msgid "No package is selected.\n" msgstr "No hay ningún paquete seleccionado.\n" @@ -1398,8 +1419,14 @@ msgstr "Seleccione la versión de %s que debería forzarse para la instalación" #: ../gtk/rgmainwindow.cc:520 -msgid "The package manager always selects the most applicable version available. If you force a different version from the default one, errors in the dependency handling can occur." -msgstr "El administrador de paquetes siempre selecciona la versión disponible que mejor se adapta. Si fuerza una versión diferente de la predeterminada, pueden ocurrir errores en la manipulación de dependencias." +msgid "" +"The package manager always selects the most applicable version available. If " +"you force a different version from the default one, errors in the dependency " +"handling can occur." +msgstr "" +"El administrador de paquetes siempre selecciona la versión disponible que " +"mejor se adapta. Si fuerza una versión diferente de la predeterminada, " +"pueden ocurrir errores en la manipulación de dependencias." #. TRANSLATORS: Column header for the column "Status" in the package list #: ../gtk/rgmainwindow.cc:851 @@ -1415,15 +1442,18 @@ msgstr "Descargar" #: ../gtk/rgmainwindow.cc:1283 -msgid "Reload the package information to become informed about new, removed or upgraded software packages." -msgstr "Recargar la información de los paquetes para informarse acerca de los paquetes de software nuevos, eliminados o actualizados." +msgid "" +"Reload the package information to become informed about new, removed or " +"upgraded software packages." +msgstr "" +"Recargar la información de los paquetes para informarse acerca de los " +"paquetes de software nuevos, eliminados o actualizados." #: ../gtk/rgmainwindow.cc:1289 msgid "Mark all possible upgrades" msgstr "Marcar todas las actualizaciones posibles" -#: ../gtk/rgmainwindow.cc:1293 -#: ../gtk/glade/window_summary.glade.h:5 +#: ../gtk/rgmainwindow.cc:1293 ../gtk/glade/window_summary.glade.h:5 msgid "Apply all marked changes" msgstr "Aplicar todos los cambios seleccionados" @@ -1459,8 +1489,7 @@ msgid "Hold Current Version" msgstr "Mantener la versión actual" -#: ../gtk/rgmainwindow.cc:1549 -#: ../gtk/glade/window_main.glade.h:37 +#: ../gtk/rgmainwindow.cc:1549 ../gtk/glade/window_main.glade.h:37 #: ../gtk/glade/window_filters.glade.h:55 msgid "Properties" msgstr "Propiedades" @@ -1483,18 +1512,30 @@ #: ../gtk/rgmainwindow.cc:1709 #, c-format -msgid "%i packages listed, %i installed, %i broken. %i to install/upgrade, %i to remove; %s will be freed" -msgstr "%i paquetes listados, %i instalados, %i rotos. %i para instalar/actualizar, %i para eliminar; se liberarán %s " +msgid "" +"%i packages listed, %i installed, %i broken. %i to install/upgrade, %i to " +"remove; %s will be freed" +msgstr "" +"%i paquetes listados, %i instalados, %i rotos. %i para instalar/actualizar, %" +"i para eliminar; se liberarán %s " #: ../gtk/rgmainwindow.cc:1715 #, c-format -msgid "%i packages listed, %i installed, %i broken. %i to install/upgrade, %i to remove; %s will be used" -msgstr "%i paquetes listados, %i instalados, %i rotos. %i para instalar/actualizar, %i para eliminar; se usarán %s" +msgid "" +"%i packages listed, %i installed, %i broken. %i to install/upgrade, %i to " +"remove; %s will be used" +msgstr "" +"%i paquetes listados, %i instalados, %i rotos. %i para instalar/actualizar, %" +"i para eliminar; se usarán %s" #: ../gtk/rgmainwindow.cc:1721 #, c-format -msgid "%i packages listed, %i installed, %i broken. %i to install/upgrade, %i to remove" -msgstr "%i paquetes listados, %i instalados, %i rotos. %i para instalar/actualizar, %i para eliminar" +msgid "" +"%i packages listed, %i installed, %i broken. %i to install/upgrade, %i to " +"remove" +msgstr "" +"%i paquetes listados, %i instalados, %i rotos. %i para instalar/actualizar, %" +"i para eliminar" #: ../gtk/rgmainwindow.cc:1782 #, c-format @@ -1520,8 +1561,12 @@ msgstr "Descargando el historial de cambios" #: ../gtk/rgmainwindow.cc:1946 -msgid "The changelog contains information about the changes and closed bugs in each version of the package." -msgstr "El informe de cambios contiene información acerca de los cambios y fallos arreglados en cada versión del paquete." +msgid "" +"The changelog contains information about the changes and closed bugs in each " +"version of the package." +msgstr "" +"El informe de cambios contiene información acerca de los cambios y fallos " +"arreglados en cada versión del paquete." #. TRANSLATORS: Title of the changelog dialog - %s is the name of the package #: ../gtk/rgmainwindow.cc:1959 @@ -1529,69 +1574,76 @@ msgid "%s Changelog" msgstr "Informe de cambios de %s" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "¿Quiere añadir otro CD-ROM?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Abrir cambios" -#: ../gtk/rgmainwindow.cc:2121 -#: ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 -#: ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "No se puede escribir %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 msgid "Save changes" msgstr "Guardar cambios" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Guardar el estado completo, no sólo los cambios" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "Los repositorios han cambiado" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 -msgid "The repository information has changed. You have to click on the \"Reload\" button for your changes to take effect" -msgstr "La información de los repositorios ha cambiado. Tiene que pulsar en el botón «Recargar» para que estos cambios surtan efecto" +#: ../gtk/rgmainwindow.cc:2271 +msgid "" +"The repository information has changed. You have to click on the \"Reload\" " +"button for your changes to take effect" +msgstr "" +"La información de los repositorios ha cambiado. Tiene que pulsar en el botón " +"«Recargar» para que estos cambios surtan efecto" -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "No mostrar este mensaje de nuevo" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "Se encontraron %i paquetes" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "Iniciando el visor de ayuda…" -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" -"You need either the GNOME help viewer 'yelp', the 'konqueror' browser or the 'mozilla' browser to view the synaptic manual.\n" +"You need either the GNOME help viewer 'yelp', the 'konqueror' browser or the " +"'mozilla' browser to view the synaptic manual.\n" "\n" -"Alternatively you can open the man page with 'man synaptic' from the command line or view the html version located in the 'synaptic/html' folder." +"Alternatively you can open the man page with 'man synaptic' from the command " +"line or view the html version located in the 'synaptic/html' folder." msgstr "" "No hay instalado un visor de ayuda.\n" "\n" -"Necesita o el visor de ayuda de GNOME 'yelp', 'konqueror' o el navegador 'mozilla' para ver el manual de synaptic.\n" +"Necesita o el visor de ayuda de GNOME 'yelp', 'konqueror' o el navegador " +"'mozilla' para ver el manual de synaptic.\n" "\n" -"Alternativamente puede abrir la página de manual con 'man synaptic' desde la línea de comandos o ver la versión html ubicada en la carpeta 'synaptic/html'." +"Alternativamente puede abrir la página de manual con 'man synaptic' desde la " +"línea de comandos o ver la versión html ubicada en la carpeta 'synaptic/" +"html'." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1599,20 +1651,24 @@ "No se puede iniciar la herramienta de configuración.\n" "Tiene que instalar el paquete requerido 'libgnome2-perl'." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "Iniciando la herramienta de configuración de paquetes…" #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "Iniciando el visor de la documentación de los paquetes…" -#: ../gtk/rgmainwindow.cc:2579 -msgid "You have to install the package \"dwww\" to browse the documentation of a package" -msgstr "Tiene que instalar el paquete «dwww» para examinar la documentación de un paquete" +#: ../gtk/rgmainwindow.cc:2582 +msgid "" +"You have to install the package \"dwww\" to browse the documentation of a " +"package" +msgstr "" +"Tiene que instalar el paquete «dwww» para examinar la documentación de un " +"paquete" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1620,39 +1676,43 @@ "No se pudieron aplicar los cambios.\n" "Arregle los paquetes rotos primero." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "Aplicando los cambios marcados. Llevará un rato…" -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 msgid "Downloading Package Files" msgstr "Descargando paquetes" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "¿Quiere salir de Synaptic?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 msgid "Downloading Package Information" msgstr "Descargando información de paquetes" -#: ../gtk/rgmainwindow.cc:2806 -msgid "The repositories will be checked for new, removed or upgraded software packages." -msgstr "Se comprobarán los repositorios buscando paquetes de software nuevos, eliminados o actualizados." - #: ../gtk/rgmainwindow.cc:2809 +msgid "" +"The repositories will be checked for new, removed or upgraded software " +"packages." +msgstr "" +"Se comprobarán los repositorios buscando paquetes de software nuevos, " +"eliminados o actualizados." + +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "Recargando información de paquetes…" -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "Se produjo un fallo al resolver problemas de dependencias." -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "Se arreglaron con éxito los problemas de dependencias" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1660,27 +1720,27 @@ "No se pudo actualizar el sistema\n" "Arregle los paquetes rotos primero." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "Marcando todas las posibles actualizaciones…" -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "Se han marcado con éxito todas las actualizaciones disponibles" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "Se produjo un fallo al marcar todas las actualizaciones disponibles." -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 msgid "Save script" msgstr "Guardar script" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 msgid "Select directory" msgstr "Seleccionar directorio" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 msgid "Please select a directory" msgstr "Seleccione un directorio" @@ -1694,8 +1754,7 @@ "\n" "Los paquetes en este componente no están soportados. ¿Está seguro?" -#: ../gtk/rgrepositorywin.cc:124 -#: ../gtk/glade/window_repositories.glade.h:3 +#: ../gtk/rgrepositorywin.cc:124 ../gtk/glade/window_repositories.glade.h:3 msgid "Repositories" msgstr "Repositorios" @@ -1707,14 +1766,12 @@ msgid "Type" msgstr "Tipo" -#: ../gtk/rgrepositorywin.cc:168 -#: ../gtk/rgvendorswindow.cc:62 +#: ../gtk/rgrepositorywin.cc:168 ../gtk/rgvendorswindow.cc:62 #: ../gtk/rgvendorswindow.cc:80 msgid "Vendor" msgstr "Fabricante" -#: ../gtk/rgrepositorywin.cc:191 -#: ../gtk/glade/window_preferences.glade.h:36 +#: ../gtk/rgrepositorywin.cc:191 ../gtk/glade/window_preferences.glade.h:36 msgid "Distribution" msgstr "Distribución" @@ -1730,8 +1787,7 @@ msgid "Source (deb-src)" msgstr "Fuentes (deb-src)" -#: ../gtk/rgrepositorywin.cc:267 -#: ../gtk/rgrepositorywin.cc:409 +#: ../gtk/rgrepositorywin.cc:267 ../gtk/rgrepositorywin.cc:409 #: ../gtk/glade/window_repositories.glade.h:1 msgid "(no vendor)" msgstr "(sin fabricante)" @@ -1758,7 +1814,9 @@ #: ../gtk/rgsummarywindow.cc:148 msgid "To be completely removed (including configuration files)" -msgstr "Para ser eliminados completamente (incluyendo archivos de configuración)" +msgstr "" +"Para ser eliminados completamente (incluyendo archivos de configuración)" #: ../gtk/rgsummarywindow.cc:200 msgid "Unchanged" @@ -1892,14 +1950,13 @@ #: ../gtk/rguserdialog.cc:76 msgid "The following details are provided:" -msgstr "" +msgstr "Se proporcionaron los siguientes detalles:" #: ../gtk/rgvendorswindow.cc:39 msgid "Setup Vendors" msgstr "Configuración de fabricantes" -#: ../gtk/rgvendorswindow.cc:62 -#: ../gtk/rgvendorswindow.cc:107 +#: ../gtk/rgvendorswindow.cc:62 ../gtk/rgvendorswindow.cc:107 msgid "FingerPrint" msgstr "Huella dactilar" @@ -1922,8 +1979,7 @@ #. TRANSLATORS: this is a abbreviation for "not applicable" (on forms) #. happens when e.g. a package has no installed version (or no #. downloadable version) -#: ../gtk/rggladewindow.cc:110 -#: ../gtk/rggladewindow.cc:128 +#: ../gtk/rggladewindow.cc:110 ../gtk/rggladewindow.cc:128 #: ../gtk/rggladewindow.cc:191 msgid "N/A" msgstr "N/D" @@ -1940,54 +1996,48 @@ #: ../gtk/glade/window_main.glade.h:1 #: ../gtk/glade/window_preferences.glade.h:2 -#: ../gtk/glade/window_summary.glade.h:2 -#: ../gtk/glade/window_filters.glade.h:2 +#: ../gtk/glade/window_summary.glade.h:2 ../gtk/glade/window_filters.glade.h:2 #: ../gtk/glade/window_details.glade.h:1 msgid " " msgstr " " -#: ../gtk/glade/window_main.glade.h:2 -#: ../gtk/glade/window_details.glade.h:2 +#: ../gtk/glade/window_main.glade.h:2 ../gtk/glade/window_details.glade.h:2 msgid "Installed Version" msgstr "Versión instalada" -#: ../gtk/glade/window_main.glade.h:3 -#: ../gtk/glade/window_details.glade.h:3 +#: ../gtk/glade/window_main.glade.h:3 ../gtk/glade/window_details.glade.h:3 msgid "Latest Available Version" msgstr "Última versión disponible" -#: ../gtk/glade/window_main.glade.h:4 -#: ../gtk/glade/window_details.glade.h:4 +#: ../gtk/glade/window_main.glade.h:4 ../gtk/glade/window_details.glade.h:4 msgid "Maintainer:" msgstr "Mantenedor:" -#: ../gtk/glade/window_main.glade.h:5 -#: ../gtk/glade/window_details.glade.h:5 -msgid "Note: To install a version that is different from the default one, choose Package -> Force Version... from the menu." -msgstr "Nota: Para instalar una versión que es diferente de la predeterminada, elija Paquete ⇨ Forzar versión… del menú." +#: ../gtk/glade/window_main.glade.h:5 ../gtk/glade/window_details.glade.h:5 +msgid "" +"Note: To install a version that is different from the default one, " +"choose Package -> Force Version... from the menu." +msgstr "" +"Nota: Para instalar una versión que es diferente de la " +"predeterminada, elija Paquete ⇨ Forzar versión… del menú." -#: ../gtk/glade/window_main.glade.h:6 -#: ../gtk/glade/window_details.glade.h:6 +#: ../gtk/glade/window_main.glade.h:6 ../gtk/glade/window_details.glade.h:6 msgid "Package:" msgstr "Paquete:" -#: ../gtk/glade/window_main.glade.h:7 -#: ../gtk/glade/window_details.glade.h:7 +#: ../gtk/glade/window_main.glade.h:7 ../gtk/glade/window_details.glade.h:7 msgid "Priority:" msgstr "Prioridad:" -#: ../gtk/glade/window_main.glade.h:8 -#: ../gtk/glade/window_details.glade.h:8 +#: ../gtk/glade/window_main.glade.h:8 ../gtk/glade/window_details.glade.h:8 msgid "Section:" msgstr "Sección:" -#: ../gtk/glade/window_main.glade.h:9 -#: ../gtk/glade/window_details.glade.h:9 +#: ../gtk/glade/window_main.glade.h:9 ../gtk/glade/window_details.glade.h:9 msgid "Status:" msgstr "Estado:" -#: ../gtk/glade/window_main.glade.h:10 -#: ../gtk/glade/window_details.glade.h:10 +#: ../gtk/glade/window_main.glade.h:10 ../gtk/glade/window_details.glade.h:10 msgid "Tags:" msgstr "Etiquetas:" @@ -2000,8 +2050,12 @@ msgstr "Añadir paquetes descargados" #: ../gtk/glade/window_main.glade.h:13 -msgid "Add packages downloaded with the \"Generate package download script\" feature to the system" +msgid "" +"Add packages downloaded with the \"Generate package download script\" " +"feature to the system" msgstr "" +"Añada paquetes descargados con la funcionalidad \"Generar un script de " +"descarga de paquetes\" al sistema" #: ../gtk/glade/window_main.glade.h:14 msgid "Apply" @@ -2011,13 +2065,11 @@ msgid "Automatically installed" msgstr "Instalado automáticamente" -#: ../gtk/glade/window_main.glade.h:16 -#: ../gtk/glade/window_details.glade.h:11 +#: ../gtk/glade/window_main.glade.h:16 ../gtk/glade/window_details.glade.h:11 msgid "Available versions:" msgstr "Versiones disponibles:" -#: ../gtk/glade/window_main.glade.h:17 -#: ../gtk/glade/window_details.glade.h:12 +#: ../gtk/glade/window_main.glade.h:17 ../gtk/glade/window_details.glade.h:12 msgid "Common" msgstr "Comunes" @@ -2025,27 +2077,27 @@ msgid "Dependants" msgstr "Dependientes" -#: ../gtk/glade/window_main.glade.h:19 -#: ../gtk/glade/window_find.glade.h:1 +#: ../gtk/glade/window_main.glade.h:19 ../gtk/glade/window_find.glade.h:1 #: ../gtk/glade/window_filters.glade.h:18 -#: ../gtk/glade/window_details.glade.h:13 -#: ../gtk/rgfiltermanager.h:72 +#: ../gtk/glade/window_details.glade.h:13 ../gtk/rgfiltermanager.h:72 msgid "Dependencies" msgstr "Dependencias" -#: ../gtk/glade/window_main.glade.h:20 -#: ../gtk/glade/window_details.glade.h:14 +#: ../gtk/glade/window_main.glade.h:20 ../gtk/glade/window_details.glade.h:14 msgid "Dependencies of the Latest Version" msgstr "Dependencias de la última versión" -#: ../gtk/glade/window_main.glade.h:22 -#: ../gtk/glade/window_details.glade.h:17 +#: ../gtk/glade/window_main.glade.h:22 ../gtk/glade/window_details.glade.h:17 msgid "Download:" msgstr "Descargar:" #: ../gtk/glade/window_main.glade.h:23 -msgid "Generate a shell script so that you can download the selected packages on a different computer" +msgid "" +"Generate a shell script so that you can download the selected packages on a " +"different computer" msgstr "" +"Se genera un script de consola de modo que pueda descargar los paquetes " +"seleccionados en máquinas diferentes" #: ../gtk/glade/window_main.glade.h:24 msgid "Generate package download script" @@ -2055,8 +2107,7 @@ msgid "Icon _Legend" msgstr "_Leyenda de iconos" -#: ../gtk/glade/window_main.glade.h:26 -#: ../gtk/glade/window_details.glade.h:18 +#: ../gtk/glade/window_main.glade.h:26 ../gtk/glade/window_details.glade.h:18 msgid "Installed Files" msgstr "Archivos instalados" @@ -2088,8 +2139,7 @@ msgid "Mark for _Upgrade" msgstr "Marcar para _actualización" -#: ../gtk/glade/window_main.glade.h:38 -#: ../gtk/glade/window_find.glade.h:6 +#: ../gtk/glade/window_main.glade.h:38 ../gtk/glade/window_find.glade.h:6 #: ../gtk/glade/window_filters.glade.h:56 #: ../gtk/glade/window_details.glade.h:21 msgid "Provided Packages" @@ -2115,8 +2165,7 @@ msgid "Search" msgstr "Buscar" -#: ../gtk/glade/window_main.glade.h:44 -#: ../gtk/glade/window_details.glade.h:22 +#: ../gtk/glade/window_main.glade.h:44 ../gtk/glade/window_details.glade.h:22 msgid "Size:" msgstr "Tamaño:" @@ -2140,13 +2189,11 @@ msgid "U_nmark All" msgstr "Desmarcar _todo" -#: ../gtk/glade/window_main.glade.h:50 -#: ../gtk/glade/window_details.glade.h:23 +#: ../gtk/glade/window_main.glade.h:50 ../gtk/glade/window_details.glade.h:23 msgid "Version:" msgstr "Versión:" -#: ../gtk/glade/window_main.glade.h:51 -#: ../gtk/glade/window_details.glade.h:24 +#: ../gtk/glade/window_main.glade.h:51 ../gtk/glade/window_details.glade.h:24 msgid "Versions" msgstr "Versiones" @@ -2358,8 +2405,12 @@ msgstr "Software de gestión de paquetes usando apt." #: ../gtk/glade/window_about.glade.h:28 -msgid "This software is licensed under the terms of the GNU General Public License, Version 2" -msgstr "Este software se licencia bajo los términos de la Licencia Pública General de GNU, Versión 2" +msgid "" +"This software is licensed under the terms of the GNU General Public License, " +"Version 2" +msgstr "" +"Este software se licencia bajo los términos de la Licencia Pública General " +"de GNU, Versión 2" #: ../gtk/glade/window_about.glade.h:29 msgid "Translated by" @@ -2398,24 +2449,32 @@ msgstr "_Buscar" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "Mostrar el progreso de cada archivo individual" #: ../gtk/glade/window_changes.glade.h:1 -msgid "Mark additional required changes?" -msgstr "¿Marcar los cambios adicionales requeridos?" +msgid "" +"Mark additional required changes?" +msgstr "" +"¿Marcar los cambios adicionales " +"requeridos?" #: ../gtk/glade/window_changes.glade.h:2 -msgid "The chosen action also affects other packages. The following changes are required in order to proceed." -msgstr "La acción elegida afecta a otros paquetes. Los cambios siguientes se requieren para proceder." +msgid "" +"The chosen action also affects other packages. The following changes are " +"required in order to proceed." +msgstr "" +"La acción elegida afecta a otros paquetes. Los cambios siguientes se " +"requieren para proceder." #: ../gtk/glade/window_changes.glade.h:3 msgid "_Mark" msgstr "_Marcar" #: ../gtk/glade/window_preferences.glade.h:1 -#: ../gtk/glade/window_summary.glade.h:1 -#: ../gtk/glade/window_filters.glade.h:1 +#: ../gtk/glade/window_summary.glade.h:1 ../gtk/glade/window_filters.glade.h:1 msgid " " msgstr " " @@ -2449,7 +2508,9 @@ #: ../gtk/glade/window_preferences.glade.h:10 msgid "Package upgrade behaviour (default distribution)" -msgstr "Comportamiento de la actualización de los paquetes (distribución predeterminada)" +msgstr "" +"Comportamiento de la actualización de los paquetes (distribución " +"predeterminada)" #: ../gtk/glade/window_preferences.glade.h:11 msgid "Proxy Server" @@ -2460,8 +2521,12 @@ msgstr "Archivos temporales" #: ../gtk/glade/window_preferences.glade.h:13 -msgid "These settings affect the core of your system. Consider any changes carefully." -msgstr "Estas opciones afectan al corazón del sistema. Considere los cambios cuidadosamente." +msgid "" +"These settings affect the core of your " +"system. Consider any changes carefully." +msgstr "" +"Estas opciones afectan al corazón del " +"sistema. Considere los cambios cuidadosamente." #: ../gtk/glade/window_preferences.glade.h:14 msgid "A_pplication Font" @@ -2524,8 +2589,12 @@ msgstr "Columnas y tipos" #: ../gtk/glade/window_preferences.glade.h:29 -msgid "Comma separated list of hosts and domains that will not be contacted through the proxy (e.g. localhost, 192.168.1.231, .net)" -msgstr "Lista separada por comas de hosts y dominios que no serán contactados a través del proxy (ej localhost, 192.168.1.231, .net)" +msgid "" +"Comma separated list of hosts and domains that will not be contacted through " +"the proxy (e.g. localhost, 192.168.1.231, .net)" +msgstr "" +"Lista separada por comas de hosts y dominios que no serán contactados a " +"través del proxy (ej localhost, 192.168.1.231, .net)" #: ../gtk/glade/window_preferences.glade.h:30 msgid "Completely" @@ -2536,7 +2605,6 @@ msgstr "Considerar los paquetes recomendados como si fuesen dependencias" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Actualización predeterminada" @@ -2681,7 +2749,6 @@ msgstr "Mostrar las propiedades del paquete en la ventana principal" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Actualización inteligente" @@ -2736,20 +2803,27 @@ msgstr "*" #: ../gtk/glade/window_disc_name.glade.h:2 -msgid "Enter the label of the CD-ROM" -msgstr "Introduzca la etiqueta del CD-ROM" +msgid "" +"Enter the label of the CD-ROM" +msgstr "" +"Introduzca la etiqueta del CD-ROM" #: ../gtk/glade/window_disc_name.glade.h:3 msgid "Disc label:" msgstr "Etiqueta del disco:" #: ../gtk/glade/window_disc_name.glade.h:4 -msgid "The label will be used to identify the CD-ROM if you want to install packages from it later." -msgstr "La etiqueta será usada para identificar el CD-ROM si quiere instalar paquetes de él más tarde." +msgid "" +"The label will be used to identify the CD-ROM if you want to install " +"packages from it later." +msgstr "" +"La etiqueta será usada para identificar el CD-ROM si quiere instalar " +"paquetes de él más tarde." #: ../gtk/glade/window_setopt.glade.h:1 msgid "Set an internal option" -msgstr "Establecer una opción interna" +msgstr "" +"Establecer una opción interna" #: ../gtk/glade/window_setopt.glade.h:2 msgid "Only experts should use this." @@ -2768,8 +2842,11 @@ msgstr "Resumen" #: ../gtk/glade/window_summary.glade.h:4 -msgid "Apply the following changes?" -msgstr "¿Quiere aplicar los cambios siguientes?" +msgid "" +"Apply the following changes?" +msgstr "" +"¿Quiere aplicar los cambios siguientes?" +"" #: ../gtk/glade/window_summary.glade.h:6 msgid "Download package files only" @@ -2784,12 +2861,20 @@ msgstr "Los paquetes serán descargados, pero no serán instalados" #: ../gtk/glade/window_summary.glade.h:9 -msgid "This is your last opportunity to look through the list of marked changes before they are applied." -msgstr "Esta es su última oportunidad para mirar a través de la lista de cambios marcados antes de que se apliquen." +msgid "" +"This is your last opportunity to look through the list of marked changes " +"before they are applied." +msgstr "" +"Esta es su última oportunidad para mirar a través de la lista de cambios " +"marcados antes de que se apliquen." #: ../gtk/glade/window_summary.glade.h:10 -msgid "Vendors sign their packages to verify the origin and integrity of the packages. Disabling the verification is a security risk." -msgstr "Los fabricantes firman sus paquetes para verificar el origen y la integridad de los paquetes. Desactivar la verificación es un riesgo de seguridad." +msgid "" +"Vendors sign their packages to verify the origin and integrity of the " +"packages. Disabling the verification is a security risk." +msgstr "" +"Los fabricantes firman sus paquetes para verificar el origen y la integridad " +"de los paquetes. Desactivar la verificación es un riesgo de seguridad." #: ../gtk/glade/window_summary.glade.h:11 msgid "Verify package signatures" @@ -2839,8 +2924,9 @@ msgstr "Paquetes incompatibles" #: ../gtk/glade/window_filters.glade.h:17 +#, fuzzy msgid "Currently in broken policy state" -msgstr "" +msgstr "Actualmente en estado de política rota" #: ../gtk/glade/window_filters.glade.h:19 #: ../gtk/glade/window_details.glade.h:15 @@ -2855,8 +2941,7 @@ msgid "Exclude selected sections" msgstr "Excluir las secciones seleccionadas" -#: ../gtk/glade/window_filters.glade.h:23 -#: ../gtk/rgfiltermanager.h:62 +#: ../gtk/glade/window_filters.glade.h:23 ../gtk/rgfiltermanager.h:62 msgid "Excludes" msgstr "Excluye" @@ -2876,8 +2961,7 @@ msgid "Include selected sections only" msgstr "Incluir sólo las secciones seleccionadas" -#: ../gtk/glade/window_filters.glade.h:29 -#: ../gtk/rgfiltermanager.h:61 +#: ../gtk/glade/window_filters.glade.h:29 ../gtk/rgfiltermanager.h:61 msgid "Includes" msgstr "Incluye" @@ -2950,18 +3034,19 @@ msgstr "Paquetes con dependencias rotas" #: ../gtk/glade/window_filters.glade.h:54 +#, fuzzy msgid "Policy broken" -msgstr "" +msgstr "Política rota" #. replaces/obsoletes -#: ../gtk/glade/window_filters.glade.h:57 -#: ../gtk/rgfiltermanager.h:76 +#: ../gtk/glade/window_filters.glade.h:57 ../gtk/rgfiltermanager.h:76 msgid "Recommendations" msgstr "Recomendaciones" #: ../gtk/glade/window_filters.glade.h:58 msgid "Removed packages that have left configuration files on the system" -msgstr "Paquetes eliminados que han dejado archivos de configuración en el sistema" +msgstr "" +"Paquetes eliminados que han dejado archivos de configuración en el sistema" #: ../gtk/glade/window_filters.glade.h:59 msgid "Replaced Packages" @@ -2972,8 +3057,7 @@ msgstr "Conf. residual" #. /recommends -#: ../gtk/glade/window_filters.glade.h:63 -#: ../gtk/rgfiltermanager.h:77 +#: ../gtk/glade/window_filters.glade.h:63 ../gtk/rgfiltermanager.h:77 msgid "Suggestions" msgstr "Sugerencias" @@ -3039,7 +3123,9 @@ #: ../gtk/glade/window_rgdebinstall_progress.glade.h:2 msgid "Automatically close after the changes have been successfully applied" -msgstr "Cerrar este diálogo automáticamente después de que se apliquen los cambios con éxito" +msgstr "" +"Cerrar este diálogo automáticamente después de que se apliquen los cambios " +"con éxito" #: ../gtk/glade/window_rgdebinstall_progress.glade.h:3 msgid "Details" @@ -3051,13 +3137,18 @@ #: ../gtk/glade/window_tasks.glade.h:1 msgid "" -"Which tasks should be performed by your computer?\n" +"Which tasks should be performed by your " +"computer?\n" "\n" -"These are preselected groups of packages to perform each task. If you select a task, the corresponding packages will be marked for installation." +"These are preselected groups of packages to perform each task. If you select " +"a task, the corresponding packages will be marked for installation." msgstr "" -"¿Qué tareas debe realizar su computadora?\n" +"¿Qué tareas debe realizar su " +"computadora?\n" "\n" -"Hay grupos preseleccionados de paquetes para realizar cada tarea. Si selecciona una tarea, los paquetes correspondientes se marcarán para instalar." +"Hay grupos preseleccionados de paquetes para realizar cada tarea. Si " +"selecciona una tarea, los paquetes correspondientes se marcarán para " +"instalar." #: ../gtk/glade/window_tasks.glade.h:4 msgid "_Description" @@ -3076,8 +3167,12 @@ msgstr " - " #: ../gtk/glade/dialog_welcome.glade.h:2 -msgid "Note: Changes are not applied instantly. At first you have to mark all changes and then apply them." -msgstr "Nota: Los cambios no se aplican instantáneamente. Primero tiene que marcar todos los cambios y después aplicarlos." +msgid "" +"Note: Changes are not applied instantly. At first you have to mark " +"all changes and then apply them." +msgstr "" +"Nota: Los cambios no se aplican instantáneamente. Primero tiene que " +"marcar todos los cambios y después aplicarlos." #: ../gtk/glade/dialog_welcome.glade.h:3 msgid "Choose the action from the context menu of the package." @@ -3085,7 +3180,9 @@ #: ../gtk/glade/dialog_welcome.glade.h:4 msgid "Click on the status icon to open a menu that contains all actions." -msgstr "Pulse en el icono de estado para abrir un menú que contiene todas las acciones." +msgstr "" +"Pulse en el icono de estado para abrir un menú que contiene todas las " +"acciones." #: ../gtk/glade/dialog_welcome.glade.h:5 msgid "Double click on the package name." @@ -3104,26 +3201,44 @@ msgstr "Mostrar este diálogo al inicio" #: ../gtk/glade/dialog_welcome.glade.h:9 -msgid "The software on your system is organized in so called packages. The package manager enables you to install, to upgrade or to remove software packages." -msgstr "El software en su sistema se organiza en lo que se llaman paquetes. El gestor de paquetes le permite instalar, actualizar o eliminar paquetes de software." +msgid "" +"The software on your system is organized in so called packages. The " +"package manager enables you to install, to upgrade or to remove software " +"packages." +msgstr "" +"El software en su sistema se organiza en lo que se llaman paquetes. " +"El gestor de paquetes le permite instalar, actualizar o eliminar paquetes de " +"software." #: ../gtk/glade/dialog_welcome.glade.h:10 -msgid "You can mark packages for installation, upgrade or removal in several ways:" -msgstr "Puede marcar paquetes para instalación, actualización o eliminación de diferentes formas:" +msgid "" +"You can mark packages for installation, upgrade or removal in several ways:" +msgstr "" +"Puede marcar paquetes para instalación, actualización o eliminación de " +"diferentes formas:" #: ../gtk/glade/dialog_welcome.glade.h:11 -msgid "You should reload the package information regularly. Otherwise you could miss important security upgrades." -msgstr "Debe recargar la información de los paquetes regularmente. De otro modo podría perderse actualizaciones de seguridad importantes." +msgid "" +"You should reload the package information regularly. Otherwise you could " +"miss important security upgrades." +msgstr "" +"Debe recargar la información de los paquetes regularmente. De otro modo " +"podría perderse actualizaciones de seguridad importantes." #: ../gtk/glade/dialog_unmet.glade.h:1 msgid "" -"Could not mark all packages for installation or upgrade\n" +"Could not mark all packages for " +"installation or upgrade\n" "\n" -"The following packages have unresolvable dependencies. Make sure that all required repositories are added and enabled in the preferences." +"The following packages have unresolvable dependencies. Make sure that all " +"required repositories are added and enabled in the preferences." msgstr "" -"No se pudieron marcar todos los paquetes para instalación o actualización\n" +"No se pudieron marcar todos los " +"paquetes para instalación o actualización\n" "\n" -"Los siguientes paquetes tienen dependencias no resolubles. Asegúrese de que todos los repositorios requeridos están añadidos y activados en las preferencias." +"Los siguientes paquetes tienen dependencias no resolubles. Asegúrese de que " +"todos los repositorios requeridos están añadidos y activados en las " +"preferencias." #: ../gtk/glade/dialog_changelog.glade.h:1 msgid "Complete changelog of the latest version:" @@ -3133,18 +3248,29 @@ msgid "" "Could not download all repository indexes\n" "\n" -"The repository may no longer be available or could not be contacted because of network problems. If available an older version of the failed index will be used. Otherwise the repository will be ignored. Check your network connection and ensure the repository address in the preferences is correct." -msgstr "" -"No se pudieron descargar todos los índices de los repositorios\n" -"\n" -"El repositorio quizá no esté disponible o no se pudo contactar con él por problemas en la red. Si hay disponible una versión más antigua del índice que falló, se usará esa versión. En otro caso el repositorio será ignorado. Compruebe su conexión de red y que la dirección del repositorio esté escrita correctamente en las preferencias." +"The repository may no longer be available or could not be contacted because " +"of network problems. If available an older version of the failed index will " +"be used. Otherwise the repository will be ignored. Check your network " +"connection and ensure the repository address in the preferences is correct." +msgstr "" +"No se pudieron descargar todos los índices de los repositorios\n" +"\n" +"El repositorio quizá no esté disponible o no se pudo contactar con él por " +"problemas en la red. Si hay disponible una versión más antigua del índice " +"que falló, se usará esa versión. En otro caso el repositorio será ignorado. " +"Compruebe su conexión de red y que la dirección del repositorio esté escrita " +"correctamente en las preferencias." #: ../gtk/glade/window_iconlegend.glade.h:1 -msgid "The following icons are used to indicate the current status of a package:" -msgstr "Los siguientes iconos se usan para indicar el estado actual de un paquete:" +msgid "" +"The following icons are used to indicate the current status of a package:" +"" +msgstr "" +"Los siguientes iconos se usan para indicar el estado actual de un paquete:" +"" -#: ../gtk/glade/window_iconlegend.glade.h:2 -#: ../gtk/rgiconlegend.cc:41 +#: ../gtk/glade/window_iconlegend.glade.h:2 ../gtk/rgiconlegend.cc:41 msgid "Icon Legend" msgstr "Leyenda de iconos" @@ -3152,21 +3278,33 @@ msgid "" "Could not download all necessary package files\n" "\n" -"The version of the package that you want to install might be no longer available in the repository, or there may be problems with the source of the package. Reload the package list and check the source of the package (e.g. CD or network connection)." +"The version of the package that you want to install might be no longer " +"available in the repository, or there may be problems with the source of the " +"package. Reload the package list and check the source of the package (e.g. " +"CD or network connection)." msgstr "" "No se pudieron descargar todos los paquetes necesarios\n" "\n" -"La versión del paquete que quiere instalar quizá no esté disponible ya en el repositorio, o quizá haya problemas con la fuente del paquete. Refresque la lista de paquetes y compruebe la fuente del paquete (ej: CD o conexión de red)." +"La versión del paquete que quiere instalar quizá no esté disponible ya en el " +"repositorio, o quizá haya problemas con la fuente del paquete. Refresque la " +"lista de paquetes y compruebe la fuente del paquete (ej: CD o conexión de " +"red)." #: ../gtk/glade/dialog_update_outdated.glade.h:1 msgid "" -"Your package information is out of date\n" -"\n" -"Your package information is older than 48 hours. There could be important security updates available. It is recommended to reload the package information regularly." -msgstr "" -"La información de sus paquetes está caducada\n" +"Your package information is out of " +"date\n" "\n" -"La información acerca de sus paquetes es más antigua que 48 horas. Podría haber actualizaciones de seguridad importantes. Se le recomienda recargarla información de los paquetes regularmente." +"Your package information is older than 48 hours. There could be important " +"security updates available. It is recommended to reload the package " +"information regularly." +msgstr "" +"La información de sus paquetes está " +"caducada\n" +"\n" +"La información acerca de sus paquetes es más antigua que 48 horas. Podría " +"haber actualizaciones de seguridad importantes. Se le recomienda recargarla " +"información de los paquetes regularmente." #: ../gtk/glade/dialog_update_outdated.glade.h:4 msgid "Remember the answer" @@ -3182,17 +3320,20 @@ #: ../gtk/glade/window_logview.glade.h:2 msgid "History of installed, upgraded and removed software packages." -msgstr "Histórico de paquetes de software instalados, actualizados y eliminados." +msgstr "" +"Histórico de paquetes de software instalados, actualizados y eliminados." #: ../gtk/glade/dialog_quit.glade.h:1 msgid "" "Quit and discard marked changes?\n" "\n" -"There are still marked changes that have not yet been applied. They will get lost if you choose to quit 'Synaptic'." +"There are still marked changes that have not yet been applied. They will get " +"lost if you choose to quit 'Synaptic'." msgstr "" "¿Salir y descartar los cambios marcados?\n" "\n" -"Todavía hay cambios seleccionados que no han sido aplicados. Éstos cambios se perderán si sale de «Synaptic»." +"Todavía hay cambios seleccionados que no han sido aplicados. Éstos cambios " +"se perderán si sale de «Synaptic»." #: ../gtk/glade/dialog_conffile.glade.h:1 msgid "Difference between the files" @@ -3218,40 +3359,56 @@ msgid "" "Mark upgrades in a smart way?\n" "\n" -"The default upgrade method skips upgrades that would introduce conflicts or require installation of additional packages.\n" +"The default upgrade method skips upgrades that would introduce conflicts or " +"require installation of additional packages.\n" "\n" -"The smart upgrade (dist-upgrade) attempts to resolve conflicts and to fulfil all dependencies of upgrades in a smart way.\n" +"The smart upgrade (dist-upgrade) attempts to resolve conflicts and to fulfil " +"all dependencies of upgrades in a smart way.\n" "\n" -"Note: The upgrades will be marked only. You still have to apply them afterwards." +"Note: The upgrades will be marked only. You still have to apply them " +"afterwards." msgstr "" -"¿Quiere marcar las actualizaciones de una forma inteligente?\n" +"¿Quiere marcar las actualizaciones de una forma inteligente?\n" "\n" -"El método de actualización predeterminado se salta las actualizaciones que podrían introducir conflictos o que requieran instalar paquetes adicionales.\n" +"El método de actualización predeterminado se salta las actualizaciones que " +"podrían introducir conflictos o que requieran instalar paquetes " +"adicionales.\n" "\n" -"La actualización inteligente (dist-upgrade) intenta resolver los conflictos y completar todas las dependencias de las actualizaciones de una forma inteligente.\n" +"La actualización inteligente (dist-upgrade) intenta resolver los conflictos " +"y completar todas las dependencias de las actualizaciones de una forma " +"inteligente.\n" "\n" -"Nota: Las actualizaciones sólo se marcarán. Tiene que aplicarlas después." +"Nota: Las actualizaciones sólo se marcarán. Tiene que aplicarlas " +"después." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "Recordar la respuesta para actualizaciones futuras" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "Este comportamiento puede cambiarse en las preferencias más tarde." -#: ../data/synaptic.desktop.in.h:1 -#: ../data/synaptic-kde.desktop.in.h:1 +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Actualización predeterminada" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Actualización inteligente" + +#: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Instalar, eliminar y actualizar los paquetes de software" -#: ../data/synaptic.desktop.in.h:2 -#: ../data/synaptic-kde.desktop.in.h:2 +#: ../data/synaptic.desktop.in.h:2 ../data/synaptic-kde.desktop.in.h:2 msgid "Package Manager" msgstr "Gestor de paquetes" -#: ../data/synaptic.desktop.in.h:3 -#: ../data/synaptic-kde.desktop.in.h:3 +#: ../data/synaptic.desktop.in.h:3 ../data/synaptic-kde.desktop.in.h:3 msgid "Synaptic Package Manager" msgstr "Gestor de Paquetes Synaptic" @@ -3328,23 +3485,36 @@ msgid "" "Enter a label for this CD-Rom\n" "\n" -"The label will be used if you want to install packages from this CD-Rom. It is recommended to also write the label on the CD-Rom to easily find it again.\n" -msgstr "" +"The label will be used if you want to install packages from this CD-Rom. It " +"is recommended to also write the label on the CD-Rom to easily find it " +"again.\n" +msgstr "" +"Introduzca una etiqueta para este CD-" +"ROM\n" +"\n" +"La etiqueta del disco se usará si quiere instalar paquetes desde este CD-" +"ROM. También se recomienda escribir la etiqueta en el CD-ROM para " +"encontrarlo fácilmente en otra ocasión.\n" #: ../gtk/glade/dialog_disc_label.glade.h:6 -#, fuzzy msgid "Label:" -msgstr "Etiqueta del disco" +msgstr "Etiqueta del disco:" #: ../gtk/glade/dialog_new_repositroy.glade.h:2 msgid "" -"Enter the complete APT line of the repository that you want to add\n" +"Enter the complete APT line of the repository that you want to add\n" "\n" -"The APT line contains the type, location and content of a repository, for example \"deb http://ftp.debian.org sarge main\". You can find a detailed description of the syntax in the documentation." -msgstr "" -"Introduzca la línea APT completa del repositorio que quiere añadir\n" -"\n" -"La línea APT contiene el tipo, localización y contenido de un repositorio, por ejemplo \"deb http://ftp.debian.org sarge main\". Puede encontrar una descripción detallada de la sintaxis en la documentación." +"The APT line contains the type, location and content of a repository, for " +"example \"deb http://ftp.debian.org sarge main\". You can find a " +"detailed description of the syntax in the documentation." +msgstr "" +"Introduzca la línea APT completa del repositorio que quiere añadir\n" +"\n" +"La línea APT contiene el tipo, localización y contenido de un repositorio, " +"por ejemplo \"deb http://ftp.debian.org sarge main\". Puede encontrar " +"una descripción detallada de la sintaxis en la documentación." #: ../gtk/glade/dialog_new_repositroy.glade.h:5 msgid "APT line:" @@ -3356,6 +3526,7 @@ #~ msgid "The package files will be cached locally for installation." #~ msgstr "Los paquetes se almacenarán localmente para instalarlos." + #~ msgid "" #~ "\n" #~ "Failed to apply all changes! Scroll in the terminal buffer to see what " @@ -3364,40 +3535,58 @@ #~ "\n" #~ "Se ha producido un fallo al aplicar todos los cambios. Desplace este " #~ "búfer para ver lo que fue mal." + #~ msgid "You must run this program as the root user." #~ msgstr "Debe ejecutar este programa como el usuario root." + #~ msgid "The following problems were found on your system:" #~ msgstr "Se han encontrado los siguientes problemas en su sistema:" + #~ msgid "S_earch" #~ msgstr "_Buscar" + #~ msgid "_Custom" #~ msgstr "_Personalizado" + #~ msgid "Terminal" #~ msgstr "Terminal" + #~ msgid "could not open recommends file %s" #~ msgstr "no se pudo abrir el archivo de recomendaciones %s" + #~ msgid "Bad regular expression '%s' in Recommends file." #~ msgstr "Expresión regular errónea «%s» en el archivo Recommends." + #~ msgid "Preparing for removal %s" #~ msgstr "Preparándose para quitar %s" + #~ msgid "Removing %s" #~ msgstr "Quitando %s" + #~ msgid "Removed %s" #~ msgstr "Se ha quitado %s" + #~ msgid "Removing with config %s" #~ msgstr "Quitando %s y su configuración" + #~ msgid "Removed with config %s" #~ msgstr "Se ha quitado %s y su configuración" + #~ msgid "Preparing %s" #~ msgstr "Preparando %s" + #~ msgid "Unpacking %s" #~ msgstr "Desempaquetando %s" + #~ msgid "Configuring %s" #~ msgstr "Configurando %s" + #~ msgid "Installed %s" #~ msgstr "%s instalado" + #~ msgid "Installing %s" #~ msgstr "Instalando %s" + #~ msgid "" #~ "Building repository dialog\n" #~ "\n" @@ -3406,4 +3595,3 @@ #~ "Construyendo diálogo del repositorio\n" #~ "\n" #~ "Por favor, espere." - diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/eu.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/eu.po --- synaptic-0.62.1ubuntu2~ppa1/po/eu.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/eu.po 2008-08-19 20:59:27.000000000 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2007-08-14 19:48+0100\n" "Last-Translator: Mikel Pascual Aldabaldetreku \n" "Language-Team: Basque \n" @@ -919,9 +919,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "Ezin da %s irakurri" @@ -1144,21 +1144,34 @@ msgid "Applying Changes" msgstr "Aldaketak Aplikatzen" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"Pakete hau kentzean zure sistema apurtu daiteke\n" +"Ziur al zaude hori egin nahi duzula?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "Errorea %s paketean" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "Aldaketak aplikatu dira" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." @@ -1166,15 +1179,15 @@ "Markatutako aldaketak aplikatuak izaten ari dira orain. Honek denbora luzea " "behar dezake. Itxaron mesedez." -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "Softwarea instalatzen eta kentzen" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "Softwarea kentzen" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "Softwarea instalatzen" @@ -1559,37 +1572,37 @@ msgid "%s Changelog" msgstr "%s Aldaketa-Txostena" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Beste CD-ROM bat gehitu nahi al duzu?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Aldaketak ireki" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "Ezin da %s idatzi" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 #, fuzzy msgid "Save changes" msgstr "Aldaketak ireki" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Egoera osoa gorde, ez aldaketak bakarrik" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "Errepositorioak aldatu dira" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" @@ -1597,20 +1610,20 @@ "Errepositorioen informazioa aldatu da. \"Birkargatu\" botoia sakatu behar " "duzu aldaketak indarrean jar daitezen." -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "Ez berriro erakutsi mezu hau" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "%i pakete aurkitu dira" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "Laguntza erakusteko tresna abiarazten..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1629,7 +1642,7 @@ "idatziz, edota 'synaptic/html' karpetan gordetako html bertsioa ikusi " "dezakezu ere." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1637,23 +1650,23 @@ "Ezin izan da konfigurazio-tresna abiarazi!\n" "'libgnome2-perl' beharrezko paketea instalatu behar duzu." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "Paketeak konfiguratzeko tresna abiarazten..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "Paketeen dokumentazioa ikusteko aplikazioa abiarazten..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" msgstr "" "\"dwww\" paketea instalatu behar duzu pakete baten dokumentazioa ikusteko" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1661,44 +1674,44 @@ "Ezin izan dira aldaketak aplikatu!\n" "Apurtutako paketeak konpondu lehenik." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "Markatutako aldaketak aplikatzen. Honek denbora behar dezake..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "Pakete-fitxategiak deskargatzen" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Synaptic itxi nahi al duzu?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "Paketearen informazioa deskargatzen" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." msgstr "" "Errepositorioak egiaztatuko dira pakete berri, kendu edo eguneratuen bila." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "Paketeen informazioa birkargatzen..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "Ezin izan dira menpekotasun arazoak konpondu!" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "Menpekotasun arazoak konpondu dira" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1706,29 +1719,29 @@ "Ezin izan da sistema eguneratu!\n" "Lehenik, pakete apurtuak konpondu itzazu." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "Eguneratze eskuragarri guztiak markatzen..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "Eguneratze eskuragarri guztiak markatu dira" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "Ezin izan dira eguneratze guztiak markatu!" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "Deskribapena" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "Bilaketa Historia" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 #, fuzzy msgid "Please select a directory" msgstr "Mesedez, sartu disko bat irakurgailuan." @@ -2436,7 +2449,8 @@ msgstr "_Bilatu" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "Fitxategi bakoitzaren aurreratzea erakutsi" #: ../gtk/glade/window_changes.glade.h:1 @@ -2592,7 +2606,6 @@ msgstr "Gomendaturiko paketeak dependentziak bailira bezala hartu" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Eguneratze Lehenetsia" @@ -2737,7 +2750,6 @@ msgstr "Paketeen propietateak erakutsi leiho nagusian" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Eguneratze Adimentsua" @@ -3358,14 +3370,24 @@ "Oharra: Eguneratzeak markatu egingo dira bakarrik. Oraindik ere, " "aplikatu egin beharko dituzu." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "Nire erantzuna gogoratu, hurrengo eguneratzeetareko" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "Portaera hau hobespenetan alda daiteke beranduago." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Eguneratze Lehenetsia" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Eguneratze Adimentsua" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Software-paketeak instalatu, kendu edo eguneratu." diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/fi.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/fi.po --- synaptic-0.62.1ubuntu2~ppa1/po/fi.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/fi.po 2008-08-19 20:59:27.000000000 +0100 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: synaptic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2007-07-20 07:31+0000\n" "Last-Translator: Timo Jyrinki \n" "Language-Team: Finnish \n" @@ -921,9 +921,9 @@ msgid "Local" msgstr "Paikallinen" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "Ei voi lukea kohdetta %s" @@ -1143,21 +1143,34 @@ msgid "Applying Changes" msgstr "Toteutetaan muutokset" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"Tämän paketin poistaminen saattaa tehdä järjestelmästä käyttökelvottoman.\n" +"Haluatko varmasti poistaa sen?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "Virhe paketissa %s" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "Jonkin pakkauksen asennus epäonnistui. Yritän toipua:" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "Muutokset toteutettu" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." @@ -1165,15 +1178,15 @@ "Merkittyjä muutoksia toteutetaan. Se voi viedä jonkin aikaa, odota " "kärsivällisesti." -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "Asennetaan ja poistetaan ohjelmia" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "Poistetaan ohjelmia" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "Asennetaan ohjelmia" @@ -1554,36 +1567,36 @@ msgid "%s Changelog" msgstr "Paketin %s muutosloki" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Haluatko lisätä CD-levyn?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Avaa muutokset" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "Ei voi kirjoittaa %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 msgid "Save changes" msgstr "Tallenna muutokset" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Tallenna muutosten lisäksi koko tila" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "Pakettivarastot muuttuneet" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" @@ -1591,20 +1604,20 @@ "Pakettivarastotiedot ovat muuttuneet. Sinun täytyy napsauttaa \"Päivitä\"-" "painiketta, jotta muutokset tulevat voimaan" -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "Älä näytä tätä viestiä uudelleen" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "Löytyi %i pakettia" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "Käynnistetään ohjeselain..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1622,7 +1635,7 @@ "Vaihtoehtoisesti voit lukea ohjelman käyttöohjesivun komentoriviltä " "komennolla 'man synaptic' tai lukea HTML-version kansiosta 'synaptic/html'." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1630,23 +1643,23 @@ "Asetustyökalua ei voi käynnistää!\n" "Asenna ensin tarvittava paketti \"libgnome2-perl\"." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "Käynnistetään paketin asetustyökalu..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "Käynnistetään paketin dokumentaatioselain..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" msgstr "" "Paketti \"dwww\" täytyy asentaa, jotta voit selata pakettien dokumentaatioita" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1654,44 +1667,44 @@ "Muutoksia ei voi toteuttaa!\n" "Korjaa ensin rikkinäiset paketit." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "Toteutetaan merkityt muutokset. Tämä voi kestää hetken..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "Noudetaan pakettitiedostoja" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Haluatko sulkea Synapticin?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "Noudetaan tietoja paketeista" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." msgstr "" "Pakettivarastoista etsitään uusia, poistettuja ja päivitettyjä paketteja." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "Päivitetään pakettien tietoja..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "Riippuvuusongelmien korjaus epäonnistui!" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "Riippuvuusongelmat korjattiin onnistuneesti" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1699,27 +1712,27 @@ "Järjestelmää ei voi päivittää!\n" "Korjaa ensin rikkinäiset paketit." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "Merkitään saatavilla olevat päivitykset..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "Saatavilla olevat päivitykset merkittiin onnistuneesti" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "Kaikkia saatavilla olevia päivityksiä ei voitu merkitä!" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 msgid "Save script" msgstr "Tallenna komentosarja" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 msgid "Select directory" msgstr "Valitse kansio" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 msgid "Please select a directory" msgstr "Ole hyvä ja valitse kansio" @@ -2429,7 +2442,8 @@ msgstr "Et_si" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "Näytä yksittäisten tiedostojen edistyminen" #: ../gtk/glade/window_changes.glade.h:1 @@ -2583,7 +2597,6 @@ msgstr "Käsittele suositeltuja paketteja riippuvuuksina" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Tavallinen päivitys" @@ -2728,7 +2741,6 @@ msgstr "Näytä paketin ominaisuudet pääikkunassa" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Älykäs päivitys" @@ -3349,14 +3361,24 @@ "Huomautus: Päivitykset ainoastaan merkitään ja ne täytyy erikseen " "vielä asentaa jälkeenpäin." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "Muista vastaukseni myöhemmissä päivityksissä" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "Tätä toimintatapaa voi muuttaa myöhemmin asetuksista." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Tavallinen päivitys" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Älykäs päivitys" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Asenna, poista ja päivitä ohjelmistopaketteja" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/fr.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/fr.po --- synaptic-0.62.1ubuntu2~ppa1/po/fr.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/fr.po 2008-08-19 20:59:27.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2005-04-06 11:09+0200\n" "Last-Translator: Jean-Luc Coulon (f5ibh) \n" "Language-Team: French \n" @@ -933,9 +933,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "Impossible de lire %s" @@ -1163,21 +1163,34 @@ msgid "Applying Changes" msgstr "Application des changements en cours" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"La suppression de ce paquet risque de rendre votre système inutilisable.\n" +"Êtes-vous certain de vouloir le faire ?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "Erreur dans la paquet %s" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "Les modifications ont été appliquées" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." @@ -1185,15 +1198,15 @@ "Les modifications marquées vont être appliquées. Cela peut prendre un " "certain temps. Veuillez patienter." -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "Installation et suppression de logiciel" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "Suppression de logiciel" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "Installation de logiciel" @@ -1580,37 +1593,37 @@ msgid "%s Changelog" msgstr "Journal des modifications de %s" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Souhaitez-vous ajouter un autre cédérom ?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Ouvrir le journal des modifications" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "Impossible d'écrire %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 #, fuzzy msgid "Save changes" msgstr "Ouvrir le journal des modifications" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Enregistrer l'état complet, pas seulement les changements" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "Dépôts modifiés" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" @@ -1618,20 +1631,20 @@ "L'information des dépôts à changé. Veuillez cliquer sur le bouton " "« Recharger » pour que vos modifications soient prises en compte" -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "Ne plus afficher ce message à l'avenir" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "%i paquets trouvés" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "Lancement du visualisateur d'aide..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1651,7 +1664,7 @@ "avec « man synaptic » ou visualiser la version HTML qui se trouve dans le " "répertoire « synaptic/html »." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1659,16 +1672,16 @@ "Impossible de démarrer l'outil de configuration.\n" "Vous devez installer le paquet « libgnome2-perl »." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "Démarrage de l'outil de configuration des paquets..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "Lancement du visualisateur de documentation des paquets..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" @@ -1676,7 +1689,7 @@ "Vous devez installer le paquet « dwww » pour afficher la documentation d'un " "paquet" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1684,25 +1697,25 @@ "Impossible d'appliquer les changements.\n" "Réparez d'abord les paquets cassés." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "Les modifications sont en cours. Veuillez patienter..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "Téléchargement des fichiers en cours" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Souhaitez-vous quitter Synaptic ?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "Téléchargement de l'information concernant les paquets" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." @@ -1710,19 +1723,19 @@ "Les dépôts vont être consultés pour connaître les nouveaux paquets, les " "paquets supprimés et ceux pour lesquels il existe une version plus récente." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "Rechargement de l'information concernant les paquets..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "Impossible de corriger les problèmes de dépendances." -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "Les problèmes de dépendance ont été corrigés avec succès" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1730,29 +1743,29 @@ "Impossible de mettre à jour le système.\n" "Corrigez d'abord les paquets cassés." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "Sélectionner l'ensemble des mises à niveau disponibles..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "Les mises à niveau disponibles ont été correctement sélectionnées" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "Échec de la sélection des mises à niveau disponibles" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "Description" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "Historique de recherche" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 #, fuzzy msgid "Please select a directory" msgstr "Insérez un cédérom dans le lecteur." @@ -2465,7 +2478,8 @@ msgstr "_Rechercher" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "Afficher l'avancement des fichiers individuels" #: ../gtk/glade/window_changes.glade.h:1 @@ -2624,7 +2638,6 @@ msgstr "Traiter les paquets recommandés comme des dépendances" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Mise à jour par défaut" @@ -2770,7 +2783,6 @@ msgstr "Afficher les propriétés du paquet dans la fenêtre principale" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Mise à jour intelligente" @@ -3410,16 +3422,26 @@ "Note : Les mises à jour seront seulement sélectionnées. Vous devrez " "ensuite appliquer les changements." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "Mémoriser la réponse pour les prochaines mises à jour" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "" "Par la suite, il est possible de modifier ce comportement dans les " "préférences." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Mise à jour par défaut" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Mise à jour intelligente" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Installer, désinstaller et mettre à jour les paquets de logiciels" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/gl.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/gl.po --- synaptic-0.62.1ubuntu2~ppa1/po/gl.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/gl.po 2008-08-19 20:59:27.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2007-07-27 11:33+0200\n" "Last-Translator: Ignacio Casal Quinteiro \n" "Language-Team: Galego \n" @@ -923,9 +923,9 @@ msgid "Local" msgstr "Local" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "Non se pode ler %s" @@ -1147,21 +1147,34 @@ msgid "Applying Changes" msgstr "Aplicando os cambios" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"Eliminar este paquete pode facer que o sistema sexa inutilizable.\n" +"Está seguro de que quere facer iso?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "Erro no paquete %s" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "Fallou un paquete ao instalar. Tentando recuperar:" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "Cambios aplicados" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." @@ -1169,15 +1182,15 @@ "Os cambios marcados estanse aplicando agora. Isto pode levar algún tempo. " "Agarde." -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "Instalando e quitando os paquetes de software" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "Eliminando software" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "Instalando software" @@ -1562,36 +1575,36 @@ msgid "%s Changelog" msgstr "Informe de cambios de %s" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Quere engadir outro CD-ROM?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Abrir cambios" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "Non se pode escribir %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 msgid "Save changes" msgstr "Gardar cambios" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Gardar o estado completo, non só os cambios" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "Os repositorios cambiaron" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" @@ -1599,20 +1612,20 @@ "A información dos repositorios cambiou. Ten que premer no botón \"Recargar\" " "para que estes cambios surtan efecto" -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "Non amosar esta mensaxe de novo" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "Atopáronse %i paquetes" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "Iniciando o visor de axuda..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1630,7 +1643,7 @@ "Alternativamente pode abrir a páxina de manual con 'man synaptic' desde a " "liña de comandos ou ver a versión html ubicada no cartafol 'synaptic/html'." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1638,23 +1651,23 @@ "Non se pode iniciar a ferramenta de configuración!\n" "Ten que instalar o paquete requerido 'libgnome2-perl'." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "Iniciando a ferramenta de configuración de paquetes..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "Iniciando o visor de documentación de paquetes..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" msgstr "" "Ten que instalar o paquete \"dwww\" para examinar a documentación dun paquete" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1662,25 +1675,25 @@ "Non se puideron aplicar os cambios!\n" "Arranxe os paquetes rotos primeiro." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "Aplicando os cambios marcados. Levaralle un intre..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "Descargando paquetes" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Quere saír de Synaptic?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "Descargando información do paquete" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." @@ -1688,19 +1701,19 @@ "Comprobaranse os repositorios procurando paquetes novos, eliminados ou " "actualizados." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "Recargando información de paquetes..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "Fallou ao resolver problemas de dependencias!" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "Arranxáronse con éxito os problemas de dependencias" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1708,27 +1721,27 @@ "Non se puido actualizar o sistema!\n" "Arranxe os paquetes rotos primeiro." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "Marcando todas as posibles actualizacións..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "Marcáronse con éxito todas as actualizacións dispoñibles" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "Fallou ao marcar todas as actualizacións dispoñibles!" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 msgid "Save script" msgstr "Gardar script" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 msgid "Select directory" msgstr "Seleccionar directorio" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 msgid "Please select a directory" msgstr "Seleccione un directorio" @@ -2437,7 +2450,8 @@ msgstr "_Procurar" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "Amosar o progreso de cada ficheiro individual" #: ../gtk/glade/window_changes.glade.h:1 @@ -2593,7 +2607,6 @@ msgstr "Considerar os paquetes recomendados coma se foran dependencias" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Actualización predeterminada" @@ -2738,7 +2751,6 @@ msgstr "Amosar as propiedades do paquete na ventá principal" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Actualización intelixente" @@ -3364,14 +3376,24 @@ "completar todas as dependencias das actualizacións dunha forma intelixente.\n" "Nota: As actualizacións só se marcarán. Ten que aplicalas despois." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "Lembrar a resposta para actualizacións futuras" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "Este comportamento pode cambiarse nas preferencias máis tarde." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Actualización predeterminada" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Actualización intelixente" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Instalar, eliminar e actualizar os paquetes de software" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/he.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/he.po --- synaptic-0.62.1ubuntu2~ppa1/po/he.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/he.po 2008-08-19 20:59:27.000000000 +0100 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: synaptic-he\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2007-11-24 20:12+0000\n" "Last-Translator: Yaniv Abir \n" "Language-Team: hebrew \n" @@ -912,9 +912,9 @@ msgid "Local" msgstr "מקומי" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "לא יכול לקרוא %s" @@ -1130,35 +1130,48 @@ msgid "Applying Changes" msgstr "מבצע שינויים" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"הסרת חבילה זו עשויה להשאיר את המערכת לא ניתנת לשימוש. \n" +"האם אתה בטוח שאתה מעוניין להסיר אותה?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "שגיאה בחבילה %s" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "נכשלה התקנת אחת החבילות. מנסה לתקן:" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "השינויים הוחלו" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." msgstr "השינויים שסומנו מוחלים כעת. הדבר יכול לארוך זמן מה, אנא חכו." -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "מתקין ומסיר תוכנות" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "מסיר תוכנות" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "מתקין תוכנות" @@ -1534,55 +1547,55 @@ msgid "%s Changelog" msgstr "%s רשימת שינויים" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "האם ברצונך להוסיף עוד תקליטור?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "פתח שינויים" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "לא יכול לכתוב %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 msgid "Save changes" msgstr "שמירת שינויים" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "שמירת המצב המלא, לא רק שינויים" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "רשימת המאגרים שונתה" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" msgstr "רשימת המאגרים שונתה. עליך ללחוץ על \"טען מחדש\" כדי שהשינויים יוחלו" -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "אל תציג הודעה זו שנית" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "נמצאו %i חבילות" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "מתחיל את מערכת העזרה..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1600,7 +1613,7 @@ "באופן חלופי, אפשר לראות את המדריך על ידי \"man synaptic\" משורת הפקודה או " "לראות את גרסת הhtml תיקיית synaptic/html." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1608,22 +1621,22 @@ "לא יכלו להפעיל את כי ההגדרה.\n" "יש צורך להתקין את החבילה \"libgnome2-perl\"." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "מתחיל את כלי תצורת ההגדרות..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "מתחיל את המציג התיעוד של החבילה..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" msgstr "יש צורך להתקין את החבילה \"dwww\" בשביל לדפדף בתיעוד חבילה" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1631,43 +1644,43 @@ "לא יכול לבצע שינויים.\n" "תקן תחלה חבילות שבורות." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "מבצע את השינויים הנבחרים... זה ייקח קצת זמן" -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "מוריד קבצי חבילות" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "האם ברצונך לצאת מ-Synaptic?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "מוריד מידע חבילות" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." msgstr "המאגרים ייבדקו למציאת חבילות חדשות, משודרגות, או חבילות שהוסרו." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "טוען מחדש את מידע החבילות..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "נכשל בניסיון לתיקון בעיית תלויות." -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "בעיית התלויות תוקנה בהצלחה" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1675,27 +1688,27 @@ "לא יכול לשדרג את המערכת.\n" "תקן תחילה חבילות שבורות." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "מסמן את כל העדכונים האפשריים..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "כל העדכונים האפשריים סומנו בהצלחה" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "נכשל בניסיון לסמן את כל השדרוגים הקיימים." -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 msgid "Save script" msgstr "שמירת סקריפט" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 msgid "Select directory" msgstr "בחר תיקייה" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 msgid "Please select a directory" msgstr "יש לבחור תיקייה" @@ -2396,7 +2409,8 @@ msgstr "_חיפוש" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "הראה התקדמות כל קובץ" #: ../gtk/glade/window_changes.glade.h:1 @@ -2548,7 +2562,6 @@ msgstr "החשב חבילות מומלצות כתלויות" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "שדרוג ברירת מחדל" @@ -2693,7 +2706,6 @@ msgstr "הצג מאפייני חבילה בחלון הראשי" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "שדרוג חכם" @@ -3294,14 +3306,24 @@ "\n" "שימו לב: השידרוגים יסומנו בלבד. עדיין יהיה צורך להחיל אותם מאוחר יותר." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "זכור את התשובה שלי לשדרוגים הבאים." -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "אפשר לשנות התנהגות זו במאפיינים מאוחר יותר." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "שדרוג ברירת מחדל" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "שדרוג חכם" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "התקנה, הסרה ושדרוג חבילות תכנה." diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/hi.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/hi.po --- synaptic-0.62.1ubuntu2~ppa1/po/hi.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/hi.po 2008-08-19 20:59:28.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: hi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2005-10-01 00:32-0500\n" "Last-Translator: vivek rai \n" "Language-Team: Hindi \n" @@ -915,9 +915,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "%s को पढ़ नहीं सकता" @@ -1120,36 +1120,49 @@ msgid "Applying Changes" msgstr "परिवर्तन लागू हो रहे हैं" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"इस पैकेज को हटाना आपके तन्त्र को उपयोग के लिए बेकार कर सकता है.\n" +"क्या आप सचमुच ऐसा करना चाहते हैं?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, fuzzy, c-format msgid "Error in package %s" msgstr "%i पैकेज मिले" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." msgstr "" -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 #, fuzzy msgid "Installing and removing software" msgstr "सॉफ्टवेयर पैकेजों की स्थापना, अद्यतन करें या उन्हें हटाएं." -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "" @@ -1519,29 +1532,29 @@ msgid "%s Changelog" msgstr "%s परिवर्तित-सूची" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "क्या आप एक और सी.डी. रॉम जोड़ना चाहते हैं?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "परिवर्तन खोलें" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "%s लिख नहीं सकता" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 msgid "Save changes" msgstr "परिवर्तन सहेजें" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 #, fuzzy msgid "Repositories changed" msgstr "कोष" @@ -1549,26 +1562,26 @@ #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" msgstr "" -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "%i पैकेज मिले" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "मदद दर्शक चालू हो रहा है..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 #, fuzzy msgid "" "No help viewer is installed!\n" @@ -1587,7 +1600,7 @@ "विकल्प के तौर पर, आप शेल कमान्ड लाइन पर 'man synaptic' चला सकते हैं, या फिर " "'synaptic/html' फोल्डर के अन्दर की html फाइलें देख सकते हैं." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1595,22 +1608,22 @@ "संरचना उपकरण न चल सका!\n" "आपको जरूरी पैकेज 'libgnome2-perl'. स्थापित करना पड़ेगा." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "संरचना उपकरण चालू हो रहा है..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "पैकेज प्रलेखन दर्शक चालू हो रहा है..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" msgstr "पैकेज प्रलेखन देखने के लिए आपको पैकेज \"dwww\" की स्थापना करनी पड़ेगी" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1618,43 +1631,43 @@ "परिवर्तन लागू ना किए जा सके!\n" "टूटे हुए पैकेजों को पहले ठीक करें." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "चिह्नित परिवर्तन लागू किए जा रहे हैं, इसमें थोड़ा समय लग सकता है..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "पैकेज फाइलों का डाउनलोड जारी है." -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "क्या आप सिनेप्टिक से बाहर जाना चाहते हैं?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "पैकेज के बारे में जानकारी डाउनलोड हो रही है." -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." msgstr "नए, अद्यतन योग्य या हटाने योग्य पैकेजों के लिए कोषों की जाँच की जाऐगी." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "पैकेज सूचना फिर से लोड की जा रही है..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "निर्भरताओं का समाधान न हो सका!" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "निर्भरताओं का समाधान सफलता पूर्वक हो गया!" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1662,29 +1675,29 @@ "तन्त्र का अद्यतन न हो सका!\n" "पहले टूटे पैकेजों को ठीक करें." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "सभी उपलब्ध अद्यतन चिह्नित किए जा रहे हैं..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "सभी उपलब्ध अद्यतन चिह्नित किए गए." -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "सभी उपलब्ध अद्यतन चिह्नित करने में विफल!." -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "विवरण" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "इतिहास में खोजें" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 msgid "Please select a directory" msgstr "" @@ -2368,7 +2381,8 @@ msgstr "खोजें(_S)" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "एक एक फाइल की प्रगति दिखाएं" #: ../gtk/glade/window_changes.glade.h:1 @@ -2524,7 +2538,6 @@ msgstr "सुझाए गए पैकेजों को निर्भरता के समान मानें " #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "पूर्वनियत अद्यतन" @@ -2673,7 +2686,6 @@ msgstr "पैकेज के गुण मुख्य विन्डो में दिखाएं" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "स्मार्ट अद्यतन" @@ -3303,15 +3315,25 @@ "नोट:अद्यतनों को सिर्फ चिह्नित किया जाएगा. आपको बाद में उन्हे ' स्वयं लागू करना " "पड़ेगा. " -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 #, fuzzy msgid "Remember my answer for future upgrades" msgstr "भविष्य में अद्यतन के लिए उत्तर याद रखें" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "यह बर्ताव बाद में वरीयताओं के अन्दर बदला जा सकता है." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "पूर्वनियत अद्यतन" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "स्मार्ट अद्यतन" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "सॉफ्टवेयर पैकेजों की स्थापना, अद्यतन करें या उन्हें हटाएं." diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/hu.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/hu.po --- synaptic-0.62.1ubuntu2~ppa1/po/hu.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/hu.po 2008-08-19 20:59:28.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: synaptic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2005-07-10 21:48+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -917,9 +917,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "Nem tudom olvasni: %s" @@ -1138,21 +1138,34 @@ msgid "Applying Changes" msgstr "Változtatások alkalmazása" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"Ezen csomag eltávolítása használhatatlanná teheti a rendszert.\n" +"Biztosan ezt akarja tenni?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "Hiba a(z) %s csomagban" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "A változtatások alkalmazva" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." @@ -1160,15 +1173,15 @@ "A kijelölt változtatások most lesznek alkalmazva.\n" "Ez eltarthat egy ideig. Kérem várjon." -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "Csomagok telepítése és eltávolítása" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "Szoftverek eltávolítása" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "Szoftver telepítése" @@ -1555,37 +1568,37 @@ msgid "%s Changelog" msgstr "%s változásainak listája" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Akar még egy CD-ROM-ot hozzáadni?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Változások megnyitása" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "Nem tudom írni: %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 #, fuzzy msgid "Save changes" msgstr "Változások megnyitása" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Teljes állapot mentése, nem csak a változások" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "Megváltoztak a tárolók" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" @@ -1593,20 +1606,20 @@ "Megváltoztatta a tárolóinformációkat. A változtatások érvényesítéséhez " "kattintson a \"Frissítés\" gombra!" -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "Ne mutassa többé ezt az üzenetet" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "%i csomagot találtam" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "Súgóböngésző indítása..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1624,7 +1637,7 @@ "Alternatívaként megnézheti a html verziót a synaptic/html mappában vagy " "megnyithatja parancssorból a man oldalt a 'man synaptic'-kal." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1632,16 +1645,16 @@ "Nem tudom elindítani a konfigurálóeszközt!\n" "Telepítenie kell az ehhez szükséges 'libgnome2-perl' csomagot." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "Csomagkonfiguráló eszköz indítása..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "Csomagdokumentáció-néző indítása..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" @@ -1649,7 +1662,7 @@ "A csomagok dokumentációjának böngészéséhez telepítenie kell a \"dwww\" " "csomagot" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1657,25 +1670,25 @@ "Nem lehet alkalmazni a változtatásokat!\n" "Először javítsa meg a törött csomagokat." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "Kijelölt változtatások alkalmazása. Ez eltarthat egy ideig..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "Csomagfájlok letöltése" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Ki akar lépni a Synapticból?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "Csomagok információinak letöltése" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." @@ -1683,19 +1696,19 @@ "Ellenőrizve lesz, hogy a tárolókban vannak-e új, eltávolított vagy " "frissített programcsomagok." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "Csomaginformációk újratöltése..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "Függőségi problémák megoldása sikertelen!" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "Függőségi problémák sikeresen megoldva" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1703,29 +1716,29 @@ "Nem tudom frissíteni a rendszert!\n" "Először javítsa meg a törött csomagokat." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "Minden rendelkezésre álló frissítés kijelölése..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "Minden lehetséges frissítés sorba állítása" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "Minden rendelkezésre álló frissítés kijelölése sikertelen!" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "Leírás" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "Keresés előzményei" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 #, fuzzy msgid "Please select a directory" msgstr "Kérem tegyen be egy lemezt a meghajtóba." @@ -2430,7 +2443,8 @@ msgstr "_Keresés" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "Egyes fájlok állapotának mutatása" #: ../gtk/glade/window_changes.glade.h:1 @@ -2584,7 +2598,6 @@ msgstr "Kezelje az ajánlott csomagokat függőségekként" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Alapértelmezett frissítés" @@ -2729,7 +2742,6 @@ msgstr "Csomag tulajdonságainak mutatása a főablakban" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Intelligens frissítés" @@ -3355,14 +3367,24 @@ "Megjegyzés: A frissítések csak kijelölve lesznek. Ezután még " "alkalmaznia kell őket." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "Emlékezzen a válaszomra későbbi frissítéseknél is" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "Ez a viselkedés a tulajdonságoknál később megváltoztatható." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Alapértelmezett frissítés" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Intelligens frissítés" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Csomagokat telepít, töröl és frissít" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/it.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/it.po --- synaptic-0.62.1ubuntu2~ppa1/po/it.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/it.po 2008-08-19 20:59:28.000000000 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: 0.57\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2006-01-09 14:29+0000\n" "Last-Translator: Marco Colombo \n" "Language-Team: Italian \n" @@ -924,9 +924,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "Impossibile leggere %s" @@ -1154,21 +1154,35 @@ msgid "Applying Changes" msgstr "Applicazione delle modifiche" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"La rimozione di questo pacchetto potrebbe rendere il sistema " +"inutilizzabile.\n" +"Continuare?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "Errori nel pacchetto %s" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "Modifiche applicate" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." @@ -1176,15 +1190,15 @@ "Le modifiche marcate stanno per essere applicate. Questo può durare a lungo, " "attendere." -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "Installazione e rimozione software" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "Rimozione software" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "Installazione software" @@ -1572,37 +1586,37 @@ msgid "%s Changelog" msgstr "Changelog di %s" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Aggiungere un altro CD-ROM?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Modifiche aperte" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "Impossibile scrivere %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 #, fuzzy msgid "Save changes" msgstr "Modifiche aperte" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Salvare lo stato completo, non solo le modifiche" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "Archivi cambiati" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" @@ -1610,20 +1624,20 @@ "Le informazioni sugli archivi sono cambiate. Fare clic sul pulsante " "\"Ricarica\" per applicare le modifiche" -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "Non mostrare più questo messaggio" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "%i pacchetti trovati" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "Avvio visualizzatore aiuto..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1643,7 +1657,7 @@ "riga di comando, oppure visualizzare la versione html situata nella cartella " "\"synaptic/html\"." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1651,16 +1665,16 @@ "Impossibile avviare lo strumento di configurazione!\n" "È necessario installare il pacchetto \"libgnome2-perl\"." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "Avvio strumento di configurazione dei pacchetti..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "Avvio visualizzatore documentazione del pacchetto..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" @@ -1668,7 +1682,7 @@ "È necessario installare il pacchetto \"dwww\" per visualizzare la " "documentazione di un pacchetto" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1676,25 +1690,25 @@ "Impossibile applicare le modifiche!\n" "Sistemare i pacchetti difettosi prima." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "Esecuzione modifiche richieste. Potrebbe richiedere un po' di tempo..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "Scaricamento file dei pacchetti" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Uscire da Synaptic?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "Scaricamento delle informazioni sui pacchetti" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." @@ -1702,19 +1716,19 @@ "Verranno controllati gli archivi per la presenza di software nuovo, rimosso " "o aggiornato." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "Aggiornamento informazioni pacchetti..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "Impossibile risolvere i problemi di dipendenza." -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "Sistemati con successo i problemi di dipendenza" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1722,30 +1736,30 @@ "Impossibile aggiornare il sistema.\n" "Sistemare i pacchetti difettosi prima." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "Marcatura di tutti gli aggiornamenti disponibili..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "" "Marcatura di tutti gli aggiornamenti disponibili eseguita con successo." -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "Errore nella marcatura degli aggiornamenti!" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "Descrizione" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "Ricerca cronologia" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 #, fuzzy msgid "Please select a directory" msgstr "Inserire un disco nell'unità." @@ -2458,7 +2472,8 @@ msgstr "_Cerca" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "Visualizza avanzamento dei singoli file" #: ../gtk/glade/window_changes.glade.h:1 @@ -2614,7 +2629,6 @@ msgstr "Considerare i pacchetti raccomandati come dipendenze" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Aggiornamento predefinito" @@ -2762,7 +2776,6 @@ msgstr "Visualizzare le proprietà del pacchetto nella finestra principale" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Aggiornamento intelligente" @@ -3401,15 +3414,25 @@ "Nota: gli aggiornamenti verranno solo marcati. Dovranno essere " "applicati successivamente." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "Ricorda la risposta per i prossimi aggiornamenti" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "" "Questo comportamento può essere modificato successivamente nelle preferenze." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Aggiornamento predefinito" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Aggiornamento intelligente" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Installa, rimuove e aggiorna i pacchetti software" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/ja.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/ja.po --- synaptic-0.62.1ubuntu2~ppa1/po/ja.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/ja.po 2008-08-19 20:59:28.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: synaptic 0.57.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2005-12-16 22:30+0900\n" "Last-Translator: Yasumichi Akahoshi \n" "Language-Team: Project Vine \n" @@ -925,9 +925,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "%s を読むことができません" @@ -1138,35 +1138,48 @@ msgid "Applying Changes" msgstr "変更を適用しています" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"このパッケージを削除するとシステムが動作不能になる可能性があります\n" +"本当にこれを実行してもよろしいですか?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "パッケージ %s のエラー" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "変更を適用しました。" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." msgstr "" -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "ソフトウエアのインストールと削除" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "ソフトウエアを削除します" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "ソフトウェアのインストール" @@ -1537,55 +1550,55 @@ msgid "%s Changelog" msgstr "%s 変更履歴" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "ほかのCD-ROMを追加しますか?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "変更履歴を開く" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "%s を書き込むことができません" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 msgid "Save changes" msgstr "変更履歴を保存する" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "変更だけでなく、全ての状態を保存します" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "リポジトリが変更されました" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" msgstr "" -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "今後このメッセージを表示しない" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "%i 個のパッケージが見つかりました" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "ヘルプビュアーを開始しています..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1604,7 +1617,7 @@ "を参照するか、'synaptic/html' フォルダにある HTML バージョンのマニュアルを参" "照することもできます。" -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1612,16 +1625,16 @@ "設定ツールを起動できません!\n" "パッケージ 'libgnome2-perl' をインストールする必要があります。" -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "パッケージ設定ツールを起動しています..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "パッケージドキュメントビュアーを開始しています..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" @@ -1629,7 +1642,7 @@ "パッケージのドキュメントを参照するためには、パッケージ \"dwww\" をインストー" "ルする必要があります。" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1637,25 +1650,25 @@ "変更を適用することができませんでした!\n" "まず破損パッケージを修復してください。" -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "指定された変更を適用しています. しばらく時間がかかる場合があります..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "パッケージファイルのダウンロード中" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Synaptic を終了しますか?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "パッケージ情報をダウンロードしています" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." @@ -1663,19 +1676,19 @@ "リポジトリの新規、削除あるいはアップグレードされたパッケージをチェックしま" "す。" -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "パッケージ情報を再読込しています..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "依存問題の修正に失敗しました" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "依存問題の修正に成功しました" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1683,29 +1696,29 @@ "システムをアップグレードすることができませんでした!\n" "まず破損パッケージを修復してください。" -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "アップグレード可能な全てのパッケージをアップグレード指定する..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "アップグレード可能な全てのパッケージを指定しました" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "アップグレード可能な全てのパッケージを指定することができませんでした" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "説明" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "検索履歴" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 #, fuzzy msgid "Please select a directory" msgstr "ドライブにディスクを挿入して下さい" @@ -2409,7 +2422,8 @@ msgstr "検索(_S)" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "単一ファイルでもプログレスバーを表示する" #: ../gtk/glade/window_changes.glade.h:1 @@ -2564,7 +2578,6 @@ msgstr "依存関係で推奨されたパッケージを考慮する" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "標準のアップグレード" @@ -2709,7 +2722,6 @@ msgstr "メインウィンドウ内でパッケージ情報を表示する" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "スマートアップグレード" @@ -3327,14 +3339,24 @@ "注意: このアップグレードは予約されるだけです。実際にアップグレードする" "にはこの後、適用を実行する必要があります。" -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "今後のアップグレードでもこの選択を記憶する" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "この振舞は後で設定で変更することが可能です。" +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "標準のアップグレード" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "スマートアップグレード" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "ソフトウエアパッケージのインストール、削除またはアップグレード" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/ko.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/ko.po --- synaptic-0.62.1ubuntu2~ppa1/po/ko.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/ko.po 2008-08-19 20:59:28.000000000 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: 0.57.7.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2006-01-09 03:11+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: GNOME Korea \n" @@ -916,9 +916,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "%s을(를) 읽을 수 없습니다" @@ -1132,21 +1132,34 @@ msgid "Applying Changes" msgstr "변경 사항을 적용하는 중입니다" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"이 꾸러미를 지우면 시스템을 사용할 수 없게 될 수도 있습니다.\n" +"정말로 이 꾸러미를 지우시겠습니까?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "%s 꾸러미에 오류" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "변경 사항을 적용했습니다" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." @@ -1154,15 +1167,15 @@ "표시한 사항을 적용하는 중입니다. 시간이 좀 걸릴 수 있습니다. 잠시 기다려 주십" "시오." -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "소프트웨어를 설치하고 지우는 중입니다" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "소프트웨어를 지우는 중입니다" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "소프트웨어를 설치하는 중입니다" @@ -1540,36 +1553,36 @@ msgid "%s Changelog" msgstr "%s 꾸러미의 변경 사항 기록" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "다른 CD-ROM을 더하시겠습니까?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "변경 사항 열기" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "%s을(를) 쓸 수 없습니다" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 msgid "Save changes" msgstr "변경 사항 저장" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "변경 사항 뿐만 아니라 전체 상태를 저장" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "저장소가 변경되었습니다" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" @@ -1577,20 +1590,20 @@ "저장소 정보가 바뀌었습니다. 변경 사항을 적용하려면 먼저 \"새로 고침\" 단추를 " "눌러야 합니다." -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "이 메세지를 다시 표시하지 않기" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "%i개 꾸러미 있음" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "도움말 보기 프로그램을 시작하고 있습니다...." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1608,7 +1621,7 @@ "그 외에 커맨드 라인에서 'man synaptic'을 실행해서 맨 페이지를 이용하거나 " "'synaptic/html' 폴더에 있는 HTML 버전을 볼 수도 있습니다." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1616,22 +1629,22 @@ "설정 도구를 시작할 수 없습니다!\n" "먼저 필요한 'libgnome2-perl' 꾸러미를 설치해야 합니다." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "꾸러미 설정 도구를 시작하고 있습니다..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "꾸러미 문서 보기 프로그램을 시작하고 있습니다..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" msgstr "꾸러미의 문서를 보려면 \"dwww\" 꾸러미를 설치해야 합니다" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1639,25 +1652,25 @@ "변경 사항을 적용할 수 없습니다!\n" "먼저 깨진 꾸러미를 고치십시오." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "표시된 변경 사항을 적용하는 중입니다. 시간이 좀 걸릴 수 있습니다..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "꾸러미 파일을 내려받고 있습니다" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "시냅틱을 끝내시겠습니까?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "꾸러미 정보를 내려받는 중입니다" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." @@ -1665,19 +1678,19 @@ "저장소에 새로운 꾸러미, 지워진 꾸러미, 업그레이드한 꾸러미가 있는 지 검사합니" "다<." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "꾸러미 정보를 다시 읽어들이고 있습니다..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "의존성 문제를 해결하는 데 실패했습니다!" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "의존성 문제를 성공적으로 고쳤습니다" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1685,27 +1698,27 @@ "시스템을 업그레이드할 수 없습니다!\n" "먼저 깨진 꾸러미를 고치십시오." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "가능한 모든 업그레이드를 표시하고 있습니다..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "가능한 모든 업그레이드를 성공적으로 표시했습니다" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "가능한 모든 업그레이드를 표시하는데 실패했습니다!" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 msgid "Save script" msgstr "스크립트 저장" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 msgid "Select directory" msgstr "디렉토리 선택" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 msgid "Please select a directory" msgstr "디렉토리를 선택하십시오" @@ -2405,7 +2418,8 @@ msgstr "찾기(_S)" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "각각 파일의 진행 상황 표시" #: ../gtk/glade/window_changes.glade.h:1 @@ -2559,7 +2573,6 @@ msgstr "추천 꾸러미를 의존하는 것으로 간주" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "기본 업그레이드" @@ -2704,7 +2717,6 @@ msgstr "메인 창에 꾸러미 등록 정보 표시" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "똑똑한 업그레이드" @@ -3319,14 +3331,24 @@ "주의: 업그레이드를 표시하기만 합니다. 나중에 직접 그 업그레이드를 적용" "해야 합니다." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "대답을 기억해서 앞으로 업그레이드할 때도 사용" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "이 동작은 나중에 기본 설정에서 바꿀 수 있습니다." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "기본 업그레이드" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "똑똑한 업그레이드" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "소프트웨어 꾸러미를 설치, 지우기, 업그레이드" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/lt.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/lt.po --- synaptic-0.62.1ubuntu2~ppa1/po/lt.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/lt.po 2008-08-19 20:59:28.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.56\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2005-12-15 14:21+0200\n" "Last-Translator: Žygimantas Beručka \n" "Language-Team: Lithuanian \n" @@ -914,9 +914,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "Nepavyko perskaityti %s" @@ -1138,21 +1138,34 @@ msgid "Applying Changes" msgstr "Pritaikomi pakeitimai" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"Šio paketo pašalinimas gali padaryti Jūsų sistemą nebenaudojamą.\n" +"Ar tikrai norite tai padaryti?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "Klaida pakete %s" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "Pakeitimai pritaikyti" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." @@ -1160,15 +1173,15 @@ "Dabar pritaikomi pažymėti pakeitimai. Tai gali truputėlį užtrukti. Prašom " "palaukti." -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "Diegiamos ir šalinamos programos" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "Šalinamos programos" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "Diegiamos programos" @@ -1557,37 +1570,37 @@ msgid "%s Changelog" msgstr "%s pakeitimų žurnalas" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Ar norite pridėti kitą CD-ROM?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Atidaryti pakeitimus" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "Nepavyko įrašyti %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 #, fuzzy msgid "Save changes" msgstr "Atidaryti pakeitimus" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Išsaugoti pilną būseną, ne tik pakeitimus" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "Saugyklos pakeistos" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" @@ -1595,20 +1608,20 @@ "Pakito saugyklų informacija. Norėdami, kad įsigaliotų pakeitimai, Jūs turite " "paspausti „Perkrauti“" -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "Daugiau niekuomet nerodyti šios žinutės" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "Rasta %i paketų" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "Paleidžiama pagalbos žiūryklė..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1627,7 +1640,7 @@ "eilutėje komandą „man synaptic“ arba peržiūrėti html versiją esančią " "„synaptic/html“ aplanke." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1635,22 +1648,22 @@ "Nepavyko paleisti konfigūravimo įrankio!\n" "Jums reikia įdiegti reikalingą paketą „libgnome2-perl“." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "Paleidžiamas paketų konfigūravimo įrankis..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "Paleidžiama paketų dokumentacijos žiūryklė..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" msgstr "Norėdami naršyti paketo dokumentaciją Jūs turite įdiegti „dwww“ paketą" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1658,44 +1671,44 @@ "Nepavyko pritaikyti pakeitimų!\n" "Pirmiau pataisykite sugadintus paketus." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "Pritaikomi pažymėti pakeitimai. Tai gali šiek tiek užtrukti..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "Parsiunčiamos paketų bylos" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Ar norite uždaryti Synaptic?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "Parsiunčiama paketų informacija" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." msgstr "" "Saugyklos bus patikrintos ar nėra naujų, pašalintų ar atnaujintų paketų." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "Perkraunama paketų informacija..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "Nepavyko išspręsti priklausomybių problemų!" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "Priklausomybių problemos sėkmingai ištaisytos" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1703,29 +1716,29 @@ "Sistemos atnaujinti nepavyko!\n" "Pirmiau pataisykit sugadintus paketus." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "Pažymimi visi galimi atnaujinimai..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "Prieinami atnaujinimai sėkmingai pažymėti" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "Nepavyko pažymėti visų prieinamų atnaujinimų!" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "Aprašymas" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "Paieškos istorija" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 #, fuzzy msgid "Please select a directory" msgstr "Į įrenginį įdėkite diską." @@ -2442,7 +2455,8 @@ msgstr "_Ieškoti" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "Rodyti pavienių bylų pažangą" #: ../gtk/glade/window_changes.glade.h:1 @@ -2597,7 +2611,6 @@ msgstr "Laikyti rekomenduojamus paketus priklausomybėmis" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Įprastas atnaujinimas" @@ -2742,7 +2755,6 @@ msgstr "Pagrindiniame lange rodyti paketų savybes" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Gudrus atnaujinimas" @@ -3368,14 +3380,24 @@ "Pastaba: Atnaujinimai bus tik pažymėti. Jūs vis dar turėsite po to " "juos pritaikyti." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "Atsiminti atsakymą tolesniems atnaujinimams" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "Ši elgsena vėliau nustatymuose gali būti pakeista." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Įprastas atnaujinimas" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Gudrus atnaujinimas" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Įdiekite, šalinkite ir atnaujinkite programų paketus" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/Makefile.in.in /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/Makefile.in.in --- synaptic-0.62.1ubuntu2~ppa1/po/Makefile.in.in 2008-06-17 08:58:24.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/Makefile.in.in 2008-10-21 18:33:57.000000000 +0100 @@ -54,16 +54,16 @@ ALL_LINGUAS = @ALL_LINGUAS@ -PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi) +PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi) +USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi) -USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) +USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) -POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) +POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) -DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES) -EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS +DISTFILES = Makefile.in.in POTFILES.in $(POFILES) +EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS POTFILES = \ # This comment gets stripped out @@ -101,7 +101,6 @@ install-data: install-data-@USE_NLS@ install-data-no: all install-data-yes: all - $(mkdir_p) $(DESTDIR)$(itlocaledir) linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/mk.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/mk.po --- synaptic-0.62.1ubuntu2~ppa1/po/mk.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/mk.po 2008-08-19 20:59:28.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: synaptic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2005-04-09 17:05+0200\n" "Last-Translator: Arangel Angov \n" "Language-Team: Macedonian \n" @@ -923,9 +923,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "Не можам да прочитам %s" @@ -1138,21 +1138,34 @@ msgid "Applying Changes" msgstr "Ги применувам промените" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"Ако го отстраните пакетот Вашиот систем може да стане нестабилен.\n" +"Дали сте сигурни дека сакате да го направите ова?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "Грешка во пакетот %s" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 #, fuzzy msgid "" "The marked changes are now being applied. This can take some time. Please " @@ -1162,17 +1175,17 @@ "\n" "Обележаните промени се применети. Ова може да потрае. Ве молам почекајте." -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 #, fuzzy msgid "Installing and removing software" msgstr "Инсталирајте, отстранете или надградете софтверски пакети" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 #, fuzzy msgid "Removing software" msgstr "Отстранувам %s" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 #, fuzzy msgid "Installing software" msgstr "Инсталирам %s" @@ -1555,37 +1568,37 @@ msgid "%s Changelog" msgstr "Датотека со промени за %s" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Дали сакате да додадете друг CD-ROM?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Отвори променети" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "Не можам да запишам %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 #, fuzzy msgid "Save changes" msgstr "Отвори променети" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Зачувај целосна состојба, не само промени" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "Складиштата се променети" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" @@ -1593,20 +1606,20 @@ "Информациите за складиштата се променети. Треба да кликнете на копчето " "„Освежи“ за да се применат промените." -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "Не ја покажувај оваа порака пак" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "Пронајдов %i пакети" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "Го подигнувам прегледувачот за помош..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 #, fuzzy msgid "" "No help viewer is installed!\n" @@ -1623,7 +1636,7 @@ "\n" "Инаку можете да го отворите и во терминал со командата „man synaptic“." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1631,23 +1644,23 @@ "Не можам да ја подигнам алатката за конфигурација!\n" "Морате да го инсталирате пакетот „libgnome2-perl“." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "Ја подигнувам алатката за конфигурација на пакети..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "Го подигнувам прегледувачот за документација" -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" msgstr "" "Морате да инсталирате „dwww“ за да можете да ја разгледувате документацијата" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1655,25 +1668,25 @@ "Не можам да ги применам промените!\n" "Прво поправете ги расипаните пакети." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "Ги применувам промените. Ова може да потрае..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "Ги преземам пакетите" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Дали сакате да излезете од Синаптик?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "Ги преземам информациите за пакетите" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." @@ -1681,19 +1694,19 @@ "Складиштата ќе бидат проверени за нови, отстранети или надградени софтверски " "пакети." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "Ги освежувам информациите за пакетите..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "Не успеав да ги решам проблемите со зависностите!" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "Успешно ги поправив проблемите со зависностите" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1701,29 +1714,29 @@ "Не можам да го надградам системот!\n" "Прво поравете ги расипаните пакети." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "Ги обележувам сите достапни надградби..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "Успешно ги обележав достапните надградби" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "Не успеав да ги обележам достапните надградби!" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "Опис" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "Историја на пребарување" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 #, fuzzy msgid "Please select a directory" msgstr "Внесете диск во уредот." @@ -2428,7 +2441,8 @@ msgstr "_Барај" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "Покажувај го напредокот поединечно" #: ../gtk/glade/window_changes.glade.h:1 @@ -2582,7 +2596,6 @@ msgstr "Сметај ги препорачаните пакети како зависности" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Стандардна надградба" @@ -2728,7 +2741,6 @@ msgstr "Покажи ги својствата на пакетот во главниот прозорец" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Паметена надградба" @@ -3355,14 +3367,24 @@ "Забелешка: Надградбите ќе бидат само обележани. Морате да ги " "примените потоа." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "Запамти го одговорот" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "Однесувањето може да се промени во преференците подоцна." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Стандардна надградба" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Паметена надградба" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Инсталирајте, отстранете или надградете софтверски пакети" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/nb.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/nb.po --- synaptic-0.62.1ubuntu2~ppa1/po/nb.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/nb.po 2008-08-19 20:59:28.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: synaptic 0.53\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "Last-Translator: Vidar Braut Haarr \n" "Language-Team: Norwegian Bokmaal \n" "MIME-Version: 1.0\n" @@ -937,9 +937,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "" @@ -1151,36 +1151,49 @@ msgid "Applying Changes" msgstr "Utfører forandringene" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"Dersom du fjerner denne pakken kan systemet bli ubrukelig.\n" +"Er du sikker på at du vil fjerne pakken?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, fuzzy, c-format msgid "Error in package %s" msgstr "Ta vare på pakken" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." msgstr "" -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 #, fuzzy msgid "Removing software" msgstr "[Henter] " -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 #, fuzzy msgid "Installing software" msgstr "Installer" @@ -1551,31 +1564,31 @@ msgid "%s Changelog" msgstr "Plateforandring" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 #, fuzzy msgid "Open changes" msgstr "Pakkeforandringer" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 #, fuzzy msgid "Save changes" msgstr "Pakkeforandringer" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 #, fuzzy msgid "Repositories changed" msgstr "Arkiv" @@ -1583,26 +1596,26 @@ #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" msgstr "" -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, fuzzy, c-format msgid "Found %i packages" msgstr "Søk i pakker" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "" -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1613,102 +1626,102 @@ "line or view the html version located in the 'synaptic/html' folder." msgstr "" -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." msgstr "" -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "" #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "" -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" msgstr "" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." msgstr "" -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "" -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "Henter pakkefiler" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "Bytt til panelet for pakkefilter" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." msgstr "" -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 #, fuzzy msgid "Reloading package information..." msgstr "Bruk farger i pakkelisten" -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 #, fuzzy msgid "Failed to resolve dependency problems!" msgstr "Fiks avhengighetsforhold" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 #, fuzzy msgid "Successfully fixed dependency problems" msgstr "Fiks avhengighetsforhold" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." msgstr "" -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 #, fuzzy msgid "Marking all available upgrades..." msgstr "Pakken vil bli oppgradert." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "Beskrivelse" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "Søkefilter" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 #, fuzzy msgid "Please select a directory" msgstr "Vennligst sett inn platen med navnet:\n" @@ -2437,7 +2450,7 @@ msgstr "Søk" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +msgid "Show for individual files" msgstr "" #: ../gtk/glade/window_changes.glade.h:1 @@ -2588,7 +2601,6 @@ msgstr "" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 #, fuzzy msgid "Default Upgrade" msgstr "_Distribusjonsoppgradering" @@ -2750,7 +2762,6 @@ msgstr "" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 #, fuzzy msgid "Smart Upgrade" msgstr "Oppgrader" @@ -3359,14 +3370,24 @@ "afterwards." msgstr "" -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "" +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "_Distribusjonsoppgradering" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Oppgrader" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/nl.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/nl.po --- synaptic-0.62.1ubuntu2~ppa1/po/nl.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/nl.po 2008-08-19 20:59:28.000000000 +0100 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: nl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2005-04-11 14:44+0200\n" "Last-Translator: Vincent van Adrighem \n" "Language-Team: Dutch \n" @@ -920,9 +920,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "Kan %s niet lezen" @@ -1142,21 +1142,35 @@ msgid "Applying Changes" msgstr "Doorvoeren van veranderingen" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"Het verwijderen van dit pakket kan het systeem in een onbruikbare staat " +"achterlaten.\n" +"Weet u zeker dat u hiermee door wilt gaan?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "probleem met pakket %s" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "veranderingen doorgevoerd" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." @@ -1164,15 +1178,15 @@ "De aangegeven veranderingen worden nu doorgevoerd. Dit kan even duren. Even " "geduld alstublieft." -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "Verwijderen en installeren van software" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "Software verwijderen" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "Software installeren" @@ -1553,37 +1567,37 @@ msgid "%s Changelog" msgstr "%s Veranderingen" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Wilt u nog een CD-ROM doorzoeken?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Veranderingen openen" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "Kan %s niet schrijven" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 #, fuzzy msgid "Save changes" msgstr "Veranderingen openen" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Volledige status opslaan, niet alleen veranderingen" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "Pakketbronnen veranderd" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" @@ -1591,20 +1605,20 @@ "De informatie over de pakketbronnen is veranderd. U dient op de knop " "\"Herladen\" te klikken om de veranderingen door te voeren" -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "Dit bericht niet meer weergeven" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "%i pakketten gevonden" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "Starten van hulpweergave..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1622,7 +1636,7 @@ "U kunt ook de handleiding bekijken met de opdracht 'man synaptic', of de " "html-versie bekijken in de map 'synaptic/html'." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1630,16 +1644,16 @@ "Kan de configuratie niet starten!\n" "U dient eerst het pakket 'libgnome2-perl' te installeren." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "Starten van pakketconfiguratie..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "Starten van pakketdocumentatieweergave..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" @@ -1647,7 +1661,7 @@ "U dient het pakket \"dwww\" te installeren om de documentatie van een pakket " "te bekijken." -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1655,25 +1669,25 @@ "Kan veranderingen niet toepassen.\n" "U dient eerst de gebroken pakketten te repareren." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "Gegeven veranderingen worden doorgevoerd. Dit kan even duren..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "Ophalen van pakketten" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Wilt u Synaptic afsluiten?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "Ophalen van pakketinformatie" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." @@ -1681,19 +1695,19 @@ "Er wordt gecontroleerd op nieuwe, verwijderde of bijgewerkte " "softwarepakketten." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "Herladen van pakketinformatie..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "Kan afhankelijkheidsproblemen niet oplossen!" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "Afhankelijkheden succesvol gerepareerd" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1701,29 +1715,29 @@ "Kan systeem niet bijwerken!\n" "Er zijn gebroken pakketten. Die moeten eerst gerepareerd worden." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "Markeren van bij te werken pakketten..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "Alle bij te werken pakketten succesvol gemarkeerd" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "Kan niet alle bij te werken pakketten markeren!" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "Beschrijving" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "Zoekgeschiedenis" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 #, fuzzy msgid "Please select a directory" msgstr "Doe een schijf in het schijfstation." @@ -2440,7 +2454,8 @@ msgstr "_Zoeken" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "Voortgang van individuele pakketten" #: ../gtk/glade/window_changes.glade.h:1 @@ -2597,7 +2612,6 @@ msgstr "Beschouw aanbevolen pakketten als afhankelijkheden" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Normaal bijwerken" @@ -2743,7 +2757,6 @@ msgstr "Pakketeigenschappen in hoofdvenster weergeven" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Slim bijwerken" @@ -3373,14 +3386,24 @@ "Opmerking: Dit beïnvloed alleen het markeren zelf. Het uitvoeren van " "de veranderingen moet nog door u gestart worden." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "Dit antwoord onthouden" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "Dit gedrag kan later veranderd worden in de Voorkeuren." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Normaal bijwerken" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Slim bijwerken" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Softwarepakketten installeren, verwijderen of bijwerken" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/no.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/no.po --- synaptic-0.62.1ubuntu2~ppa1/po/no.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/no.po 2008-08-19 20:59:28.000000000 +0100 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: no\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2005-02-04 19:34+0100\n" "Last-Translator: John Sverre \n" "Language-Team: \n" @@ -938,9 +938,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "Kan ikke lese %s" @@ -1147,36 +1147,49 @@ msgid "Applying Changes" msgstr "Utfører forandringene" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"Dersom du fjerner denne pakken kan systemet bli ubrukelig.\n" +"Er du sikker på at du vil fjerne pakken?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, fuzzy, c-format msgid "Error in package %s" msgstr "Ta vare på pakken" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." msgstr "" -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 #, fuzzy msgid "Installing and removing software" msgstr "Installer, fjern eller oppgrader programvare pakker" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "" @@ -1544,38 +1557,38 @@ msgid "%s Changelog" msgstr "Plateforandring" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Vil du legge til en annen cd-plate?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 #, fuzzy msgid "Open changes" msgstr "Pakkeforandringer" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "Kan ikke lese %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 #, fuzzy msgid "Save changes" msgstr "Pakkeforandringer" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "Arkiv er forandret" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" @@ -1583,20 +1596,20 @@ "Arkivet har forandret seg. Du må trykke på \"Reload\" knappen for at " "forandringen skal skje" -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "Aldri hvis denne beskjeden igjen" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, fuzzy, c-format msgid "Found %i packages" msgstr "Søk i pakker" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "Starter Help..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1607,7 +1620,7 @@ "line or view the html version located in the 'synaptic/html' folder." msgstr "" -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1615,23 +1628,23 @@ "Kan ikke starter konfigurasjonsverktøy!\n" "Du må installere pakken 'libgnome2-perl'." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "Starter pakke konfigurasjonsverktøy..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "Starter pakkedokumentasjons viseren" -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" msgstr "" "Du må installere pakken \"dwww\" for å lese dokumentasjonen til en pakke" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1639,47 +1652,47 @@ "Kunne ikke fullføre forandringene!\n" "Fiks ødelagte pakker først." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "Utfører merkede forandringer. Dette kan ta ei stund..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "Henter pakkefiler" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Vil du avslutte Synaptic?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "Bytt til panelet for pakkefilter" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." msgstr "" "Arkivet vil bli sjekket for ny, fjernet eller oppgradert programvarepakker." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 #, fuzzy msgid "Reloading package information..." msgstr "Bruk farger i pakkelisten" -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 #, fuzzy msgid "Failed to resolve dependency problems!" msgstr "Fiks avhengighetsforhold" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 #, fuzzy msgid "Successfully fixed dependency problems" msgstr "Fiks avhengighetsforhold" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1687,30 +1700,30 @@ "Kunne ikke oppgradere systemet!\n" "Fiks ødelagte pakker først." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 #, fuzzy msgid "Marking all available upgrades..." msgstr "Pakken vil bli oppgradert." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "Vellykket merket tilgjengelige oppgraderinger" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "Feilet i å merke alle tilgjengelige oppgraderinger!" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "Beskrivelse" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "Søkehistorie" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 #, fuzzy msgid "Please select a directory" msgstr "Sett inn en cd i cdrommen." @@ -2473,7 +2486,8 @@ msgstr "Søk" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "Vis progresjon av enkelt filer" #: ../gtk/glade/window_changes.glade.h:1 @@ -2632,7 +2646,6 @@ msgstr "" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Distribusjonsoppgradering" @@ -2791,7 +2804,6 @@ msgstr "" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Smart Oppgradering" @@ -3414,15 +3426,25 @@ "afterwards." msgstr "" -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 #, fuzzy msgid "Remember my answer for future upgrades" msgstr "Husk svaret for fremtidige oppgraderinger" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "Denne oppførselen kan bli forandre i _preferences_ senere" +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Distribusjonsoppgradering" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Smart Oppgradering" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Installer, fjern eller oppgrader programvare pakker" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/pl.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/pl.po --- synaptic-0.62.1ubuntu2~ppa1/po/pl.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/pl.po 2008-08-19 20:59:28.000000000 +0100 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2008-01-13 21:28+0100\n" "Last-Translator: Tomasz Argasiński \n" "Language-Team: Polish \n" @@ -930,9 +930,9 @@ msgid "Local" msgstr "Lokalne" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "Nie można odczytać %s" @@ -1157,22 +1157,35 @@ msgid "Applying Changes" msgstr "Wykonywanie wybranych zmian" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"Usunięcie tego pakietu może spowodować, że system stanie się bezużyteczny.\n" +"Czy na pewno chcesz to uczynić?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "Błąd w pakiecie %s" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" "Nie udało się zainstalować pakietu. Próba powrócenia do poprzedniego stanu:" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "Zmiany zostały wprowadzone" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." @@ -1180,15 +1193,15 @@ "Wybrane wcześniej zmiany zostaną teraz wprowadzone do systemu. Proszę " "cierpliwie poczekać." -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "Instalacja i usuwanie pakietów z oprogramowaniem" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "Usuwanie oprogramowania" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "Instalacja oprogramowania" @@ -1579,36 +1592,36 @@ msgid "%s Changelog" msgstr "plik Changelog dla %s" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Czy chcesz dodać kolejny CD-ROM?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Otwórz plik zmian" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "Nie można zapisywać %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 msgid "Save changes" msgstr "Zapisz zmiany" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Zapisz pełny stan (nie tylko zmiany)" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "Repozytoria uległy zmianie" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" @@ -1616,20 +1629,20 @@ "Informacje o repozytoriach zostały zmienione. Należy wcisnąć przycisk " "\"Odśwież\", aby zaktualizować bazę danych informacji o pakietach." -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "Nie pokazuj tej wiadomości w przyszłości." -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "Znaleziono %i pakietów" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "Uruchamianie systemu pomocy..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1649,7 +1662,7 @@ "poleceń lub przejrzeć jego wersję html znajdującą się w katalogu 'synaptic/" "html'." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1657,23 +1670,23 @@ "Nie można uruchomić narzędzia konfiguracyjnego!\n" "Należy zainstalować wymagany pakiet 'libgnome2-perl'." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "Uruchamianie narzędzia do konfiguracji pakietów..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "Uruchamianie przeglądarki do dokumentacji pakietów..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" msgstr "" "Aby przeglądać dokumentację pakietów, należy wcześniej zainstalować \"dwww\"." -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1681,25 +1694,25 @@ "Nie można wykoać zmian!\n" "Należy najpierw naprawić uszkodzone pakiety." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "Dokonywanie wybranych wcześniej zmian - może to trochę potrwać..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "Pobieranie plików z pakietami" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Zakończyć działanie programu Synaptic?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "Pobieranie informacji o pakietach" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." @@ -1707,19 +1720,19 @@ "Repozytoria zostaną sprawdzone w poszukiwaniu nowych, usuniętych lub " "zaktualizowanych pakietów." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "Odświeżanie informacji o pakietach..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "Nie udało się naprawić brakujących zależności!" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "Pomyślnie rozwiązano problemy z zależnościami" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1727,27 +1740,27 @@ "Nie można zaktualizować systemu!\n" "Należy najpierw naprawić uszkodzone pakiety." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "Zaznaczanie wszystkich możliwych pakietów do aktualizacji..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "Zaznaczono wszystkie możliwe pakiety do aktualizacji" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "Nie udało się zaznaczyć wszystkich możliwych pakietów do aktualizacji!" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 msgid "Save script" msgstr "Zapisywanie skryptu" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 msgid "Select directory" msgstr "Wybór katalogu" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 msgid "Please select a directory" msgstr "Proszę wybrać katalog" @@ -2472,7 +2485,8 @@ msgstr "_Szukaj" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "Pokaż postęp pobierania poszczególnych plików" #: ../gtk/glade/window_changes.glade.h:1 @@ -2626,7 +2640,6 @@ msgstr "Traktowanie rekomendowanych pakietów jako zależności" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Domyślna aktualizacja" @@ -2771,7 +2784,6 @@ msgstr "Pokazywanie właściwości pakietu o oknie głównym" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Inteligenta Aktualizacja" @@ -3401,14 +3413,24 @@ "Uwaga: Operacja ta zaznacza tylko odpowiednie pakiety. Aby wprowadzić " "zmiany należy je później \"wykonać\"." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "Zapamiętaj odpowiedź przy późniejszych aktualizacjach" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "To działanie można później zmienić w oknie preferencji." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Domyślna aktualizacja" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Inteligenta Aktualizacja" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Instalacja, usuwanie i aktualizacja pakietów z oprogramowaniem" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/POTFILES.in /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/POTFILES.in --- synaptic-0.62.1ubuntu2~ppa1/po/POTFILES.in 2008-06-12 14:45:40.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/POTFILES.in 2008-08-22 13:07:34.000000000 +0100 @@ -9,6 +9,8 @@ common/rinstallprogress.cc common/rpackage.cc common/rpackage.h +common/rpackagestatus.cc +common/rpackagestatus.h common/rpackagecache.cc common/rpackagefilter.cc common/rpackagelister.cc @@ -76,7 +78,8 @@ gtk/rgfiltermanager.h gtk/rgpkgcdrom.cc gtk/rgiconlegend.cc -gtk/rgmisc.cc +gtk/rgpackagestatus.cc +gtk/rgutils.cc gtk/rgterminstallprogress.cc gtk/glade/dialog_authentication.glade gtk/glade/dialog_disc_label.glade diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/pt_BR.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/pt_BR.po --- synaptic-0.62.1ubuntu2~ppa1/po/pt_BR.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/pt_BR.po 2008-08-19 20:59:28.000000000 +0100 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: synaptic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2005-05-18 22:48-0300\n" "Last-Translator: André Luís Lopes \n" "Language-Team: Debian-BR Project \n" @@ -923,9 +923,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "Não foi possível ler %s" @@ -1149,21 +1149,34 @@ msgid "Applying Changes" msgstr "Aplicando Modificações" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"A remoção deste pacote pode tornar o sistema inutilizável.\n" +"Está certo de que deseja fazer isto?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "Erro no pacote %s" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "Mudanças aplicadas" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." @@ -1171,15 +1184,15 @@ "As mundaças marcadas estão agora sendo aplicadas. Isto pode levar algum " "tempo. Por favor, aguarde." -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "Instalando e removendo software" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "Removendo software" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "Instalando software" @@ -1565,36 +1578,36 @@ msgid "%s Changelog" msgstr "Log de Mudanças de %s" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Deseja adicionar outro CD-ROM?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Abrir mudanças" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "Não foi possível escrever %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 msgid "Save changes" msgstr "Salvar mudanças" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Salvar todo o estado, não apenas as mudanças" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "Repositórios mudados" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" @@ -1602,20 +1615,20 @@ "A informação de repositório foi mudada. Você precisa clicar no botão " "\"Recarregar\" para que suas mudanças tenham efeito" -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "Nunca exibir esta mensagem novamente" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "%i pacotes encontrados" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "Iniciando o visualizador de ajuda..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1635,7 +1648,7 @@ "synaptic' na linha de comando ou visualizar a versão html localizada na " "pasta 'synaptic/html'." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1643,16 +1656,16 @@ "Não foi possível iniciar a ferramenta de configuração !\n" "Você precisa instalar o pacote necessário 'lbgnome2-perl'." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "Iniciando a ferramenta de configuração de pacotes..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "Iniciando visualizador de documentação do pacote..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" @@ -1660,7 +1673,7 @@ "Você precisa instalar o pacote \"dwww\" para navegar pela documentação de um " "pacote" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1668,25 +1681,25 @@ "Não foi possível aplicar mudanças!\n" "Solucione os pacotes quebrados antes." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "Aplicando as mudanças marcadas. Isto pode levar algum tempo..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "Fazendo o download de arquivos de pacotes" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Deseja sair do Synaptic?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "Fazendo o download de informação de pacotes" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." @@ -1694,19 +1707,19 @@ "Os repositórios serão checados a procura de pacotes de software novos, " "removidos ou atualizados." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "Recarregando a informação de pacotes ..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "Falha ao resolver problemas de dependência !" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "Problemas de dependência solucionados com sucesso" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1714,29 +1727,29 @@ "Não foi possível atualizar o sistema !\n" "Solucione os pacotes quebrados antes." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "Marcando todas as atualizações disponíveis..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "Atualizações disponíveis marcadas com sucesso" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "Falha ao marcar todas as atualizações disponíveis !" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "Descrição" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "Histórico de Busca" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 #, fuzzy msgid "Please select a directory" msgstr "Insira um disco no leitor." @@ -2460,7 +2473,8 @@ msgstr "_Procura" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "Exibir progresso de arquivos únicos" #: ../gtk/glade/window_changes.glade.h:1 @@ -2614,7 +2628,6 @@ msgstr "Considerar pacotes recomendados como dependências" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Atualização Padrão" @@ -2760,7 +2773,6 @@ msgstr "Exibir propriedades de pacotes na janela principal" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Atualização Inteligente" @@ -3395,14 +3407,24 @@ "Nota : As atualizações serão somente marcadas. Você ainda terá que " "aplicá-las posteriormente." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "Lembrar minhas respostas para atualizações futuras" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "Esse comportamento pode ser modificado nas preferências mais tarde." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Atualização Padrão" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Atualização Inteligente" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Instalar, remover e atualizar pacotes" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/pt.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/pt.po --- synaptic-0.62.1ubuntu2~ppa1/po/pt.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/pt.po 2008-08-19 20:59:28.000000000 +0100 @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: pt_PT\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2005-09-05 22:26+0100\n" "Last-Translator: Rui Az. \n" "Language-Team: \n" @@ -938,9 +938,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "Não foi possí­vel ler %s" @@ -1151,21 +1151,34 @@ msgid "Applying Changes" msgstr "A Aplicar Alterações" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"A remoção deste pacote pode tornar o sistema inutilizável.\n" +"De certeza que deseja fazer isto?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "Erro no pacote %s" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "Alterações aplicadas" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." @@ -1173,15 +1186,15 @@ "As alterações marcadas estão agora a ser aplicadas. Isto pode demorar algum " "tempo. Por favor aguarde." -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "A instalar e remover software" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "A remover software" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "A instalar software" @@ -1566,37 +1579,37 @@ msgid "%s Changelog" msgstr "Registo de Mudanças de %s" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Deseja adicionar outro CD-ROM?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Abrir alterações" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "Não foi possível escrever %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 #, fuzzy msgid "Save changes" msgstr "Abrir alterações" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Gravar o estado completo, não apenas as alterações" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "Repositórios alterados" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" @@ -1604,20 +1617,20 @@ "A informação de repositórios foi alterada. Tem de clicar no botão " "\"Recarregar\" para que as suas alterações tenham efeito." -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "Não mostrar esta mensagem novamente" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "%i pacotes encontrados" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "A iniciar o visualizador de ajuda..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 #, fuzzy msgid "" "No help viewer is installed!\n" @@ -1638,7 +1651,7 @@ "da linha de comandos ou ver a versão html localizada na directoria /html do " "synaptic." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1646,16 +1659,16 @@ "Não foi possível iniciar a ferramenta de configuração !\n" "Precisa de instalar o pacote necessário 'lbgnome2-perl'." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "A iniciar a ferramenta de configuração de pacotes..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "A iniciar o visualizador de documentação do pacote..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" @@ -1663,7 +1676,7 @@ "Precisa de instalar o pacote \"dwww\" para navegar pela documentação de um " "pacote" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1671,25 +1684,25 @@ "Não foi possível efectuar alterações!\n" "Precisa de resolver os pacotes quebrados." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "A aplicar as alterações marcadas. Isto pode levar algum tempo..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "A descarregar os pacotes" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Deseja sair do Synaptic?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "A descarregar informação dos pacotes" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." @@ -1697,19 +1710,19 @@ "Os repositórios serão alvo de uma procura por pacotes novos, removidos ou " "actualizados." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "A refrescar a informação dos pacotes..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "Falha ao resolver problemas de dependências !" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "Problemas de dependências resolvidos com sucesso" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1717,29 +1730,29 @@ "Não foi possível actualizar o sistema !\n" "Precisa de resolver os pacotes quebrados." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "A marcar todas as actualizações disponíveis..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "Actualizações disponíveis marcadas com sucesso" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "Falha ao marcar todas as actualizações disponíveis !" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "Descrição" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "Histórico de Pesquisa" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 #, fuzzy msgid "Please select a directory" msgstr "Insira um disco no leitor." @@ -2461,7 +2474,8 @@ msgstr "_Procurar" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "Mostrar progresso de ficheiros únicos" #: ../gtk/glade/window_changes.glade.h:1 @@ -2616,7 +2630,6 @@ msgstr "Considerar pacotes recomendados como dependências" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Actualização Padrão" @@ -2762,7 +2775,6 @@ msgstr "Mostrar as propriedades dos pacotes na janela principal" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Actualização Inteligente" @@ -3402,14 +3414,24 @@ "Nota : As actualizações serão somente marcadas. Terá que as aplicar " "posteriormente." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "Lembrar a resposta para actualizações futuras" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "Este comportamento pode ser modificado nas preferências mais tarde." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Actualização Padrão" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Actualização Inteligente" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Instalar, remover e actualizar pacotes" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/ro.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/ro.po --- synaptic-0.62.1ubuntu2~ppa1/po/ro.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/ro.po 2008-08-19 20:59:28.000000000 +0100 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: ro\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2005-10-04 23:55+0300\n" "Last-Translator: Dan Damian \n" "Language-Team: Romanian \n" @@ -916,9 +916,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "Nu pot citi %s" @@ -1144,21 +1144,35 @@ msgid "Applying Changes" msgstr "Aplic modificările" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"Prin dezinstalarea acestui pachet puteţi să vă aduceţi sistemul într-o " +"stare inutilizabilă\n" +"Sigur doriţi să faceţi asta?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "Eroare în pachetul %s" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "Modificări aplicate" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." @@ -1166,15 +1180,15 @@ "Modificările marcate sunt aplicate în acest moment. Această operaţiune poate " "dura un timp. Vă rog să aşteptaţi." -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "Instalez şi dezinstalez software" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "Dezinstalez software" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "Instalez software" @@ -1565,37 +1579,37 @@ msgid "%s Changelog" msgstr "Istoric modificări pentru %s" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Doriţi să adăugaţi un alt CD-ROM?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Deschide modificările" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "Nu pot scrie %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 #, fuzzy msgid "Save changes" msgstr "Deschide modificările" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Salvează starea completă, nu doar modificările" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "Arhivele au fost modificate" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" @@ -1603,20 +1617,20 @@ "Informaţiile despre arhive au fost modificate. Trebuie să apăsaţi butonul " "„Reîncarcă” pentru ca modificările să aibe efect." -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "Nu afişa acest dialog în viitor" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "Am găsit %i pachete" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "Pornesc vizualizatorul de ajutor..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1635,7 +1649,7 @@ "synaptic” sau vizualiza versiunea HTML localizată în directorul „synaptic/" "html”." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1643,16 +1657,16 @@ "Nu pot porni unealta de configurare!\n" "Trebuie să instalaţi pachetul „libgnome2-perl”." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "Pornesc unealta de configurare a pachetelor..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "Pornesc vizualizatorul de documentaţie a pachetelor..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" @@ -1660,7 +1674,7 @@ "Trebuie să instalaţi pachetul „dwww” pentru a naviga în documentaţia unui " "pachet" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1668,44 +1682,44 @@ "Nu pot aplica modificările!\n" "Mai întâi trebuie să fixaţi pachetele deteriorate." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "Aplic modificările marcate. Această operaţie poate dura un timp..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "Descarc pachetele" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Doriţi să ieşiţi din Synaptic?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "Descarc informaţiile despre pachete" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." msgstr "" "Arhivele vor fi verificate pentru pachete noi, dezinstalate sau actualizate." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "Reîncarc informaţiile despre pachete..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "Nu am putut rezolva problemele de dependenţă" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "Am fixat cu succes problemele de dependenţă" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1713,29 +1727,29 @@ "Nu am putut actualiza sistemul!\n" "Mai întâi trebuie să fixaţi pachetele deteriorate." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "Marchez toate actualizările disponibile..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "Am marcat cu succes toate actualizările disponibile" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "Nu am putut marca toate actualizările posibile!" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "Descriere" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "Istoric căutare" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 #, fuzzy msgid "Please select a directory" msgstr "Introduceţi vă rog un disc în unitate." @@ -2456,7 +2470,8 @@ msgstr "_Caută" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "Afişează progresul pentru fiecare fişier în parte" #: ../gtk/glade/window_changes.glade.h:1 @@ -2611,7 +2626,6 @@ msgstr "Consideră pachetele recomandate ca dependenţe" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Actualizare standard" @@ -2756,7 +2770,6 @@ msgstr "Afişează proprietăţile pachetelor în fereastra principală" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Actualizare inteligentă" @@ -3389,14 +3402,24 @@ "Notă: Actualizările vor fi doar marcate. Va trebui să le aplicaţi " "după aceea." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "Reţine răspunsul meu pentru viitoarele actualizări" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "Acest comportament poate fi modificat mai târziu în preferinţe." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Actualizare standard" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Actualizare inteligentă" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Instalează, dezinstalează şi actualizează pachete software" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/ru.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/ru.po --- synaptic-0.62.1ubuntu2~ppa1/po/ru.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/ru.po 2008-08-19 20:59:28.000000000 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: synaptic 0.56\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2005-08-30 03:19+0300\n" "Last-Translator: Vitaly Lipatov \n" "Language-Team: Russian \n" @@ -929,9 +929,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "Невозможно прочитать %s" @@ -1153,21 +1153,34 @@ msgid "Applying Changes" msgstr "Внесение изменений..." +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"Удаление этого пакета может привести систему в нерабочее состояние.\n" +"Вы действительно хотите это сделать?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "Ошибка в пакете %s" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "Изменения применены" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." @@ -1175,15 +1188,15 @@ "Отмеченные изменения применяются. Это может занять некоторое время. " "Пожалуйста, подождите." -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "Установка и удаление программ" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "Удаление программ" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "Установка программ" @@ -1575,36 +1588,36 @@ msgid "%s Changelog" msgstr "История изменений %s" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Добавить другой компакт-диск?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Открыть отметки пакетов" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "Невозможно записать %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 msgid "Save changes" msgstr "Сохранить изменения" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Сохранить полное состояние (не только отметки)" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "Изменён список репозиториев" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" @@ -1612,20 +1625,20 @@ "Информация в репозитории изменилась. Вы должны нажать кнопку \"Получить " "сведения\", чтобы программа восприняла изменения." -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "Больше не показывать это сообщение" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "Найдено %i пакет(ов)" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "Открытие справочной системы" -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1643,7 +1656,7 @@ "Также вы можете получить информацию о Synaptic, набрав в командной строке " "'man synaptic' или просмотрев html-версию в каталоге 'synaptic/html'." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1651,23 +1664,23 @@ "Невозможно запустить программу настройки!\n" " Вы должны установить нужный для этого пакет 'libgnome2-perl'." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "Запуск программы настройки пакета..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "Открытие справки по пакету..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" msgstr "" "Вы должны установить пакет \"dwww\" для просмотра документации к пакету" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1675,25 +1688,25 @@ "Невозможно выполнить изменения!\n" "Сначала необходимо исправить проблемы в зависимостях." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "Внесение изменений... Это может занять некоторое время..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "Загружаются файлы пакетов" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Вы хотите выйти из Synaptic?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "Загружаются сведения о пакетах" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." @@ -1701,19 +1714,19 @@ "Репозитории будут проверены на новые, удалённые или обновлённые пакеты " "программ." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "Получение сведений о пакетах..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "Ошибка исправления проблем в зависимостях!" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "Проблемы в зависимостях успешно разрешены" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1721,29 +1734,29 @@ "Невозможно обновить систему!\n" "Сначала необходимо исправить проблемы в зависимостях." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "Отметить всё доступное для обновления..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "Отмечены все доступные для обновления пакеты" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "Невозможно отметить всё доступное для обновления!" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "Описание" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "История поиска" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 #, fuzzy msgid "Please select a directory" msgstr "Вставьте диск в привод." @@ -2466,7 +2479,8 @@ msgstr "_Искать" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "Показывать прогресс для одиночных файлов" #: ../gtk/glade/window_changes.glade.h:1 @@ -2624,7 +2638,6 @@ msgstr "Рассматривать рекомендуемые пакеты как зависимости" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Стандартное обновление системы" @@ -2774,7 +2787,6 @@ msgstr "Показывать информацию о пакете в главном окне" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Интеллектуальное обновление" @@ -3408,14 +3420,24 @@ "Примечание: Пакеты будут только отмечены для обновления. Вам " "потребуется затем применить отмеченные изменения." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "Запомнить ответ для дальнейших обновлений" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "Это поведение может быть позднее изменено в настройках" +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Стандартное обновление системы" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Интеллектуальное обновление" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Установить, удалить и обновить пакеты" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/sl.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/sl.po --- synaptic-0.62.1ubuntu2~ppa1/po/sl.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/sl.po 2008-08-19 20:59:28.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: synaptic 0.55\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2004-11-14 20:05+0100\n" "Last-Translator: Roman Maurer \n" "Language-Team: Slovenian \n" @@ -914,9 +914,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "%s ni moč brati" @@ -1123,36 +1123,49 @@ msgid "Applying Changes" msgstr "Uveljavi spremembe" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"Odstranitev tega paketa lahko povzroči, da sistem postane neuporaben.\n" +"Ali ste prepričani, da želite to vseeno storiti?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, fuzzy, c-format msgid "Error in package %s" msgstr "Ponujeni paketi" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." msgstr "" -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 #, fuzzy msgid "Installing and removing software" msgstr "Namesti, odstrani in nadgradi programske pakete" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 #, fuzzy msgid "Installing software" msgstr "Nameščene datoteke" @@ -1534,29 +1547,29 @@ msgid "%s Changelog" msgstr "Dnevnik sprememb %s" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Ali želite dodati še drug CD-ROM?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Odpri spremembe" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "V %s ni moč pisati" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 msgid "Save changes" msgstr "Shrani spremembe" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Shrani celotno stanje, ne le spremembe" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 #, fuzzy msgid "Repositories changed" msgstr "Skladišča" @@ -1564,26 +1577,26 @@ #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" msgstr "" -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "Najdeno %i paketov" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "Zaganja se pregledovalnik s pomočjo..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 #, fuzzy msgid "" "No help viewer is installed!\n" @@ -1603,7 +1616,7 @@ "referenčnega priročnika ali pogledate različico HTML v imeniku 'synaptic/" "html'." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1611,22 +1624,22 @@ "Prikrojitvenega orodja ni moč zagnati!\n" "Namestiti morate zahtevani paket 'libgnome2-perl'." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "Orodje za nastavitev paketov se zaganja..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "Pregledovalnik dokumentacije paketov se zaganja..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" msgstr "Za brskanje po dokumentaciji paketa morate namestiti paket \"dwww\"" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1634,43 +1647,43 @@ "Sprememb ni bilo moč uveljaviti!\n" "Najprej popravite pokvarjene pakete." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "Označene spremembe se uveljavljajo. To lahko traja nekaj časa..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "Prenašanje paketnih datotek" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Ali želite zapustiti Synaptic?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "Prenašanje podatkov o paketu." -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." msgstr "V skladiščih bo preverjeno, ali so se spremenili paketi." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "Osveževanje podatkov o paketih." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "Problemov z odvisnostjo ni bilo moč razrešiti!" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "Uspešno popravljeni problemi z odvisnostjo" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1678,29 +1691,29 @@ "Sistema ni moč nadgraditi!\n" "Najprej popravite pokvarjene pakete." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "Označevanje vseh dostopnih nadgradenj..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "Dostopne nadgradnje uspešno označene" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "Vseh dostopnih nadgradenj ni bilo moč označiti!" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "Opis" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "Pretekla iskanja" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 #, fuzzy msgid "Please select a directory" msgstr "Vstavite ploščo v pogon." @@ -2431,7 +2444,8 @@ msgstr "Iskanje..." #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "Prikaži potek nameščanja za vsako datoteko posebej" #: ../gtk/glade/window_changes.glade.h:1 @@ -2589,7 +2603,6 @@ msgstr "Razmislite priporočene pakete kot odvisnosti" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Privzeta nadgradnja" @@ -2738,7 +2751,6 @@ msgstr "Prikaži podatke o paketih v osrednjem oknu." #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Pametna nadgradnja" @@ -3371,15 +3383,25 @@ "Opomba: Te nadgradnje bodo le označene. Še vedno jih boste morali " "pozneje uveljaviti." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 #, fuzzy msgid "Remember my answer for future upgrades" msgstr "Zapomni si odgovor za nadaljnje nadgradnje" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "To obnašanje je moč pozneje spremeniti v nastavitvah." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Privzeta nadgradnja" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Pametna nadgradnja" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Namesti, odstrani in nadgradi programske pakete" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/sr@Latn.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/sr@Latn.po --- synaptic-0.62.1ubuntu2~ppa1/po/sr@Latn.po 2008-06-12 15:16:32.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/sr@Latn.po 2008-08-19 20:59:28.000000000 +0100 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Synaptic-0.48\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2004-02-04 20:53+0100\n" "Last-Translator: Слободан Средојевић \n" "Language-Team: Serbian (sr) \n" @@ -942,9 +942,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "Ne mogu da čitam sa %s" @@ -1155,36 +1155,49 @@ msgid "Applying Changes" msgstr "Izvršavanje promena..." +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"Uklanjanjem ovog paketa možete dovesti sistem u neupotrebljivo stanje.\n" +"Da li ste sigurni da želite to da uradite?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, fuzzy, c-format msgid "Error in package %s" msgstr "Paket obezbeđuje" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." msgstr "" -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 #, fuzzy msgid "Installing and removing software" msgstr "Instaliraj, ukloni i nadogradi softverske pakete" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 #, fuzzy msgid "Installing software" msgstr "Instaliraj" @@ -1572,29 +1585,29 @@ msgid "%s Changelog" msgstr "Samo preuzmi pakete" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Da li želite da dodate još jedan cd uređaj?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Učitaj odabrane promene" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "Ne mogu da pišem na %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 msgid "Save changes" msgstr "Sačuvaj odabrane promene" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Sačuvaj puno stanje, ne samo promene" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 #, fuzzy msgid "Repositories changed" msgstr "Skladišta" @@ -1602,27 +1615,27 @@ #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" msgstr "" -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, fuzzy, c-format msgid "Found %i packages" msgstr "Problematični paketi" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 #, fuzzy msgid "Starting help viewer..." msgstr "Pokrećem sistem pomoći..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 #, fuzzy msgid "" "No help viewer is installed!\n" @@ -1642,106 +1655,106 @@ "synaptic“ iz linije naredbi ili gledati html verziju smeštenu u " "direktorijumu „synaptic/html." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." msgstr "" -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 #, fuzzy msgid "Starting package configuration tool..." msgstr "Izvršavam naredbu „dpkg-reconfigure“..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 #, fuzzy msgid "Starting package documentation viewer..." msgstr "Pokrećem pomoć paketa..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" msgstr "" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." msgstr "" -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 #, fuzzy msgid "Applying marked changes. This may take a while..." msgstr "Izvodim odabrane promene... ovo može potrajati" -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "Preuzimanje datoteka..." -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Da li želite da napustite Synaptic?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "Samo preuzmi pakete" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 #, fuzzy msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." msgstr "Instaliraj, ukloni i nadogradi softverske pakete" -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 #, fuzzy msgid "Reloading package information..." msgstr "Izvršavam naredbu „dpkg-reconfigure“..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 #, fuzzy msgid "Failed to resolve dependency problems!" msgstr "Ne mogu da ispravim zavisnosti" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." msgstr "" -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 #, fuzzy msgid "Marking all available upgrades..." msgstr "Paket će biti nadograđen." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 #, fuzzy msgid "Successfully marked available upgrades" msgstr "Stavi u red sve moguće nadogradnje" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "Opis" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "Filter za pretragu" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 #, fuzzy msgid "Please select a directory" msgstr "Stavite disk u uređaj." @@ -2499,7 +2512,7 @@ msgstr "Traži u:" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +msgid "Show for individual files" msgstr "" #: ../gtk/glade/window_changes.glade.h:1 @@ -2666,7 +2679,6 @@ msgstr "Razmotri preporučene pakete kao zavisnosti" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Podrazumevana nadogradnja sistema" @@ -2827,7 +2839,6 @@ msgstr "" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Pametna nadogradnja" @@ -3462,15 +3473,25 @@ "\n" "Ovo ponašanje može biti promenjeno u postavkama kasnije." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 #, fuzzy msgid "Remember my answer for future upgrades" msgstr "Zapamti odgovor za dalje nadogradnje" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "Ovo ponašanje kasnije može biti promenjeno u postavkama" +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Podrazumevana nadogradnja sistema" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Pametna nadogradnja" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Instaliraj, ukloni i nadogradi softverske pakete" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/sr.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/sr.po --- synaptic-0.62.1ubuntu2~ppa1/po/sr.po 2008-06-12 15:16:31.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/sr.po 2008-08-19 20:59:28.000000000 +0100 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Synaptic-0.48\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2004-02-04 20:58+0100\n" "Last-Translator: Слободан Средојевић \n" "Language-Team: Serbian (sr) \n" @@ -942,9 +942,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "Не могу да читам са %s" @@ -1155,36 +1155,49 @@ msgid "Applying Changes" msgstr "Извршавање промена..." +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"Уклањањем овог пакета можете довести систем у неупотребљиво стање.\n" +"Да ли сте сигурни да желите то да урадите?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, fuzzy, c-format msgid "Error in package %s" msgstr "Пакет обезбеђује" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." msgstr "" -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 #, fuzzy msgid "Installing and removing software" msgstr "Инсталирај, уклони и надогради софтверске пакете" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 #, fuzzy msgid "Installing software" msgstr "Инсталирај" @@ -1572,29 +1585,29 @@ msgid "%s Changelog" msgstr "Само преузми пакете" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Да ли желите да додате још један цд уређај?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Учитај одабране промене" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "Не могу да пишем на %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 msgid "Save changes" msgstr "Сачувај одабране промене" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Сачувај пуно стање, не само промене" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 #, fuzzy msgid "Repositories changed" msgstr "Складишта" @@ -1602,27 +1615,27 @@ #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" msgstr "" -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, fuzzy, c-format msgid "Found %i packages" msgstr "Проблематични пакети" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 #, fuzzy msgid "Starting help viewer..." msgstr "Покрећем систем помоћи..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 #, fuzzy msgid "" "No help viewer is installed!\n" @@ -1642,106 +1655,106 @@ "synaptic“ из линије наредби или гледати html верзију смештену у " "директоријуму „synaptic/html." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." msgstr "" -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 #, fuzzy msgid "Starting package configuration tool..." msgstr "Извршавам наредбу „dpkg-reconfigure“..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 #, fuzzy msgid "Starting package documentation viewer..." msgstr "Покрећем помоћ пакета..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" msgstr "" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." msgstr "" -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 #, fuzzy msgid "Applying marked changes. This may take a while..." msgstr "Изводим одабране промене... ово може потрајати" -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "Преузимање датотека..." -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Да ли желите да напустите Synaptic?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "Само преузми пакете" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 #, fuzzy msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." msgstr "Инсталирај, уклони и надогради софтверске пакете" -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 #, fuzzy msgid "Reloading package information..." msgstr "Извршавам наредбу „dpkg-reconfigure“..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 #, fuzzy msgid "Failed to resolve dependency problems!" msgstr "Не могу да исправим зависности" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." msgstr "" -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 #, fuzzy msgid "Marking all available upgrades..." msgstr "Пакет ће бити надограђен." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 #, fuzzy msgid "Successfully marked available upgrades" msgstr "Стави у ред све могуће надоградње" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "Опис" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "Филтер за претрагу" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 #, fuzzy msgid "Please select a directory" msgstr "Ставите диск у уређај." @@ -2499,7 +2512,7 @@ msgstr "Тражи у:" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +msgid "Show for individual files" msgstr "" #: ../gtk/glade/window_changes.glade.h:1 @@ -2666,7 +2679,6 @@ msgstr "Размотри препоручене пакете као зависности" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Подразумевана надоградња система" @@ -2827,7 +2839,6 @@ msgstr "" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Паметна надоградња" @@ -3460,15 +3471,25 @@ "\n" "Ово понашање може бити промењено у поставкама касније." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 #, fuzzy msgid "Remember my answer for future upgrades" msgstr "Запамти одговор за даље надоградње" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "Ово понашање касније може бити промењено у поставкама" +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Подразумевана надоградња система" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Паметна надоградња" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Инсталирај, уклони и надогради софтверске пакете" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/sv.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/sv.po --- synaptic-0.62.1ubuntu2~ppa1/po/sv.po 2008-06-12 15:16:32.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/sv.po 2008-08-19 20:59:28.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Synaptic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2006-05-07 23:44+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -915,9 +915,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "Kan inte läsa %s" @@ -1143,21 +1143,34 @@ msgid "Applying Changes" msgstr "Verkställer ändringar" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"Att ta bort det här paketet kan resultera i att systemet blir oanvändbart.\n" +"Är du säker på att du vill göra det?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "Fel i paket %s" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "Ändringar verkställda" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." @@ -1165,15 +1178,15 @@ "De markerade ändringarna verkställs nu. Det här kan ta lite tid. Var god " "vänta." -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "Installerar och tar bort programvara" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "Tar bort programvara" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "Installerar programvara" @@ -1556,37 +1569,37 @@ msgid "%s Changelog" msgstr "%s ändringslogg" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Vill du lägga till en annan cd-rom?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Öppna ändringar" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "Kan inte skriva %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 #, fuzzy msgid "Save changes" msgstr "Öppna ändringar" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Spara all status, inte bara ändringar" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "Förråd ändrade" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" @@ -1594,20 +1607,20 @@ "Förrådsinformationen har ändrats. Du måste trycka på \"Läs om\"-knappen för " "att dina ändringar ska bli aktiva" -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "Visa aldrig det här meddelandet igen" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "Hittade %i paket" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "Startar hjälpvisaren..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1625,7 +1638,7 @@ "Alternativt kan du öppna manualsidan med \"man synaptic\" från kommandoraden " "eller visa html-versionen som ligger i katalogen \"synaptic/html\"." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1633,23 +1646,23 @@ "Kan inte starta konfigurationsverktyget!\n" "Du måste installera det nödvändiga paketet \"libgnome2-perl\"." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "Startar paketkonfigureringsverktyget..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "Startar paketinformationsvisaren..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" msgstr "" "Du måste installera paketet \"dwww\" för att bläddra i paketets dokumentation" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1657,25 +1670,25 @@ "Kunde inte verkställa ändringar!\n" "Lös problemet med de trasiga paketen först." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "Verkställer markerade ändringar. Det här kan ta en stund..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "Hämtar paketfilerna" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Vill du avsluta Synaptic?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "Hämtar paketinformation" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." @@ -1683,19 +1696,19 @@ "Förråden kommer att kontrolleras efter nya, borttagna eller uppgraderade " "paket." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "Läser om paketinformation..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "Misslyckades att lösa beroendeproblem!" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "Lyckades lösa alla beroendeproblem" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1703,29 +1716,29 @@ "Kunde inte uppgradera systemet!\n" "Lös problemet med de trasiga paketen först." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "Markerar alla tillgängliga uppgraderingar..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "Alla tillgängliga uppgraderingar markerade" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "Misslyckades att markera alla tillgängliga uppgraderingar!" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "Beskrivning" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "Sökhistorik" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 #, fuzzy msgid "Please select a directory" msgstr "Vänligen mata in en skiva i enheten." @@ -2438,7 +2451,8 @@ msgstr "_Sök" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "Visa förlopp för enstaka filer" #: ../gtk/glade/window_changes.glade.h:1 @@ -2592,7 +2606,6 @@ msgstr "Betrakta rekommenderade paket som beroenden" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Standarduppgradering" @@ -2738,7 +2751,6 @@ msgstr "Visa paketegenskaper i huvudfönstret" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Smart uppgradering" @@ -3367,14 +3379,24 @@ "Notera: Uppgraderingarna kommer endast markeras. Du behöver " "fortfarande verkställa dem efteråt." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "Kom i håg mitt svar för framtida uppgraderingar" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "Det här beteendet kan senare ändras i inställningarna." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Standarduppgradering" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Smart uppgradering" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Installera, ta bort och uppgradera programvarupaket" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/synaptic.pot /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/synaptic.pot --- synaptic-0.62.1ubuntu2~ppa1/po/synaptic.pot 2008-06-12 15:16:32.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/synaptic.pot 2008-10-21 14:18:35.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -876,9 +876,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "" @@ -1080,35 +1080,45 @@ msgid "Applying Changes" msgstr "" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." msgstr "" -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "" @@ -1448,55 +1458,55 @@ msgid "%s Changelog" msgstr "" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 msgid "Save changes" msgstr "" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" msgstr "" -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "" -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1507,94 +1517,94 @@ "line or view the html version located in the 'synaptic/html' folder." msgstr "" -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." msgstr "" -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "" #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "" -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" msgstr "" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." msgstr "" -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "" -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 msgid "Downloading Package Files" msgstr "" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 msgid "Downloading Package Information" msgstr "" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." msgstr "" -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "" -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." msgstr "" -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "" -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 msgid "Save script" msgstr "" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 msgid "Select directory" msgstr "" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 msgid "Please select a directory" msgstr "" @@ -2262,7 +2272,7 @@ msgstr "" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +msgid "Show for individual files" msgstr "" #: ../gtk/glade/window_changes.glade.h:1 @@ -2407,7 +2417,6 @@ msgstr "" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "" @@ -2552,7 +2561,6 @@ msgstr "" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "" @@ -3108,14 +3116,22 @@ "afterwards." msgstr "" -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "" +#: ../gtk/glade/dialog_upgrade.glade.h:10 +msgid "_Default Upgrade" +msgstr "" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +msgid "_Smart Upgrade" +msgstr "" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/th.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/th.po --- synaptic-0.62.1ubuntu2~ppa1/po/th.po 2008-06-12 15:16:32.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/th.po 2008-08-19 20:59:28.000000000 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Synaptic VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2006-02-07 02:21-0500\n" "Last-Translator: Isriya Paireepairit \n" "Language-Team: Thai \n" @@ -879,9 +879,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "öҹ %s" @@ -1083,35 +1083,45 @@ msgid "Applying Changes" msgstr "" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "Դѭᾡࡨ %s" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." msgstr "" -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "ѧԴᾡࡨ͡" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "ѧҫͿ͡" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "ѧԴ駫Ϳ" @@ -1458,56 +1468,56 @@ msgid "%s Changelog" msgstr "ѹ֡¹ŧͧ %s" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "سͧմ¡?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "ö¹ %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 #, fuzzy msgid "Save changes" msgstr "_ѹ֡͡" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "ѹ֡ʶҹз ੾С¹ŧ" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" msgstr "" -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr " % ᾡࡨ" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "" -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1518,97 +1528,97 @@ "line or view the html version located in the 'synaptic/html' folder." msgstr "" -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." msgstr "" -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "" #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "" -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" msgstr "" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." msgstr "" -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "" -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "ѧǹŴѹ֡¹ŧ" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "ǹŴᾡࡨ" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." msgstr "" -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "" -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." msgstr "" -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "" -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "͸Ժ" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 msgid "Select directory" msgstr "" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 msgid "Please select a directory" msgstr "" @@ -2284,7 +2294,7 @@ msgstr "" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +msgid "Show for individual files" msgstr "" #: ../gtk/glade/window_changes.glade.h:1 @@ -2431,7 +2441,6 @@ msgstr "" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "" @@ -2577,7 +2586,6 @@ msgstr "ʴسѵᾡࡨ˹ҵҧѡ" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "" @@ -3138,14 +3146,23 @@ "afterwards." msgstr "" -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "" +#: ../gtk/glade/dialog_upgrade.glade.h:10 +msgid "_Default Upgrade" +msgstr "" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "͡Ѿô" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "ᾡࡨͿ١Դ Ѿô͡" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/tr.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/tr.po --- synaptic-0.62.1ubuntu2~ppa1/po/tr.po 2008-06-12 15:16:32.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/tr.po 2008-08-19 20:59:28.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: synaptic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2005-03-15 09:08+0200\n" "Last-Translator: Erçin EKER \n" "Language-Team: Turkish \n" @@ -913,9 +913,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "%s okunamıyor" @@ -1138,21 +1138,34 @@ msgid "Applying Changes" msgstr "Değişiklikler Uygulanıyor" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"Bu paketin silinmesi sisteminizi kullanılamaz hale sokabilir.\n" +"Bunu yapmak istediğinizden emin misiniz?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "%s paketinde hata" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "Değişiklikler uygulandı" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." @@ -1160,15 +1173,15 @@ "Seçilen değişiklikler şimdi yapılacak. Bu işlem vakit alabilir. Lütfen " "bekleyin." -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "Yazılım kuruluyor ya da kaldırılıyor" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "Yazılım kaldırılıyor" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "Yazılım kuruluyor" @@ -1549,36 +1562,36 @@ msgid "%s Changelog" msgstr "%s Changelog" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Bir CD-ROM daha eklemek ister misiniz?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Değişiklikleri aç" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "%s yazılamıyor" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 msgid "Save changes" msgstr "Değişiklikleri kaydet" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Sadece değişikliği değil, tam durumu kaydet" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "Depolar değişti" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" @@ -1586,20 +1599,20 @@ "Depo bilgileri değişti. Değişikliklerin etkin olabilmesi için \"Teniden Yükle" "\" tuşuna basın." -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "Bu mesajı tekrar gösterme" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "%i paket bulundu" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "Yardım görüntüleyicisi başlatılıyor..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1618,7 +1631,7 @@ "Başka bir seçenek ise komut satırından 'man synaptic' komutuyla veya " "'synaptic/html' dizininden kılavuza ulaşabilirsiniz." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1626,16 +1639,16 @@ "Yapılandırma aracı başlatılamıyor!\n" "Gerekli olan 'libgnome2-perl' paketini kurmanız gerekiyor." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "Paket yapılandırma aracı başlatılıyor..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "Paket yardım görüntüleyicisi başlatılıyor..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" @@ -1643,7 +1656,7 @@ "Bir paketin belgelerini görüntülemek için \"dwww\" paketinin kurulu olması " "gerekmektedir" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1651,25 +1664,25 @@ "Değişiklikler uygulanamıyor!\n" "Öncelikle yarım kalan paketleri düzeltin." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "İşaretlenen değişiklikler uygulanıyor. Bu işlem zaman alabilir..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "Paket dosyalarını indir" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Synaptic'ten çıkmak istiyor musunuz?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "Paket bilgisi indiriliyor" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." @@ -1677,19 +1690,19 @@ "Paket depoları yeni, kaldırılmış ya da yükseltilmiş yazılım paketlerini " "bulmak için taranacak." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "Paket bilgileri yeniden yükleniyor..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "Bağımlılık problemi çözümlemesi başarısız!" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "Bağımlılık problemi çözümlemesi başarılı" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1697,29 +1710,29 @@ "Sistem yükseltilemiyor!\n" "Öncelikle yarım kalan paketleri düzeltin." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "Mümkün olan tüm yükseltmeler seçiliyor..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "Mevcut yükseltmeler başarıyla seçildi" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "Mümkün olan tüm yükseltmeler seçilirken hata oluştu!" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "Açıklama" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "Arama Geçmişi" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 #, fuzzy msgid "Please select a directory" msgstr "Sürücüye bir disk yerleştirin." @@ -2432,7 +2445,8 @@ msgstr "_Ara" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "Her dosya için ayrı işlem göstergesi" #: ../gtk/glade/window_changes.glade.h:1 @@ -2586,7 +2600,6 @@ msgstr "Önerilen paketleri bağımlılık olarak kabul et" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "Öntanımlı Yükseltme" @@ -2732,7 +2745,6 @@ msgstr "Ana pencerede paket tercihlerini göster" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "Akıllı Yükseltme" @@ -3351,14 +3363,24 @@ "Not: Yükseltmeler sadece seçilecektir. Hâlâ değişiklikleri " "uygulamanız gerekecek." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "Cevabı sonraki yükseltmeler için hatırla" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "Bu davranış daha sonra tercihler bölümünden değiştirilebilir." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "Öntanımlı Yükseltme" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "Akıllı Yükseltme" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Paketleri kur, kaldır ya da yükselt" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/xh.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/xh.po --- synaptic-0.62.1ubuntu2~ppa1/po/xh.po 2008-06-12 15:16:32.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/xh.po 2008-08-19 20:59:28.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: synaptic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2005-03-22 18:22+0200\n" "Last-Translator: Canonical Ltd \n" "Language-Team: Xhosa \n" @@ -922,9 +922,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "Ayikwazi kufunda %s" @@ -1139,21 +1139,34 @@ msgid "Applying Changes" msgstr "Ifaka iiNguqulelo" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"Ukususa lo mqulu kunganikezela inkqubo ingasebenziseki.\n" +"Uqinisekile ufuna ukwenza oko?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "Impazamo kumqulu %s" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 #, fuzzy msgid "" "The marked changes are now being applied. This can take some time. Please " @@ -1164,17 +1177,17 @@ "Iinguqulelo eziphawuliweyo ziyasebenza ngoku. Oku kungathatha ixesha. Nceda " "ulinde." -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 #, fuzzy msgid "Installing and removing software" msgstr "Faka, susa uze uphucule imiqulu yesoftware" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 #, fuzzy msgid "Removing software" msgstr "Iyasusa %s" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 #, fuzzy msgid "Installing software" msgstr "Iyafaka %s" @@ -1558,37 +1571,37 @@ msgid "%s Changelog" msgstr "%s I-Changelog" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "Ufuna ukongeza enye i-CD-ROM?" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "Vula iinguqulelo" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "Ayikwazi kubhala %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 #, fuzzy msgid "Save changes" msgstr "Vula iinguqulelo" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "Gcina imeko yonke, ingezizo iinguqulelo kuphela" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "Iindawo zogcino zitshintshiwe" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" @@ -1596,20 +1609,20 @@ "Ulwazi kwiindawo zogcino lutshintshile. Kufuneka ucofe iqhosha \"Khuphela " "ngokutsha\" kwiinguqulelo zakho ukuze ziqalise" -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "Ungaze uphinde ubonise lo myalezo kwakhona" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "Kufumaneke %i imiqulu" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "Iqalisa umbonisi woncedo..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 #, fuzzy msgid "" "No help viewer is installed!\n" @@ -1628,7 +1641,7 @@ "Kungenjalo ungavula i-man page ne-'man synaptic' kumgca woyalelo okanye " "ujonge inguqulelo ye-html ekwisigcini-zifayili ye-'synaptic/html'." -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1636,22 +1649,22 @@ "Ayikwazi kuqala isixhobo sesimo!\n" "Kufuneka ufake umqulu ofunekayo 'libgnome2-perl'." -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "Iqalisa isixhobo sesimo somqulu..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "Iqalisa isibonisi samaxwebhu omqulu..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" msgstr "Kufuneka ufake umqulu \"dwww\" ukukhangela amaxwebhu omqulu" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1659,25 +1672,25 @@ "Ayifakanga zinguqulelo!\n" "Lungisa imiqulu eyophukileyo kuqala." -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "Ifakela iinguqulelo eziphawuliweyo. Oku kungathatha ixesha..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "Ikhuphela iifayili zomqulu" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "Ufuna ukuphuma kwi-Synaptic?" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "Ikhuphela ulwazi lomqulu" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." @@ -1685,19 +1698,19 @@ "Iindawo zogcino ziya kujongelwa imiqulu emitsha, esusiweyo okanye i-software " "ephuculweyo." -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "Ikhuphela ngokutsha ulwazi lomqulu..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "Ayiphumeleli ukusombulula iingxaki zoxhomekeko!" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "Izilungise ngempumelelo iingxaki zoxhomekeko" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1705,29 +1718,29 @@ "Ayikwazi kuphucula inkqubo!\n" "Lungisa imiqulu eyonakeleyo kuqala." -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "Iphawula lonke uphuculo olufumanekayo..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "Uphuculo olufumanekayo oluphawulwe ngempumelelo" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "Ayiphumeleli ukuphawula lonke uphuculo olufumanekayo!" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "Inkcazelo" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "Khangela iMbali" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 #, fuzzy msgid "Please select a directory" msgstr "Faka idisc kwidrive." @@ -2439,7 +2452,8 @@ msgstr "_Khangela" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "Bonisa inkqubela-phambili kwiifayili ezinganye" #: ../gtk/glade/window_changes.glade.h:1 @@ -2594,7 +2608,6 @@ msgstr "Qaphela imiqulu ecetyiswa njengoxhomekeko" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "UPhuculo oluMiyo" @@ -2741,7 +2754,6 @@ msgstr "Bonisa iimpawu zomqulu kwifestile enkulu" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "UPhuculo oluHle" @@ -3375,15 +3387,25 @@ "Qaphela: Uphuculo luya kuphawulwa kuphela. Kusafuneka ulusebenzise " "kamva." -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "Khumbula impendulo yam kuphuculo lwexesha elizayo" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "" "Le ndlela yokuziphatha ingatshintshwa kuluhlu lwezinto ezikhethwayo kamva." +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "UPhuculo oluMiyo" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "UPhuculo oluHle" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "Faka, susa uze uphucule imiqulu yesoftware" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/zh_CN.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/zh_CN.po --- synaptic-0.62.1ubuntu2~ppa1/po/zh_CN.po 2008-06-12 15:16:32.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/zh_CN.po 2008-08-19 20:59:28.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: synaptic 0.57.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2005-07-07 01:05+0800\n" "Last-Translator: Liu Songhe \n" "Language-Team: Chinese (simplified) \n" @@ -907,9 +907,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "无法读取 %s" @@ -1120,35 +1120,48 @@ msgid "Applying Changes" msgstr "正在实施变更..." +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"删除这个软件包可能导致您的系统不稳定。\n" +"您确定要那样做吗?" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "软件包有错误 %s" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "变更已实施" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." msgstr "已标记的变更现在正在实施。这会花费一些时间。请稍候。" -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "安装和删除软件包" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "删除软件" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "安装软件" @@ -1519,55 +1532,55 @@ msgid "%s Changelog" msgstr "%s 变更日志" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "您想添加其他 CD-ROM 吗？" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "打开变更方案" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "无法写入 %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 msgid "Save changes" msgstr "保存变更方案" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "保存全部状态，不仅仅是变更" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "软件库已发生改变" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" msgstr "仓库信息已变更。您必须点击“刷新”按钮以便使您的变更生效" -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "禁止再显示该消息" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "找到 %i 个软件包" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "正在启动帮助查看器..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1585,7 +1598,7 @@ "另外您可以从命令行使用“man synaptic”打开手册页，或者查看位于“synaptic/html”文" "件夹下的 html 版。" -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1593,22 +1606,22 @@ "无法启动配置工具！\n" "您不得不安装所需的软件包“libgnome2-perl”。" -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "正在启动软件包配置工具..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "正在启动软件包文档查看器..." -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" msgstr "您不得不安装软件包“dwww”以便浏览软件包文档" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1616,43 +1629,43 @@ "无法实施变更！\n" "首先要修复损毁的软件包。" -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "正在实施已标记的变更。这可能需要一会..." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "正在下载软件包文件" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "您真的要退出新立得吗？" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "正在下载软件包信息" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." msgstr "将校验软件库里全新、已删除或已升级的软件包" -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "正在重新载入软件包信息..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "无法解决软件包依赖关系问题！" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "已成功修正软件包依赖关系问题！" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1660,29 +1673,29 @@ "无法升级系统！\n" "请先修复(依赖关系)毁损的软件包。" -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "正在标记全部可用的升级..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "已成功标记全部可用的升级" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "无法标记全部可用的升级！" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "软件包描述" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "搜索历史" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 #, fuzzy msgid "Please select a directory" msgstr "请向驱动器内放入一张光盘。" @@ -2381,7 +2394,8 @@ msgstr "搜索(_S)" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "显示单个文件进度" #: ../gtk/glade/window_changes.glade.h:1 @@ -2534,7 +2548,6 @@ msgstr "把推荐的软件包视作依赖的软件包" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "默认升级" @@ -2679,7 +2692,6 @@ msgstr "在主窗口显示软件包属性" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "智能升级" @@ -3280,14 +3292,24 @@ "\n" "注意：升级仅会被标记。您仍然不得不随后应用这些变更。" -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "为将来的升级记住我的回答" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "此行为今后可以在首选项里更改。" +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "默认升级" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "智能升级" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "安装，删除和升级软件包" diff -Nru /tmp/Nqqi7s5SHo/synaptic-0.62.1ubuntu2~ppa1/po/zh_TW.po /tmp/3XSkVYa20T/synaptic-0.62.1ubuntu10/po/zh_TW.po --- synaptic-0.62.1ubuntu2~ppa1/po/zh_TW.po 2008-06-12 15:16:32.000000000 +0100 +++ synaptic-0.62.1ubuntu10/po/zh_TW.po 2008-08-19 20:59:28.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: synaptic 0.56\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-20 15:50+0200\n" +"POT-Creation-Date: 2008-08-01 21:38+0200\n" "PO-Revision-Date: 2005-06-08 11:29+0800\n" "Last-Translator: Woodman Tuen \n" "Language-Team: Chinese/Traditional \n" @@ -910,9 +910,9 @@ msgid "Local" msgstr "" -#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2097 -#: ../gtk/rgmainwindow.cc:2766 ../gtk/rgmainwindow.cc:2852 -#: ../gtk/rgmainwindow.cc:3025 +#: ../common/rsources.cc:69 ../gtk/rgmainwindow.cc:2100 +#: ../gtk/rgmainwindow.cc:2769 ../gtk/rgmainwindow.cc:2855 +#: ../gtk/rgmainwindow.cc:3028 #, c-format msgid "Can't read %s" msgstr "無法讀取 %s" @@ -1124,35 +1124,48 @@ msgid "Applying Changes" msgstr "套用變更" +#: ../gtk/rgdebinstallprogress.cc:448 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../gtk/rgdebinstallprogress.cc:449 +#, fuzzy +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" +"移除這個套件或會導致您的系統完全失效。\n" +"您確定要那樣做嗎？" + #. error from dpkg, needs to be parsed different -#: ../gtk/rgdebinstallprogress.cc:471 +#: ../gtk/rgdebinstallprogress.cc:503 #, c-format msgid "Error in package %s" msgstr "套件 %s 發生錯誤" -#: ../gtk/rgdebinstallprogress.cc:566 +#: ../gtk/rgdebinstallprogress.cc:598 msgid "A package failed to install. Trying to recover:" msgstr "" -#: ../gtk/rgdebinstallprogress.cc:623 ../gtk/rgdebinstallprogress.cc:626 +#: ../gtk/rgdebinstallprogress.cc:655 ../gtk/rgdebinstallprogress.cc:658 msgid "Changes applied" msgstr "變更已套用" -#: ../gtk/rgdebinstallprogress.cc:682 +#: ../gtk/rgdebinstallprogress.cc:714 msgid "" "The marked changes are now being applied. This can take some time. Please " "wait." msgstr "正在套用已標記的變更。這可能需要一段時間，請稍候。" -#: ../gtk/rgdebinstallprogress.cc:687 +#: ../gtk/rgdebinstallprogress.cc:719 msgid "Installing and removing software" msgstr "正在安裝及移除軟體" -#: ../gtk/rgdebinstallprogress.cc:689 +#: ../gtk/rgdebinstallprogress.cc:721 msgid "Removing software" msgstr "正在移除軟體" -#: ../gtk/rgdebinstallprogress.cc:691 +#: ../gtk/rgdebinstallprogress.cc:723 msgid "Installing software" msgstr "正在安裝軟體" @@ -1525,56 +1538,56 @@ msgid "%s Changelog" msgstr "%s 的修改記錄" -#: ../gtk/rgmainwindow.cc:2047 +#: ../gtk/rgmainwindow.cc:2050 msgid "Do you want to add another CD-ROM?" msgstr "您要加入其它的光碟嗎？" -#: ../gtk/rgmainwindow.cc:2084 +#: ../gtk/rgmainwindow.cc:2087 msgid "Open changes" msgstr "開啟變更" -#: ../gtk/rgmainwindow.cc:2121 ../gtk/rgmainwindow.cc:2684 -#: ../gtk/rgmainwindow.cc:2820 ../gtk/rgmainwindow.cc:2998 +#: ../gtk/rgmainwindow.cc:2124 ../gtk/rgmainwindow.cc:2687 +#: ../gtk/rgmainwindow.cc:2823 ../gtk/rgmainwindow.cc:3001 #, c-format msgid "Can't write %s" msgstr "無法寫入 %s" -#: ../gtk/rgmainwindow.cc:2140 +#: ../gtk/rgmainwindow.cc:2143 #, fuzzy msgid "Save changes" msgstr "套件變更" -#: ../gtk/rgmainwindow.cc:2147 +#: ../gtk/rgmainwindow.cc:2150 msgid "Save full state, not only changes" msgstr "儲存整個狀態，而非只是變更" -#: ../gtk/rgmainwindow.cc:2264 +#: ../gtk/rgmainwindow.cc:2267 msgid "Repositories changed" msgstr "套件庫已改變" #. TRANSLATORS: this message appears when the user added/removed #. a repostiory (sources.list entry) a reload (apt-get udpate) is #. needed then -#: ../gtk/rgmainwindow.cc:2268 +#: ../gtk/rgmainwindow.cc:2271 msgid "" "The repository information has changed. You have to click on the \"Reload\" " "button for your changes to take effect" msgstr "套件庫的資料已改變。您需要按下「重新載入」按鈕來使您的變更生效" -#: ../gtk/rgmainwindow.cc:2279 +#: ../gtk/rgmainwindow.cc:2282 msgid "Never show this message again" msgstr "不再顯示這訊息" -#: ../gtk/rgmainwindow.cc:2333 +#: ../gtk/rgmainwindow.cc:2336 #, c-format msgid "Found %i packages" msgstr "找到 %i 個套件" -#: ../gtk/rgmainwindow.cc:2374 +#: ../gtk/rgmainwindow.cc:2377 msgid "Starting help viewer..." msgstr "正在執行說明文件瀏覽器..." -#: ../gtk/rgmainwindow.cc:2394 +#: ../gtk/rgmainwindow.cc:2397 msgid "" "No help viewer is installed!\n" "\n" @@ -1592,7 +1605,7 @@ "另外你可以在命令列中‘man synaptic’來開啟 man page；或以瀏覽器顯示位" "於‘synaptic/html’ 資料夾中的 html 版本。" -#: ../gtk/rgmainwindow.cc:2546 +#: ../gtk/rgmainwindow.cc:2549 msgid "" "Cannot start configuration tool!\n" "You have to install the required package 'libgnome2-perl'." @@ -1600,22 +1613,22 @@ "無法執行設置工具！\n" "您安裝需要的‘libgnome2-perl’套件。" -#: ../gtk/rgmainwindow.cc:2552 +#: ../gtk/rgmainwindow.cc:2555 msgid "Starting package configuration tool..." msgstr "正在執行套件設置工具..." #. cout << "RGMainWindow::pkgHelpClicked()" << endl; -#: ../gtk/rgmainwindow.cc:2567 +#: ../gtk/rgmainwindow.cc:2570 msgid "Starting package documentation viewer..." msgstr "正在執行套件文件瀏覽器" -#: ../gtk/rgmainwindow.cc:2579 +#: ../gtk/rgmainwindow.cc:2582 msgid "" "You have to install the package \"dwww\" to browse the documentation of a " "package" msgstr "您需要安裝“dwww”來瀏覽套件的文件" -#: ../gtk/rgmainwindow.cc:2648 +#: ../gtk/rgmainwindow.cc:2651 msgid "" "Could not apply changes!\n" "Fix broken packages first." @@ -1623,43 +1636,43 @@ "無法套用變更！\n" "請先修正套件安裝不完整的問題。" -#: ../gtk/rgmainwindow.cc:2669 +#: ../gtk/rgmainwindow.cc:2672 msgid "Applying marked changes. This may take a while..." msgstr "正在套用已標記的變更。這需要一點時間...." -#: ../gtk/rgmainwindow.cc:2673 +#: ../gtk/rgmainwindow.cc:2676 #, fuzzy msgid "Downloading Package Files" msgstr "正在下載套件檔案" -#: ../gtk/rgmainwindow.cc:2749 +#: ../gtk/rgmainwindow.cc:2752 msgid "Do you want to quit Synaptic?" msgstr "您真的要離開 Synaptic？" -#: ../gtk/rgmainwindow.cc:2805 +#: ../gtk/rgmainwindow.cc:2808 #, fuzzy msgid "Downloading Package Information" msgstr "正在下載套件資訊" -#: ../gtk/rgmainwindow.cc:2806 +#: ../gtk/rgmainwindow.cc:2809 msgid "" "The repositories will be checked for new, removed or upgraded software " "packages." msgstr "套件庫將會檢查新的、已移除或升級的套件。" -#: ../gtk/rgmainwindow.cc:2809 +#: ../gtk/rgmainwindow.cc:2812 msgid "Reloading package information..." msgstr "正在從新載入套件資訊..." -#: ../gtk/rgmainwindow.cc:2877 +#: ../gtk/rgmainwindow.cc:2880 msgid "Failed to resolve dependency problems!" msgstr "無法解決套件相依性問題！" -#: ../gtk/rgmainwindow.cc:2879 +#: ../gtk/rgmainwindow.cc:2882 msgid "Successfully fixed dependency problems" msgstr "套件相依性問題已成功修復！" -#: ../gtk/rgmainwindow.cc:2895 +#: ../gtk/rgmainwindow.cc:2898 msgid "" "Could not upgrade the system!\n" "Fix broken packages first." @@ -1667,29 +1680,29 @@ "系統無法升級！\n" "請先修正套件安裝不完整的問題。" -#: ../gtk/rgmainwindow.cc:2944 +#: ../gtk/rgmainwindow.cc:2947 msgid "Marking all available upgrades..." msgstr "標記所有現存的升級..." -#: ../gtk/rgmainwindow.cc:2963 +#: ../gtk/rgmainwindow.cc:2966 msgid "Successfully marked available upgrades" msgstr "現存的升級已標記完成" -#: ../gtk/rgmainwindow.cc:2965 +#: ../gtk/rgmainwindow.cc:2968 msgid "Failed to mark all available upgrades!" msgstr "無法標記所有現存的升級！" -#: ../gtk/rgmainwindow.cc:3344 +#: ../gtk/rgmainwindow.cc:3347 #, fuzzy msgid "Save script" msgstr "套件描述" -#: ../gtk/rgmainwindow.cc:3371 +#: ../gtk/rgmainwindow.cc:3374 #, fuzzy msgid "Select directory" msgstr "搜尋歷史" -#: ../gtk/rgmainwindow.cc:3383 +#: ../gtk/rgmainwindow.cc:3386 msgid "Please select a directory" msgstr "" @@ -2402,7 +2415,8 @@ msgstr "搜尋(_S)" #: ../gtk/glade/window_fetch.glade.h:1 -msgid "Show progress of single files" +#, fuzzy +msgid "Show for individual files" msgstr "顯示每個檔案的進度" #: ../gtk/glade/window_changes.glade.h:1 @@ -2552,7 +2566,6 @@ msgstr "以推薦套件為依賴的套件" #: ../gtk/glade/window_preferences.glade.h:32 -#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Default Upgrade" msgstr "預設升級" @@ -2698,7 +2711,6 @@ msgstr "在主視窗中顯示套件屬性" #: ../gtk/glade/window_preferences.glade.h:70 -#: ../gtk/glade/dialog_upgrade.glade.h:10 msgid "Smart Upgrade" msgstr "聰明升級" @@ -3296,14 +3308,24 @@ "\n" "注意：升級只是標記而已。您需要稍後套用它們。" -#: ../gtk/glade/dialog_upgrade.glade.h:9 +#: ../gtk/glade/dialog_upgrade.glade.h:8 msgid "Remember my answer for future upgrades" msgstr "記錄我的答案以便在未來升級時使用" -#: ../gtk/glade/dialog_upgrade.glade.h:11 +#: ../gtk/glade/dialog_upgrade.glade.h:9 msgid "This behavior can be changed in the preferences later." msgstr "本行為可以稍後在偏好設定中更改。" +#: ../gtk/glade/dialog_upgrade.glade.h:10 +#, fuzzy +msgid "_Default Upgrade" +msgstr "預設升級" + +#: ../gtk/glade/dialog_upgrade.glade.h:11 +#, fuzzy +msgid "_Smart Upgrade" +msgstr "聰明升級" + #: ../data/synaptic.desktop.in.h:1 ../data/synaptic-kde.desktop.in.h:1 msgid "Install, remove and upgrade software packages" msgstr "安裝、移除及升級套件"