June 2010 - spacewalk-commits - Fedora Mailing-Lists

backend/spacewalk-backend.spec rel-eng/packages

by Michael Mraka

backend/spacewalk-backend.spec | 6 +++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 7e92f8c7ae1254400cc7285a47166e980922982e Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Jun 8 16:51:46 2010 +0200 Automatic commit of package [spacewalk-backend] release [1.1.20-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 103f39f..3347bfb 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -8,7 +8,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 1.1.19 +Version: 1.1.20 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -631,6 +631,10 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Tue Jun 08 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.1.20-1 +- more exporter code cleanup +- 589524 - select packages, erratas and kickstart trees according to import + * Thu Jun 03 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.1.19-1 - removed duplicated code from export routines * Mon May 31 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.1.18-1 diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 3d31023..e29d7aa 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -1.1.19-1 backend/ +1.1.20-1 backend/

14 years

1
0
0 / 0

9 commits - backend/satellite_exporter backend/satellite_tools

by Michael Mraka

backend/satellite_exporter/handlers/non_auth_dumper.py | 285 ++++++++++++++--- backend/satellite_tools/disk_dumper/dumper.py | 248 -------------- 2 files changed, 249 insertions(+), 284 deletions(-) New commits: commit 2b1c8029989b474914326754b4e2b97475c8fe92 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Jun 8 16:48:10 2010 +0200 _get_package_id() not used anywhere diff --git a/backend/satellite_exporter/handlers/non_auth_dumper.py b/backend/satellite_exporter/handlers/non_auth_dumper.py index b7f70f0..e52f93a 100644 --- a/backend/satellite_exporter/handlers/non_auth_dumper.py +++ b/backend/satellite_exporter/handlers/non_auth_dumper.py @@ -657,21 +657,6 @@ class NonAuthenticatedDumper(rhnHandler, dumper.XML_Dumper): def close_rpm(self): self._is_closed = 1 - def _get_package_id(package, prefix): - """ Extracts the package id from a string rhn-package-12345 """ - log_debug(4, package, prefix) - if package[:len(prefix)] != prefix: - raise rhnFault(3002, "Invalid package name %s" % package) - package_id = package[len(prefix):] - try: - package_id = int(package_id) - except ValueError: - raise rhnFault(3002, "Invalid package id %s" % package) - return package_id - - _get_package_id = staticmethod(_get_package_id) - - def _respond_xmlrpc(self, data): # Marshal s = xmlrpclib.dumps((data, )) commit 1a55283cc3dbbe182f8e41a8836b9aa794650762 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Jun 8 16:41:30 2010 +0200 if we inherit from dumper.ChannelsDumper, we can even remove set_iterator() diff --git a/backend/satellite_exporter/handlers/non_auth_dumper.py b/backend/satellite_exporter/handlers/non_auth_dumper.py index e503ac9..b7f70f0 100644 --- a/backend/satellite_exporter/handlers/non_auth_dumper.py +++ b/backend/satellite_exporter/handlers/non_auth_dumper.py @@ -734,16 +734,7 @@ class ContainerWriter: # Overwrite the ChannelsDumper class to filter packages/source packages/errata # based on the creation date # XXX No caching for now -class ChannelsDumper(exportLib.ChannelsDumper): - def set_iterator(self): - if not self._channels: - # Nothing to do - return - - # Import the query from the dumper.ChannelsDumper class - h = rhnSQL.prepare(dumper.ChannelsDumper._query_list_channels) - return dumper.QueryIterator(statement=h, params=self._channels) - +class ChannelsDumper(dumper.ChannelsDumper): def dump_subelement(self, data): c = exportLib.ChannelDumper(self._writer, data) c.dump() commit b3a48f60786a4db76b51b66b4978139e4db65086 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Jun 8 16:35:42 2010 +0200 removed useless try-except diff --git a/backend/satellite_exporter/handlers/non_auth_dumper.py b/backend/satellite_exporter/handlers/non_auth_dumper.py index f23c355..e503ac9 100644 --- a/backend/satellite_exporter/handlers/non_auth_dumper.py +++ b/backend/satellite_exporter/handlers/non_auth_dumper.py @@ -746,10 +746,7 @@ class ChannelsDumper(exportLib.ChannelsDumper): def dump_subelement(self, data): c = exportLib.ChannelDumper(self._writer, data) - try: - c.dump() - except: - raise + c.dump() _query_lookup_last_modified_packages = rhnSQL.Statement(""" select TO_CHAR(last_modified, 'YYYY-MM-DD HH24:MI:SS') last_modified commit 974fff4e84936810a33a54bfceaa8b7b312ac2ce Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Jun 8 16:34:29 2010 +0200 superclass' __init__() is called by default diff --git a/backend/satellite_exporter/handlers/non_auth_dumper.py b/backend/satellite_exporter/handlers/non_auth_dumper.py index c9efa0f..f23c355 100644 --- a/backend/satellite_exporter/handlers/non_auth_dumper.py +++ b/backend/satellite_exporter/handlers/non_auth_dumper.py @@ -735,11 +735,6 @@ class ContainerWriter: # based on the creation date # XXX No caching for now class ChannelsDumper(exportLib.ChannelsDumper): - def __init__(self, writer, channels): - # if snapshot is None, then all the objects from the channel are - # returned - this is useful for snapshotting - exportLib.ChannelsDumper.__init__(self, writer, channels) - def set_iterator(self): if not self._channels: # Nothing to do commit db705d2b3bae84b7abaedc647a6d8880c6188cb5 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Jun 8 16:22:38 2010 +0200 fixed namespace in moved funcitions diff --git a/backend/satellite_exporter/handlers/non_auth_dumper.py b/backend/satellite_exporter/handlers/non_auth_dumper.py index c4bd142..c9efa0f 100644 --- a/backend/satellite_exporter/handlers/non_auth_dumper.py +++ b/backend/satellite_exporter/handlers/non_auth_dumper.py @@ -285,10 +285,10 @@ class NonAuthenticatedDumper(rhnHandler, dumper.XML_Dumper): h.execute() writer = self._get_xml_writer() - dumper = SatelliteDumper(writer, + d = dumper.SatelliteDumper(writer, exportLib.ChannelFamiliesDumper(writer, data_iterator=h, null_max_members=0, virt_filter=virt_filter),) - dumper.dump() + d.dump() writer.flush() log_debug(4, "OK") self.close() @@ -299,9 +299,9 @@ class NonAuthenticatedDumper(rhnHandler, dumper.XML_Dumper): channels = self._validate_channels(channel_labels=channel_labels) writer = self._get_xml_writer() - dumper = SatelliteDumper(writer, ChannelsDumperEx(writer, + d = dumper.SatelliteDumper(writer, dumper.ChannelsDumperEx(writer, channels=channels.values())) - dumper.dump() + d.dump() writer.flush() log_debug(4, "OK") self.close() @@ -352,7 +352,7 @@ class NonAuthenticatedDumper(rhnHandler, dumper.XML_Dumper): except IOError: log_error("Client disconnected prematurely") self.close() - raise ClosedConnectionError + raise dumper.ClosedConnectionError # We're done return 0 @@ -384,9 +384,9 @@ class NonAuthenticatedDumper(rhnHandler, dumper.XML_Dumper): packages_hash[package_id] = row writer = self._get_xml_writer() - dumper = SatelliteDumper(writer, + d = dumper.SatelliteDumper(writer, dump_class(writer, packages_hash.values())) - dumper.dump() + d.dump() writer.flush() log_debug(4, "OK") self.close() @@ -420,9 +420,9 @@ class NonAuthenticatedDumper(rhnHandler, dumper.XML_Dumper): errata_hash[errata_id] = row writer = self._get_xml_writer() - dumper = SatelliteDumper(writer, - ErrataDumper(writer, errata_hash.values())) - dumper.dump() + d = dumper.SatelliteDumper(writer, + dumper.ErrataDumper(writer, errata_hash.values())) + d.dump() writer.flush() log_debug(4, "OK") self.close() @@ -434,9 +434,9 @@ class NonAuthenticatedDumper(rhnHandler, dumper.XML_Dumper): kickstart_labels=kickstart_labels) writer = self._get_xml_writer() - dumper = SatelliteDumper(writer, - KickstartableTreesDumper(writer, kickstarts=kickstarts)) - dumper.dump() + d = dumper.SatelliteDumper(writer, + dumper.KickstartableTreesDumper(writer, kickstarts=kickstarts)) + d.dump() writer.flush() log_debug(4, "OK") self.close() @@ -445,8 +445,8 @@ class NonAuthenticatedDumper(rhnHandler, dumper.XML_Dumper): def dump_product_names(self): log_debug(4) writer = self._get_xml_writer() - dumper = SatelliteDumper(writer, exportLib.ProductNamesDumper(writer)) - dumper.dump() + d = dumper.SatelliteDumper(writer, exportLib.ProductNamesDumper(writer)) + d.dump() writer.flush() self.close() return 0 commit f44cda03d238d7cc4742258538bf0fa7466d5797 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Jun 8 16:00:53 2010 +0200 removed empty XML_DumperEx diff --git a/backend/satellite_exporter/handlers/non_auth_dumper.py b/backend/satellite_exporter/handlers/non_auth_dumper.py index 6c36381..c4bd142 100644 --- a/backend/satellite_exporter/handlers/non_auth_dumper.py +++ b/backend/satellite_exporter/handlers/non_auth_dumper.py @@ -38,7 +38,7 @@ class NullPathPackageError(Exception): class MissingPackageError(Exception): pass -class NonAuthenticatedDumper(rhnHandler, dumper.XML_DumperEx): +class NonAuthenticatedDumper(rhnHandler, dumper.XML_Dumper): def __init__(self, req): rhnHandler.__init__(self) self.compress_level = 5 diff --git a/backend/satellite_tools/disk_dumper/dumper.py b/backend/satellite_tools/disk_dumper/dumper.py index e9dbaaa..91a7e98 100644 --- a/backend/satellite_tools/disk_dumper/dumper.py +++ b/backend/satellite_tools/disk_dumper/dumper.py @@ -533,9 +533,6 @@ class XML_Dumper: return result -class XML_DumperEx(XML_Dumper): - pass - class SatelliteDumper(exportLib.SatelliteDumper): def set_attributes(self): """ Overriding with our own version """ commit c7c71e8bed064746f6ba8d60aed5fd605a9ef8f2 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Jun 8 15:58:29 2010 +0200 moved dump_channel_families(), dump_channels(), dump_channel_packages_short(), _packages(), dump_errata(), dump_kickstartable_trees() and dump_product_names() to NonAuthenticatedDumper diff --git a/backend/satellite_exporter/handlers/non_auth_dumper.py b/backend/satellite_exporter/handlers/non_auth_dumper.py index 3177bb0..6c36381 100644 --- a/backend/satellite_exporter/handlers/non_auth_dumper.py +++ b/backend/satellite_exporter/handlers/non_auth_dumper.py @@ -277,6 +277,180 @@ class NonAuthenticatedDumper(rhnHandler, dumper.XML_DumperEx): h.executemany(snapshot_channel_id=snapshot_channel_ids, obj_id=obj_ids, last_modified=last_modifieds) + # Dumper functions here + def dump_channel_families(self, virt_filter=0): + log_debug(2) + + h = self.get_channel_families_statement() + h.execute() + + writer = self._get_xml_writer() + dumper = SatelliteDumper(writer, + exportLib.ChannelFamiliesDumper(writer, + data_iterator=h, null_max_members=0, virt_filter=virt_filter),) + dumper.dump() + writer.flush() + log_debug(4, "OK") + self.close() + return 0 + + def dump_channels(self, channel_labels=None): + log_debug(2) + channels = self._validate_channels(channel_labels=channel_labels) + + writer = self._get_xml_writer() + dumper = SatelliteDumper(writer, ChannelsDumperEx(writer, + channels=channels.values())) + dumper.dump() + writer.flush() + log_debug(4, "OK") + self.close() + return 0 + + def dump_channel_packages_short(self, channel_label, last_modified): + log_debug(2, channel_label) + channels = self._validate_channels(channel_labels=[channel_label]) + channel_obj = channels[channel_label] + db_last_modified = int(rhnLib.timestamp(channel_obj['last_modified'])) + last_modified = int(rhnLib.timestamp(last_modified)) + log_debug(3, "last modified", last_modified, "db last modified", + db_last_modified) + if last_modified != db_last_modified: + raise rhnFault(3013, "The requested channel version does not match" + " the upstream version", explain=0) + channel_id = channel_obj['channel_id'] + key = "xml-channel-packages/rhn-channel-%d.data" % channel_id + # Try to get everything off of the cache + val = rhnCache.get(key, compressed=0, raw=1, modified=last_modified) + if val is None: + # Not generated yet + log_debug(4, "Cache MISS for %s (%s)" % (channel_label, + channel_id)) + stream = self._cache_channel_packages_short(channel_id, key, + last_modified) + else: + log_debug(4, "Cache HIT for %s (%s)" % (channel_label, + channel_id)) + temp_stream = tempfile.TemporaryFile() + temp_stream.write(val) + temp_stream.flush() + stream = self._normalize_compressed_stream(temp_stream) + + # Copy the results to the output stream + # They shold be already compressed if they were requested to be + # compressed + buffer_size = 16384 + # Send the HTTP headers - but don't init the compressed stream since + # we send the data ourselves + self._send_headers(init_compressed_stream=0) + while 1: + buff = stream.read(buffer_size) + if not buff: + break + try: + self._raw_stream.write(buff) + except IOError: + log_error("Client disconnected prematurely") + self.close() + raise ClosedConnectionError + # We're done + return 0 + + def _packages(self, packages, prefix, dump_class, sources=0): + if sources: + h = self.get_source_packages_statement() + else: + h = self.get_packages_statement() + + packages_hash = {} + for package in packages: + package = str(package) + if package[:len(prefix)] != prefix: + raise rhnFault(3002, "Invalid package name %s" % package) + package_id = package[len(prefix):] + try: + package_id = int(package_id) + except ValueError: + raise rhnFault(3002, "Invalid package name %s" % package) + if packages_hash.has_key(package_id): + # Already verified + continue + h.execute(package_id=package_id) + row = h.fetchone_dict() + if not row: + # XXX Silently ignore it? + raise rhnFault(3003, "No such package %s" % package) + # Saving the row, it's handy later when we create the iterator + packages_hash[package_id] = row + + writer = self._get_xml_writer() + dumper = SatelliteDumper(writer, + dump_class(writer, packages_hash.values())) + dumper.dump() + writer.flush() + log_debug(4, "OK") + self.close() + return 0 + + def dump_errata(self, errata): + log_debug(2) + + h = self.get_errata_statement() + + errata_hash = {} + prefix = 'rhn-erratum-' + for erratum in errata: + erratum = str(erratum) + if erratum[:len(prefix)] != prefix: + raise rhnFault(3004, "Wrong erratum name %s" % erratum) + errata_id = erratum[len(prefix):] + try: + errata_id = int(errata_id) + except ValueError: + raise rhnFault(3004, "Wrong erratum name %s" % erratum) + if errata_hash.has_key(errata_id): + # Already verified + continue + h.execute(errata_id=errata_id) + row = h.fetchone_dict() + if not row: + # XXX Silently ignore it? + raise rhnFault(3005, "No such erratum %s" % erratum) + # Saving the row, it's handy later when we create the iterator + errata_hash[errata_id] = row + + writer = self._get_xml_writer() + dumper = SatelliteDumper(writer, + ErrataDumper(writer, errata_hash.values())) + dumper.dump() + writer.flush() + log_debug(4, "OK") + self.close() + return 0 + + def dump_kickstartable_trees(self, kickstart_labels=None): + log_debug(2) + kickstarts = self._validate_kickstarts( + kickstart_labels=kickstart_labels) + + writer = self._get_xml_writer() + dumper = SatelliteDumper(writer, + KickstartableTreesDumper(writer, kickstarts=kickstarts)) + dumper.dump() + writer.flush() + log_debug(4, "OK") + self.close() + return 0 + + def dump_product_names(self): + log_debug(4) + writer = self._get_xml_writer() + dumper = SatelliteDumper(writer, exportLib.ProductNamesDumper(writer)) + dumper.dump() + writer.flush() + self.close() + return 0 + def arches(self): return self.dump_arches(rpm_arch_type_only=1) diff --git a/backend/satellite_tools/disk_dumper/dumper.py b/backend/satellite_tools/disk_dumper/dumper.py index c081212..e9dbaaa 100644 --- a/backend/satellite_tools/disk_dumper/dumper.py +++ b/backend/satellite_tools/disk_dumper/dumper.py @@ -534,179 +534,7 @@ class XML_Dumper: return result class XML_DumperEx(XML_Dumper): - # Dumper functions here - def dump_channel_families(self, virt_filter=0): - log_debug(2) - - h = self.get_channel_families_statement() - h.execute() - - writer = self._get_xml_writer() - dumper = SatelliteDumper(writer, - exportLib.ChannelFamiliesDumper(writer, - data_iterator=h, null_max_members=0, virt_filter=virt_filter),) - dumper.dump() - writer.flush() - log_debug(4, "OK") - self.close() - return 0 - - def dump_channels(self, channel_labels=None): - log_debug(2) - channels = self._validate_channels(channel_labels=channel_labels) - - writer = self._get_xml_writer() - dumper = SatelliteDumper(writer, ChannelsDumperEx(writer, - channels=channels.values())) - dumper.dump() - writer.flush() - log_debug(4, "OK") - self.close() - return 0 - - def dump_channel_packages_short(self, channel_label, last_modified): - log_debug(2, channel_label) - channels = self._validate_channels(channel_labels=[channel_label]) - channel_obj = channels[channel_label] - db_last_modified = int(rhnLib.timestamp(channel_obj['last_modified'])) - last_modified = int(rhnLib.timestamp(last_modified)) - log_debug(3, "last modified", last_modified, "db last modified", - db_last_modified) - if last_modified != db_last_modified: - raise rhnFault(3013, "The requested channel version does not match" - " the upstream version", explain=0) - channel_id = channel_obj['channel_id'] - key = "xml-channel-packages/rhn-channel-%d.data" % channel_id - # Try to get everything off of the cache - val = rhnCache.get(key, compressed=0, raw=1, modified=last_modified) - if val is None: - # Not generated yet - log_debug(4, "Cache MISS for %s (%s)" % (channel_label, - channel_id)) - stream = self._cache_channel_packages_short(channel_id, key, - last_modified) - else: - log_debug(4, "Cache HIT for %s (%s)" % (channel_label, - channel_id)) - temp_stream = tempfile.TemporaryFile() - temp_stream.write(val) - temp_stream.flush() - stream = self._normalize_compressed_stream(temp_stream) - - # Copy the results to the output stream - # They shold be already compressed if they were requested to be - # compressed - buffer_size = 16384 - # Send the HTTP headers - but don't init the compressed stream since - # we send the data ourselves - self._send_headers(init_compressed_stream=0) - while 1: - buff = stream.read(buffer_size) - if not buff: - break - try: - self._raw_stream.write(buff) - except IOError: - log_error("Client disconnected prematurely") - self.close() - raise ClosedConnectionError - # We're done - return 0 - - def _packages(self, packages, prefix, dump_class, sources=0): - if sources: - h = self.get_source_packages_statement() - else: - h = self.get_packages_statement() - - packages_hash = {} - for package in packages: - package = str(package) - if package[:len(prefix)] != prefix: - raise rhnFault(3002, "Invalid package name %s" % package) - package_id = package[len(prefix):] - try: - package_id = int(package_id) - except ValueError: - raise rhnFault(3002, "Invalid package name %s" % package) - if packages_hash.has_key(package_id): - # Already verified - continue - h.execute(package_id=package_id) - row = h.fetchone_dict() - if not row: - # XXX Silently ignore it? - raise rhnFault(3003, "No such package %s" % package) - # Saving the row, it's handy later when we create the iterator - packages_hash[package_id] = row - - writer = self._get_xml_writer() - dumper = SatelliteDumper(writer, - dump_class(writer, packages_hash.values())) - dumper.dump() - writer.flush() - log_debug(4, "OK") - self.close() - return 0 - - def dump_errata(self, errata): - log_debug(2) - - h = self.get_errata_statement() - - errata_hash = {} - prefix = 'rhn-erratum-' - for erratum in errata: - erratum = str(erratum) - if erratum[:len(prefix)] != prefix: - raise rhnFault(3004, "Wrong erratum name %s" % erratum) - errata_id = erratum[len(prefix):] - try: - errata_id = int(errata_id) - except ValueError: - raise rhnFault(3004, "Wrong erratum name %s" % erratum) - if errata_hash.has_key(errata_id): - # Already verified - continue - h.execute(errata_id=errata_id) - row = h.fetchone_dict() - if not row: - # XXX Silently ignore it? - raise rhnFault(3005, "No such erratum %s" % erratum) - # Saving the row, it's handy later when we create the iterator - errata_hash[errata_id] = row - - writer = self._get_xml_writer() - dumper = SatelliteDumper(writer, - ErrataDumper(writer, errata_hash.values())) - dumper.dump() - writer.flush() - log_debug(4, "OK") - self.close() - return 0 - - def dump_kickstartable_trees(self, kickstart_labels=None): - log_debug(2) - kickstarts = self._validate_kickstarts( - kickstart_labels=kickstart_labels) - - writer = self._get_xml_writer() - dumper = SatelliteDumper(writer, - KickstartableTreesDumper(writer, kickstarts=kickstarts)) - dumper.dump() - writer.flush() - log_debug(4, "OK") - self.close() - return 0 - - def dump_product_names(self): - log_debug(4) - writer = self._get_xml_writer() - dumper = SatelliteDumper(writer, exportLib.ProductNamesDumper(writer)) - dumper.dump() - writer.flush() - self.close() - return 0 + pass class SatelliteDumper(exportLib.SatelliteDumper): def set_attributes(self): commit 6fd98337fdef099a67fa9a32dd98d7fc5e5f3537 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Jun 8 15:47:50 2010 +0200 moved _send_headers(), send() and close() to NonAuthenticatedDumper diff --git a/backend/satellite_exporter/handlers/non_auth_dumper.py b/backend/satellite_exporter/handlers/non_auth_dumper.py index 34197c3..3177bb0 100644 --- a/backend/satellite_exporter/handlers/non_auth_dumper.py +++ b/backend/satellite_exporter/handlers/non_auth_dumper.py @@ -97,6 +97,64 @@ class NonAuthenticatedDumper(rhnHandler, dumper.XML_DumperEx): """ self._channel_family_query = None + def _send_headers(self, error=0, init_compressed_stream=1): + log_debug(4, "is_closed", self._is_closed) + if self._is_closed: + raise Exception, "Trying to write to a closed connection" + if self._headers_sent: + return + self._headers_sent = 1 + if self.compress_level: + self.headers_out['Content-Encoding'] = 'gzip' + # Send the headers + if error: + # No compression + self.compress_level = 0 + self._raw_stream.content_type = 'text/xml' + for h, v in self.headers_out.items(): + self._raw_stream.headers_out[h] = str(v) + self._raw_stream.send_http_header() + # If need be, start gzipping + if self.compress_level and init_compressed_stream: + log_debug(4, "Compressing with factor %s" % self.compress_level) + self._compressed_stream = gzip.GzipFile(None, "wb", + self.compress_level, self._raw_stream) + + def send(self, data): + log_debug(3, "Sending %d bytes" % len(data)) + try: + self._send_headers() + if self._compressed_stream: + log_debug(4, "Sending through a compressed stream") + self._compressed_stream.write(data) + else: + self._raw_stream.write(data) + except IOError: + log_error("Client appears to have closed connection") + self.close() + raise dumper.ClosedConnectionError + log_debug(5, "Bytes sent", len(data)) + + write = send + + def close(self): + log_debug(2, "Closing") + if self._is_closed: + log_debug(3, "Already closed") + return + + if self._compressed_stream: + log_debug(5, "Closing a compressed stream") + try: + self._compressed_stream.close() + except IOError, e: + # Remote end has closed connection already + log_error("Error closing the stream", str(e)) + pass + self._compressed_stream = None + self._is_closed = 1 + log_debug(3, "Closed") + def set_channel_family_query(self, channel_labels=[]): if not channel_labels: # All null-pwned channel families diff --git a/backend/satellite_tools/disk_dumper/dumper.py b/backend/satellite_tools/disk_dumper/dumper.py index 57abde4..c081212 100644 --- a/backend/satellite_tools/disk_dumper/dumper.py +++ b/backend/satellite_tools/disk_dumper/dumper.py @@ -534,64 +534,6 @@ class XML_Dumper: return result class XML_DumperEx(XML_Dumper): - def _send_headers(self, error=0, init_compressed_stream=1): - log_debug(4, "is_closed", self._is_closed) - if self._is_closed: - raise Exception, "Trying to write to a closed connection" - if self._headers_sent: - return - self._headers_sent = 1 - if self.compress_level: - self.headers_out['Content-Encoding'] = 'gzip' - # Send the headers - if error: - # No compression - self.compress_level = 0 - self._raw_stream.content_type = 'text/xml' - for h, v in self.headers_out.items(): - self._raw_stream.headers_out[h] = str(v) - self._raw_stream.send_http_header() - # If need be, start gzipping - if self.compress_level and init_compressed_stream: - log_debug(4, "Compressing with factor %s" % self.compress_level) - self._compressed_stream = gzip.GzipFile(None, "wb", - self.compress_level, self._raw_stream) - - def send(self, data): - log_debug(3, "Sending %d bytes" % len(data)) - try: - self._send_headers() - if self._compressed_stream: - log_debug(4, "Sending through a compressed stream") - self._compressed_stream.write(data) - else: - self._raw_stream.write(data) - except IOError: - log_error("Client appears to have closed connection") - self.close() - raise ClosedConnectionError - log_debug(5, "Bytes sent", len(data)) - - write = send - - def close(self): - log_debug(2, "Closing") - if self._is_closed: - log_debug(3, "Already closed") - return - - if self._compressed_stream: - log_debug(5, "Closing a compressed stream") - try: - self._compressed_stream.close() - except IOError, e: - # Remote end has closed connection already - log_error("Error closing the stream", str(e)) - pass - self._compressed_stream = None - self._is_closed = 1 - log_debug(3, "Closed") - # Dumper functions here def dump_channel_families(self, virt_filter=0): log_debug(2) commit d8bdbfb07fc386882d7dced778aea6a2ae446bec Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Jun 8 15:36:15 2010 +0200 let's move XML_DumperEx methods to NonAuthenticatedDumper as it's the only subclass and then remove XML_DumperEx completely diff --git a/backend/satellite_exporter/handlers/non_auth_dumper.py b/backend/satellite_exporter/handlers/non_auth_dumper.py index 9030af9..34197c3 100644 --- a/backend/satellite_exporter/handlers/non_auth_dumper.py +++ b/backend/satellite_exporter/handlers/non_auth_dumper.py @@ -41,7 +41,20 @@ class MissingPackageError(Exception): class NonAuthenticatedDumper(rhnHandler, dumper.XML_DumperEx): def __init__(self, req): rhnHandler.__init__(self) - dumper.XML_DumperEx.__init__(self, req) + self.compress_level = 5 + self.headers_out = UserDictCase() + self._raw_stream = req + self._raw_stream.content_type = 'application/octet-stream' + # State machine + self._headers_sent = 0 + self._is_closed = 0 + self._compressed_stream = None + # Redefine in subclasses + self._channel_family_query = """ + select pcf.channel_family_id, to_number(null) quantity + from rhnPublicChannelFamily pcf + """ + # Don't check for abuse self.check_for_abuse = 0 diff --git a/backend/satellite_tools/disk_dumper/dumper.py b/backend/satellite_tools/disk_dumper/dumper.py index b8d9b16..57abde4 100644 --- a/backend/satellite_tools/disk_dumper/dumper.py +++ b/backend/satellite_tools/disk_dumper/dumper.py @@ -534,21 +534,6 @@ class XML_Dumper: return result class XML_DumperEx(XML_Dumper): - def __init__(self, req): - self.compress_level = 5 - self.headers_out = UserDictCase() - self._raw_stream = req - self._raw_stream.content_type = 'application/octet-stream' - # State machine - self._headers_sent = 0 - self._is_closed = 0 - self._compressed_stream = None - # Redefine in subclasses - self._channel_family_query = """ - select pcf.channel_family_id, to_number(null) quantity - from rhnPublicChannelFamily pcf - """ - def _send_headers(self, error=0, init_compressed_stream=1): log_debug(4, "is_closed", self._is_closed) if self._is_closed:

14 years

1
0
0 / 0

Branch 'yum-repo-sync' - java/code

by Shannon Hughes

java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml | 14 ++++++++++ java/code/webapp/WEB-INF/nav/manage_channel.xml | 6 ++++ 2 files changed, 20 insertions(+) New commits: commit c44c20cd58841889b3c0ddeb052d15e86f86ac51 Author: Shannon Hughes <shughes(a)redhat.com> Date: Tue Jun 8 10:21:16 2010 -0400 adding new sync nav, moving add/remove to new tab diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml index bca43a9..15353c8 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml @@ -735,6 +735,20 @@ http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd" </context-group> </trans-unit> + <trans-unit id="Sync"> +<source>Sync</source> + <context-group name="ctx"> + <context context-type="sourcefile">Navigation Menu</context> + </context-group> + </trans-unit> + + <trans-unit id="Add / Remove"> +<source>Add / Remove</source> + <context-group name="ctx"> + <context context-type="sourcefile">Navigation Menu</context> + </context-group> + </trans-unit> + <trans-unit id="List / Leave"> <source>List / Leave</source> <context-group name="ctx"> diff --git a/java/code/webapp/WEB-INF/nav/manage_channel.xml b/java/code/webapp/WEB-INF/nav/manage_channel.xml index ea66733..9cd3640 100644 --- a/java/code/webapp/WEB-INF/nav/manage_channel.xml +++ b/java/code/webapp/WEB-INF/nav/manage_channel.xml @@ -50,6 +50,12 @@ </rhn-tab> <rhn-tab name="Repositories" acl="channel_exists()"> <rhn-tab-url>/rhn/channels/manage/Repositories.do</rhn-tab-url> + <rhn-tab name="Add / Remove"> + <rhn-tab-url>/rhn/channels/manage/Repositories.do</rhn-tab-url> + </rhn-tab> + <rhn-tab name="Sync"> + <rhn-tab-url>/rhn/channels/manage/Sync.do</rhn-tab-url> + </rhn-tab> </rhn-tab> <rhn-tab name="Patches" acl="channel_exists();channel_packaging_type(sysv-solaris)" on-click="Sniglets::Lists->navi_empty_set" node-id="remove_channel_packages"> <rhn-tab-url>/network/software/channels/manage/patches/index.pxt</rhn-tab-url>

14 years

1
0
0 / 0

Branch 'yum-repo-sync' - 39 commits - backend/rhn-conf backend/satellite_tools backend/spacewalk-backend.spec client/rhel client/tools java/code rel-eng/packages

by Shannon Hughes

backend/rhn-conf/rhn_server_iss.conf | 5 backend/rhn-conf/rhn_server_satexport.conf | 7 backend/rhn-conf/rhn_server_satexport_internal.conf | 2 backend/satellite_tools/constants.py | 2 backend/satellite_tools/disk_dumper/dumper.py | 220 - backend/satellite_tools/disk_dumper/iss.py | 40 backend/satellite_tools/exporter/exportLib.py | 46 backend/spacewalk-backend.spec | 5 client/rhel/rhn-client-tools/po/es.po | 1683 +------- client/rhel/rhn-client-tools/po/ru.po | 1922 +--------- client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py | 5 client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py | 49 client/rhel/rhn-client-tools/src/up2date_client/tui.py | 50 client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py | 35 client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py | 2 client/tools/rhnpush/rhnpush.py | 2 java/code/src/com/redhat/rhn/domain/errata/AbstractErrata.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/UpgradeConfirmSetupAction.java | 4 java/code/src/com/redhat/rhn/frontend/dto/PackageOverview.java | 4 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 16 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 java/code/src/com/redhat/rhn/frontend/struts/CommandForm.java | 44 java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 93 java/code/webapp/WEB-INF/struts-config.xml | 2 rel-eng/packages/spacewalk-backend | 2 25 files changed, 740 insertions(+), 3504 deletions(-) New commits: commit 8eb682c7880b93e5ec75cdad2fd694683a082a59 Merge: 9b78c4e... 6cabba1... Author: Shannon Hughes <shughes(a)redhat.com> Date: Tue Jun 8 09:42:10 2010 -0400 Merge branch 'master' into repo commit 6cabba164fa96f091c042b2576cbf30911278080 Author: Justin Sherrill <jsherril(a)redhat.com> Date: Tue Jun 8 09:36:05 2010 -0400 fixing issue where package summary could be null, causing NPE diff --git a/java/code/src/com/redhat/rhn/frontend/dto/PackageOverview.java b/java/code/src/com/redhat/rhn/frontend/dto/PackageOverview.java index 6c75756..32bd4dc 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/PackageOverview.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/PackageOverview.java @@ -14,6 +14,8 @@ */ package com.redhat.rhn.frontend.dto; +import org.apache.commons.lang.StringUtils; + import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.List; @@ -108,7 +110,7 @@ public class PackageOverview extends BaseDto { * @return Returns the summary. */ public String getSummary() { - return summary.trim(); + return StringUtils.defaultString(summary).trim(); } /** * @param summaryIn The summary to set. commit af0a6d6fdd421e57146675d1a2bac2c19a92cfeb Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Jun 8 14:34:08 2010 +0200 589524 - select packages, erratas and kickstart trees according to import date diff --git a/backend/satellite_tools/disk_dumper/dumper.py b/backend/satellite_tools/disk_dumper/dumper.py index c82865b..b8d9b16 100644 --- a/backend/satellite_tools/disk_dumper/dumper.py +++ b/backend/satellite_tools/disk_dumper/dumper.py @@ -1051,8 +1051,12 @@ class _ChannelsDumper(exportLib._ChannelDumper): from rhnPackage rp, rhnChannelPackage rcp where rcp.channel_id = :channel_id and rcp.package_id = rp.id - and rp.last_modified >= TO_Date(:lower_limit, 'YYYYMMDDHH24MISS') - and rp.last_modified <= TO_Date(:upper_limit, 'YYYYMMDDHH24MISS') + and (rcp.modified >= TO_Date(:lower_limit, 'YYYYMMDDHH24MISS') + or rp.last_modified >= TO_Date(:lower_limit, 'YYYYMMDDHH24MISS') + ) + and (rcp.modified <= TO_Date(:upper_limit, 'YYYYMMDDHH24MISS') + and rp.last_modified <= TO_Date(:upper_limit, 'YYYYMMDDHH24MISS') + ) """) # Things that can be overwriten in subclasses @@ -1074,8 +1078,12 @@ class _ChannelsDumper(exportLib._ChannelDumper): from rhnChannelErrata ce, rhnErrata e where ce.channel_id = :channel_id and ce.errata_id = e.id - and e.last_modified >= TO_Date(:lower_limit, 'YYYYMMDDHH24MISS') - and e.last_modified <= TO_Date(:upper_limit, 'YYYYMMDDHH24MISS') + and (ce.modified >= TO_Date(:lower_limit, 'YYYYMMDDHH24MISS') + or e.last_modified >= TO_Date(:lower_limit, 'YYYYMMDDHH24MISS') + ) + and (ce.modified <= TO_Date(:upper_limit, 'YYYYMMDDHH24MISS') + and e.last_modified <= TO_Date(:upper_limit, 'YYYYMMDDHH24MISS') + ) """) def _get_errata_ids(self): diff --git a/backend/satellite_tools/disk_dumper/iss.py b/backend/satellite_tools/disk_dumper/iss.py index 3359358..c9e2b02 100644 --- a/backend/satellite_tools/disk_dumper/iss.py +++ b/backend/satellite_tools/disk_dumper/iss.py @@ -245,8 +245,12 @@ class Dumper(dumper.XML_Dumper): """ if self.start_date: query += """ - and rp.last_modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS') - and rp.last_modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS') + and (rcp.modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS') + or rp.last_modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS') + ) + and (rcp.modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS') + and rp.last_modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS') + ) """ self.brpm_query = rhnSQL.Statement(query) brpm_data = rhnSQL.prepare(self.brpm_query) @@ -276,8 +280,12 @@ class Dumper(dumper.XML_Dumper): """ if self.start_date: query += """ - and rp.last_modified >= TO_DATE(:start_date,'YYYYMMDDHH24MISS') - and rp.last_modified <= TO_DATE(:end_date,'YYYYMMDDHH24MISS') + and (rcp.modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS') + or rp.last_modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS') + ) + and (rcp.modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS') + and rp.last_modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS') + ) """ self.package_query = rhnSQL.Statement(query) package_data = rhnSQL.prepare(self.package_query) @@ -311,8 +319,12 @@ class Dumper(dumper.XML_Dumper): """ if self.start_date: query += """ - where ps.last_modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS') - and ps.last_modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS') + where (ps.modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS') + or ps.last_modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS') + ) + and (ps.modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS') + and ps.last_modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS') + ) """ self.source_package_query = rhnSQL.Statement(query) source_package_data = rhnSQL.prepare(self.source_package_query) @@ -343,8 +355,12 @@ class Dumper(dumper.XML_Dumper): """ if self.start_date: query += """ - and e.last_modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS') - and e.last_modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS') + and (ce.modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS') + or e.last_modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS') + ) + and (ce.modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS') + and e.last_modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS') + ) """ self.errata_query = rhnSQL.Statement(query) errata_data = rhnSQL.prepare(self.errata_query) @@ -374,8 +390,12 @@ class Dumper(dumper.XML_Dumper): """ if self.start_date: query += """ - and kt.last_modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS') - and kt.last_modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS') + and (kt.last_modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS') + or kt.modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS') + ) + and (kt.last_modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS') + and kt.modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS') + ) and kt.org_id is Null """ self.kickstart_trees_query = rhnSQL.Statement(query) commit 877a9e218e517e4b75e8c7e1d0cc22174244ce52 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Jun 8 14:26:23 2010 +0200 601656 - fix channel permission check diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java index b552262..bf6b001 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java @@ -1761,14 +1761,8 @@ public class ChannelSoftwareHandler extends BaseHandler { Channel mergeFrom = lookupChannelByLabel(loggedInUser, mergeFromLabel); Channel mergeTo = lookupChannelByLabel(loggedInUser, mergeToLabel); - try { - ChannelManager.verifyChannelAdmin(loggedInUser, mergeTo.getId()); - } - catch (InvalidChannelRoleException e) { - LocalizationService ls = LocalizationService.getInstance(); - throw new PermissionException(ls.getMessage( - "frontend.xmlrpc.channels.software.merge.permsfailure", - mergeTo.getLabel())); + if (!UserManager.verifyChannelAdmin(loggedInUser, mergeTo)) { + throw new PermissionCheckFailureException(); } Set<Errata> mergedErrata = @@ -1809,14 +1803,8 @@ public class ChannelSoftwareHandler extends BaseHandler { Channel mergeFrom = lookupChannelByLabel(loggedInUser, mergeFromLabel); Channel mergeTo = lookupChannelByLabel(loggedInUser, mergeToLabel); - try { - ChannelManager.verifyChannelAdmin(loggedInUser, mergeTo.getId()); - } - catch (InvalidChannelRoleException e) { - LocalizationService ls = LocalizationService.getInstance(); - throw new PermissionException(ls.getMessage( - "frontend.xmlrpc.channels.software.merge.permsfailure", - mergeTo.getLabel())); + if (!UserManager.verifyChannelAdmin(loggedInUser, mergeTo)) { + throw new PermissionCheckFailureException(); } Set<Errata> toErrata = mergeTo.getErratas(); commit 5c14ba73da7e5f19bdc73092bbfa51f632cb536a Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Jun 8 14:00:00 2010 +0200 591291 - clone errata instead of associating them to custom channels diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java index b17d64e..b552262 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java @@ -30,6 +30,7 @@ import com.redhat.rhn.domain.channel.InvalidChannelRoleException; import com.redhat.rhn.domain.channel.NewChannelHelper; import com.redhat.rhn.domain.errata.Errata; import com.redhat.rhn.domain.errata.ErrataFactory; +import com.redhat.rhn.domain.errata.impl.PublishedClonedErrata; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.rhnpackage.Package; import com.redhat.rhn.domain.rhnpackage.PackageFactory; @@ -57,6 +58,7 @@ import com.redhat.rhn.frontend.xmlrpc.user.XmlRpcUserHelper; import com.redhat.rhn.manager.channel.ChannelEditor; import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.channel.CreateChannelCommand; +import com.redhat.rhn.manager.errata.ErrataManager; import com.redhat.rhn.manager.errata.cache.ErrataCacheManager; import com.redhat.rhn.manager.system.IncompatibleArchException; import com.redhat.rhn.manager.system.SystemManager; @@ -1769,13 +1771,10 @@ public class ChannelSoftwareHandler extends BaseHandler { mergeTo.getLabel())); } - Set<Errata> toErrata = mergeTo.getErratas(); - Set<Errata> fromErrata = mergeFrom.getErratas(); - Set<Errata> differentErrata = errataDiff(fromErrata, toErrata); + Set<Errata> mergedErrata = + mergeErrataToChannel(loggedInUser, mergeFrom.getErratas(), mergeTo); - mergeTo.getErratas().addAll(differentErrata); - ChannelFactory.save(mergeTo); - return differentErrata.toArray(); + return mergedErrata.toArray(); } /** @@ -1823,30 +1822,60 @@ public class ChannelSoftwareHandler extends BaseHandler { Set<Errata> toErrata = mergeTo.getErratas(); List<Errata> fromErrata = ErrataFactory.lookupByChannelBetweenDates( loggedInUser.getOrg(), mergeFrom, startDate, endDate); - Set<Errata> differentErrata = errataDiff(new HashSet(fromErrata), toErrata); - mergeTo.getErratas().addAll(differentErrata); - ChannelFactory.save(mergeTo); - return differentErrata.toArray(); + Set<Errata> mergedErrata = + mergeErrataToChannel(loggedInUser, mergeFrom.getErratas(), mergeTo); + + return mergedErrata.toArray(); } - private Set<Errata> errataDiff(Set<Errata> from, Set<Errata> to) { - Set<Errata> diff = new HashSet<Errata>(); - for (Errata errata : from) { - if (!errataInSet(to, errata)) { - diff.add(errata); + private Set<Errata> mergeErrataToChannel(User user, Set<Errata> fromErrata, + Channel toChannel) { + Set<Errata> toErrata = toChannel.getErratas(); + Set<Errata> diffErrata = new HashSet(fromErrata); + + for (Iterator iter = fromErrata.iterator(); iter.hasNext();) { + Errata errata = (Errata) iter.next(); + if (toErrata.contains(errata)) { + // remove errata already in channel + diffErrata.remove(errata); + } + else if (errata.isCloned()) { + Errata origErrata = ((PublishedClonedErrata) errata).getOriginal(); + if (cloneInSet(user, origErrata, toErrata)) { + // remove errata those brothers already in channel + // (different clones of the same original) + diffErrata.remove(errata); + } + } + else { + if (cloneInSet(user, errata, toErrata)) { + // remove errata those clones already in channel + diffErrata.remove(errata); + } } } - return diff; + + ErrataManager.publishErrataToChannel(toChannel, getErrataIds(diffErrata), user); + ChannelFactory.save(toChannel); + + return diffErrata; } - private boolean errataInSet(Set<Errata> where, Errata what) { - for (Errata errata : where) { - if (errata.equals(what)) { - return true; - } + private Set<Long> getErrataIds(Set<Errata> errata) { + Set<Long> ids = new HashSet(); + for (Errata erratum : errata) { + ids.add(erratum.getId()); } - return false; + return ids; + } + + private Boolean cloneInSet(User user, Errata original, Set<Errata> set) { + List<Errata> clones = ErrataManager.lookupPublishedByOriginal( + user, original); + int numOfClones = clones.size(); + clones.removeAll(set); + return (clones.size() != numOfClones); } /* commit 7021edfc653b6d422e9863a033171a792e545fb2 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Jun 8 09:56:35 2010 +0200 fixing hashCode for Errata the bug prevented to work errata comparism, errata set operations, ... diff --git a/java/code/src/com/redhat/rhn/domain/errata/AbstractErrata.java b/java/code/src/com/redhat/rhn/domain/errata/AbstractErrata.java index b903f59..7d302d6 100644 --- a/java/code/src/com/redhat/rhn/domain/errata/AbstractErrata.java +++ b/java/code/src/com/redhat/rhn/domain/errata/AbstractErrata.java @@ -649,6 +649,6 @@ public abstract class AbstractErrata extends BaseDomainHelper implements eb.append(this.getAdvisoryRel()); eb.append(this.getAdvisorySynopsis()); eb.append(this.getOrg()); - return eb.hashCode(); + return eb.toHashCode(); } } commit 18f23c924e962b7e3a640d49fea8b1ecdc0f1876 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Tue Jun 8 13:25:35 2010 +0200 596237 - use constants in SendingWindow diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py index b21b284..313dece 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py @@ -129,6 +129,9 @@ SEND_WINDOW_DESC = _("We are finished collecting information for the System Prof "You can run the registration program later by " "typing `rhn_register` at the command line.") +# Sending Window +SENDING_WINDOW = _("Sending Profile to Red Hat Network") + # Finish Window FINISH_WINDOW = _("Finish setting up software updates") FINISH_WINDOW_TEXT_TUI = _("You may now run 'yum update' from this system's " diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py b/client/rhel/rhn-client-tools/src/up2date_client/tui.py index 5e208e1..cb64223 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py @@ -793,8 +793,7 @@ class SendingWindow: self.name = "SendingWindow" size = snack._snack.size() - self.pwin = snack.GridForm(screen, _("Sending Profile to Red Hat Network"), - 1, 1) + self.pwin = snack.GridForm(screen, SENDING_WINDOW, 1, 1) self.scale = snack.Scale(40, 100) self.pwin.add(self.scale, 0, 0) commit abd6b45fd407b3ada03bc440d92f76342c58632e Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Tue Jun 8 13:22:35 2010 +0200 596237 - use constants in SendWindow diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py index c32996b..b21b284 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py @@ -122,11 +122,12 @@ SYSTEM_ALREADY_REGISTERED = _("It appears this system has already been set up fo SYSTEM_ALREADY_REGISTERED_CONT = _("Are you sure you would like to continue?") # Send Window -SEND_WINDOW = _("We are finished collecting information for the System Profile.\n\n" - "Press \"Next\" to send this System Profile to Red Hat Network. " - "Click \"Cancel\" and no information will be sent. " - "You can run the registration program later by " - "typing `rhn_register` at the command line.") +SEND_WINDOW = _("Send Profile Information to Red Hat Network") +SEND_WINDOW_DESC = _("We are finished collecting information for the System Profile.\n\n" + "Press \"Next\" to send this System Profile to Red Hat Network. " + "Click \"Cancel\" and no information will be sent. " + "You can run the registration program later by " + "typing `rhn_register` at the command line.") # Finish Window FINISH_WINDOW = _("Finish setting up software updates") diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py b/client/rhel/rhn-client-tools/src/up2date_client/tui.py index 096256e..5e208e1 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py @@ -757,10 +757,9 @@ class SendWindow: self.name = "SendWindow" size = snack._snack.size() - toplevel = snack.GridForm(screen, _("Send Profile Information to Red Hat Network"), - 1, 2) + toplevel = snack.GridForm(screen, SEND_WINDOW, 1, 2) - text = snack.TextboxReflowed(size[0]-15, SEND_WINDOW) + text = snack.TextboxReflowed(size[0]-15, SEND_WINDOW_DESC) toplevel.add(text, 0, 0) # BUTTON BAR commit 10ac58f27079f27b289be6be0d598029152f3508 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Tue Jun 8 13:19:18 2010 +0200 596237 - use constants in PackagesWindow diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py index 8fb8b7e..c32996b 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py @@ -99,6 +99,17 @@ HARDWARE_WINDOW_DESC2 = _("Additional hardware information including PCI" HARDWARE_WINDOW_CHECKBOX = _("Include the following information about hardware" " and network:") +# Packages Window +PACKAGES_WINDOW = _("Register a System Profile - Packages") +PACKAGES_WINDOW_DESC1 = _("RPM information is important to determine what" + " updated software packages are relevant to this" + " system.") +PACKAGES_WINDOW_DESC2 = _("Include RPM packages installed on this system" + " in my System Profile") +PACKAGES_WINDOW_UNCHECK = _("You may deselect individual packages by" + " unchecking them below.") +PACKAGES_WINDOW_PKGLIST = _("Building Package List") + # Product Window HOSTED_LOGIN_PROMPT = _("Please enter your login information for Red " "Hat Network (http://rhn.redhat.com/):\n\n") diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py b/client/rhel/rhn-client-tools/src/up2date_client/tui.py index a0d33e9..096256e 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py @@ -676,20 +676,19 @@ class PackagesWindow: self.screen = screen self.tui = tui size = snack._snack.size() - toplevel = snack.GridForm(screen, _("Register a System Profile - Packages"), - 1, 5) + toplevel = snack.GridForm(screen, PACKAGES_WINDOW, 1, 5) self.g = toplevel - text = snack.TextboxReflowed(size[0]-10, _("RPM information is important to determine what updated software packages are relevant to this system.")) + text = snack.TextboxReflowed(size[0]-10, PACKAGES_WINDOW_DESC1) toplevel.add(text, 0, 0, anchorLeft = 1) - self.packagesButton = snack.Checkbox(_("Include RPM packages installed on this system in my System Profile"), 1) + self.packagesButton = snack.Checkbox(PACKAGES_WINDOW_DESC2, 1) toplevel.add(self.packagesButton, 0, 1, padding = (0, 1, 0, 1), anchorLeft = 1) - label = snack.Label(_("You may deselect individual packages by unchecking them below.")) + label = snack.Label(PACKAGES_WINDOW_UNCHECK) toplevel.add(label, 0, 2, anchorLeft = 1) #self.packageList = snack.Listbox(size[1]-18, 1, width = size[0]-10) @@ -698,8 +697,7 @@ class PackagesWindow: # do we need to read the packages from disk? if tui.packageList == []: - self.pwin = snack.GridForm(screen, _("Building Package List"), - 1, 1) + self.pwin = snack.GridForm(screen, PACKAGES_WINDOW_PKGLIST, 1, 1) self.scale = snack.Scale(40, 100) self.pwin.add(self.scale, 0, 0) commit 790678be341a0d43b69a10a7dbf85b98a91ec18b Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Tue Jun 8 13:10:34 2010 +0200 596237 - use constants in HardwareWindow diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py index aca761d..8fb8b7e 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py @@ -87,6 +87,18 @@ CONFIRM_OS_ALL = _("Your system will be subscribed to the base" " software channel to receive all available" " updates.") +# Hardware Window +HARDWARE_WINDOW = _("Register a System Profile - Hardware") +HARDWARE_WINDOW_DESC1 = _("A Profile Name is a descriptive name that" + " you choose to identify this System Profile" + " on the Red Hat Network web pages. Optionally," + " include a computer serial or identification number.") +HARDWARE_WINDOW_DESC2 = _("Additional hardware information including PCI" + " devices, disk sizes and mount points will be" + " included in the profile.") +HARDWARE_WINDOW_CHECKBOX = _("Include the following information about hardware" + " and network:") + # Product Window HOSTED_LOGIN_PROMPT = _("Please enter your login information for Red " "Hat Network (http://rhn.redhat.com/):\n\n") diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py b/client/rhel/rhn-client-tools/src/up2date_client/tui.py index c34e313..a0d33e9 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py @@ -564,10 +564,9 @@ class HardwareWindow: # read all hardware in tui.hardware = hardware.Hardware() - toplevel = snack.GridForm(screen, _("Register a System Profile - Hardware"), - 1, 7) + toplevel = snack.GridForm(screen, HARDWARE_WINDOW, 1, 7) - text = snack.TextboxReflowed(70, _("A Profile Name is a descriptive name that you choose to identify this System Profile on the Red Hat Network web pages. Optionally, include a computer serial or identification number.")) + text = snack.TextboxReflowed(70, HARDWARE_WINDOW_DESCRIPTION) toplevel.add(text, 0, 0, anchorLeft = 1) @@ -582,9 +581,9 @@ class HardwareWindow: toplevel.add(grid, 0, 1, anchorLeft = 1) if tui.includeHardware: - self.hardwareButton = snack.Checkbox(_("Include the following information about hardware and network:"), isOn = 1) + self.hardwareButton = snack.Checkbox(HARDWARE_WINDOW_CHECKBOX, isOn = 1) else: - self.hardwareButton = snack.Checkbox(_("Include the following information about hardware and network:")) + self.hardwareButton = snack.Checkbox(HARDWARE_WINDOW_CHECKBOX) toplevel.add(self.hardwareButton, 0, 2, padding = (0, 1, 0, 0), anchorLeft = 1) @@ -640,7 +639,7 @@ class HardwareWindow: tb = snack.TextboxReflowed(80, hardware_text) toplevel.add(tb, 0, 4) - self.additionalHWLabel = snack.TextboxReflowed(size[0]-10, _("Additional hardware information including PCI devices, disk sizes and mount points will be included in the profile.")) + self.additionalHWLabel = snack.TextboxReflowed(size[0]-10, HARDWARE_WINDOW_DESC2) toplevel.add(self.additionalHWLabel, 0, 5, padding = (0, 1, 0, 0), anchorLeft = 1) commit a7e6566dfb5a723b56ee0b6229451a33f28fee41 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Tue Jun 8 12:59:04 2010 +0200 596237 - use constants in OSReleaseWindow & AlreadyRegisteredWindow diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py index 2edde34..aca761d 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py @@ -76,6 +76,17 @@ LOGIN_TIP = _("Tip: Forgot your login or password? Contact your " USER_REQUIRED = _("Please enter a desired login.") PASSWORD_REQUIRED = _("Please enter and verify a password.") +# OS Release Window +SELECT_OSRELEASE = _("Select Operating System Release") +OS_VERSION = _("Operating System version:") +MINOR_RELEASE = _(" Minor Release: ") +LIMITED_UPDATES = _("Limited Updates Only") +ALL_UPDATES = _("All available updates") +CONFIRM_OS_RELEASE_SELECTION = _("Confirm operating system release selection") +CONFIRM_OS_ALL = _("Your system will be subscribed to the base" + " software channel to receive all available" + " updates.") + # Product Window HOSTED_LOGIN_PROMPT = _("Please enter your login information for Red " "Hat Network (http://rhn.redhat.com/):\n\n") @@ -83,6 +94,7 @@ HOSTED_LOGIN_TIP = _("Tip: Forgot your login or password? " "Visit: https://rhn.redhat.com/rhn/sales/LoginInfo.do") EMAIL = _("*Email Address:") +SYSTEM_ALREADY_SETUP = _("System software updates already set up") SYSTEM_ALREADY_REGISTERED = _("It appears this system has already been set up for software updates:") SYSTEM_ALREADY_REGISTERED_CONT = _("Are you sure you would like to continue?") diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py b/client/rhel/rhn-client-tools/src/up2date_client/tui.py index 618cf52..c34e313 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py @@ -109,7 +109,7 @@ class AlreadyRegisteredWindow: oldUsername = systemIdXml[0][0]['username'] oldsystemId = systemIdXml[0][0]['system_id'] - toplevel = snack.GridForm(self.screen, _("System software updates already set up"), 1, 2) + toplevel = snack.GridForm(self.screen, SYSTEM_ALREADY_SETUP, 1, 2) self.bb = snack.ButtonBar(self.screen, [(YES_CONT, "next"), (NO_CANCEL, "exit")]) @@ -430,14 +430,12 @@ class OSReleaseWindow: self.selectChannel = False - toplevel = snack.GridForm(self.screen, - _("Select Operating System Release"), 1, 7) + toplevel = snack.GridForm(self.screen, SELECT_OSRELEASE, 1, 7) self.g = toplevel - self.ostext = snack.TextboxReflowed(self.size[0]-10, - _("Operating System version:")) + self.ostext = snack.TextboxReflowed(self.size[0]-10, OS_VERSION) toplevel.add(self.ostext, 0, 0, anchorLeft = 1) - optiontext1 = _("Limited Updates Only") + optiontext1 = LIMITED_UPDATES if self.tui.limited_updates_button: self.limited_updates_button = snack.SingleRadioButton(optiontext1, @@ -449,7 +447,7 @@ class OSReleaseWindow: toplevel.add(self.limited_updates_button, 0, 1, padding = (0, 1, 0, 1), anchorLeft = 1) - self.sublabel = snack.Label(_(" Minor Release: ")) + self.sublabel = snack.Label(MINOR_RELEASE) toplevel.add(self.sublabel, 0, 2, anchorLeft = 1) self.channelList = snack.Listbox(self.size[1]-22, 1, @@ -464,7 +462,7 @@ class OSReleaseWindow: self.tip = snack.TextboxReflowed(self.size[0]-10, CHANNEL_PAGE_TIP) toplevel.add(self.tip, 0, 4, anchorLeft = 1) - optiontext2 = _("All available updates") + optiontext2 = ALL_UPDATES if self.tui.all_updates_button: self.all_updates_button = snack.SingleRadioButton(optiontext2, @@ -517,7 +515,7 @@ class OSReleaseWindow: later_release = self.channelList.current() != \ self.available_channels['default_channel'] - title = _("Confirm operating system release selection") + title = CONFIRM_OS_RELEASE_SELECTION if later_release: msgbox = snack.ButtonChoiceWindow(self.screen, title, CONFIRM_OS_WARNING % self.channelList.current(), @@ -525,9 +523,6 @@ class OSReleaseWindow: return msgbox if self.all_updates_button.selected() or later_release: - CONFIRM_OS_ALL = _("Your system will be subscribed to the base" - " software channel to receive all available" - " updates.") msgbox = snack.ButtonChoiceWindow(self.screen, title, CONFIRM_OS_ALL, buttons =[OK, CANCEL]) return msgbox commit de81e657281610d344bda399011b69dd1cecd2cd Author: ypoyarko <ypoyarko(a)fedoraproject.org> Date: Tue Jun 8 05:09:50 2010 +0000 l10n: Updates to Russian (ru) translation Transmitted-via: Transifex (translate.fedoraproject.org) diff --git a/client/rhel/rhn-client-tools/po/ru.po b/client/rhel/rhn-client-tools/po/ru.po index d917c56..5ed88f1 100644 --- a/client/rhel/rhn-client-tools/po/ru.po +++ b/client/rhel/rhn-client-tools/po/ru.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-07 13:34+0200\n" -"PO-Revision-Date: 2010-06-07 13:36\n" +"PO-Revision-Date: 2010-06-08 15:05\n" "Last-Translator: Yulia <ypoyarko(a)redhat.com>\n" "Language-Team: Russian\n" "MIME-Version: 1.0\n" @@ -722,14 +722,14 @@ msgstr "" #: ../src/up2date_client/rhnreg_constants.py:221 #, python-format msgid "Architecture: %s, OS Release: %s, OS Version: %s" -msgstr "Архитектура: %s, Выпуск ОС: %s, Версия ОС: %s" +msgstr "Архитектура: %s, выпуск ОС: %s, версия ОС: %s" #: ../src/up2date_client/rhnreg_constants.py:223 msgid "" "This server doesn't support functionality needed by this version of the " "software update setup client. Please try again with a newer server." msgstr "" -"Сервер не поддерживает функциональность, необходимую для данной версией " +"Сервер не поддерживает функциональность, необходимую для данной версии " "клиента настройки обновлений ПО. Повторите попытку с более поздней версией " "сервера." @@ -780,13 +780,13 @@ msgid "" "universal default activation key. More details can be found in Red Hat " "Knowledgebase Article #7924 at http://kbase.redhat.com/faq/FAQ_61_7924.shtm " msgstr "" -"Проблема с регистрацией системы:\n" +"Проблема при регистрации системы:\n" "\n" "Универсальный ключ активации ограничивает число систем, подключаемых к " -"организации RHN, связанной с вашей учетной записью. Для разрешения " -"подключения данной системы обратитесь к вашему Администратору организации " -"RHN и запросите либо увеличение числа систем, которым разрешено подключение, " -"либо деактивацию универсального ключа. Более подробная информация может быть " +"организации RHN, связанной с вашей учётной записью. Для разрешения " +"подключения данной системы обратитесь к вашему администратору организации " +"RHN и запросите увеличение числа систем, которым разрешено подключение, " +"или деактивацию универсального ключа. Более подробная информация может быть " "найдена в статье #7924 Базы знаний по адресу http://kbase.redhat.com/faq/" "FAQ_61_7924.shtm (на английском)." @@ -796,12 +796,15 @@ msgid "" " Tip: Minor releases with a '*' are currently supported by Red Hat.\n" "\n" msgstr "" +"\n" +" Подсказка: в настоящее время вспомогательные выпуски с «*» поддерживаются Red Hat.\n" +"\n" #: ../src/up2date_client/rhnreg_constants.py:260 msgid "" "Warning:You will not be able to limit this system to minor release that is " "older than the recent minor release if you select this option.\n" -msgstr "" +msgstr "Предупреждение: при выборе этой опции вы не сможете ограничить систему вспомогательным выпуском, версия которого старше версии последнего выпуска.\n" #: ../src/up2date_client/rhnreg_constants.py:265 #, python-format @@ -816,7 +819,7 @@ msgstr "" "основной программный канал %s.\n" "Вы не сможете переназначить систему\n" "предыдущему выпуску\n" -"(но можно будет переназначить более\n" +"(но можно переназначить более\n" "позднему выпуску).\n" "Вы действительно хотите продолжить?" @@ -853,7 +856,7 @@ msgstr "Да, продолжить" #: ../src/up2date_client/rhnreg_constants.py:281 msgid "Press <space> to deselect the option." -msgstr "Нажмите <пробел> для отмены выделения." +msgstr "Нажмите <пробел> для отмены выбора." #: ../src/up2date_client/rhnregGui.py:113 msgid "Automatic Subscription Activation" @@ -865,7 +868,7 @@ msgstr "Активация подписки" #: ../src/up2date_client/rhnregGui.py:136 msgid "Notice" -msgstr "Замечание" +msgstr "Примечание" #: ../src/up2date_client/rhnregGui.py:261 msgid "There was an error while applying your choice." @@ -873,7 +876,7 @@ msgstr "Ошибка при применении изменений." #: ../src/up2date_client/rhnregGui.py:287 msgid "You specified an invalid protocol. Only https and http are allowed." -msgstr "Указан неверный протокол. Только https и http могут быть заданы." +msgstr "Указан неверный протокол. Допускаются только https и http." #: ../src/up2date_client/rhnregGui.py:300 msgid "" @@ -884,7 +887,7 @@ msgstr "Вы не сможете зарегистрировать систему #: ../src/up2date_client/rhnregGui.py:325 #, python-format msgid "We could not contact Red Hat Network (%s)." -msgstr "Невозможно связаться с Red Hat Network (%s)." +msgstr "Не удалось связаться с Red Hat Network (%s)." #: ../src/up2date_client/rhnregGui.py:327 #: ../src/up2date_client/rhnregGui.py:340 @@ -896,13 +899,13 @@ msgid "" "Did you mean to register to a Red Hat Network Satellite or Proxy? If so, you " "can enter a Satellite or Proxy location instead." msgstr "" -"Если вы хотите зарегистрировать Red Hat Network Satellite или Proxy, введите " -"положение соответствующего сервера." +"Если вы хотите зарегистрироваться на Red Hat Network Satellite или Proxy, укажите " +"расположение соответствующего сервера." #: ../src/up2date_client/rhnregGui.py:335 #, python-format msgid "We could not contact the Satellite or Proxy at '%s.'" -msgstr "Невозможно связаться с Satellite или Proxy на '%s.'" +msgstr "Не удалось связаться с Satellite или Proxy на «%s.»" #: ../src/up2date_client/rhnregGui.py:337 #, python-format @@ -910,7 +913,7 @@ msgid "" "Double-check the location - is '%s' correct? If not, you can correct it and " "try again." msgstr "" -"Проверьте правильность введенного пути - '%s'. Если неверно, исправьте и " +"Проверьте правильность введённого пути («%s»). Если нужно, исправьте и " "повторите попытку." #: ../src/up2date_client/rhnregGui.py:350 @@ -919,18 +922,18 @@ msgstr "Ошибка при соединении с Red Hat Network." #: ../src/up2date_client/rhnregGui.py:351 msgid "The server may be in outage mode. You may have to try connecting later." -msgstr "Возможно, сервер в офлайн. Попробуйте подключиться позже." +msgstr "Возможно, сервер отключен. Попробуйте подключиться позже." #: ../src/up2date_client/rhnregGui.py:353 msgid "You may be running a client that is incompatible with the server." -msgstr "Возможно ваш клиент несовместим с сервером." +msgstr "Возможно, клиент несовместим с сервером." #: ../src/up2date_client/rhnregGui.py:396 #, python-format msgid "" "Please enter your account information for the %s Red Hat Network " "Satellite:" -msgstr "Введите данные вашей учётной записи для %s Red Hat Network Satellite:" +msgstr "Введите данные учётной записи для %s Red Hat Network Satellite:" #: ../src/up2date_client/rhnregGui.py:445 msgid "You must enter a login." @@ -942,13 +945,13 @@ msgstr "Необходимо ввести пароль." #: ../src/up2date_client/rhnregGui.py:465 msgid "There was an error while logging in." -msgstr "Ошибка при авторизации." +msgstr "Ошибка авторизации." #: ../src/up2date_client/rhnregGui.py:489 msgid "" "There was an error communicating with the registration server. The message " "was:\n" -msgstr "Произошла ошибка связи с сервером регистрации. Сообщение:\n" +msgstr "Ошибка связи с сервером регистрации. Сообщение:\n" #: ../src/up2date_client/rhnregGui.py:631 msgid "There was an error while assembling information for the profile." @@ -964,7 +967,7 @@ msgstr "Ошибка при заполнении профиля." #: ../src/up2date_client/rhnregGui.py:699 msgid "You must choose a name for this profile." -msgstr "Необходимо задать имя для данного профиля." +msgstr "Необходимо задать имя профиля." #: ../src/up2date_client/rhnregGui.py:714 msgid "There was an error while creating the profile." @@ -973,19 +976,19 @@ msgstr "Ошибка при создании профиля." #: ../src/up2date_client/rhnregGui.py:725 msgid "Sending your profile information to Red Hat Network. Please wait." msgstr "" -"Информация вашего профиля передается в Red Hat Network. Пожалуйста " +"Информация профиля передаётся в Red Hat Network. Пожалуйста, " "подождите." #: ../src/up2date_client/rhnregGui.py:744 msgid "Registering System" -msgstr "Система регистрируется" +msgstr "Выполняется регистрация системы" #: ../src/up2date_client/rhnregGui.py:758 #: ../src/up2date_client/rhnregGui.py:762 #: ../src/up2date_client/rhnregGui.py:766 ../src/up2date_client/tui.py:835 #: ../src/up2date_client/tui.py:838 ../src/up2date_client/tui.py:841 msgid "Problem registering system:\n" -msgstr "Проблема с регистрацией системы:\n" +msgstr "Проблема при регистрации системы:\n" #: ../src/up2date_client/rhnregGui.py:769 #, python-format @@ -993,20 +996,20 @@ msgid "" "The installation number [ %s ] provided is not a valid installation number. " "Please go back to the previous screen and fix it." msgstr "" -"Указанный номер установки [ %s ] не является корректным. Вернитесь к " -"предыдущему экрану и исправьте номер." +"Некорректный код установки: [ %s ]. Вернитесь к " +"предыдущему экрану и исправьте код." #: ../src/up2date_client/rhnregGui.py:779 ../src/up2date_client/tui.py:847 msgid "Problem registering system." -msgstr "Проблема с регистрацией системы." +msgstr "Проблема при регистрации системы." #: ../src/up2date_client/rhnregGui.py:789 ../src/up2date_client/tui.py:852 msgid "Problem writing out system id to disk." -msgstr "Проблема с записью системного идентификатора на диск." +msgstr "Проблема при записи системного идентификатора на диск." #: ../src/up2date_client/rhnregGui.py:795 msgid "There was a problem registering this system." -msgstr "Проблема с регистрацией данной системы." +msgstr "Проблема при регистрации данной системы." #: ../src/up2date_client/rhnregGui.py:808 msgid "Sending hardware information" @@ -1037,13 +1040,13 @@ msgstr "Ошибка при отправке информации о пакет #: ../src/up2date_client/rhnregGui.py:893 ../src/up2date_client/tui.py:866 #: ../src/up2date_client/tui.py:880 msgid "Problem registering personal information:\n" -msgstr "Проблема с регистрацией персональной информации:\n" +msgstr "Проблема при регистрации личных данных:\n" #: ../src/up2date_client/rhnregGui.py:881 #: ../src/up2date_client/rhnregGui.py:898 ../src/up2date_client/tui.py:872 #: ../src/up2date_client/tui.py:884 msgid "Problem registering personal information" -msgstr "Проблема с регистрацией персональной информации" +msgstr "Проблема при регистрации личных данных." #: ../src/up2date_client/rhnregGui.py:940 msgid "There was an error while installing the certificate." @@ -1060,7 +1063,7 @@ msgid "" "There was an SSL error. This could be because the file you picked was not a " "certificate file." msgstr "" -"Ошибка SSL. Возможная причина - выбранный файл не является файлом " +"Ошибка SSL. Возможно, выбранный файл не является файлом " "сертификата." #. TODO Provide better messages @@ -1086,7 +1089,7 @@ msgstr "%d МГц" #: ../src/up2date_client/rhnregGui.py:1154 #, python-format msgid "%s MB" -msgstr "%s Мб" +msgstr "%s МБ" #: ../src/up2date_client/rhnregGui.py:1198 msgid "There was an error building the list of packages." @@ -1103,7 +1106,7 @@ msgstr "Архитектура" #: ../src/up2date_client/rhnregGui.py:1225 msgid "Building a list of RPM packages installed on your system. Please wait." msgstr "" -"Построение списка установленных в вашей системе RPM пакетов. Пожалуйста " +"Создание списка установленных в вашей системе RPM пакетов. Пожалуйста, " "подождите." #: ../src/up2date_client/rhnregGui.py:1256 @@ -1120,8 +1123,8 @@ msgid "" "There was an error saving your configuration. Make sure that\n" "you own %s." msgstr "" -"Произошла ошибка сохранения вашей конфигурации. Убедитесь,\n" -"что Вы имеете права записи в %s." +"Произошла ошибка сохранения конфигурации. Убедитесь,\n" +"что вы являетесь владельцем %s." #: ../src/up2date_client/rhnregGui.py:1327 #, python-format @@ -1130,13 +1133,13 @@ msgid "" "program, please file a bug at bugzilla.redhat.com. Including the relevant " "parts of '%s' would be very helpful. Thanks!" msgstr "" -"Непредвиденная ошибка. Если вы хотите помочь нам улучшить эту программу, " -"отправьте отчет об ошибке через bugzilla.redhat.com. Если возможно, включите " -"соответствующие сегменты '%s'. Спасибо!" +"Непредвиденная ошибка. Чтобы помочь нам улучшить эту программу, " +"отправьте отчёт об ошибке через bugzilla.redhat.com. Если возможно, включите " +"соответствующие сегменты «%s». Спасибо!" #: ../src/up2date_client/rhnreg.py:55 msgid "Warning: unable to enable rhnsd with chkconfig" -msgstr "Внимание: Невозможно включить rhnsd с chkconfig" +msgstr "Внимание: невозможно включить rhnsd с chkconfig" #: ../src/up2date_client/rhnreg.py:65 msgid "Warning: unable to run rhn_check" @@ -1148,7 +1151,7 @@ msgstr "Ошибка: сервер недоступен. Повторите по #: ../src/up2date_client/rpcServer.py:171 msgid "ERROR: can not find RHNS CA file" -msgstr "ОШИБКА: невозможно найти файл RHNS CA" +msgstr "ОШИБКА: файл RHNS CA не найден" #: ../src/up2date_client/rpcServer.py:207 msgid "Connection aborted by the user" @@ -1164,7 +1167,7 @@ msgstr "Получение списка установленных в систе #: ../src/up2date_client/tui.py:112 ../data/rh_register.glade.h:83 msgid "System software updates already set up" -msgstr "Обновления ПО системы уже настроены" +msgstr "Программные обновления системы уже настроены" #: ../src/up2date_client/tui.py:115 msgid "Red Hat Network Location:" @@ -1214,7 +1217,7 @@ msgstr "Ваша система будет подписана на основн #: ../src/up2date_client/tui.py:572 msgid "Register a System Profile - Hardware" -msgstr "Регистрация системного профиля: Оборудование" +msgstr "Регистрация системного профиля: оборудование" #: ../src/up2date_client/tui.py:575 msgid "" @@ -1222,8 +1225,8 @@ msgid "" "Profile on the Red Hat Network web pages. Optionally, include a computer " "serial or identification number." msgstr "" -"Название профиля - это описательное имя, которое вы выбираете для " -"идентификации этой системы на web-страницах Red Hat Network. Дополнительно, " +"Название профиля — это описательное имя для " +"идентификации системы на веб-страницах Red Hat Network. Дополнительно " "включает серийный или идентификационный номер компьютера." #: ../src/up2date_client/tui.py:581 @@ -1232,7 +1235,7 @@ msgstr "Название профиля:" #: ../src/up2date_client/tui.py:590 ../src/up2date_client/tui.py:592 msgid "Include the following information about hardware and network:" -msgstr "Включить следующую информацию об оборудовании и сети:" +msgstr "Включите следующую информацию об оборудовании и сети:" #: ../src/up2date_client/tui.py:603 ../src/up2date_client/tui.py:604 msgid "Version: " @@ -1252,7 +1255,7 @@ msgstr "Скорость CPU: " #: ../src/up2date_client/tui.py:633 msgid "IP Address: " -msgstr "IP адрес: " +msgstr "IP-адрес: " #: ../src/up2date_client/tui.py:639 msgid "Memory: " @@ -1268,28 +1271,28 @@ msgid "" "Additional hardware information including PCI devices, disk sizes and mount " "points will be included in the profile." msgstr "" -"Дополнительная информация об оборудовании, такая как устройства PCI, объем " -"дисков и точки монтирования,будет включена в профиль." +"Дополнительная информация об оборудовании, включая устройства PCI, объём " +"дисков и точки подключения, будет добавлена в профиль." #: ../src/up2date_client/tui.py:685 msgid "Register a System Profile - Packages" -msgstr "Регистрация системного профиля: Пакеты" +msgstr "Регистрация системного профиля: пакеты" #: ../src/up2date_client/tui.py:690 msgid "" "RPM information is important to determine what updated software packages are " "relevant to this system." msgstr "" -"Информация о RPM является важной для определения того, какие из обновленных " -"пакетов являются необходимыми для этой системы." +"Информация о RPM необходима для определения того, какие из обновленных " +"пакетов подходят этой системе." #: ../src/up2date_client/tui.py:694 msgid "Include RPM packages installed on this system in my System Profile" -msgstr "Включить пакеты, установленные в этой системе в мой системный профиль" +msgstr "Включить установленные в системе пакеты в мой системный профиль" #: ../src/up2date_client/tui.py:698 msgid "You may deselect individual packages by unchecking them below." -msgstr "Вы можете исключить отдельные пакеты, сняв с них отметку ниже." +msgstr "Вы можете исключить отдельные пакеты, отменив их выбор." #: ../src/up2date_client/tui.py:707 msgid "Building Package List" @@ -1339,15 +1342,15 @@ msgstr "Программу регистрации RHN необходимо за #: ../src/up2date_client/up2dateErrors.py:31 msgid "Disk error. The message was:\n" -msgstr "Ошибка диска. Сообщение:\n" +msgstr "Ошибка диска. Сообщение:\n" #: ../src/up2date_client/up2dateErrors.py:39 msgid "RPM error. The message was:\n" -msgstr "Ошибка RPM. Сообщение:\n" +msgstr "Ошибка RPM. Сообщение:\n" #: ../src/up2date_client/up2dateErrors.py:50 msgid "There was a fatal error installing the package:\n" -msgstr "Произошла фатальная ошибка установки пакета:\n" +msgstr "Критическая ошибка при установке пакета:\n" #: ../src/up2date_client/up2dateErrors.py:63 msgid "Password error. The message was:\n" @@ -1355,7 +1358,7 @@ msgstr "Ошибка пароля. Сообщение:\n" #: ../src/up2date_client/up2dateErrors.py:74 msgid "RPM package conflict error. The message was:\n" -msgstr "Ошибка конфликта RPM пакета. Сообщение:\n" +msgstr "Конфликт RPM-пакета. Сообщение:\n" #: ../src/up2date_client/up2dateErrors.py:86 msgid "RPM file conflict error. The message was:\n" @@ -1372,7 +1375,7 @@ msgstr "Ошибка RPM. Сообщение:\n" #: ../src/up2date_client/up2dateErrors.py:127 #: ../src/up2date_client/up2dateErrors.py:140 msgid "RPM dependency error. The message was:\n" -msgstr "Зависимость RPM нарушена. Сообщение:\n" +msgstr "Ошибка зависимостей RPM. Сообщение:\n" #: ../src/up2date_client/up2dateErrors.py:151 msgid "Package Skip List error. The message was:\n" @@ -1399,7 +1402,7 @@ msgstr "Ошибка задержки от сервера. Сообщение:\n #: ../src/up2date_client/up2dateErrors.py:204 #, python-format msgid "Could not remove package \"%s\". It was on the RemoveSkipList" -msgstr "Не могу удалить пакет \"%s\". Он был в составе RemoveSkipList" +msgstr "Не удалось удалить пакет «%s». Он был в составе RemoveSkipList" #: ../src/up2date_client/up2dateErrors.py:227 msgid "GPG is not installed properly." @@ -1408,7 +1411,7 @@ msgstr "GPG не установлен корректно." #: ../src/up2date_client/up2dateErrors.py:237 msgid "GPG keyring does not include the Red Hat, Inc. public package-signing key" msgstr "" -"Доступные ключи GPG не включают публичного ключа Red Hat Inc. для подписи " +"Доступные ключи GPG не включают открытого ключа Red Hat Inc. для подписи " "пакетов" #: ../src/up2date_client/up2dateErrors.py:249 @@ -1417,8 +1420,8 @@ msgid "" "The package %s failed its gpg signature verification. This means the package " "is corrupt." msgstr "" -"Пакет %s не прошел проверку на корректность gpg подписи. Это означает, что " -"пакет поврежден." +"Пакет %s не прошёл проверку GPG-подписи. Это означает, что " +"пакет повреждён." #: ../src/up2date_client/up2dateErrors.py:263 #, python-format @@ -1428,7 +1431,7 @@ msgstr "Пакет %s не имеет подписи GPG.\n" #: ../src/up2date_client/up2dateErrors.py:276 #, python-format msgid "Package %s has a untrusted GPG signature.\n" -msgstr "Пакет %s подписан неизвестной подписью GPG.\n" +msgstr "Пакет %s подписан ненадёжной подписью GPG.\n" #: ../src/up2date_client/up2dateErrors.py:289 #, python-format @@ -1468,6 +1471,18 @@ msgid "" "retry to avoid\n" " requiring a Management entitlement." msgstr "" +"\n" +" Недостаточно полномочий управления для регистрации системы в\n" +" Red Hat Network. Сообщите об этом вашему администратору организации.\n" +" После освобождения организацией существующих или \n" +" приобретения новых полномочий вы сможете зарегистрировать систему.\n" +" Новые полномочия администратор может приобрести после авторизации в " +" Red Hat Network на странице «Ваша RHN - Управление подпиской».\n" +" \n" +" Типичная причина этой ошибки — неверная настройка\n" +" ключа активации как используемого по умолчанию универсального ключа.\n" +" В этом случае можно отключить ключ и постараться избегать необходимости\n" +" использования полномочия управления." #: ../src/firstboot/rhn_choose_server_gui.py:40 ../data/rh_register.glade.h:43 msgid "Choose Server" @@ -1488,11 +1503,11 @@ msgstr "Подключение к Red Hat Network" #: ../src/firstboot/rhn_finish_gui.py:39 msgid "Finish Updates Setup" -msgstr "Завершить настройку" +msgstr "Завершение настройки обновлений" #: ../src/firstboot/rhn_login_gui.py:54 msgid "Red Hat Login" -msgstr "Учетная запись Red Hat" +msgstr "Учётная запись Red Hat" #: ../src/firstboot/rhn_login_gui.py:56 ../src/firstboot/rhn_start_gui.py:41 msgid "Register with Red Hat Network" @@ -1505,11 +1520,11 @@ msgstr "Произошла ошибка соединения с сервером #: ../src/firstboot/rhn_login_gui.py:106 msgid "Would you like to try changing the network configuration and trying again?" -msgstr "Желаете ли вы изменить сетевую конфигурацию и повторить попытку?" +msgstr "Изменить сетевую конфигурацию и повторить попытку?" #: ../src/firstboot/rhn_provide_certificate_gui.py:40 msgid "Provide Certificate" -msgstr "Предоставить сертификат" +msgstr "Предоставление сертификата" #: ../src/firstboot/rhn_provide_certificate_gui.py:42 msgid "Provide a certificate for this Red Hat Network server" @@ -1521,16 +1536,14 @@ msgstr "Просмотр подписки" #: ../src/firstboot/rhn_start_gui.py:39 msgid "Set Up Software Updates" -msgstr "" -"Настроить\n" -"обновления ПО" +msgstr "Настроить обновления ПО" #: ../src/bin/rhn-profile-sync.py:34 msgid "" "You need to register this system by running `rhn_register` before using this " "option" msgstr "" -"Необходимо зарегистрировать систему запустив `rhn_register` до использования " +"Необходимо зарегистрировать систему, запустив «rhn_register» до использования " "этой опции" #: ../src/bin/rhn-profile-sync.py:42 @@ -1539,11 +1552,11 @@ msgstr "Обновление профиля пакетов..." #: ../src/bin/rhn-profile-sync.py:45 msgid "Updating hardware profile..." -msgstr "Обновляются данные об используемом оборудовании..." +msgstr "Обновляется профиль оборудования..." #: ../src/bin/rhn-profile-sync.py:49 msgid "Updating virtualization profile..." -msgstr "Обновление профиля виртуализации..." +msgstr "Обновляется профиль виртуализации..." #: ../src/bin/rhn_register.py:36 msgid "Do not attempt to use X" @@ -1563,11 +1576,11 @@ msgstr "Укажите пароль" #: ../src/bin/rhnreg_ks.py:50 msgid "Specify an organizational id for this system" -msgstr "Укажите id системы в организации" +msgstr "Укажите ID системы в организации" #: ../src/bin/rhnreg_ks.py:52 msgid "Specify a url to use as a server" -msgstr "Укажите url сервера" +msgstr "Укажите URL сервера" #: ../src/bin/rhnreg_ks.py:54 msgid "Specify a file to use as the ssl CA cert" @@ -1587,7 +1600,7 @@ msgstr "[Устарело] Прочитать контактную информ #: ../src/bin/rhnreg_ks.py:62 msgid "Do not probe or upload any hardware info" -msgstr "Не пытаться определить или загрузить информацию об оборудовании" +msgstr "Не пытаться определять или передавать информацию об оборудовании" #: ../src/bin/rhnreg_ks.py:64 msgid "Do not profile or upload any package info" @@ -1595,7 +1608,7 @@ msgstr "Не передавать или сохранять в профиль и #: ../src/bin/rhnreg_ks.py:66 msgid "Do not upload any virtualization info" -msgstr "Не загружать информацию о виртуализации" +msgstr "Не передавать информацию о виртуализации" #: ../src/bin/rhnreg_ks.py:68 msgid "Do not start rhnsd after completion" @@ -1612,7 +1625,7 @@ msgstr "Имя пользователя и пароль обязательны #: ../src/bin/rhnreg_ks.py:85 msgid "This system is already registered. Use --force to override" msgstr "" -"Данная система уже зарегистрирована. Используйте --force для принудительной " +"Система уже зарегистрирована. Используйте -«force» для принудительной " "регистрации" #: ../src/bin/rhnreg_ks.py:119 @@ -1636,7 +1649,7 @@ msgid "" "A profilename was not specified, and hostname and IP address could not be " "determined to use as a profilename, please specify one." msgstr "" -"Название профиля (profilename) не указано, а имя узла и IP адрес не могут " +"Название профиля не указано, а имя узла и IP-адрес не могли " "быть определены для использования в качестве названия. Пожалуйста, " "задайте название профиля." @@ -1650,7 +1663,7 @@ msgstr "Создать свой системный профиль" #: ../data/gui.glade.h:3 msgid "Enter your account information" -msgstr "Введите информацию о вашей учетной записи" +msgstr "Введите информацию о вашей учётной записи" #: ../data/gui.glade.h:4 msgid "Provide a security certificate" @@ -1666,7 +1679,7 @@ msgstr "Выберите выпуск ОС" #: ../data/progress.glade.h:1 msgid "Progress Dialog" -msgstr "Состояние выполнения" +msgstr "Степень выполнения" #: ../data/rh_register.glade.h:1 msgid "" @@ -1716,9 +1729,7 @@ msgstr "ID системы:" msgid "" "The network connection on your system is not active. Your system cannot " "be set up for software updates at this time." -msgstr "" -"В системе нет активного сетевого соединения. Она не может быть настроена " -"на получение обновлений ПО." +msgstr "В системе нет активного сетевого соединения. Получение обновлений ПО не может быть настроено." #: ../data/rh_register.glade.h:13 msgid "" @@ -1731,17 +1742,14 @@ msgid "" "Warning: You will not be able to limit this system to a minor " "release that is older than the most recent minor release if you select this " "option." -msgstr "" +msgstr "Предупреждение: при выборе этой опции вы не сможете ограничить систему вспомогательным выпуском, версия которого старше версии последнего выпуска." #: ../data/rh_register.glade.h:15 msgid "" "You have no active subscriptions available in your account. You will " "need to do one of the following to create an active subscription in your " "account before this system can be registered:" -msgstr "" -"У вашей учетной записи нет активных подписок. Выполните следующее для " -"создания активной подписки, для того чтобы ваша система могла подключиться к " -"Red Hat Network:" +msgstr "У вашей учётной записи нет активных подписок. Чтобы создать активную подписку для последующей регистрации системы, выполните одно из следующих:" #: ../data/rh_register.glade.h:16 msgid "Your system was registered for updates during installation." @@ -1753,7 +1761,7 @@ msgid "" "if kept updated, will always be equivalent to the latest available minor " "release of Red Hat Enterprise Linux 5. It will be registered to the main " "'Red Hat Enterprise Linux 5' software channel." -msgstr "" +msgstr "_Все доступные обновления будут предоставлены этой системе, обеспечив тем самым её соответствие последнему вспомогательному выпуску Red Hat Enterprise Linux 5. Система будет сопоставлена каналу «Red Hat Enterprise Linux 5»." #: ../data/rh_register.glade.h:18 msgid "" @@ -1799,15 +1807,15 @@ msgid "" "Tip: Forgot your login or password? Contact your Satellite's " "Organization Administrator." msgstr "" -"Замечание: Забыли имя пользователя или пароль? Обратитесь к вашему " -"Администратору организации Satellite. " +"Подсказка: забыли имя пользователя или пароль? Обратитесь к вашему " +"администратору организации Satellite. " #: ../data/rh_register.glade.h:27 msgid "" "Tip: Forgot your login or password? Look it up at \n" "https://www.redhat.com/wapps/sso/rhn/lostPassword.html" msgstr "" -"Замечание: Забыли имя пользователя или пароль? Перейдите к\n" +"Подсказка: забыли имя пользователя или пароль? Перейдите на\n" "https://www.redhat.com/wapps/sso/rhn/lostPassword.html" #: ../data/rh_register.glade.h:30 @@ -1822,13 +1830,12 @@ msgid "" msgstr "" "В вашей системе не найден сертификат безопасности, совместимый с %s.\n" "\n" -"Сертификат безопасности, использующий технологию SSL, нужен для обеспечения " -"защиты данных, передаваемых между системой и Red Hat Network (включая имя " +"Сертификат безопасности, использующий технологию SSL, нужен для защиты данных, передаваемых между системой и Red Hat Network (включая имя " "входа и пароль)." #: ../data/rh_register.glade.h:34 msgid "Activate a previously purchased subscription you have not yet activated." -msgstr "Активируйте ранее приобретенную, но не активную подписку." +msgstr "Активируйте ранее приобретённую, но неактивную подписку." #: ../data/rh_register.glade.h:35 msgid "Advanced Network Configuration" @@ -1843,21 +1850,21 @@ msgid "" "Are you sure you don't want to connect your system to Red Hat Network? " "You'll miss out on the benefits of a Red Hat Enterprise Linux subscription:" msgstr "" -"Вы уверены в том, что вы не хотите подключить вашу систему к Red Hat " +"Вы уверены, что вы не хотите подключить систему к Red Hat " "Network? Вы не сможете воспользоваться преимуществами подписки Red Hat " "Enterprise Linux." #: ../data/rh_register.glade.h:39 msgid "CPU Model:" -msgstr "Модель процессора (CPU):" +msgstr "Модель CPU:" #: ../data/rh_register.glade.h:40 msgid "CPU Speed:" -msgstr "Частота процессора:" +msgstr "Частота CPU:" #: ../data/rh_register.glade.h:41 msgid "Certificate _Location:" -msgstr "Местоположение с_ертификата:" +msgstr "Расположение с_ертификата:" #: ../data/rh_register.glade.h:42 msgid "Choose Channel" @@ -1877,11 +1884,11 @@ msgstr "ОШИБКА" #: ../data/rh_register.glade.h:49 msgid "Enter Your Account Information" -msgstr "Введите информацию о вашей учетной записи" +msgstr "Введите информацию о вашей учётной записи" #: ../data/rh_register.glade.h:50 msgid "Enter in the format hostname(:port)" -msgstr "Ввод в формате hostname(:port)" +msgstr "Ввод в формате «узел(:порт)»" #: ../data/rh_register.glade.h:51 msgid "Hardware Info" @@ -1893,7 +1900,7 @@ msgstr "Профиль оборудования" #: ../data/rh_register.glade.h:53 msgid "Hostname:" -msgstr "Имя узла:" +msgstr "Узел:" #: ../data/rh_register.glade.h:54 msgid "" @@ -1918,19 +1925,19 @@ msgstr "У меня есть сертификат _SSL для соеди #: ../data/rh_register.glade.h:57 msgid "I would like to connect to Red Hat Network via an _HTTP proxy." -msgstr "Я хочу подключаться к Red Hat Network через _HTTP proxy." +msgstr "Я хочу подключаться к Red Hat Network через _HTTP-прокси." #: ../data/rh_register.glade.h:58 msgid "" "I'd like to receive updates from Red Hat Network. (I don't have " "access to a Red Hat Network Satellite or Proxy.)" msgstr "" -"Я хочу получать обновления от Red Hat Network. (У меня нет доступа к " +"Я хочу получать обновления от Red Hat Network (у меня нет доступа к " "Red Hat Network Satellite или Proxy)." #: ../data/rh_register.glade.h:59 msgid "IP Address:" -msgstr "IP адрес:" +msgstr "IP-адрес:" #: ../data/rh_register.glade.h:60 msgid "Installation _Number:" @@ -1938,7 +1945,7 @@ msgstr "Код _установки:" #: ../data/rh_register.glade.h:62 msgid "Link To Subscription" -msgstr "Перейти к подписке" +msgstr "Сопоставить подписке" #: ../data/rh_register.glade.h:63 msgid "" @@ -1946,8 +1953,8 @@ msgid "" "RHN > Subscription Management > System Entitlements." msgstr "" "Выполните вход в http://rhn.redhat.com/ и отмените все полномочия для " -"неактивной системы через Ваша RHN > Управление подпиской > Полномочия " -"системы." +"неактивной системы через «Ваша RHN > Управление подпиской > Полномочия " +"системы»." #: ../data/rh_register.glade.h:64 msgid "Memory:" @@ -1961,7 +1968,7 @@ msgstr "Сведения о пакете" msgid "" "Please enter your account information for Red Hat Network (http://rhn." "redhat.com/)" -msgstr "Введите данные учетной записи Red Hat Network (http://rhn.redhat.com)" +msgstr "Введите данные учётной записи Red Hat Network (http://rhn.redhat.com)" #: ../data/rh_register.glade.h:68 msgid "Provide a Security Certificate" @@ -1989,8 +1996,8 @@ msgid "" "this Red Hat Enterprise Linux system updated and secure." msgstr "" "Получайте последние обновления ПО, включая обновления безопасности, тем " -"самым сохраняя систему Red Hat Enterprise Linux в обновленном и " -"защищенном состоянии." +"самым поддерживая систему Red Hat Enterprise Linux в обновлённом и " +"защищённом состоянии." #: ../data/rh_register.glade.h:73 msgid "Red Hat Linux Version:" @@ -2002,7 +2009,7 @@ msgstr "_Расположение Red Hat Network:" #: ../data/rh_register.glade.h:75 msgid "Review system..." -msgstr "Анализ системы..." +msgstr "Просмотр системы..." #: ../data/rh_register.glade.h:76 msgid "Select A File" @@ -2048,17 +2055,16 @@ msgid "" "menu." msgstr "" "Без подключения к серверу Red Hat Network вы не сможете получать " -"обновления ПО, в том числе обновлений безопасности Red Hat для данной " +"обновления ПО, в том числе обновления безопасности Red Hat для данной " "системы.\n" "\n" -"Для поддержания системы в обновленном и защищенном состоянии, " -"зарегистрируйте ее как можно раньше. Доступ к утилите регистрации возможен " -"через запуск Обновление ПО в меню Приложения > Системные " -"параметры. " +"Для поддержания системы в обновлённом и защищённом состоянии " +"зарегистрируйте её как можно раньше. Доступ к программе регистрации возможен " +"через запуск Обновление пакетов в меню Приложения > Система. " #: ../data/rh_register.glade.h:88 msgid "Use Au_thentication with HTTP Proxy:" -msgstr "Использовать а_утентификацию HTTP Proxy:" +msgstr "А_утентификация на HTTP Proxy:" #: ../data/rh_register.glade.h:89 msgid "V_iew Package Profile ..." @@ -2072,7 +2078,7 @@ msgstr "Зачем регистрироваться" msgid "" "Would you like to register your system at this time? (Strongly " "recommended.)" -msgstr "Зарегистрировать систему сейчас? (Строго рекомендуется)" +msgstr "Зарегистрировать систему сейчас? (настоятельно рекомендуется)" #: ../data/rh_register.glade.h:93 msgid "" @@ -2080,7 +2086,7 @@ msgid "" "com/) or to a Red Hat Network Satellite or Red Hat Network Proxy</" "b> in order to receive software updates." msgstr "" -"Вы можете подключить свою систему к Red Hat Network (https://rhn." +"Вы можете подключить систему к Red Hat Network (https://rhn." "redhat.com/), Red Hat Network Satellite или Red Hat Network Proxy</" "b> для получения обновлений ПО." @@ -2102,19 +2108,19 @@ msgid "" "updates setup tool at any time by running Software Updater in the " "Applications > System Tools menu." msgstr "" -"Вы не сможете получать обновления ПО, в том числе обновлений безопасности " +"Вы не сможете получать обновления ПО, в том числе обновления безопасности " "для данной системы.\n" "\n" -"Для поддержания системы в обновленном и защищенном состоянии, " -"зарегистрируйте ее в RHN как можно раньше. Доступ к утилите регистрации " -"возможен через запуск Обновление ПО в меню Приложения > Системные параметры." +"Для поддержания системы в обновлённом и защищённом состоянии " +"зарегистрируйте её в RHN как можно раньше. Доступ к программе регистрации " +"возможен через запуск «Обновление пакетов» в меню «Приложения > Система»." #: ../data/rh_register.glade.h:98 msgid "" "You'll need to send us a profile of what packages and hardware are installed " "on your system so we can determine what updates are available." msgstr "" -"Чтобы мы могли определить подходящие вашей системе обновления, вам нужно " +"Чтобы мы смогли определить подходящие вашей системе обновления, нужно " "предоставить информацию об оборудовании и установленных в системе пакетах." #: ../data/rh_register.glade.h:99 @@ -2122,7 +2128,7 @@ msgid "" "You'll want to choose a name for this system so you'll be able to identify " "it in the Red Hat Network interface." msgstr "" -"Можно выбрать имя для системы для ее легкого нахождения в интерфейсе Red Hat " +"Можно выбрать имя системы для её идентификации в интерфейсе Red Hat " "Network." #: ../data/rh_register.glade.h:100 @@ -2139,12 +2145,11 @@ msgid "" "circled below.) Clicking on this icon, when available, will guide you " "through applying any updates that are available:" msgstr "" -"Система готова к получению обновлений ПО, которые обеспечат ее безопасность " +"Система готова к получению обновлений ПО, которые обеспечат её безопасность " "и поддержку.\n" "\n" -"Обновления ПО доступны, если значок уведомления появился на рабочем столе " -"(обычно в правом верхнем углу). При нажатии этого значка начнется пошаговая " -"установка доступных обновлений:" +"Индикатором наличия программных обновлений служит появление значка уведомления на рабочем столе (обычно в правом верхнем углу). " +"Нажмите этот значок, чтобы начать пошаговую установку обновлений:" #: ../data/rh_register.glade.h:104 msgid "" @@ -2166,7 +2171,7 @@ msgid "" "Your system will be subscribed to the base software channel. You will not " "be able to move this system to an earlier minor release channel if you " "continue (you will be able to move to a later release.)" -msgstr "" +msgstr "Ваша система будет подписана на основной программный канал. Вы не сможете переназначить систему предыдущему вспомогательному выпуску (но можно переназначить более позднему выпуску)." #: ../data/rh_register.glade.h:108 msgid "" @@ -2174,7 +2179,7 @@ msgid "" "your system updated, secure, and supported." msgstr "" "Необходимо получить доступ к подписке, что позволит поддерживать систему в " -"обновленном и защищенном состоянии." +"обновлённом и защищённом состоянии." #: ../data/rh_register.glade.h:109 msgid "_Activate a subscription now..." @@ -2198,7 +2203,7 @@ msgstr "_Нет, спасибо. Я зарегистрируюсь позже." #: ../data/rh_register.glade.h:114 msgid "_No, Cancel" -msgstr "_Нет, отмена" +msgstr "_Нет, отменить" #: ../data/rh_register.glade.h:115 msgid "_No, I prefer to register at a later time." @@ -2222,7 +2227,7 @@ msgstr "_Вернуться к регистрации" #: ../data/rh_register.glade.h:120 msgid "_Take me back to the setup process." -msgstr "_Вернуться к установке" +msgstr "_Вернуться к настройке" #: ../data/rh_register.glade.h:121 msgid "_View Hardware Profile ..." @@ -2266,7 +2271,7 @@ msgstr "Регистрация в RHN" #: ../rhn_register.desktop.in.h:2 msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network" -msgstr "Регистрация для получения программных обновлений из Spacewalk/Satellite/Red Hat Network" +msgstr "Регистрация для получения программных обновлений от Spacewalk/Satellite/Red Hat Network" #: ../rhn_register.desktop.in.h:3 msgid "Register to Spacewalk/Satellite/Red Hat Network." commit 56f268a138aa05ef759ce2e61a6b973923c5c074 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Mon Jun 7 20:37:22 2010 +0200 600316 - don't traceback for zero subscribed channels diff --git a/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py b/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py index 72aa70d..30e1d48 100644 --- a/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py +++ b/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py @@ -82,7 +82,10 @@ def main(): if OPTIONS.verbose: print "Channel(s): %s successfully removed" % ', '.join(OPTIONS.channel) elif OPTIONS.list: - channels = map(lambda x: x['label'], getChannels().channels()) + try: + channels = map(lambda x: x['label'], getChannels().channels()) + except up2dateErrors.NoChannelsError: + systemExit(1, 'This system is not associated with any channel.') channels.sort() print '\n'.join(channels) else: commit bd5af68a942e0c5dfe54c8fe35e7b6e42f5a2eb2 Author: Partha Aji <paji(a)redhat.com> Date: Mon Jun 7 14:08:30 2010 -0400 529359: Fixed a couple of bugs related to Remote Command Package upgrade diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/UpgradeConfirmSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/UpgradeConfirmSetupAction.java index 4f2e8a7..6782e66 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/UpgradeConfirmSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/UpgradeConfirmSetupAction.java @@ -45,12 +45,12 @@ public class UpgradeConfirmSetupAction extends BaseSystemPackagesConfirmAction { @Override protected String getMessageKeyForMany() { - return "message.packageinstall.plural"; + return "message.packageupgrades"; } @Override protected String getMessageKeyForOne() { - return "message.packageinstall"; + return "message.packageupgrade"; } @Override diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index 3ca1797..e5cc410 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -3578,22 +3578,6 @@ user before attempting to deactivate their account.</source> </context-group> </trans-unit> - <trans-unit id="message.packageinstall"> -<source>{0} package install has been <a href="/rhn/schedule/ActionDetails.do?aid={1}">scheduled</a> for <a href="/rhn/systems/details/Overview.do?sid={2}">{3}</a>.</source> - <context-group name="ctx"> - <context context-type="sourcefile">/rhn/systems/details/packages/details/UpgradeConfirm.do</context> - <context context-type="paramnotes">1 package install has been scheduled for workstation3.</context> - </context-group> - </trans-unit> - - <trans-unit id="message.packageinstall.plural"> -<source>{0} package installs have been <a href="/rhn/schedule/ActionDetails.do?aid={1}">scheduled</a> for <a href="/rhn/systems/details/Overview.do?sid={2}">{3}</a>.</source> - <context-group name="ctx"> - <context context-type="sourcefile">/rhn/systems/details/packages/details/UpgradeConfirm.do</context> - <context context-type="paramnotes">46 package installs have been scheduled for workstation3.</context> - </context-group> - </trans-unit> - <trans-unit id="message.packagerefresh"> <source>You have successfully scheduled a <a href="/rhn/schedule/ActionDetails.do?aid={0}">package profile refresh</a> for <a href="/rhn/systems/details/Overview.do?sid={1}">{2}</a>.</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml index cc9d49e..1f04705 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml @@ -6465,7 +6465,7 @@ value for this entitlement, excluding the default organization's consumption.</s <context context-type="sourcefile">/rhn/systems/details/packages/PackageList.do</context> </context-group> </trans-unit> - <trans-unit id="message.packageupgradessss"> + <trans-unit id="message.packageupgrade"> <source>{0} package upgrade has been <a href="/rhn/schedule/ActionDetails.do?aid={1}">scheduled</a> for <a href="/rhn/systems/details/Overview.do?sid={2}">{3}</a></source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/schedule/PackageList</context> diff --git a/java/code/src/com/redhat/rhn/frontend/struts/CommandForm.java b/java/code/src/com/redhat/rhn/frontend/struts/CommandForm.java new file mode 100644 index 0000000..024cd3f --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/struts/CommandForm.java @@ -0,0 +1,44 @@ +/** + * Copyright (c) 2010 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.frontend.struts; + + +/** + * CommandForm + * @version $Rev$ + */ +public class CommandForm extends ScrubbingDynaActionForm { + /** + * Comment for <code>serialVersionUID</code> + */ + private static final long serialVersionUID = -6448446372713516210L; + private static final String COMMAND = "command"; + private static final String SCRIPT = "script"; + private static final String RUN_SCRIPT = "run_script"; + + /** + * + * {@inheritDoc} + */ + protected boolean isScrubbable(String name, Object value) { + //Donot scrub the Contents because that contains the other characters + //for every other field feel free to scrub. + if (COMMAND.equalsIgnoreCase(name) || + SCRIPT.equalsIgnoreCase(name) || RUN_SCRIPT.equalsIgnoreCase(name)) { + return false; + } + return super.isScrubbable(name, value); + } +} diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml index 43ba674..c0a33b8 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -378,7 +378,7 @@ </form-bean> <form-bean name="scheduleRemoteCmdForm" - type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm"> + type="com.redhat.rhn.frontend.struts.CommandForm"> <form-property name="run_script" type="java.lang.String"/> <form-property name="username" type="java.lang.String"/> <form-property name="group" type="java.lang.String"/> commit 0c5fd8f369852df98d45f258a12693936257192b Author: ypoyarko <ypoyarko(a)fedoraproject.org> Date: Mon Jun 7 07:39:54 2010 +0000 l10n: Updates to Russian (ru) translation Transmitted-via: Transifex (translate.fedoraproject.org) diff --git a/client/rhel/rhn-client-tools/po/ru.po b/client/rhel/rhn-client-tools/po/ru.po index c6e360e..d917c56 100644 --- a/client/rhel/rhn-client-tools/po/ru.po +++ b/client/rhel/rhn-client-tools/po/ru.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-07 13:34+0200\n" -"PO-Revision-Date: 2010-06-07 11:55\n" +"PO-Revision-Date: 2010-06-07 13:36\n" "Last-Translator: Yulia <ypoyarko(a)redhat.com>\n" "Language-Team: Russian\n" "MIME-Version: 1.0\n" @@ -1196,7 +1196,7 @@ msgstr "Только ограниченные обновления" #: ../src/up2date_client/tui.py:452 msgid " Minor Release: " -msgstr "" +msgstr " Вспомогательный выпуск: " #: ../src/up2date_client/tui.py:467 msgid "All available updates" @@ -1579,7 +1579,7 @@ msgstr "Укажите ключ активации" #: ../src/bin/rhnreg_ks.py:58 msgid "Subscribe this system to the EUS channel tied to the system's redhat-release" -msgstr "" +msgstr "Подпишите систему к каналу EUS, соответствующему выпуску Red Hat системы" #: ../src/bin/rhnreg_ks.py:60 msgid "[Deprecated] Read contact info from stdin" @@ -1724,7 +1724,7 @@ msgstr "" msgid "" "Tip: Minor releases with a '*' are currently fully supported by Red " "Hat." -msgstr "" +msgstr "Подсказка: в настоящее время вспомогательные выпуски с «*» полностью поддерживаются Red Hat." #: ../data/rh_register.glade.h:14 msgid "" @@ -1760,11 +1760,11 @@ msgid "" "_Limited updates will be provided to this system to maintain " "compatibility with the following eligible Red Hat Enterprise Linux minor " "release software channel:" -msgstr "" +msgstr "О_граниченные обновления будут предоставлены этой системе с целью обеспечения совместимости со следующим каналом ПО вспомогательного выпуска Red Hat Enterprise Linux:" #: ../data/rh_register.glade.h:19 msgid "<big>Moving to earlier releases won't be possible</big>" -msgstr "" +msgstr "<big>Переназначение ранним выпускам будет невозможно</big>" #: ../data/rh_register.glade.h:20 msgid "<big>Profile Data</big>" @@ -2190,7 +2190,7 @@ msgstr "_Имя входа:" #: ../data/rh_register.glade.h:112 msgid "_Minor release:" -msgstr "" +msgstr "_Вспомогательный выпуск:" #: ../data/rh_register.glade.h:113 msgid "_No thanks, I'll connect later." commit 33a9a902aaf13aea7b9ffec2254e31c608d7faff Author: ypoyarko <ypoyarko(a)fedoraproject.org> Date: Mon Jun 7 01:55:56 2010 +0000 l10n: Updates to Russian (ru) translation Transmitted-via: Transifex (translate.fedoraproject.org) diff --git a/client/rhel/rhn-client-tools/po/ru.po b/client/rhel/rhn-client-tools/po/ru.po index b92c9d0..c6e360e 100644 --- a/client/rhel/rhn-client-tools/po/ru.po +++ b/client/rhel/rhn-client-tools/po/ru.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-07 13:34+0200\n" -"PO-Revision-Date: 2010-06-07 10:46\n" +"PO-Revision-Date: 2010-06-07 11:55\n" "Last-Translator: Yulia <ypoyarko(a)redhat.com>\n" "Language-Team: Russian\n" "MIME-Version: 1.0\n" @@ -101,7 +101,7 @@ msgstr "Диалог вопроса:" #: ../src/up2date_client/rhnChannel.py:97 msgid "Unable to Locate SystemId" -msgstr "" +msgstr "Не удалось обнаружить SystemId" #: ../src/up2date_client/rhnChannel.py:114 msgid "This system may not be updated until it is associated with a channel." @@ -150,30 +150,28 @@ msgstr "Попытка подключения с использованием н #: ../src/up2date_client/rhncli.py:87 #, python-format msgid "There was some sort of I/O error: %s\n" -msgstr "Ошибка ввода/ вывода: %s\n" +msgstr "Ошибка ввода/вывода: %s\n" #: ../src/up2date_client/rhncli.py:90 #, python-format msgid "There was an SSL error: %s\n" -msgstr "Произошла ошибка SSL: %s\n" +msgstr "Ошибка SSL: %s\n" #: ../src/up2date_client/rhncli.py:91 msgid "" "A common cause of this error is the system time being incorrect. Verify that " "the time on this system is correct.\n" -msgstr "" -"Типичная причина этой ошибки - некорректно выставленное системное время. " -"Убедитесь, что время на данной системе выставлено верно.\n" +msgstr "Типичная причина этой ошибки — некорректно выставленное системное время. Убедитесь, что время выставлено верно.\n" #: ../src/up2date_client/rhncli.py:95 #, python-format msgid "There was a SSL crypto error: %s\n" -msgstr "Произошла ошибка SSL шифрования: %s\n" +msgstr "Ошибка SSL-шифрования: %s\n" #: ../src/up2date_client/rhncli.py:99 #, python-format msgid "There was an authentication error: %s\n" -msgstr "Произошла ошибка аутентификации: %s\n" +msgstr "Ошибка аутентификации: %s\n" #: ../src/up2date_client/rhncli.py:112 #, python-format @@ -182,7 +180,7 @@ msgstr "Для выполнения %s необходимо перейти в р #: ../src/up2date_client/rhncli.py:142 ../src/up2date_client/rhncli.py:177 msgid "Unable to open gui. Try `up2date --nox`" -msgstr "Не удается открыть GUI. Попробуйте `up2date --nox`" +msgstr "Не удаётся открыть GUI. Попробуйте «up2date --nox»" #: ../src/up2date_client/rhncli.py:184 #, python-format @@ -193,7 +191,7 @@ msgid "" msgstr "" "%%prog (Red Hat Network Client Tools) %s\n" "(C) 1999-2010 Red Hat, Inc.\n" -"Следует лицензии GPL версии 2." +"В соответствии с лицензией GPL версии 2." #: ../src/up2date_client/rhncli.py:204 msgid "An error has occurred:" @@ -220,14 +218,12 @@ msgstr "Попытка подключения к серверу Red Hat Network #: ../src/up2date_client/rhnreg_constants.py:19 #, python-format msgid "A proxy was specified at %s." -msgstr "Proxy задан на %s." +msgstr "Прокси задан на %s." #. Start Window #: ../src/up2date_client/rhnreg_constants.py:22 msgid "Setting up Software updates" -msgstr "" -"Настройка\n" -"обновлений ПО" +msgstr "Настройка обновлений ПО" #: ../src/up2date_client/rhnreg_constants.py:23 msgid "" @@ -243,11 +239,11 @@ msgid "" msgstr "" "Помощник выполнит пошаговое подключение вашей системы к Red Hat Network " "(RHN) для получения обновлений ПО, включая обновления безопасности для " -"поддержки защиты системы. Для этого необходимо:\n" +"обеспечения защиты системы. Для этого необходимо:\n" "\n" -" * Сетевое соединение\n" -" * Имя входа и пароль Red Hat\n" -" * Местоположение Red Hat Network Satellite или Proxy (необязательно)\n" +" * сетевое соединение;\n" +" * имя входа и пароль Red Hat;\n" +" * данные о расположении Red Hat Network Satellite или Proxy (необязательно).\n" "\n" #. Why Register Window @@ -264,8 +260,8 @@ msgid "" "Connecting your system to Red Hat Network allows you to take full advantage " "of the benefits of a paid subscription, including:" msgstr "" -"Подключение системы к Red Hat Network позволит вам воспользоваться всеми " -"преимуществами платной подписки включая:" +"Подключение системы к Red Hat Network позволит воспользоваться всеми " +"преимуществами платной подписки, включая:" #: ../src/up2date_client/rhnreg_constants.py:40 msgid "Security & Updates:" @@ -273,7 +269,7 @@ msgstr "Безопасность и обновления:" #: ../src/up2date_client/rhnreg_constants.py:41 msgid "Downloads & Upgrades:" -msgstr "Возможность двухсторонней загрузки:" +msgstr "Возможность загрузки и обновления функциональности:" #: ../src/up2date_client/rhnreg_constants.py:42 msgid "Support:" @@ -289,8 +285,7 @@ msgid "" "this Red Hat Enterprise Linux system updated and secure." msgstr "" "Получайте последние обновления ПО, включая обновления безопасности, тем " -"самым сохраняя систему Red Hat Enterprise Linux в обновленном и защищенном " -"состоянии." +"самым поддерживая систему Red Hat Enterprise Linux в обновлённом и защищенном состоянии." #: ../src/up2date_client/rhnreg_constants.py:46 ../data/rh_register.glade.h:47 msgid "" @@ -304,9 +299,7 @@ msgstr "" msgid "" "Access to the technical support experts at Red Hat or Red Hat's partners for " "help with any issues you might encounter with this system." -msgstr "" -"Доступ к технической поддержке Red Hat и партнеров за помощью с любыми " -"потенциальными проблемами в системе." +msgstr "Получите доступ к технической поддержке Red Hat и партнёров и помощь в решении любых потенциальных проблем в системе." #: ../src/up2date_client/rhnreg_constants.py:50 ../data/rh_register.glade.h:81 msgid "" @@ -321,7 +314,7 @@ msgid "" "Tip: Red Hat values your privacy: http://www.redhat.com/legal/" "privacy_statement.html" msgstr "" -"Замечание: Red Hat уважает вашу конфиденциальность: http://www.redhat.com/" +"Подсказка: Red Hat уважает вашу конфиденциальность: http://www.redhat.com/" "legal/privacy_statement.html" #: ../src/up2date_client/rhnreg_constants.py:56 @@ -332,7 +325,7 @@ msgstr "Вернуться к процессу настройки." #. Confirm Quit Window #: ../src/up2date_client/rhnreg_constants.py:59 msgid "Software update setup unsuccessful" -msgstr "Неудача при настройке обновления ПО" +msgstr "Неудача при настройке программных обновлений" #: ../src/up2date_client/rhnreg_constants.py:60 msgid "" @@ -344,13 +337,12 @@ msgstr "" "Enterprise Linux:\n" #: ../src/up2date_client/rhnreg_constants.py:62 -#, fuzzy msgid "" "You will not be able to take advantage of these subscription privileges " "without connecting your system to Red Hat Network.\n" msgstr "" -"Вы не сможете воспользоваться всеми преимуществами подписки без " -"подключения вашей системы к Red Hat Network." +"Вы не сможете воспользоваться всеми преимуществами подписки без " +"подключения системы к Red Hat Network.\n" #: ../src/up2date_client/rhnreg_constants.py:65 msgid "I'll register later." @@ -367,17 +359,17 @@ msgid "" "Please enter your login information for the %s Red Hat Network Satellite:\n" "\n" msgstr "" -"Введите информацию о вашей учетной записи для %s Red Hat Network Satellite:\n" +"Введите данные авторизации для %s Red Hat Network Satellite:\n" "\n" #: ../src/up2date_client/rhnreg_constants.py:71 msgid "Red Hat Login:" -msgstr "Учетная запись Red Hat:" +msgstr "Имя входа Red Hat:" #: ../src/up2date_client/rhnreg_constants.py:72 #: ../src/up2date_client/tui.py:116 msgid "Login:" -msgstr "_Имя входа:" +msgstr "Имя входа:" #: ../src/up2date_client/rhnreg_constants.py:73 msgid "Password:" @@ -388,8 +380,8 @@ msgid "" "Tip: Forgot your login or password? Contact your Satellite's Organization " "Administrator." msgstr "" -"Замечание: Забыли имя пользователя или пароль? Обратитесь к вашему " -"Администратору организации Satellite." +"Подсказка: забыли имя пользователя или пароль? Обратитесь к " +"администратору организации вашего Satellite." #: ../src/up2date_client/rhnreg_constants.py:76 msgid "Please enter a desired login." @@ -406,7 +398,7 @@ msgid "" "com/):\n" "\n" msgstr "" -"Введите данные учетной записи Red Hat Network (http://rhn.redhat.com):\n" +"Введите данные авторизации в Red Hat Network (http://rhn.redhat.com):\n" "\n" #: ../src/up2date_client/rhnreg_constants.py:82 @@ -414,7 +406,7 @@ msgid "" "Tip: Forgot your login or password? Visit: https://rhn.redhat.com/rhn/sales/" "LoginInfo.do" msgstr "" -"Подсказка: Забыли имя пользователя или пароль? Посетите https://rhn.redhat.com/rhn/sales/" +"Подсказка: забыли имя пользователя или пароль? Посетите https://rhn.redhat.com/rhn/sales/" "LoginInfo.do" #: ../src/up2date_client/rhnreg_constants.py:84 @@ -423,11 +415,11 @@ msgstr "*Эл.адрес:" #: ../src/up2date_client/rhnreg_constants.py:86 ../data/rh_register.glade.h:61 msgid "It appears this system has already been set up for software updates:" -msgstr "Возможно ваша система уже настроена на получение обновлений ПО:" +msgstr "Возможно, ваша система уже настроена на получение обновлений ПО:" #: ../src/up2date_client/rhnreg_constants.py:87 ../data/rh_register.glade.h:38 msgid "Are you sure you would like to continue?" -msgstr "Вы уверены, что вы хотите продолжить?" +msgstr "Вы действительно хотите продолжить?" #. Send Window #: ../src/up2date_client/rhnreg_constants.py:90 @@ -438,11 +430,11 @@ msgid "" "\"Cancel\" and no information will be sent. You can run the registration " "program later by typing `rhn_register` at the command line." msgstr "" -"Сбор информации для Системного профиля завершен.\n" +"Сбор информации для системного профиля завершён.\n" "\n" -"Нажмите \"Далее\" для отправки системного профиля в Red Hat Network. Нажмите " -"\"Отменить\" для отмены отправки. Программу регистрации можно также " -"запустить набрав \"rhn_register\" в командной строке." +"Нажмите «Далее», чтобы отправить профиль в Red Hat Network. Нажмите " +"«Отменить» для отмены. Программу регистрации можно также " +"запустить в любое время, выполнив команду «rhn_register»." #: ../src/up2date_client/rhnreg_constants.py:98 msgid "" @@ -454,22 +446,22 @@ msgid "" "in chapter 6 of the RHN Reference Guide, available from the 'Help' button in " "the main Red Hat Network web interface.)" msgstr "" -"Вы можете выполнить 'yum update' в командной строке для получения последних " +"Можно выполнить «yum update» в командной строке для получения последних " "обновлений ПО с Red Hat Network. Выполняйте команду регулярно для " -"поддержания системы в обновленном состоянии. Также можно настроить " -"автоматическое выполнение обновлений ('auto errata update') через интерфейс " -"Red Hat Network (инструкции в главе 6 Справочного руководства RHN, " -"доступного через меню помощи основного интерфейса Red Hat Network)." +"поддержки системы в обновленном состоянии. Также можно настроить " +"автоматическое выполнение обновлений («auto errata update») через интерфейс " +"Red Hat Network (инструкции в главе 6 справочного руководства RHN, " +"доступного через меню справки в главном окне интерфейса Red Hat Network)." #. Review Window #: ../src/up2date_client/rhnreg_constants.py:109 ../data/gui.glade.h:6 msgid "Review system subscription details" -msgstr "Просмотрите детали подписки" +msgstr "Просмотрите сведения подписки" #: ../src/up2date_client/rhnreg_constants.py:110 #: ../data/rh_register.glade.h:67 msgid "Please review the subscription details below:" -msgstr "Ниже просмотрите детали системной подписки:" +msgstr "Ниже просмотрите сведения системной подписки:" #: ../src/up2date_client/rhnreg_constants.py:111 #, python-format @@ -484,7 +476,7 @@ msgstr "" msgid "" "Subscriptions have been activated for the following Red Hat products/" "services:" -msgstr "Активированы подписки для следующих продуктов/ сервисов Red Hat:" +msgstr "Активированы подписки для следующих продуктов и служб Red Hat:" #: ../src/up2date_client/rhnreg_constants.py:115 msgid "Software channel subscriptions:" @@ -505,10 +497,10 @@ msgid "" "get updates for that product. See Kbase article 6227 for more details. " "(http://kbase.redhat.com/faq/FAQ_58_6227.shtm)" msgstr "" -"Внимание: Если установленный продукт отсутствует в списке, вы не будете " +"Предупреждение: если установленный продукт не указан в списке, вы не будете " "получать его обновления. Если вы хотите получать обновления для этого " -"продукта, выполните вход в веб-интерфейс вашего satellite и подпишите " -"систему к необходимым каналам ПО для получения обновлений продукта. " +"продукта, выполните вход в веб-интерфейс вашего Satellite и подпишите " +"систему к необходимым каналам ПО для получения обновлений. " "Подробности в статье 6227 Kbase (http://kbase.redhat.com/faq/FAQ_58_6227." "shtm)" @@ -521,10 +513,10 @@ msgid "" "for that product. See Kbase article 6227 for more details. (http://kbase." "redhat.com/faq/FAQ_58_6227.shtm)" msgstr "" -"Внимание: Если установленный продукт отсутствует в списке, вы не будете " +"Предупреждение: если установленный продукт не указан в списке, вы не будете " "получать его обновления. Если вы хотите получать обновления для этого " -"продукта, перейдите к http://rhn.redhat.com/ и подпишите систему к " -"необходимым каналам ПО для получения обновлений продукта. Подробности в " +"продукта, перейдите на http://rhn.redhat.com/ и подпишите систему к " +"необходимым каналам ПО для получения обновлений. Подробности в " "статье 6227 Kbase (http://kbase.redhat.com/faq/FAQ_58_6227.shtm)" #: ../src/up2date_client/rhnreg_constants.py:140 @@ -532,8 +524,8 @@ msgid "" "You were unable to be subscribed to the following software channels because " "there were insufficient subscriptions available in your account:" msgstr "" -"Вы не были подписаны на следующие каналы вследствие недостаточного числа " -"доступных вашей учетной записи подписок:" +"Вы не были подписаны на следующие каналы вследствие нехватки " +"доступных вашей учётной записи подписок:" #: ../src/up2date_client/rhnreg_constants.py:144 msgid "" @@ -549,22 +541,22 @@ msgid "" "may browse to this system's profile in the RHN web interface and subscribe " "this system to software channels via the software > software channels tab." msgstr "" -"Система не смогла подписаться на какие-либо каналы ПО. Она не сможет " -"поддерживаться в обновленном и защищенном состоянии. Следующие шаги могут " +"Система не смогла подписаться на каналы ПО. Она не сможет " +"поддерживаться в обновленном и защищённом состоянии. Следующие шаги могут " "помочь в решении этой проблемы:\n" -"(1) Выполните вход в http://rhn.redhat.com/ и отмените все полномочия для " -"неактивной системы через Ваша RHN > Управление подпиской > Полномочия " -"системы.\n" -"(2) Приобретите дополнительную подписку Red Hat Enterprise Linux на http://" +"1) Выполните вход в http://rhn.redhat.com/ и отмените все полномочия для " +"неактивной системы в меню «Ваша RHN > Управление подпиской > Полномочия " +"системы».\n" +"2) Приобретите дополнительную подписку Red Hat Enterprise Linux на http://" "www.redhat.com/store/.\n" -"(3) Активируйте новый код установки на http://www.redhat.com/now/. Как " +"3) Активируйте новый код установки на http://www.redhat.com/now/. Как " "только новые подписки будут доступны вашей учетной записи, вы можете перейти " "к просмотру системного профиля в интерфейсе RHN и подписать систему на " -"каналы ПО на вкладке ПО > Каналы ПО." +"каналы ПО на вкладке «ПО > Каналы ПО»." #: ../src/up2date_client/rhnreg_constants.py:155 msgid "RHN service level:" -msgstr "уровень сервиса RHN" +msgstr "Уровень обслуживания RHN:" #: ../src/up2date_client/rhnreg_constants.py:156 msgid "" @@ -582,15 +574,13 @@ msgid "" "because there were insufficient subscriptions available in your account:" msgstr "" "Данная система не может быть связана со следующими модулями RHN вследствие " -"отсутствия достаточных подписок:" +"нехватки подписок:" #: ../src/up2date_client/rhnreg_constants.py:163 msgid "" "Update module: per-system updates, email errata notifications, errata " "information" -msgstr "" -"Модуль обновления: обновления ПО для отдельных систем, исправления " -"уведомлений эл.почты, информация об исправлениях" +msgstr "Модуль обновления: обновления ПО для отдельных систем, уведомления об исправлениях по электронной почте, информация об исправлениях" #: ../src/up2date_client/rhnreg_constants.py:165 msgid "" @@ -612,10 +602,7 @@ msgstr "" msgid "" "Monitoring module: pre-defined and custom system performance probes, system " "performance email notifications, graphs of system performance" -msgstr "" -"Модуль мониторинга: предопределенные и индивидуальные зонды проверки " -"производительности системы, эл. уведомления производительности системы, " -"диаграммы производительности" +msgstr "Модуль мониторинга: предопределенные и индивидуальные обработчики событий для проверки производительности системы, уведомления о производительности системы по электронной почте, диаграммы производительности" #: ../src/up2date_client/rhnreg_constants.py:173 msgid "" @@ -668,12 +655,12 @@ msgstr "" "Данная система не может быть связана с модулями обслуживания RHN. Она не " "будет получать обновления ПО для обеспечения ее поддержки и безопасности. " "Следующие шаги могут помочь в решении этой проблемы:\n" -"(1) Выполните вход в http://rhn.redhat.com/ и отмените все полномочия для " -"неактивной системы через Ваша RHN > Управление подпиской > Полномочия " -"системы.\n" -"(2) Приобретите дополнительную подписку Red Hat Enterprise Linux на http://" +"1) Выполните вход в http://rhn.redhat.com/ и отмените все полномочия для " +"неактивной системы через «Ваша RHN > Управление подпиской > Полномочия " +"системы».\n" +"2) Приобретите дополнительную подписку Red Hat Enterprise Linux на http://" "www.redhat.com/store/.\n" -"(3) Активируйте новый код установки на http://www.redhat.com/now/. Как " +"3) Активируйте новый код установки на http://www.redhat.com/now/. Как " "только новые подписки будут доступны вашей учетной записи, вы можете перейти " "к просмотру системного профиля в интерфейсе RHN, удалить профиль и " "переподключить систему к Red Hat Network." @@ -703,7 +690,7 @@ msgstr "" #. Error Messages. #: ../src/up2date_client/rhnreg_constants.py:212 msgid "Fatal Error" -msgstr "Фатальная ошибка" +msgstr "Критическая ошибка" #: ../src/up2date_client/rhnreg_constants.py:213 msgid "Warning" @@ -722,10 +709,10 @@ msgid "" "This system will not be able to successfully receive software updates from " "Red Hat without connecting to a Red Hat Network server" msgstr "" -"Невозможно связаться с сервером Red Hat Network.\n" +"Не удалось связаться с сервером Red Hat Network.\n" "\n" -"Проверьте правильность введенного пути - '%s'.\n" -"Если неверно, исправьте и повторите попытку.\n" +"Проверьте правильность введённого пути: «%s».\n" +"Если требуется, исправьте ошибки и повторите попытку.\n" "\n" "Проверьте сетевое подключение.\n" "\n" @@ -747,7 +734,7 @@ msgstr "" "сервера." #: ../src/up2date_client/rhnreg_constants.py:229 -#, fuzzy, python-format +#, python-format msgid "" "Incompatible Certificate File\n" "\n" @@ -760,10 +747,10 @@ msgid "" msgstr "" "Несовместимый файл сертификата\n" "\n" -"Предоставленный вами сертификат %s не совместим с сервером Red Hat " +"Предоставленный сертификат %s не совместим с сервером Red Hat " "Network %s. Убедитесь в правильности вашего сертификата. Вы уверены, " -"что вы предоставили корректный сертификат, и что файл сертификата не " -"поврежден?\n" +"что вы предоставили корректный сертификат и файл сертификата не " +"повреждён?\n" "\n" "Повторите попытку с другим файлом сертификата." @@ -774,6 +761,9 @@ msgid "" " The certificate is expired. Please ensure you have the correct certificate " "and your system time is correct." msgstr "" +"Несовместимый файл сертификата\n" +"\n" +"Срок действия сертификата истёк. Проверьте сертификат и убедитесь в правильности системного времени." #: ../src/up2date_client/rhnreg_constants.py:241 msgid "Please verify the value of sslCACert in /etc/sysconfig/rhn/up2date" @@ -822,6 +812,13 @@ msgid "" "(you will be able to move to a newer release.)\n" "Are you sure you Would like to Continue?" msgstr "" +"Ваша система будет подписана на\n" +"основной программный канал %s.\n" +"Вы не сможете переназначить систему\n" +"предыдущему выпуску\n" +"(но можно будет переназначить более\n" +"позднему выпуску).\n" +"Вы действительно хотите продолжить?" #. Navigation #: ../src/up2date_client/rhnreg_constants.py:274 @@ -871,22 +868,18 @@ msgid "Notice" msgstr "Замечание" #: ../src/up2date_client/rhnregGui.py:261 -#, fuzzy msgid "There was an error while applying your choice." -msgstr "Ошибка при заполнении профиля." +msgstr "Ошибка при применении изменений." #: ../src/up2date_client/rhnregGui.py:287 msgid "You specified an invalid protocol. Only https and http are allowed." msgstr "Указан неверный протокол. Только https и http могут быть заданы." #: ../src/up2date_client/rhnregGui.py:300 -#, fuzzy msgid "" "You will not be able to successfully register this system without contacting " "a Red Hat Network server." -msgstr "" -"Вы не сможете воспользоваться всеми преимуществами подписки без " -"подключения вашей системы к Red Hat Network." +msgstr "Вы не сможете зарегистрировать систему без обращения к серверу Red Hat Network." #: ../src/up2date_client/rhnregGui.py:325 #, python-format @@ -958,9 +951,8 @@ msgid "" msgstr "Произошла ошибка связи с сервером регистрации. Сообщение:\n" #: ../src/up2date_client/rhnregGui.py:631 -#, fuzzy msgid "There was an error while assembling information for the profile." -msgstr "Ошибка при заполнении профиля." +msgstr "Ошибка при сборе информации для профиля." #: ../src/up2date_client/rhnregGui.py:652 msgid "Error running hardware profile" @@ -1083,9 +1075,8 @@ msgid "unknown" msgstr "неизвестно" #: ../src/up2date_client/rhnregGui.py:1138 -#, fuzzy msgid "There was an error getting the list of hardware." -msgstr "Ошибка при заполнении профиля." +msgstr "Ошибка при получении списка оборудования." #: ../src/up2date_client/rhnregGui.py:1150 ../src/up2date_client/tui.py:631 #, python-format @@ -1098,9 +1089,8 @@ msgid "%s MB" msgstr "%s Мб" #: ../src/up2date_client/rhnregGui.py:1198 -#, fuzzy msgid "There was an error building the list of packages." -msgstr "Произошла фатальная ошибка установки пакета:\n" +msgstr "Ошибка при создании списка пакетов." #: ../src/up2date_client/rhnregGui.py:1213 msgid "Package" @@ -1149,13 +1139,12 @@ msgid "Warning: unable to enable rhnsd with chkconfig" msgstr "Внимание: Невозможно включить rhnsd с chkconfig" #: ../src/up2date_client/rhnreg.py:65 -#, fuzzy msgid "Warning: unable to run rhn_check" -msgstr "Внимание: Невозможно включить rhnsd с chkconfig" +msgstr "Предупреждение: не удалось выполнить rhn_check" #: ../src/up2date_client/rpcServer.py:47 msgid "Error: Server Unavailable. Please try later." -msgstr "" +msgstr "Ошибка: сервер недоступен. Повторите попытку позже." #: ../src/up2date_client/rpcServer.py:171 msgid "ERROR: can not find RHNS CA file" @@ -1178,16 +1167,12 @@ msgid "System software updates already set up" msgstr "Обновления ПО системы уже настроены" #: ../src/up2date_client/tui.py:115 -#, fuzzy msgid "Red Hat Network Location:" -msgstr "_Расположение Red Hat Network:" +msgstr "Расположение Red Hat Network:" #: ../src/up2date_client/tui.py:117 -#, fuzzy msgid "System ID:" -msgstr "" -"\n" -"ID системы: " +msgstr "ID системы:" #: ../src/up2date_client/tui.py:371 msgid "The server indicated an error:\n" @@ -1199,15 +1184,15 @@ msgstr "Ошибка связи с сервером регистрации:\n" #: ../src/up2date_client/tui.py:434 msgid "Select Operating System Release" -msgstr "" +msgstr "Выберите выпуск ОС" #: ../src/up2date_client/tui.py:438 msgid "Operating System version:" -msgstr "" +msgstr "Версия ОС:" #: ../src/up2date_client/tui.py:440 msgid "Limited Updates Only" -msgstr "" +msgstr "Только ограниченные обновления" #: ../src/up2date_client/tui.py:452 msgid " Minor Release: " @@ -1215,17 +1200,17 @@ msgstr "" #: ../src/up2date_client/tui.py:467 msgid "All available updates" -msgstr "" +msgstr "Все доступные обновления" #: ../src/up2date_client/tui.py:520 msgid "Confirm operating system release selection" -msgstr "" +msgstr "Подтвердите выбор выпуска ОС" #: ../src/up2date_client/tui.py:528 msgid "" "Your system will be subscribed to the base software channel to receive all " "available updates." -msgstr "" +msgstr "Ваша система будет подписана на основной канал для получения доступных программных обновлений." #: ../src/up2date_client/tui.py:572 msgid "Register a System Profile - Hardware" @@ -1602,7 +1587,7 @@ msgstr "[Устарело] Прочитать контактную информ #: ../src/bin/rhnreg_ks.py:62 msgid "Do not probe or upload any hardware info" -msgstr "Не пытаться определить или загрузить информацию об используемом оборудовании" +msgstr "Не пытаться определить или загрузить информацию об оборудовании" #: ../src/bin/rhnreg_ks.py:64 msgid "Do not profile or upload any package info" @@ -1634,7 +1619,7 @@ msgstr "" msgid "" "Usage of --use-eus-channel option with --activationkey is not supported. " "Please use username and password instead." -msgstr "" +msgstr "Использование параметра «--use-eus-channel» с «--activationkey» не поддерживается. Вместо этого используйте имя пользователя и пароль." #: ../src/bin/rhnreg_ks.py:122 msgid "The server you are registering against does not support EUS." @@ -1644,7 +1629,7 @@ msgstr "Сервер, на котором вы пытаетесь зарегис msgid "" "Warning: --contactinfo option has been deprecated. Please login to the " "server web user Interface and update your contactinfo. " -msgstr "" +msgstr "Предупреждение: параметр «--contactinfo» устарел. Войдите в веб-интерфейс сервера и обновите контактную информацию." #: ../src/bin/rhnreg_ks.py:192 msgid "" @@ -1760,7 +1745,7 @@ msgstr "" #: ../data/rh_register.glade.h:16 msgid "Your system was registered for updates during installation." -msgstr "" +msgstr "Ваша система зарегистрирована и будет получать обновления во время установки." #: ../data/rh_register.glade.h:17 msgid "" @@ -2162,7 +2147,6 @@ msgstr "" "установка доступных обновлений:" #: ../data/rh_register.glade.h:104 -#, fuzzy msgid "" "Your system is ready to receive the software updates that will keep it " "secure and supported.\n" @@ -2172,12 +2156,10 @@ msgid "" "circled below.) Clicking on this icon, when available, will guide you " "through applying any updates that are available:" msgstr "" -"Система готова к получению обновлений ПО, которые обеспечат ее безопасность " -"и поддержку.\n" +"Система готова к получению программных обновлений, которые обеспечат ее защиту и поддержку.\n" "\n" -"Обновления ПО доступны, если значок уведомления появился на рабочем столе " -"(обычно в правом верхнем углу). При нажатии этого значка начнется пошаговая " -"установка доступных обновлений:" +"Индикатором наличия программных обновлений служит появление значка уведомления на рабочем столе (обычно в правом верхнем углу). " +"Нажмите этот значок, чтобы начать пошаговую установку обновлений:" #: ../data/rh_register.glade.h:107 msgid "" @@ -2284,10 +2266,9 @@ msgstr "Регистрация в RHN" #: ../rhn_register.desktop.in.h:2 msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network" -msgstr "" +msgstr "Регистрация для получения программных обновлений из Spacewalk/Satellite/Red Hat Network" #: ../rhn_register.desktop.in.h:3 -#, fuzzy msgid "Register to Spacewalk/Satellite/Red Hat Network." -msgstr "Регистрация в Red Hat Network" +msgstr "Регистрация в Spacewalk/Satellite/Red Hat Network." commit b0cee5488ca99766320aebd4210556e8e42dd5d8 Author: ypoyarko <ypoyarko(a)fedoraproject.org> Date: Mon Jun 7 00:47:23 2010 +0000 l10n: Updates to Russian (ru) translation Transmitted-via: Transifex (translate.fedoraproject.org) diff --git a/client/rhel/rhn-client-tools/po/ru.po b/client/rhel/rhn-client-tools/po/ru.po index 694f07e..b92c9d0 100644 --- a/client/rhel/rhn-client-tools/po/ru.po +++ b/client/rhel/rhn-client-tools/po/ru.po @@ -1,46 +1,31 @@ -# translation of ru.po to -# translation of ru.po to -# translation of ru.po to -# translation of ru.po to -# translation of ru.po to -# translation of ru.po to -# translation of ru.po to -# translation of ru.po to -# translation of ru.po to -# translation of ru.po to -# translation of ru.po to -# translation of ru.po to -# translation of ru.po to -# translation of ru.po to # translation of ru.po to # translation of ru.po to Russian # Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +# # Leonid Kanter <leon(a)geon.donetsk.ua>, 2003. # Vladimir Lazarenko <vlad(a)lazarenko.net>, 2004. # Andrew Martynov <andrewm(a)inventa.ru>, 2004, 2005. -# Yuliya Poyarkova <ypoyarko(a)brisbane.redhat.com>, 2005. -# Yulia Poyarkova <ypoyarko(a)redhat.com>, 2006, 2007. -# +# Yulia <ypoyarko(a)redhat.com>, 2006, 2007, 2010. msgid "" msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-07 13:34+0200\n" -"PO-Revision-Date: 2007-02-01 12:03+1000\n" -"Last-Translator: Yulia Poyarkova <ypoyarko(a)redhat.com>\n" -"Language-Team: \n" +"PO-Revision-Date: 2010-06-07 10:46\n" +"Last-Translator: Yulia <ypoyarko(a)redhat.com>\n" +"Language-Team: Russian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.9.1\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: ../src/up2date_client/capabilities.py:88 #, python-format msgid "" "This client requires the server to support %s, which the current server does " "not support" -msgstr "" -"Данный клиент требует от сервера поддержки %s, которую сервер не осуществляет" +msgstr "Данный клиент требует от сервера поддержки %s, которую сервер не осуществляет" #: ../src/up2date_client/config.py:139 #, python-format @@ -55,20 +40,19 @@ msgstr "_Готово" #: ../src/up2date_client/gui.py:299 #: ../src/up2date_client/rhnreg_constants.py:97 msgid "Finish setting up software updates" -msgstr "Завершить настройку" +msgstr "Завершить настройку обновлений" #: ../src/up2date_client/gui.py:301 msgid "_Exit" -msgstr "" +msgstr "В_ыход" #: ../src/up2date_client/gui.py:302 -#, fuzzy msgid "Software updates setup unsuccessful" -msgstr "Неудача при настройке обновления ПО" +msgstr "Не удалось настроить программные обновления" #: ../src/up2date_client/gui.py:312 msgid "You must run rhn_register as root." -msgstr "Утилита rhn_register должна выполняться в режиме пользователя root." +msgstr "Для выполнения rhn_register необходимы права root." #: ../src/up2date_client/gui.py:336 #, python-format @@ -105,15 +89,15 @@ msgstr "Предупреждение:" #: ../src/up2date_client/messageWindow.py:108 msgid "OK dialog:" -msgstr "OK диалог:" +msgstr "Диалог «OK»:" #: ../src/up2date_client/messageWindow.py:116 msgid "Yes/No dialog:" -msgstr "Да/Нет диалог:" +msgstr "Диалог «Да/Нет»:" #: ../src/up2date_client/messageWindow.py:123 msgid "Question dialog:" -msgstr "Диалог с вопросом:" +msgstr "Диалог вопроса:" #: ../src/up2date_client/rhnChannel.py:97 msgid "Unable to Locate SystemId" @@ -155,12 +139,11 @@ msgid "An unexpected OS error occurred: %s\n" msgstr "Произошла неожиданная ошибка OС: %s\n" #: ../src/up2date_client/rhncli.py:83 -#, fuzzy msgid "A connection was attempted with a malformed URI.\n" msgstr "Попытка подключения с использованием некорректного URI.\n" #: ../src/up2date_client/rhncli.py:85 -#, fuzzy, python-format +#, python-format msgid "A connection was attempted with a malformed URI: %s.\n" msgstr "Попытка подключения с использованием некорректного URI: %s.\n" @@ -202,15 +185,15 @@ msgid "Unable to open gui. Try `up2date --nox`" msgstr "Не удается открыть GUI. Попробуйте `up2date --nox`" #: ../src/up2date_client/rhncli.py:184 -#, fuzzy, python-format +#, python-format msgid "" "%%prog (Red Hat Network Client Tools) %s\n" "Copyright (C) 1999--2010 Red Hat, Inc.\n" "Licensed under the terms of the GPLv2." msgstr "" "%%prog (Red Hat Network Client Tools) %s\n" -"Copyright (C) 1999-2006 Red Hat, Inc.\n" -"Следует условиям лицензии GPL." +"(C) 1999-2010 Red Hat, Inc.\n" +"Следует лицензии GPL версии 2." #: ../src/up2date_client/rhncli.py:204 msgid "An error has occurred:" @@ -221,9 +204,8 @@ msgid "See /var/log/up2date for more information" msgstr "Дополнительную информацию можно найти в /var/log/up2date" #: ../src/up2date_client/rhnreg_constants.py:13 -#, fuzzy msgid "Copyright © 2006--2010 Red Hat, Inc. All rights reserved." -msgstr "Copyright Â© 2006 Red Hat, Inc. Все права защищены." +msgstr "© 2006-2010 Red Hat, Inc. Все права защищены." #. Connect Window #: ../src/up2date_client/rhnreg_constants.py:16 @@ -353,14 +335,13 @@ msgid "Software update setup unsuccessful" msgstr "Неудача при настройке обновления ПО" #: ../src/up2date_client/rhnreg_constants.py:60 -#, fuzzy msgid "" "Are you sure you don't want to connect your system to Red Hat Network? " "You'll miss out on the benefits of a Red Hat Enterprise Linux subscription:\n" msgstr "" -"Вы уверены в том, что вы не хотите подключить вашу систему к Red Hat " +"Вы действительно не хотите подключить вашу систему к Red Hat " "Network? Вы не сможете воспользоваться преимуществами подписки Red Hat " -"Enterprise Linux." +"Enterprise Linux:\n" #: ../src/up2date_client/rhnreg_constants.py:62 #, fuzzy @@ -429,13 +410,12 @@ msgstr "" "\n" #: ../src/up2date_client/rhnreg_constants.py:82 -#, fuzzy msgid "" "Tip: Forgot your login or password? Visit: https://rhn.redhat.com/rhn/sales/" "LoginInfo.do" msgstr "" -"Замечание: Забыли имя пользователя или пароль? Перейдите к\n" -"https://www.redhat.com/wapps/sso/rhn/lostPassword.html" +"Подсказка: Забыли имя пользователя или пароль? Посетите https://rhn.redhat.com/rhn/sales/" +"LoginInfo.do" #: ../src/up2date_client/rhnreg_constants.py:84 msgid "*Email Address:" @@ -514,8 +494,7 @@ msgstr "Подписки канала ПО:" msgid "" "This system will receive updates from the following Red Hat Network software " "channels:" -msgstr "" -"Система будет получать обновление через следующие каналы ПО Red Hat Network:" +msgstr "Система будет получать обновление через следующие каналы ПО Red Hat Network:" #: ../src/up2date_client/rhnreg_constants.py:118 msgid "" @@ -954,13 +933,11 @@ msgid "You may be running a client that is incompatible with the server." msgstr "Возможно ваш клиент несовместим с сервером." #: ../src/up2date_client/rhnregGui.py:396 -#, fuzzy, python-format +#, python-format msgid "" "Please enter your account information for the %s Red Hat Network " "Satellite:" -msgstr "" -"Введите информацию о вашей учетной записи для %s Red Hat Network Satellite:\n" -"\n" +msgstr "Введите данные вашей учётной записи для %s Red Hat Network Satellite:" #: ../src/up2date_client/rhnregGui.py:445 msgid "You must enter a login." @@ -971,9 +948,8 @@ msgid "You must enter a password." msgstr "Необходимо ввести пароль." #: ../src/up2date_client/rhnregGui.py:465 -#, fuzzy msgid "There was an error while logging in." -msgstr "Проблема входа в систему." +msgstr "Ошибка при авторизации." #: ../src/up2date_client/rhnregGui.py:489 msgid "" @@ -999,9 +975,8 @@ msgid "You must choose a name for this profile." msgstr "Необходимо задать имя для данного профиля." #: ../src/up2date_client/rhnregGui.py:714 -#, fuzzy msgid "There was an error while creating the profile." -msgstr "Ошибка при заполнении профиля." +msgstr "Ошибка при создании профиля." #: ../src/up2date_client/rhnregGui.py:725 msgid "Sending your profile information to Red Hat Network. Please wait." @@ -1079,9 +1054,8 @@ msgid "Problem registering personal information" msgstr "Проблема с регистрацией персональной информации" #: ../src/up2date_client/rhnregGui.py:940 -#, fuzzy msgid "There was an error while installing the certificate." -msgstr "Ошибка при заполнении профиля." +msgstr "Ошибка при установке сертификата." #: ../src/up2date_client/rhnregGui.py:966 msgid "You must select a certificate." @@ -1220,9 +1194,8 @@ msgid "The server indicated an error:\n" msgstr "Сервер сообщает об ошибке:\n" #: ../src/up2date_client/tui.py:375 -#, fuzzy msgid "There was an error communicating with the registration server:\n" -msgstr "Произошла ошибка связи с сервером регистрации. Сообщение:\n" +msgstr "Ошибка связи с сервером регистрации:\n" #: ../src/up2date_client/tui.py:434 msgid "Select Operating System Release" @@ -1370,16 +1343,14 @@ msgid "You specified an invalid protocol." msgstr "Указан неверный протокол." #: ../src/up2date_client/tui.py:1106 -msgid "" -" <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen" +msgid " <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen" msgstr "" " <Tab>/<Alt-Tab> между элементами | <Space> выбор | <F12> следующий " "экран" #: ../src/up2date_client/tui.py:1200 msgid "You must run the RHN registration program as root." -msgstr "" -"Программу регистрации RHN необходимо запускать в режиме пользователя root." +msgstr "Программу регистрации RHN необходимо запускать в режиме пользователя root." #: ../src/up2date_client/up2dateErrors.py:31 msgid "Disk error. The message was:\n" @@ -1450,8 +1421,7 @@ msgid "GPG is not installed properly." msgstr "GPG не установлен корректно." #: ../src/up2date_client/up2dateErrors.py:237 -msgid "" -"GPG keyring does not include the Red Hat, Inc. public package-signing key" +msgid "GPG keyring does not include the Red Hat, Inc. public package-signing key" msgstr "" "Доступные ключи GPG не включают публичного ключа Red Hat Inc. для подписи " "пакетов" @@ -1549,8 +1519,7 @@ msgid "There was a communication error with the server: %s" msgstr "Произошла ошибка соединения с сервером: %s" #: ../src/firstboot/rhn_login_gui.py:106 -msgid "" -"Would you like to try changing the network configuration and trying again?" +msgid "Would you like to try changing the network configuration and trying again?" msgstr "Желаете ли вы изменить сетевую конфигурацию и повторить попытку?" #: ../src/firstboot/rhn_provide_certificate_gui.py:40 @@ -1617,26 +1586,23 @@ msgstr "Укажите url сервера" #: ../src/bin/rhnreg_ks.py:54 msgid "Specify a file to use as the ssl CA cert" -msgstr "Укажите файл сертификата ssl CA cert" +msgstr "Укажите файл сертификата SSL CA" #: ../src/bin/rhnreg_ks.py:56 msgid "Specify an activation key" msgstr "Укажите ключ активации" #: ../src/bin/rhnreg_ks.py:58 -msgid "" -"Subscribe this system to the EUS channel tied to the system's redhat-release" +msgid "Subscribe this system to the EUS channel tied to the system's redhat-release" msgstr "" #: ../src/bin/rhnreg_ks.py:60 -#, fuzzy msgid "[Deprecated] Read contact info from stdin" -msgstr "Прочитать контактную информацию со стандартного ввода" +msgstr "[Устарело] Прочитать контактную информацию из стандартного ввода" #: ../src/bin/rhnreg_ks.py:62 msgid "Do not probe or upload any hardware info" -msgstr "" -"Не пытаться определить или загрузить информацию об используемом оборудовании" +msgstr "Не пытаться определить или загрузить информацию об используемом оборудовании" #: ../src/bin/rhnreg_ks.py:64 msgid "Do not profile or upload any package info" @@ -1671,11 +1637,8 @@ msgid "" msgstr "" #: ../src/bin/rhnreg_ks.py:122 -#, fuzzy msgid "The server you are registering against does not support EUS." -msgstr "" -"Сервер, на котором вы пытаетесь зарегистрироваться, не поддерживает текущую " -"версию клиента." +msgstr "Сервер, на котором вы пытаетесь зарегистрироваться, не поддерживает EUS." #: ../src/bin/rhnreg_ks.py:152 msgid "" @@ -1689,8 +1652,8 @@ msgid "" "determined to use as a profilename, please specify one." msgstr "" "Название профиля (profilename) не указано, а имя узла и IP адрес не могут " -"быть определены для использования в качестве Названия профиля. Пожалйуста, " -"задайте Название профиля." +"быть определены для использования в качестве названия. Пожалуйста, " +"задайте название профиля." #: ../data/gui.glade.h:1 msgid "Choose an update location" @@ -1714,22 +1677,23 @@ msgstr "Регистрация для обновлений ПО" #: ../data/gui.glade.h:7 msgid "Select operating system release" -msgstr "" +msgstr "Выберите выпуск ОС" #: ../data/progress.glade.h:1 msgid "Progress Dialog" msgstr "Состояние выполнения" #: ../data/rh_register.glade.h:1 -#, fuzzy msgid "" "\n" "Are you sure you would like to continue?" -msgstr "Вы уверены, что вы хотите продолжить?" +msgstr "" +"\n" +"Вы действительно хотите продолжить?" #: ../data/rh_register.glade.h:3 msgid " " -msgstr "" +msgstr " " #: ../data/rh_register.glade.h:4 msgid "Compliance:" @@ -1838,13 +1802,12 @@ msgid "Example: XXXX-XXXX-XXXX-XXXX" msgstr "Пример: XXXX-XXXX-XXXX-XXXX" #: ../data/rh_register.glade.h:25 -#, fuzzy msgid "" "Tip: Red Hat values your privacy: http://www.redhat.com/legal/" "privacy_statement.html." msgstr "" -"Замечание: Red Hat уважает вашу конфиденциальность: http://www.redhat.com/" -"legal/privacy_statement.html" +"Подсказка: Red Hat уважает вашу конфиденциальность: http://www.redhat.com/" +"legal/privacy_statement.html" #: ../data/rh_register.glade.h:26 msgid "" @@ -1879,8 +1842,7 @@ msgstr "" "входа и пароль)." #: ../data/rh_register.glade.h:34 -msgid "" -"Activate a previously purchased subscription you have not yet activated." +msgid "Activate a previously purchased subscription you have not yet activated." msgstr "Активируйте ранее приобретенную, но не активную подписку." #: ../data/rh_register.glade.h:35 @@ -1913,13 +1875,12 @@ msgid "Certificate _Location:" msgstr "Местоположение с_ертификата:" #: ../data/rh_register.glade.h:42 -#, fuzzy msgid "Choose Channel" -msgstr "Выбрать организацию" +msgstr "Выберите канал" #: ../data/rh_register.glade.h:44 msgid "Confirm operation system release selection" -msgstr "" +msgstr "Подтвердите выбор выпуска ОС" #: ../data/rh_register.glade.h:46 msgid "Create profile" @@ -2015,8 +1976,7 @@ msgstr "Сведения о пакете" msgid "" "Please enter your account information for Red Hat Network (http://rhn." "redhat.com/)" -msgstr "" -"Введите данные учетной записи Red Hat Network (http://rhn.redhat.com)" +msgstr "Введите данные учетной записи Red Hat Network (http://rhn.redhat.com)" #: ../data/rh_register.glade.h:68 msgid "Provide a Security Certificate" @@ -2256,7 +2216,7 @@ msgstr "_Нет, спасибо. Я зарегистрируюсь позже." #: ../data/rh_register.glade.h:114 msgid "_No, Cancel" -msgstr "_Нет, Отмена" +msgstr "_Нет, отмена" #: ../data/rh_register.glade.h:115 msgid "_No, I prefer to register at a later time." @@ -2264,7 +2224,7 @@ msgstr "Нет, я _зарегистрируюсь позже" #: ../data/rh_register.glade.h:116 msgid "_Operating system version:" -msgstr "" +msgstr "_Версия операционной системы:" #: ../data/rh_register.glade.h:117 msgid "_Password:" @@ -2319,9 +2279,8 @@ msgid "• Your Red Hat Network or Red Hat Network Satellite login " msgstr "• Ваше имя входа Red Hat Network или Red Hat Network Satellite" #: ../rhn_register.desktop.in.h:1 -#, fuzzy msgid "RHN Registration" -msgstr "registration_number" +msgstr "Регистрация в RHN" #: ../rhn_register.desktop.in.h:2 msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network" @@ -2332,1256 +2291,3 @@ msgstr "" msgid "Register to Spacewalk/Satellite/Red Hat Network." msgstr "Регистрация в Red Hat Network" -#~ msgid "_Exit software update setup" -#~ msgstr "В_ыход из настройки обновлений ПО" - -#~ msgid "software updates setup unsuccessful" -#~ msgstr "неудача при настройке обновления ПО" - -#~ msgid "" -#~ "If you do not have a Red Hat Login, this assistant will allow you to " -#~ "create one." -#~ msgstr "Если у вас нет имени входа Red Hat, помощник позволит его создать." - -#~ msgid "Step 1: Review the Red Hat Privacy Statement" -#~ msgstr "Шаг 1: Ознакомление с соглашением о неразглашении Red Hat" - -#~ msgid "Review the Red Hat Network Terms And Conditions" -#~ msgstr "Ознакомиться с условиями и соглашениями Red Hat Network" - -#~ msgid "" -#~ "Are you sure you don't want to connect your system to Red Hat Network? " -#~ "You'll miss out on the benefits of a Red Hat Enterprise Linux " -#~ "subscription:\n" -#~ "\n" -#~ "Security & Updates:\n" -#~ "Receive the latest software updates, including security updates, keeping " -#~ "this Red Hat Enterprise Linux system updated and secure.\n" -#~ "\n" -#~ "Downloads & Upgrades:\n" -#~ "Download installation images for Red Hat Enterprise Linux releases, " -#~ "including new releases.\n" -#~ "\n" -#~ "Support:\n" -#~ "Access to the technical support experts at Red Hat or Red Hat's partners " -#~ "for help with any issues you might encounter with this system.\n" -#~ "\n" -#~ "Compliance:\n" -#~ "Stay in compliance with your subscription agreement and manage " -#~ "subscriptions for systems connected to your account at http://rhn.redhat." -#~ "com/.\n" -#~ "\n" -#~ "You will not be able to take advantage of these subscription privileges " -#~ "without connecting your system to Red Hat Network.\n" -#~ "\n" -#~ "Tip: Red Hat values your privacy: http://www.redhat.com/legal/" -#~ "privacy_statement.html" -#~ msgstr "" -#~ "Вы уверены в том, что вы не хотите подключать систему к Red Hat Network? " -#~ "В таком случае вы не сможете воспользоваться преимуществами подписки\n" -#~ "Red Hat Enterprise Linux:\n" -#~ "\n" -#~ "Безопасность и обновления:\n" -#~ "Получать последние обновления ПО, включая обновления безопасности, тем " -#~ "самым сохраняя систему Enterprise Linux в обновленном состоянии.\n" -#~ "\n" -#~ "Возможность двухсторонней загрузки:\n" -#~ "Выполнять загрузку образов Red Hat Enterprise Linux включая новые " -#~ "выпуски.\n" -#~ "\n" -#~ "Поддержка:\n" -#~ "Доступ к технической поддержке Red Hat и партнеров за помощью с любыми " -#~ "потенциальными проблемами в системе.\n" -#~ "\n" -#~ "Соответствие стандартам:\n" -#~ "Действуйте в соответствиями с условиями подписки и управляйте подписками " -#~ "ваших систем с http://rhn.redhat.com/\n" -#~ "\n" -#~ "Вы не сможете воспользоваться всеми преимуществами подписки без " -#~ "подключения вашей системы к Red Hat Network.\n" -#~ "\n" -#~ "Замечание: Red Hat уважает вашу конфиденциальность: http://www.redhat.com/" -#~ "legal/privacy_statement.html" - -#~ msgid "No thanks. I'll connect later." -#~ msgstr "Нет, спасибо. Я подключусь позже." - -#~ msgid "Create a New Login ..." -#~ msgstr "Создать имя входа..." - -#~ msgid "" -#~ "The two passwords you entered don't match. Please re-type your passwords." -#~ msgstr "Два введенных пароля не совпадают. Повторите ввод пароля." - -#~ msgid "Create a new Red Hat login" -#~ msgstr "Создайте учетную запись Red Hat Network" - -#~ msgid "" -#~ "Fill in the form below to create a new Red Hat login for use with Red Hat " -#~ "Network (http://rhn.redhat.com/). Required information is marked with a " -#~ "'*':" -#~ msgstr "" -#~ "Заполните приведенную ниже форму для создания учетной записи Red Hat " -#~ "Network (http://rhn.redhat.com/). Обязательные поля отмечены звездочкой " -#~ "(*):" - -#~ msgid "*Desired Login:" -#~ msgstr "*Предпочитаемое имя входа:" - -#~ msgid "Examples: user(a)domain.com" -#~ msgstr "Пример: user(a)domain.com" - -#~ msgid "*Desired Password:" -#~ msgstr "*Предпочитаемый пароль:" - -#~ msgid "*Confirm Password:" -#~ msgstr "*Подтвердите пароль:" - -#~ msgid "Tip: Leave blank if not with a company." -#~ msgstr "" -#~ "Замечание: Оставьте поле пустым, если вы не действуете от лица компании." - -#~ msgid "" -#~ "Tip: Red Hat values your privacy. View our privacy policy at: http://" -#~ msgstr "" -#~ "Замечание: Red Hat уважает вашу конфиденциальность. Соглашение о " -#~ "неразглашении доступно по адресу http://" - -#~ msgid "Please enter your first name." -#~ msgstr "Введите имя." - -#~ msgid "Please enter your last name." -#~ msgstr "Введите фамилию." - -#~ msgid "Please enter your email address." -#~ msgstr "Введите адрес эл.почты." - -#~ msgid "Please enter a valid email address." -#~ msgstr "Необходимо ввести корректный эл.адрес." - -#~ msgid "Please enter your country." -#~ msgstr "Введите данные страны." - -#~ msgid "Please enter a longer login." -#~ msgstr "Имя входа слишком короткое. Введите новое имя." - -#~ msgid "Please enter a longer password." -#~ msgstr "Пароль слишком короткий. Введите другой пароль." - -#~ msgid "Please enter a shorter password." -#~ msgstr "Пароль слишком длинный. Введите другой пароль." - -#~ msgid "" -#~ "It appears this system has attempted to register to the Red Hat Network.\n" -#~ "The system may already be set up for software updates.\n" -#~ "\n" -#~ "Are you sure you would like to continue?" -#~ msgstr "" -#~ "Ваша система уже пыталась зарегистрироваться в Red Hat Network.\n" -#~ "Возможно она уже настроена на получение обновлений ПО.\n" -#~ "\n" -#~ "Продолжить?" - -#~ msgid "Select Organization" -#~ msgstr "Выбрать организацию" - -#~ msgid "" -#~ "Your login, %s, is associated with multiple organizations. You will need " -#~ "to select an organization to connect this system to." -#~ msgstr "" -#~ "Ваша учетная запись %s сопоставлена нескольким организациям. Выберите " -#~ "организацию для регистрации системы." - -#~ msgid "Organization:" -#~ msgstr "Организация:" - -#~ msgid "You must select an organization." -#~ msgstr "Необходимо выбрать организацию." - -#~ msgid "Access a subscription" -#~ msgstr "Доступ к подписке" - -#~ msgid "" -#~ "You have no active subscriptions available in your account. You will " -#~ "need to do one of the following to create an active subscription in your " -#~ "account before this system can connect to Red Hat Network:" -#~ msgstr "" -#~ "Вашей учетной записи не доступны активные подписки. Выполните следующее " -#~ "для создания активной подписки для того, чтобы ваша система могла " -#~ "подключиться к Red Hat Network:" - -#~ msgid "Activate a new subscription with an installation number:" -#~ msgstr "Для активации подписки используйте код установки:" - -#~ msgid "" -#~ "You have already activated this installation number during this " -#~ "registration." -#~ msgstr "Вы уже активировали данный код установки процессе регистрации." - -#~ msgid "Installation Number:" -#~ msgstr "Код установки:" - -#, fuzzy -#~ msgid "Example: XXXX-XXXX-XXXX-XXXX" -#~ msgstr "Шаблон: XXXX-XXXX-XXXX-XXXX-XXXX" - -#~ msgid "" -#~ "Congratulations, you have successfully completed software updates set up " -#~ "for this system.\n" -#~ "\n" -#~ "Your system is now ready to receive the software updates that will keep " -#~ "it secure and supported.\n" -#~ "\n" -#~ "You'll know when software updates are available when a package icon " -#~ "appears in the notification area of you desktop (usually in the upper-" -#~ "right corner.) Clicking on this icon, when available, will guide you " -#~ "through applying any updates that are available." -#~ msgstr "" -#~ "Поздравляем! Обновления ПО для данной системы успешно установлены.\n" -#~ "\n" -#~ "Система готова к получению обновлений ПО, которые обеспечат ее " -#~ "безопасность и поддержку.\n" -#~ "\n" -#~ "Обновления ПО доступны, если значок уведомления появился на рабочем столе " -#~ "(обычно в правом верхнем углу). При нажатии на значке начнется пошаговая " -#~ "установка доступных обновлений." - -#~ msgid "Subscriptions Activated:" -#~ msgstr "Активированные подписки:" - -#~ msgid "" -#~ "A subscription-activating installation number was found on disk, but we " -#~ "were not able to activate it (An unknown error occurred.) We used " -#~ "existing active subscription slots available in the rhn account instead. " -#~ "You may wish to contact Red Hat customer service regarding this issue: " -#~ "http://www.redhat.com/apps/support/" -#~ msgstr "" -#~ "Активирующий подписку код установки найден на диске, но его активация не " -#~ "удалась (неизвестная ошибка). Поэтому были использованы доступные " -#~ "активные сегменты подписки учетной записи rhn. Если у вас есть вопросы, " -#~ "свяжитесь со службой поддержки: http://www.redhat.com/apps/support/" - -#~ msgid "A installation number was found on disk, but we " -#~ msgstr "Активирующий подписку код установки найден на диске, но " - -#~ msgid "" -#~ "The installation number you have provided (%s) is invalid.\n" -#~ "\n" -#~ "Please check the number and try again or try another option listed on the " -#~ "'Access a Subscription' screen." -#~ msgstr "" -#~ "Введен некорректный код установки (%s).\n" -#~ "\n" -#~ "Проверьте номер и повторите попытку или воспользуйтесь другим методом " -#~ "(см. страницу 'Доступ к подписке')." - -#~ msgid "" -#~ "The installation number you provided is valid but was already activated " -#~ "and the subscriptions have already been used by systems in your " -#~ "organization or is not usable for this system.\n" -#~ "\n" -#~ "Please try a different number or try another option listed on the 'Access " -#~ "a Subscription' screen." -#~ msgstr "" -#~ "Вы предоставили верный код установки, но он уже активирован, и подписки " -#~ "уже используются системами вашей организации, или код неприменим к этой " -#~ "системе.\n" -#~ "\n" -#~ "Используйте другой код или иные методы доступа, перечисленные на экране " -#~ "\"Доступ к подписке\"." - -#~ msgid "" -#~ "The installation number you provided does not have subscriptions " -#~ "associated with it.\n" -#~ "\n" -#~ "Please try a different number or try another option listed in the 'Access " -#~ "a Subscription' screen." -#~ msgstr "" -#~ "Предоставленный код установки не связан ни с одной подпиской.\n" -#~ "\n" -#~ "Используйте другой код или иные методы доступа, перечисленные на экране " -#~ "\"Доступ к подписке\"." - -#~ msgid "" -#~ "There was a problem logging in:\n" -#~ "%s" -#~ msgstr "" -#~ "Проблема входа в систему:\n" -#~ "%s" - -#~ msgid "There was problem logging in." -#~ msgstr "Проблема входа в систему." - -#, fuzzy -#~ msgid "There was an error while getting the list of organizations." -#~ msgstr "Ошибка при заполнении профиля." - -#, fuzzy -#~ msgid "You must enter an installation number." -#~ msgstr "Необходимо ввести код установки." - -#, fuzzy -#~ msgid "There was an error activating your number." -#~ msgstr "Ошибка при соединении с Red Hat Network." - -#~ msgid "This installation number has already been activated." -#~ msgstr "Код установки уже активирован." - -#, fuzzy -#~ msgid "There was an error retrieving the privacy statement." -#~ msgstr "Ошибка при заполнении профиля." - -#~ msgid "Unable to access the server. Please check your network settings." -#~ msgstr "Невозможно связаться с сервером. Проверьте сетевые настройки." - -#~ msgid "" -#~ "The server you are attempting to register against does not support this " -#~ "version of the client." -#~ msgstr "" -#~ "Сервер, на котором вы пытаетесь зарегистрироваться, не поддерживает " -#~ "текущую версию клиента." - -#~ msgid "You must enter an Installation Number that " -#~ msgstr "Необходимо ввести код установки для " - -#~ msgid "Problem registering login name:\n" -#~ msgstr "Проблема с регистрацией имени входа:\n" - -#~ msgid "Problem registering login name." -#~ msgstr "Ошибка регистрации имени входа." - -#~ msgid ", quantity:" -#~ msgstr ", количество:" - -#~ msgid "" -#~ "\n" -#~ "\n" -#~ "Red Hat Network Location: " -#~ msgstr "" -#~ "\n" -#~ "\n" -#~ "Расположение Red Hat Network:" - -#~ msgid "" -#~ "\n" -#~ "RHN Login: " -#~ msgstr "" -#~ "\n" -#~ "Учетная запись RHN: " - -#~ msgid "Access Subscription" -#~ msgstr "Доступ к подписке" - -#~ msgid "Choose Organization" -#~ msgstr "Выбрать организацию" - -#~ msgid "Choose an organization to use with this username" -#~ msgstr "Выберите организацию, ассоциированную с данным пользователем" - -#~ msgid "Specify an email address" -#~ msgstr "Укажите адрес эл.почты" - -#, fuzzy -#~ msgid "Specify a installation number to use" -#~ msgstr "Укажите код подписки" - -#~ msgid "Important Registration Info" -#~ msgstr "Важная регистрационная информация" - -#~ msgid "Registration information" -#~ msgstr "Регистрационная информация" - -#~ msgid "Select organization" -#~ msgstr "Выбрать организацию" - -#~ msgid "Tip: Red Hat values your privacy." -#~ msgstr "" -#~ "Замечание: Red Hat уважает вашу конфиденциальность." - -#~ msgid "Privacy Statement" -#~ msgstr "Соглашение о неразглашении" - -#~ msgid "Red Hat Privacy Statement" -#~ msgstr "Соглашение о неразглашении Red Hat" - -#, fuzzy -#~ msgid "" -#~ "Your account is associated with multiple organizations. You will " -#~ "need to select an organization to register this system to." -#~ msgstr "" -#~ "Ваша учетная запись сопоставлена нескольким организациям. Выберите " -#~ "организацию для регистрации системы." - -#~ msgid "_Organization:" -#~ msgstr "_Организация" - -#~ msgid "" -#~ "were not able to activate it (An unknown error occurred.) We used " -#~ "existing " -#~ msgstr "его активация не удалась (неизвестная ошибка). Поэтому были " - -#~ msgid "" -#~ "active subscription slots available in the rhn account instead. You may " -#~ "wish " -#~ msgstr "" -#~ "использованы доступные активные сегменты подписки учетной записи rhn." - -#~ msgid "to contact Red Hat customer service regarding this issue: " -#~ msgstr "Если у вас есть вопросы, свяжитесь со службой поддержки:" - -#~ msgid "http://www.redhat.com/apps/support/" -#~ msgstr "http://www.redhat.com/apps/support/" - -#~ msgid "activates subscriptions in your account." -#~ msgstr "активации подписок вашей учетной записи." - -#~ msgid "Only https and http are allowed." -#~ msgstr "Допускается указание только https и http." - -#~ msgid "Error reading hardware information:" -#~ msgstr "Ошибка чтения информации об оборудовании:" - -#~ msgid "Error reading DMI information:" -#~ msgstr "Ошибка чтения DMI информации:" - -#~ msgid "That user account and password is not valid\n" -#~ msgstr "Указанные имя пользователя и пароль неверны\n" - -#~ msgid "You must enter a user name." -#~ msgstr "Вы должны ввести имя пользователя." - -#~ msgid "You must enter and verify a password." -#~ msgstr "Необходимо ввести и повторить пароль." - -#~ msgid "" -#~ "Problem registering login:\n" -#~ "%s" -#~ msgstr "" -#~ "Проблема с регистрацией имени входа:\n" -#~ "%s" - -#~ msgid "Problem registering login." -#~ msgstr "Ошибка регистрации имени входа." - -#~ msgid "United States" -#~ msgstr "Соединенные Штаты" - -#~ msgid "Canada" -#~ msgstr "Канада" - -#~ msgid "Login Information:" -#~ msgstr "Данные имени входа:" - -#~ msgid "Account Information:" -#~ msgstr "Данные учетной записи:" - -#~ msgid "*First Name:" -#~ msgstr "*Имя:" - -#~ msgid "*Last Name:" -#~ msgstr "*Фамилия:" - -#~ msgid "*Company Name:" -#~ msgstr "*Компания:" - -#~ msgid "Street Address:" -#~ msgstr "Адрес:" - -#~ msgid "City:" -#~ msgstr "Город:" - -#~ msgid "State/Province:" -#~ msgstr "Штат/ Область:" - -#~ msgid "Zip/Post Code:" -#~ msgstr "Индекс:" - -#~ msgid "*Country:" -#~ msgstr "*Страна:" - -#~ msgid " Address 2:" -#~ msgstr " Адрес 2:" - -#~ msgid " Address:" -#~ msgstr " Адрес:" - -#~ msgid " C_ity:" -#~ msgstr " _Город:" - -#~ msgid " Co_mpany Name:" -#~ msgstr " _Компания:" - -#~ msgid " _State/Province:" -#~ msgstr " Штат/ _Область:" - -#~ msgid " _Zip/Postal code:" -#~ msgstr " И_ндекс:" - -#~ msgid "* C_onfirm password: " -#~ msgstr "* Под_твердите пароль: " - -#~ msgid "* Co_untry:" -#~ msgstr "* _Страна:" - -#~ msgid "* Desired _Login:" -#~ msgstr "* _Имя входа:" - -#~ msgid "* Desired _Password:" -#~ msgstr "* Предпочитаемый _пароль:" - -#~ msgid "* Last _Name:" -#~ msgstr "* _Фамилия:" - -#~ msgid "* _Email Address: " -#~ msgstr "* Адрес _эл.почты" - -#~ msgid "* _First Name:" -#~ msgstr "* И_мя:" - -#~ msgid "Account Information:" -#~ msgstr "Данные учетной записи:" - -#~ msgid "Login Information:" -#~ msgstr "Данные имени входа:" - -#~ msgid "Examples: user(a)domain.com" -#~ msgstr "Пример: user(a)domain.com" - -#~ msgid "Tip: Leave blank if not with a company." -#~ msgstr "" -#~ "Замечание: Оставьте поле пустым, если вы не действуете от " -#~ "лица компании." - -#~ msgid "Afghanistan" -#~ msgstr "Афганистан" - -#~ msgid "Albania" -#~ msgstr "Албания" - -#~ msgid "Algeria" -#~ msgstr "Алжир" - -#~ msgid "American Samoa" -#~ msgstr "Американское Самоа" - -#~ msgid "Andorra" -#~ msgstr "Андорра" - -#~ msgid "Angola" -#~ msgstr "Ангола" - -#~ msgid "Anguilla" -#~ msgstr "Ангилла" - -#~ msgid "Antarctica" -#~ msgstr "Антарктика" - -#~ msgid "Antigua and Barbuda" -#~ msgstr "Антигуа и Барбуда" - -#~ msgid "Argentina" -#~ msgstr "Аргентина" - -#~ msgid "Armenia" -#~ msgstr "Армения" - -#~ msgid "Aruba" -#~ msgstr "Аруба" - -#~ msgid "Australia" -#~ msgstr "Австралия" - -#~ msgid "Austria" -#~ msgstr "Австрия" - -#~ msgid "Azerbaijan" -#~ msgstr "Азербайджан" - -#~ msgid "Bahamas" -#~ msgstr "Багамы" - -#~ msgid "Bahrain" -#~ msgstr "Бахрейн" - -#~ msgid "Bangladesh" -#~ msgstr "Бангладеш" - -#~ msgid "Barbados" -#~ msgstr "Барбадос" - -#~ msgid "Belarus" -#~ msgstr "Беларусь" - -#~ msgid "Belgium" -#~ msgstr "Бельгия" - -#~ msgid "Belize" -#~ msgstr "Белиз" - -#~ msgid "Benin" -#~ msgstr "Бенин" - -#~ msgid "Bermuda" -#~ msgstr "Бермуда" - -#~ msgid "Bhutan" -#~ msgstr "Бутан" - -#~ msgid "Bolivia" -#~ msgstr "Боливия" - -#~ msgid "Bosnia and Herzegovina" -#~ msgstr "Босния и Герцеговина" - -#~ msgid "Botswana" -#~ msgstr "Ботсвана" - -#~ msgid "Bouvet Island" -#~ msgstr "Остров Бувет" - -#~ msgid "Brazil" -#~ msgstr "Бразилия" - -#~ msgid "British Indian Ocean Territory" -#~ msgstr "Британская территория индийского океана" - -#~ msgid "Brunei Darussalam" -#~ msgstr "Бруней" - -#~ msgid "Bulgaria" -#~ msgstr "Болгария" - -#~ msgid "Burkina Faso" -#~ msgstr "Буркина Фасо" - -#~ msgid "Burundi" -#~ msgstr "Бурунди" - -#~ msgid "C_reate new login" -#~ msgstr "_Создать имя входа" - -#~ msgid "Cambodia" -#~ msgstr "Камбоджи" - -#~ msgid "Cameroon" -#~ msgstr "Камерун" - -#~ msgid "Cape Verde" -#~ msgstr "Капе Верде" - -#~ msgid "Cayman Islands" -#~ msgstr "Кайманские острова" - -#~ msgid "Central African Republic" -#~ msgstr "Центральная Африканская республика" - -#~ msgid "Chad" -#~ msgstr "Чад" - -#~ msgid "Chile" -#~ msgstr "Чили" - -#~ msgid "China" -#~ msgstr "Китай" - -#~ msgid "Christmas Island" -#~ msgstr "Остров Рождества" - -#~ msgid "Cocos (Keeling) Islands" -#~ msgstr "Кокосовые острова" - -#~ msgid "Colombia" -#~ msgstr "Колумбия" - -#~ msgid "Comoros" -#~ msgstr "Коморос" - -#~ msgid "Congo" -#~ msgstr "Конго" - -#~ msgid "Cook Islands" -#~ msgstr "Острова Кука" - -#~ msgid "Costa Rica" -#~ msgstr "Коста Рика" - -#~ msgid "Cote d'Ivoire" -#~ msgstr "Коте д'Ивуар" - -#~ msgid "Create a _New Login" -#~ msgstr "_Создать имя входа..." - -#~ msgid "Create a new Red Hat Network login" -#~ msgstr "Создать новую учетную запись Red Hat Network" - -#~ msgid "Croatia" -#~ msgstr "Хорватия" - -#~ msgid "Cuba" -#~ msgstr "Куба" - -#~ msgid "Cyprus" -#~ msgstr "Кипр" - -#~ msgid "Czech Republic" -#~ msgstr "Чешская республика" - -#~ msgid "Denmark" -#~ msgstr "Дания" - -#~ msgid "Djibouti" -#~ msgstr "Джибути" - -#~ msgid "Dominica" -#~ msgstr "Доминик" - -#~ msgid "Dominican Republic" -#~ msgstr "Доминиканская республика" - -#~ msgid "East Timor" -#~ msgstr "Восточный Тимор" - -#~ msgid "Ecuador" -#~ msgstr "Эквадор" - -#~ msgid "Egypt" -#~ msgstr "Египет" - -#~ msgid "El Salvador" -#~ msgstr "Эль Сальвадор" - -#~ msgid "Equatorial Guinea" -#~ msgstr "Экваториальная Гвинея" - -#~ msgid "Eritrea" -#~ msgstr "Эритреа" - -#~ msgid "Estonia" -#~ msgstr "Эстония" - -#~ msgid "Ethiopia" -#~ msgstr "Эфиопия" - -#~ msgid "Falkland Islands (Malvinas)" -#~ msgstr "Острова Мальвины" - -#~ msgid "Faroe Islands" -#~ msgstr "Острова Фароэ" - -#~ msgid "Fiji" -#~ msgstr "Фуджи" - -#~ msgid "" -#~ "Fill in the form below to create a new Red Hat login. Required " -#~ "information is marked with a '*':" -#~ msgstr "" -#~ "Форма создания записи Red Hat. Обязательные поля отмечены звездочкой " -#~ "('*'):" - -#~ msgid "Finland" -#~ msgstr "Финляндия" - -#~ msgid "France" -#~ msgstr "Франция" - -#~ msgid "France, Metropolitan" -#~ msgstr "Франция, Метрополь" - -#~ msgid "French Guiana" -#~ msgstr "Французская Гвиана" - -#~ msgid "French Polynesia" -#~ msgstr "Французская Полинезия" - -#~ msgid "French Southern Territories" -#~ msgstr "Южные Французские территории" - -#~ msgid "Gabon" -#~ msgstr "Габон" - -#~ msgid "Gambia" -#~ msgstr "Гамбия" - -#~ msgid "Georgia" -#~ msgstr "Джорджия" - -#~ msgid "Germany" -#~ msgstr "Германия" - -#~ msgid "Ghana" -#~ msgstr "Гана" - -#~ msgid "Gibraltar" -#~ msgstr "Гибралтар" - -#~ msgid "Greece" -#~ msgstr "Греция" - -#~ msgid "Greenland" -#~ msgstr "Гренландия" - -#~ msgid "Grenada" -#~ msgstr "Гренада" - -#~ msgid "Guadeloupe" -#~ msgstr "Гваделупа" - -#~ msgid "Guam" -#~ msgstr "Гуам" - -#~ msgid "Guatemala" -#~ msgstr "Гватемала" - -#~ msgid "Guinea" -#~ msgstr "Гвинея" - -#~ msgid "Guinea-Bissau" -#~ msgstr "Гвинея-Биссау" - -#~ msgid "Guyana" -#~ msgstr "Гаяна" - -#~ msgid "Haiti" -#~ msgstr "Гаити" - -#~ msgid "Heard Island and McDonald Islands" -#~ msgstr "Острова Херд и МакДональд" - -#~ msgid "Honduras" -#~ msgstr "Гондурас" - -#~ msgid "Hong Kong" -#~ msgstr "Гонконг" - -#~ msgid "Hungary" -#~ msgstr "Венгрия" - -#~ msgid "Iceland" -#~ msgstr "Исландия" - -#~ msgid "India" -#~ msgstr "Индия" - -#~ msgid "Indonesia" -#~ msgstr "Индонезия" - -#~ msgid "Iran (Islamic Republic of)" -#~ msgstr "Иран" - -#~ msgid "Iraq" -#~ msgstr "Ирак" - -#~ msgid "Ireland" -#~ msgstr "Ирландия" - -#~ msgid "Israel" -#~ msgstr "Израиль" - -#~ msgid "Italy" -#~ msgstr "Италия" - -#~ msgid "Jamaica" -#~ msgstr "Ямайка" - -#~ msgid "Japan" -#~ msgstr "Япония" - -#~ msgid "Jordan" -#~ msgstr "Иордан" - -#~ msgid "Kazakhstan" -#~ msgstr "Казахстан" - -#~ msgid "Kenya" -#~ msgstr "Кения" - -#~ msgid "Kiribati" -#~ msgstr "Кирибати" - -#~ msgid "Korea, Democratic People's Republic of" -#~ msgstr "Корея" - -#~ msgid "Korea, Republic of" -#~ msgstr "Корея" - -#~ msgid "Kuwait" -#~ msgstr "Кувейт" - -#~ msgid "Kyrgyzstan" -#~ msgstr "Киргизстан" - -#~ msgid "Lao People's Democratic Republic" -#~ msgstr "Республика Лао" - -#~ msgid "Latin America" -#~ msgstr "Латинская Америка" - -#~ msgid "Latvia" -#~ msgstr "Латвия" - -#~ msgid "Lebanon" -#~ msgstr "Ливан" - -#~ msgid "Lesotho" -#~ msgstr "Лезото" - -#~ msgid "Liberia" -#~ msgstr "Либерия" - -#~ msgid "Libyan Arab Jamahiriya" -#~ msgstr "Ливийско-Арабский Джамахирия" - -#~ msgid "Liechtenstein" -#~ msgstr "Лихтенштейн" - -#~ msgid "Lithuania" -#~ msgstr "Литва" - -#~ msgid "Luxembourg" -#~ msgstr "Люксембург" - -#~ msgid "Macau" -#~ msgstr "Макау" - -#~ msgid "Macedonia" -#~ msgstr "Македония" - -#~ msgid "Madagascar" -#~ msgstr "Мадагаскар" - -#~ msgid "Malawi" -#~ msgstr "Малави" - -#~ msgid "Malaysia" -#~ msgstr "Малайзия" - -#~ msgid "Maldives" -#~ msgstr "Малдивы" - -#~ msgid "Mali" -#~ msgstr "Мали" - -#~ msgid "Malta" -#~ msgstr "Мальта" - -#~ msgid "Marshall Islands" -#~ msgstr "Маршалловы острова" - -#~ msgid "Martinique" -#~ msgstr "Мартиник" - -#~ msgid "Mauritania" -#~ msgstr "Мавритания" - -#~ msgid "Mauritius" -#~ msgstr "Мавритус" - -#~ msgid "Mayotte" -#~ msgstr "Майотта" - -#~ msgid "Mexico" -#~ msgstr "Мексика" - -#~ msgid "Micronesia (Federated States of)" -#~ msgstr "Микронезия" - -#~ msgid "Moldova" -#~ msgstr "Молдавия" - -#~ msgid "Monaco" -#~ msgstr "Монако" - -#~ msgid "Mongolia" -#~ msgstr "Монголия" - -#~ msgid "Montserrat" -#~ msgstr "Монтсеррат" - -#~ msgid "Morocco" -#~ msgstr "Марокко" - -#~ msgid "Mozambique" -#~ msgstr "Мозамбик" - -#~ msgid "Myanmar" -#~ msgstr "Мьянмар" - -#~ msgid "Namibia" -#~ msgstr "Намибия" - -#~ msgid "Nauru" -#~ msgstr "Науру" - -#~ msgid "Nepal" -#~ msgstr "Непал" - -#~ msgid "Netherlands" -#~ msgstr "Нидерланды" - -#~ msgid "Netherlands Antilles" -#~ msgstr "Нидерландские Антиллы" - -#~ msgid "New Caledonia" -#~ msgstr "Новая Каледония" - -#~ msgid "New Zealand" -#~ msgstr "Новая Зеландия" - -#~ msgid "Nicaragua" -#~ msgstr "Никарагуа" - -#~ msgid "Niger" -#~ msgstr "Нигер" - -#~ msgid "Nigeria" -#~ msgstr "Нигерия" - -#~ msgid "Niue" -#~ msgstr "Ниуэ" - -#~ msgid "Norfolk Island" -#~ msgstr "Острова Норфолк" - -#~ msgid "Northern Mariana Islands" -#~ msgstr "Северные острова Мариана" - -#~ msgid "Norway" -#~ msgstr "Норвегия" - -#~ msgid "Oman" -#~ msgstr "Оман" - -#~ msgid "Pakistan" -#~ msgstr "Пакистан" - -#~ msgid "Palau" -#~ msgstr "Палау" - -#~ msgid "Panama" -#~ msgstr "Панама" - -#~ msgid "Papua New Guinea" -#~ msgstr "Папуа Новая Гвинея" - -#~ msgid "Paraguay" -#~ msgstr "Парагвай" - -#~ msgid "Peru" -#~ msgstr "Перу" - -#~ msgid "Philippines" -#~ msgstr "Филипины" - -#~ msgid "Pitcairn" -#~ msgstr "о-ва Питкерн" - -#~ msgid "Poland" -#~ msgstr "Польша" - -#~ msgid "Portugal" -#~ msgstr "Португалия" - -#~ msgid "Puerto Rico" -#~ msgstr "Пуэрто-Рико" - -#~ msgid "Qatar" -#~ msgstr "Катар" - -#~ msgid "" -#~ "Red Hat Logins and Passwords must be at least 5 alphanumeric characters" -#~ msgstr "Логины и пароли Red Hat должны быть не короче 5 символов" - -#~ msgid "Reunion" -#~ msgstr "Воссоздание" - -#~ msgid "Romania" -#~ msgstr "Румыния" - -#~ msgid "Russian Federation" -#~ msgstr "Российская Федерация" - -#~ msgid "Rwanda" -#~ msgstr "Руанда" - -#~ msgid "Saint Helena" -#~ msgstr "Остров Святой Елены" - -#~ msgid "Saint Kitts and Nevis" -#~ msgstr "Святой Киттс и Невис" - -#~ msgid "Saint Lucia" -#~ msgstr "Санта Лючия" - -#~ msgid "Saint Pierre and Miquelon " -#~ msgstr "Святой Пьер и Миккелон" - -#~ msgid "Saint Vincent and the Grenadines" -#~ msgstr "Сент-Винсент и Гренадины" - -#~ msgid "Samoa" -#~ msgstr "Самоа" - -#~ msgid "San Marino" -#~ msgstr "Сан Марино" - -#~ msgid "Sao Tome and Principe" -#~ msgstr "Сао Томе и Принцип" - -#~ msgid "Saudi Arabia" -#~ msgstr "Саудовская Аравия" - -#~ msgid "Senegal" -#~ msgstr "Сенегал" - -#~ msgid "Seychelles" -#~ msgstr "Сейшеллы" - -#~ msgid "Sierra Leone" -#~ msgstr "Сьерра Леоне" - -#~ msgid "Singapore" -#~ msgstr "Сингапур" - -#~ msgid "Slovakia" -#~ msgstr "Словакия" - -#~ msgid "Slovenia" -#~ msgstr "Словения" - -#~ msgid "Solomon Islands" -#~ msgstr "Острова Соломона" - -#~ msgid "Somalia" -#~ msgstr "Сомали" - -#~ msgid "South Africa" -#~ msgstr "Южная Африка" - -#~ msgid "South Georgia and the South Sandwich Island" -#~ msgstr "Южная Джорджия и южный Остров Сэндвич" - -#~ msgid "Spain" -#~ msgstr "Испания" - -#~ msgid "Sri Lanka" -#~ msgstr "Шри Ланка" - -#~ msgid "Sudan" -#~ msgstr "Судан" - -#~ msgid "Suriname" -#~ msgstr "Суринам" - -#~ msgid "Svalbard and Jan Mayen Islands" -#~ msgstr "Острова Свалбард и Ян Майен" - -#~ msgid "Swaziland" -#~ msgstr "Свазиленд" - -#~ msgid "Sweden" -#~ msgstr "Швеция" - -#~ msgid "Switzerland" -#~ msgstr "Швейцария" - -#~ msgid "Syrian Arab Republic" -#~ msgstr "Сирийская Арабская Республика" - -#~ msgid "Taiwan" -#~ msgstr "Тайвань" - -#~ msgid "Tajikistan" -#~ msgstr "Таджикистан" - -#~ msgid "Tanzania, United Republic of" -#~ msgstr "Танзания, Объединенная республика" - -#~ msgid "Thailand" -#~ msgstr "Тайланд" - -#~ msgid "Togo" -#~ msgstr "Того" - -#~ msgid "Tokelau" -#~ msgstr "Токелау" - -#~ msgid "Tonga" -#~ msgstr "Тонга" - -#~ msgid "Trinidad and Tobago" -#~ msgstr "Тринидад и Тобаго" - -#~ msgid "Tunisia" -#~ msgstr "Тунис" - -#~ msgid "Turkey" -#~ msgstr "Турция" - -#~ msgid "Turkmenistan" -#~ msgstr "Туркменистан" - -#~ msgid "Turks and Caicos Islands" -#~ msgstr "Острова Турок и Каикос" - -#~ msgid "Tuvalu" -#~ msgstr "Тувалу" - -#~ msgid "Uganda" -#~ msgstr "Уганда" - -#~ msgid "Ukraine" -#~ msgstr "Украина" - -#~ msgid "United Arab Emirates" -#~ msgstr "Объединенные Арабские Эмираты" - -#~ msgid "United Kingdom" -#~ msgstr "Обединенное Королевство (Британия)" - -#~ msgid "United States Minor Outlying Islands" -#~ msgstr "США Отдаленные Острова" - -#~ msgid "Uruguay" -#~ msgstr "Уругвай" - -#~ msgid "Uzbekistan" -#~ msgstr "Узбекистан" - -#~ msgid "Vanuatu" -#~ msgstr "Вануату" - -#~ msgid "Vatican City State (Holy See)" -#~ msgstr "Город Ватикан" - -#~ msgid "Venezuela" -#~ msgstr "Венесуэла" - -#~ msgid "Viet Nam" -#~ msgstr "Вьетнам" - -#~ msgid "Virgin Islands (British)" -#~ msgstr "Виргинские острова (Британия)" - -#~ msgid "Virgin Islands (U.S.)" -#~ msgstr "Виргинские острова (США)" - -#~ msgid "Wallis and Futuna Islands" -#~ msgstr "Острова Валлис и Футуна" - -#~ msgid "Western Sahara" -#~ msgstr "Западная Сахара" - -#~ msgid "Yemen" -#~ msgstr "Йемен" - -#~ msgid "Yugoslavia" -#~ msgstr "Югославия" - -#~ msgid "Zaire" -#~ msgstr "Заир" - -#~ msgid "Zambia" -#~ msgstr "Замибия" - -#~ msgid "Zimbabwe" -#~ msgstr "Зимбабве" commit 0478d841a08175f79d821ce1c43d388756dd1874 Author: Jan Hutar <jhutar(a)redhat.com> Date: Fri Jun 4 14:55:49 2010 +0200 Also fixed 'Info' -> 'info' as suggested by Milan Zazrivec. diff --git a/client/tools/rhnpush/rhnpush.py b/client/tools/rhnpush/rhnpush.py index de4a82b..695dea0 100755 --- a/client/tools/rhnpush/rhnpush.py +++ b/client/tools/rhnpush/rhnpush.py @@ -468,7 +468,7 @@ class UploadClass(uploadLib.UploadClass): # does an existance check of the packages to be uploaded and returns their checksum and other info def check_package_exists(self): - self.warn(2, "Computing checksum and package Info. This may take some time ...") + self.warn(2, "Computing checksum and package info. This may take some time ...") pkg_hash = {} digest_hash = {} commit 55597a404978154f237defd31576d972f7014577 Author: Jan Hutar <jhutar(a)redhat.com> Date: Fri Jun 4 14:45:35 2010 +0200 And one more space in 'sometime' as suggested by Jan Pazdziora diff --git a/client/tools/rhnpush/rhnpush.py b/client/tools/rhnpush/rhnpush.py index 7eed84d..de4a82b 100755 --- a/client/tools/rhnpush/rhnpush.py +++ b/client/tools/rhnpush/rhnpush.py @@ -468,7 +468,7 @@ class UploadClass(uploadLib.UploadClass): # does an existance check of the packages to be uploaded and returns their checksum and other info def check_package_exists(self): - self.warn(2, "Computing checksum and package Info. This may take sometime ...") + self.warn(2, "Computing checksum and package Info. This may take some time ...") pkg_hash = {} digest_hash = {} commit 36faa86470e8a6e9ecd84433260194729bdb1dcd Author: Jan Hutar <jhutar(a)redhat.com> Date: Fri Jun 4 14:18:49 2010 +0200 Just put space to the correct side diff --git a/client/tools/rhnpush/rhnpush.py b/client/tools/rhnpush/rhnpush.py index 5221284..7eed84d 100755 --- a/client/tools/rhnpush/rhnpush.py +++ b/client/tools/rhnpush/rhnpush.py @@ -468,7 +468,7 @@ class UploadClass(uploadLib.UploadClass): # does an existance check of the packages to be uploaded and returns their checksum and other info def check_package_exists(self): - self.warn(2, "Computing checksum and package Info .This may take sometime ...") + self.warn(2, "Computing checksum and package Info. This may take sometime ...") pkg_hash = {} digest_hash = {} commit e6d0d0c4901dab6c756974ca4a7911cf57eca1f3 Author: gguerrer <gguerrer(a)fedoraproject.org> Date: Fri Jun 4 02:05:03 2010 +0000 l10n: Updates to Spanish (Castilian) (es) translation Transmitted-via: Transifex (translate.fedoraproject.org) diff --git a/client/rhel/rhn-client-tools/po/es.po b/client/rhel/rhn-client-tools/po/es.po index b64bc9d..f90f47e 100644 --- a/client/rhel/rhn-client-tools/po/es.po +++ b/client/rhel/rhn-client-tools/po/es.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: spacewalk.rhn-client-tools.es\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-07 13:34+0200\n" -"PO-Revision-Date: 2010-06-03 16:45+1000\n" +"PO-Revision-Date: 2010-06-04 11:23+1000\n" "Last-Translator: Gladys Guerrero <gguerrer(a)redhat.com>\n" "Language-Team: Spanish <es(a)li.org>\n" "MIME-Version: 1.0\n" @@ -73,7 +73,7 @@ msgstr "Error al leer la información sobre la memoria del sistema:" #: ../src/up2date_client/hardware.py:672 msgid "Error reading networking information:" -msgstr "Error leyendo la información de la red:" +msgstr "Error al leer la información de la red:" #: ../src/up2date_client/hardware.py:693 msgid "Error reading install method information:" @@ -125,7 +125,7 @@ msgstr "Especifique un nombre de usuario para usar con un proxy http autenticado #: ../src/up2date_client/rhncli.py:53 msgid "Specify a password to use with an authenticated http proxy" -msgstr "Especifique la contraseña a usar con un proxy http autenticado" +msgstr "Especifique la contraseña a usar con un proxy de http autenticado" #: ../src/up2date_client/rhncli.py:76 msgid "" @@ -133,12 +133,12 @@ msgid "" "Aborted.\n" msgstr "" "\n" -" Cancelado.\n" +" Abortado.\n" #: ../src/up2date_client/rhncli.py:79 #, python-format msgid "An unexpected OS error occurred: %s\n" -msgstr "Ha ocurrido un error del SO no esperado: %s\n" +msgstr "Ha ocurrido un error inesperado del SO: %s\n" #: ../src/up2date_client/rhncli.py:83 msgid "A connection was attempted with a malformed URI.\n" @@ -212,12 +212,12 @@ msgstr "Copyright © 2006--2010 Red Hat, Inc. Todos los derechos reservados." #. Connect Window #: ../src/up2date_client/rhnreg_constants.py:16 msgid "Attempting to contact the Red Hat Network server." -msgstr "Intentado contactar al Servidor de la Red de Red Hat." +msgstr "Intentado contactar al Servidor de Red Hat Network." #: ../src/up2date_client/rhnreg_constants.py:17 #, python-format msgid "We are attempting to contact the Red Hat Network server at %s." -msgstr "Intentado contactar al Servidor de la Red de Red Hat en %s" +msgstr "Intentado contactar al servidor de Red Hat Network en %s." #: ../src/up2date_client/rhnreg_constants.py:19 #, python-format @@ -241,20 +241,20 @@ msgid "" " * The location of a Red Hat Network Satellite or Proxy (optional)\n" "\n" msgstr "" -"Este asistente los guiará a través de la conexión de su sistema con Red Hat " +"Este asistente los guiará a través de la conexión de su sistema a Red Hat " "Network (RHN) para recibir actualizaciones de software, incluyendo " "actualizaciones de seguridad que mantendrán su sistema soportado. En estos " "momentos necesitará lo siguiente:\n" "\n" -" * Una conexión de red\n" -" * Su Red Hat Login & contraseña\n" -" * La ubicación del Red Hat Network Satellite o Proxy (opcional)\n" +" * Una conexión a red\n" +" * Su nombre de cuenta de Red Hat & contraseña\n" +" * La ubicación de Red Hat Network Satellite o Proxy (opcional)\n" "\n" #. Why Register Window #: ../src/up2date_client/rhnreg_constants.py:36 ../data/rh_register.glade.h:91 msgid "Why Should I Connect to RHN? ..." -msgstr "¿Por qué me debo conectar a RHN?" +msgstr "¿Por qué me debo conectar a RHN? ..." #: ../src/up2date_client/rhnreg_constants.py:37 msgid "Why connect to Red Hat Network?" @@ -265,7 +265,7 @@ msgid "" "Connecting your system to Red Hat Network allows you to take full advantage " "of the benefits of a paid subscription, including:" msgstr "" -"Al conectar su sistema a la Red de Red Hat, podrá aprovechar las ventajas de " +"Al conectar su sistema a Red Hat Network, podrá aprovechar las ventajas de " "los beneficios de una suscripción paga, que incluye:" #: ../src/up2date_client/rhnreg_constants.py:40 @@ -343,7 +343,7 @@ msgid "" "You'll miss out on the benefits of a Red Hat Enterprise Linux subscription:\n" msgstr "" "¿Está seguro de no querer conectar su sistema a Red Hat Network? Perderá " -"los beneficios de una suscripción de Red Hat Enterprise Lin\nux:\n" +"los beneficios de una suscripción de Red Hat Enterprise Linux:\n" #: ../src/up2date_client/rhnreg_constants.py:62 msgid "" @@ -368,9 +368,8 @@ msgid "" "Please enter your login information for the %s Red Hat Network Satellite:\n" "\n" msgstr "" -"Por favor introduzca su información de login para el %s Red Hat Network " +"Por favor ingrese su información de nombre de cuenta para %s Red Hat Network " "Satellite:\n" -"\n" #: ../src/up2date_client/rhnreg_constants.py:71 msgid "Red Hat Login:" @@ -408,7 +407,7 @@ msgid "" "com/):\n" "\n" msgstr "" -"Por favor introduzca su información de cuenta para Red Hat Network (http://" +"Por favor ingrese su información de cuenta para Red Hat Network (http://" "rhn.redhat.com)\n" "\n" @@ -445,9 +444,8 @@ msgid "" msgstr "" "Ya se ha completado la información para el Perfil del Sistema.\n" "\n" -"Presione \"Siguiente\" para enviar este Perfil del Sistema a la Red de Red " -"Hat. Haga clic en \"Cancelar\" para no enviar ninguna información. Puede " -"ejecutar el programa de registración más tarde, tecleando `rhn_register` en " +"Presione \"Siguiente\" para enviar este Perfil del Sistema a Red Hat Network. Haga clic en \"Cancelar\" para no enviar ninguna información. Puede " +"ejecutar el programa de registro más tarde, tecleando `rhn_register` en " "la línea de comando." #: ../src/up2date_client/rhnreg_constants.py:98 @@ -463,22 +461,22 @@ msgstr "" "Puede ejecutar 'yum update' desde la línea de comandos de este sistema para " "obtener las últimas actualizaciones desde Red Hat Network. Necesitará " "ejecutar este comando periódicamente para obtener las últimas " -"actualizaciones. Alternativamente, puede configurar el sistema para recibir " -"actualizaciones de software automáticamente. (también conocido como " +"actualizaciones. Alternativamente, puede configurar el sistema para recibir automáticamente" +" actualizaciones de software. (también conocidas como " "'actualizaciones automáticas de erratas') a través de la interfaz web de Red " "Hat Network. (Las instrucciones sobre este tema están en el capítulo 6 del " "manual de referencia de RHN, disponibles desde el botón 'Ayuda' en la " -"interfaz web de Red Hat Network.)" +"interfaz web principal de Red Hat Network.)" #. Review Window #: ../src/up2date_client/rhnreg_constants.py:109 ../data/gui.glade.h:6 msgid "Review system subscription details" -msgstr "Revise la información de suscripción del sistema" +msgstr "Revise los detalles de información de suscripción del sistema" #: ../src/up2date_client/rhnreg_constants.py:110 #: ../data/rh_register.glade.h:67 msgid "Please review the subscription details below:" -msgstr "Por favor revise la información de la suscripción a continuación:" +msgstr "Por favor revise los detalles de la suscripción a continuación:" #: ../src/up2date_client/rhnreg_constants.py:111 #, python-format @@ -486,7 +484,7 @@ msgid "" "The installation number %s was activated during this system's initial " "connection to Red Hat Network." msgstr "" -"El numero de instalación %s fue activado durante la conexión inicial de este " +"El número de instalación %s fue activado durante la conexión inicial de este " "sistema a Red Hat Network." #: ../src/up2date_client/rhnreg_constants.py:113 @@ -507,7 +505,7 @@ msgid "" "channels:" msgstr "" "Este sistema recibirá suscripciones desde los siguientes canales de software " -"de la Red de Red Hat:" +"de Red Hat Network:" #: ../src/up2date_client/rhnreg_constants.py:118 msgid "" @@ -518,11 +516,11 @@ msgid "" "get updates for that product. See Kbase article 6227 for more details. " "(http://kbase.redhat.com/faq/FAQ_58_6227.shtm)" msgstr "" -"Advertencia: si un producto instalado en este sistema no se lista a " +"Advertencia: si algún producto instalado en este sistema no aparece en la lista a " "continuación, no recibirá actualizaciones o asistencia para ese producto. Si " "desea recibir actualizaciones para el producto, por favor inicie una sesión " -"en la interfaz web de su satellite y suscriba este sistema al canal de " -"software apropiado. Consulte el artículo Kbase 6227 para obtener mayor " +"en la interfaz web de su satélite y suscriba este sistema a canales de " +"software apropiados al producto. Consulte el artículo Kbase 6227 para obtener mayor " "información. (http://kbase.redhat.com/faq/FAQ_58_6227.shtm)" #: ../src/up2date_client/rhnreg_constants.py:129 @@ -534,7 +532,7 @@ msgid "" "for that product. See Kbase article 6227 for more details. (http://kbase." "redhat.com/faq/FAQ_58_6227.shtm)" msgstr "" -"Advertencia: si un producto instalado en este sistema no se lista a " +"Advertencia: si un producto instalado en este sistema no aparece en la lista a " "continuación, no recibirá actualizaciones o asistencia para ese producto. Si " "desea recibir actualizaciones para el producto, por favor visite http://rhn." "redhat.com/ y suscriba este sistema al canal de software apropiado. Consulte " @@ -589,7 +587,7 @@ msgid "" "associated with this system:" msgstr "" "Dependiendo de qué módulos RHN estén asociados a un sistema, disfrutará de " -"los diferentes beneficios de la Red de Red Hat. Los módulos RHN siguientes " +"los diferentes beneficios de Red Hat Network. Los módulos RHN siguientes " "están asociados con este sistema:" #: ../src/up2date_client/rhnreg_constants.py:160 @@ -629,9 +627,8 @@ msgid "" "Monitoring module: pre-defined and custom system performance probes, system " "performance email notifications, graphs of system performance" msgstr "" -"Módulo de monitoreo: pruebas de performance de sistema predefinidos y " -"personalizados, notificaciónes por email de la performance del sistema, " -"gráficos de la performance del sistema" +"Módulo de monitorización: sondeos de rendimiento de sistema predefinidos y " +"personalizados, notificaciones por correo-e del rendimiento del sistema y gráficos de rendimiento del sistema, " #: ../src/up2date_client/rhnreg_constants.py:173 msgid "" @@ -887,7 +884,7 @@ msgstr "Si, continuar" #: ../src/up2date_client/rhnreg_constants.py:281 msgid "Press <space> to deselect the option." -msgstr "Presione <espacio> para deseleccionar la opción." +msgstr "Presione <espacio> para desactivar la opción." #: ../src/up2date_client/rhnregGui.py:113 msgid "Automatic Subscription Activation" @@ -913,7 +910,7 @@ msgstr "Especificó un protocolo no válido. Solo https y http son permitidos." msgid "" "You will not be able to successfully register this system without contacting " "a Red Hat Network server." -msgstr "No podrá registrar este sistema exitósamente si no contacta al servidor de Red Hat Network." +msgstr "No podrá registrar este sistema si no contacta al servidor de Red Hat Network." #: ../src/up2date_client/rhnregGui.py:325 #, python-format @@ -1016,7 +1013,7 @@ msgstr "" #: ../src/up2date_client/rhnregGui.py:744 msgid "Registering System" -msgstr "Registrando el sistema." +msgstr "Registrando el sistema" #: ../src/up2date_client/rhnregGui.py:758 #: ../src/up2date_client/rhnregGui.py:762 @@ -1048,11 +1045,11 @@ msgstr "Se presentó un problema durante el registro de este sistema." #: ../src/up2date_client/rhnregGui.py:808 msgid "Sending hardware information" -msgstr "Enviando la información del hardware:" +msgstr "Enviando la información del hardware" #: ../src/up2date_client/rhnregGui.py:813 msgid "Problem sending hardware information." -msgstr "Problema al enviar la información del hardware:" +msgstr "Problema al enviar la información del hardware." #. # for row in range(self.regPackageArea.n_rows): #. # rowData = self.regPackageArea.get_row_data(row) @@ -1170,7 +1167,7 @@ msgid "" msgstr "" "Este error no debió haber ocurrido. Si desea ayudarnos a mejorar este " "programa, por favor llene un reporte de error en bugzilla.redhat.com. Es de " -"gran ayuda si incluye la parte de '%s'. Gracias." +"gran ayuda si incluye la parte de '%s'. !Gracias!" #: ../src/up2date_client/rhnreg.py:55 msgid "Warning: unable to enable rhnsd with chkconfig" @@ -1186,7 +1183,7 @@ msgstr "Error: El servidor no está disponible. Por favor intente más tarde." #: ../src/up2date_client/rpcServer.py:171 msgid "ERROR: can not find RHNS CA file" -msgstr "ERROR: no se pudo encontrar el archivo RHNS CA:" +msgstr "ERROR: no se pudo encontrar el archivo RHNS CA" #: ../src/up2date_client/rpcServer.py:207 msgid "Connection aborted by the user" @@ -1234,7 +1231,7 @@ msgstr "Actualizaciones limitadas únicamente" #: ../src/up2date_client/tui.py:452 msgid " Minor Release: " -msgstr "Lanzamiento menor:" +msgstr " Lanzamiento menor: " #: ../src/up2date_client/tui.py:467 msgid "All available updates" @@ -1248,7 +1245,7 @@ msgstr "Confirmar selección de lanzamiento de sistema operativo" msgid "" "Your system will be subscribed to the base software channel to receive all " "available updates." -msgstr "Su sistema estará suscrito al canal de software base para recibir todas las actualizaciones disponibles." +msgstr "Su sistema estará suscrito al canal de software de base para recibir todas las actualizaciones disponibles." #: ../src/up2date_client/tui.py:572 msgid "Register a System Profile - Hardware" @@ -1274,27 +1271,27 @@ msgstr "Incluya la siguiente información sobre el hardware y la red:" #: ../src/up2date_client/tui.py:603 ../src/up2date_client/tui.py:604 msgid "Version: " -msgstr "Versión:" +msgstr "Versión: " #: ../src/up2date_client/tui.py:610 msgid "CPU model: " -msgstr "Modelo de CPU:" +msgstr "Modelo de CPU: " #: ../src/up2date_client/tui.py:616 msgid "Hostname: " -msgstr "Nombre de equipo:" +msgstr "Nombre de equipo: " #: ../src/up2date_client/tui.py:627 msgid "CPU speed: " -msgstr "Velocidad de CPU:" +msgstr "Velocidad de CPU: " #: ../src/up2date_client/tui.py:633 msgid "IP Address: " -msgstr "Dirección IP:" +msgstr "Dirección IP: " #: ../src/up2date_client/tui.py:639 msgid "Memory: " -msgstr "Memoria:" +msgstr "Memoria: " #: ../src/up2date_client/tui.py:643 #, python-format @@ -1323,7 +1320,7 @@ msgstr "" #: ../src/up2date_client/tui.py:694 msgid "Include RPM packages installed on this system in my System Profile" -msgstr "Incluir paquetes RPM instalados en este sistema en mi Perfil de Sistema." +msgstr "Incluir paquetes RPM instalados en este sistema en mi Perfil de Sistema" #: ../src/up2date_client/tui.py:698 msgid "You may deselect individual packages by unchecking them below." @@ -1363,12 +1360,12 @@ msgstr "Finalizar" #: ../src/up2date_client/tui.py:1067 msgid "You specified an invalid protocol." -msgstr "Especificó un protocolo no válido." +msgstr "Especificó un protocolo inválido." #: ../src/up2date_client/tui.py:1106 msgid " <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen" msgstr "" -" <Tab>/<Alt-Tab> entre elementos | <Espacio> selecciona | <F12> pantalla " +" <Tab>/<Alt-Tab> entre elementos | <Espacio> selecciona | <F12> pantalla " "siguiente" #: ../src/up2date_client/tui.py:1200 @@ -1446,7 +1443,7 @@ msgstr "No se ha instalado GPG de forma adecuada." #: ../src/up2date_client/up2dateErrors.py:237 msgid "GPG keyring does not include the Red Hat, Inc. public package-signing key" msgstr "" -"El llavero GPG no incluye la clave pública para firma de paquetres de Red " +"El llavero GPG no incluye la clave pública para firma de paquetes de Red " "Hat, Inc." #: ../src/up2date_client/up2dateErrors.py:249 @@ -1629,12 +1626,11 @@ msgstr "Especifique una llave de activación" #: ../src/bin/rhnreg_ks.py:58 msgid "Subscribe this system to the EUS channel tied to the system's redhat-release" -msgstr "Suscriba este sistema al canal EUS ligado a la versión de redhat del sistema" +msgstr "Suscriba este sistema al canal EUS ligado al lanzamiento de redhat del sistema" #: ../src/bin/rhnreg_ks.py:60 msgid "[Deprecated] Read contact info from stdin" msgstr "" -"" "[Descontinuado] Lea la información de contacto desde stdin" "Leer la información de contacto desde stdin " @@ -1644,7 +1640,7 @@ msgstr "No pruebe o cargue ninguna información sobre el hardware " #: ../src/bin/rhnreg_ks.py:64 msgid "Do not profile or upload any package info" -msgstr "No perfile o cargue ninguna información del paquete " +msgstr "No perfile o cargue ninguna información de paquete " #: ../src/bin/rhnreg_ks.py:66 msgid "Do not upload any virtualization info" @@ -1714,7 +1710,7 @@ msgstr "Registrándose para actualizaciones de software" #: ../data/gui.glade.h:7 msgid "Select operating system release" -msgstr "Seleccione la versión de sistema operativo" +msgstr "Seleccione el lanzamiento de sistema operativo" #: ../data/progress.glade.h:1 msgid "Progress Dialog" @@ -1770,14 +1766,14 @@ msgid "" "be set up for software updates at this time." msgstr "" "La conexión de red en su sistema no está activa. Su sistema no pudo ser " -"configurado para recibir actualizaciones de software esta vez" +"configurado para recibir actualizaciones de software esta vez." #: ../data/rh_register.glade.h:13 msgid "" "Tip: Minor releases with a '*' are currently fully supported by Red " "Hat." msgstr "" -"Consejo: Las versiones menores con un '*' son actualmente soportadas totalmente por Red " +"Consejo: Actualmente, los lanzamientos menores con un '*' son soportados totalmente por Red " "Hat." #: ../data/rh_register.glade.h:14 @@ -1785,7 +1781,7 @@ msgid "" "Warning: You will not be able to limit this system to a minor " "release that is older than the most recent minor release if you select this " "option." -msgstr "" +msgstr "Advertencia: Al seleccionar esta opción usted no podrá limitar este sistema a un lanzamiento que es anterior al lanzamiento menor más reciente." #: ../data/rh_register.glade.h:15 msgid "" @@ -1793,13 +1789,13 @@ msgid "" "need to do one of the following to create an active subscription in your " "account before this system can be registered:" msgstr "" -"No tiene suscripciones activas disponible en su cuenta. Deberá " +"No tiene suscripciones activas disponibles en su cuenta. Deberá " "realizar uno de los pasos siguientes para crear una suscripción activa en su " "cuenta antes de que este sistema pueda ser registrado:" #: ../data/rh_register.glade.h:16 msgid "Your system was registered for updates during installation." -msgstr "" +msgstr "Su sistema fue registrado para obtener actualizaciones durante la instalación." #: ../data/rh_register.glade.h:17 msgid "" @@ -1807,18 +1803,18 @@ msgid "" "if kept updated, will always be equivalent to the latest available minor " "release of Red Hat Enterprise Linux 5. It will be registered to the main " "'Red Hat Enterprise Linux 5' software channel." -msgstr "" +msgstr "Todas las _actualizaciones disponibles serán provistas a este sistema. Si se mantiene actualizado, este sistema, siempre será equivalente al lanzamiento menor más reciente de Red Hat Enterprise Linux 5. Siempre estará registrado al canal de software de 'Red Hat Enterprise Linux 5'." #: ../data/rh_register.glade.h:18 msgid "" "_Limited updates will be provided to this system to maintain " "compatibility with the following eligible Red Hat Enterprise Linux minor " "release software channel:" -msgstr "" +msgstr "Actualizaciones _limitadas serán proporcionadas a este sistema para mantener compatibilidad con el siguiente lanzamiento menor de canal de software de Red Hat Enterprise Linux:" #: ../data/rh_register.glade.h:19 msgid "<big>Moving to earlier releases won't be possible</big>" -msgstr "" +msgstr "<big>El desplazamiento a lanzamientos anteriores no será posible</big>" #: ../data/rh_register.glade.h:20 msgid "<big>Profile Data</big>" @@ -1841,21 +1837,20 @@ msgid "Example: XXXX-XXXX-XXXX-XXXX" msgstr "Ejemplo: XXXX-XXXX-XXXX-XXXX" #: ../data/rh_register.glade.h:25 -#, fuzzy msgid "" "Tip: Red Hat values your privacy: http://www.redhat.com/legal/" "privacy_statement.html." msgstr "" -"Consejo: Red Hat valora su privacidad: http://www.redhat.com/legal/" -"privacy_statement.html" +"Consejo: Red Hat valora su privacidad: http://www.redhat.com/legal/" +"privacy_statement.html." #: ../data/rh_register.glade.h:26 msgid "" "Tip: Forgot your login or password? Contact your Satellite's " "Organization Administrator." msgstr "" -"Sugerencia: ¿Olvido su nombre de usuario o contraseña? Contacte al " -"Administrador de la organización de su Satellite." +"Sugerencia: ¿Olvidó su nombre de usuario o contraseña? Contacte al " +"Administrador de la organización de su Satélite." #: ../data/rh_register.glade.h:27 msgid "" @@ -1915,17 +1910,16 @@ msgid "Certificate _Location:" msgstr "Ubicación de_l certificado:" #: ../data/rh_register.glade.h:42 -#, fuzzy msgid "Choose Channel" -msgstr "Escoja una organización" +msgstr "Elija un canal" #: ../data/rh_register.glade.h:44 msgid "Confirm operation system release selection" -msgstr "" +msgstr "Confirme la selección del lanzamiento de sistema operativo" #: ../data/rh_register.glade.h:46 msgid "Create profile" -msgstr "Crear un perfil" +msgstr "Cree un perfil" #: ../data/rh_register.glade.h:48 msgid "ERROR" @@ -1933,19 +1927,19 @@ msgstr "ERROR" #: ../data/rh_register.glade.h:49 msgid "Enter Your Account Information" -msgstr "Introduzca la información de su cuenta" +msgstr "Ingrese la información de su cuenta" #: ../data/rh_register.glade.h:50 msgid "Enter in the format hostname(:port)" -msgstr "Introduzca en el formato nombre de host(:port)" +msgstr "Ingrese en el formato nombre de host(:port)" #: ../data/rh_register.glade.h:51 msgid "Hardware Info" -msgstr "Información del Hardware" +msgstr "Información de hardware" #: ../data/rh_register.glade.h:52 msgid "Hardware Profile" -msgstr "Perfil de Hardware" +msgstr "Perfil de hardware" #: ../data/rh_register.glade.h:53 msgid "Hostname:" @@ -1956,9 +1950,8 @@ msgid "" "I _don't have an SSL certificate. I will contact my system " "administrator for assistance and will register at a later time." msgstr "" -"No tengo un certificado SSL. Voy a contactar mi administrador del " -"sistema para obtener asistencia y continuaré con el proceso de registro " -"posteriormente." +"No tengo un certificado SSL. Voy a contactar a mi administrador del " +"sistema para obtener asistencia y me registraré posteriormente." #: ../data/rh_register.glade.h:55 msgid "" @@ -1967,7 +1960,7 @@ msgid "" "below:" msgstr "" "Tengo acceso a un Red Hat Network Satellite o Red Hat Network " -"Proxy. Me gustaría recibir actualizaciones desde el Satélite o el Proxy " +"Proxy. Me gustaría recibir actualizaciones del Satélite o Proxy " "dado a continuación:" #: ../data/rh_register.glade.h:56 @@ -1983,8 +1976,8 @@ msgid "" "I'd like to receive updates from Red Hat Network. (I don't have " "access to a Red Hat Network Satellite or Proxy.)" msgstr "" -"Me gustaría recibir actualizaciones desde la Red de Red Hat. (No " -"tengo accdeso a un Satélite de la Red de Red Hat o a un Proxy.)" +"Me gustaría recibir actualizaciones desde Red Hat Network. (No " +"tengo acceso a Red Hat Network Satellite o Proxy.)" #: ../data/rh_register.glade.h:59 msgid "IP Address:" @@ -2210,7 +2203,6 @@ msgstr "" "disponible, lo guiará a través de la aplicación de actualizaciones:" #: ../data/rh_register.glade.h:104 -#, fuzzy msgid "" "Your system is ready to receive the software updates that will keep it " "secure and supported.\n" @@ -2220,20 +2212,20 @@ msgid "" "circled below.) Clicking on this icon, when available, will guide you " "through applying any updates that are available:" msgstr "" -"Su sistema esta ahora listo para recibir las actualizaciones de software que " -"lo mantendrán seguro y soportado.\n" +"El sistema está listo para recibir las actualizaciones de software que " +"mantendrán su seguridad y soporte.\n" "\n" "Usted sabrá que hay actualizaciones de software cuando aparezca un icono de " "paquete en el área de notificación de su escritorio (generalmente en la " -"esquina superior derecha). Si hace clic sobre el icono, cuando éste está " -"disponible, lo guiará a través de la aplicación de actualizaciones:" +"esquina superior derecha). Si hace clic sobre el icono, cuando éste esté " +"disponible, lo guiará en la aplicación de actualizaciones disponibles:" #: ../data/rh_register.glade.h:107 msgid "" "Your system will be subscribed to the base software channel. You will not " "be able to move this system to an earlier minor release channel if you " "continue (you will be able to move to a later release.)" -msgstr "" +msgstr "Su sistema será suscrito al canal de software de base. No podrá desplazar este sistema a un canal de lanzamiento menor anterior si continúa (podrá desplazarse a un lanzamiento posterior.)" #: ../data/rh_register.glade.h:108 msgid "" @@ -2257,11 +2249,11 @@ msgstr "_Login:" #: ../data/rh_register.glade.h:112 msgid "_Minor release:" -msgstr "" +msgstr "Lanzamiento _menor:" #: ../data/rh_register.glade.h:113 msgid "_No thanks, I'll connect later." -msgstr "_No gracias. Luego me conectaré." +msgstr "_No gracias. Me conectaré después." #: ../data/rh_register.glade.h:114 msgid "_No, Cancel" @@ -2273,7 +2265,7 @@ msgstr "_No, prefiero registrarme posteriormente." #: ../data/rh_register.glade.h:116 msgid "_Operating system version:" -msgstr "" +msgstr "Versión de sistema _operativo:" #: ../data/rh_register.glade.h:117 msgid "_Password:" @@ -2317,27 +2309,25 @@ msgstr "•" #: ../data/rh_register.glade.h:127 msgid "• A name for your system's Red Hat Network profile" -msgstr "• Un nombre para el perfil Red Hat Network de su sistema" +msgstr "• Un nombre para el perfil de Red Hat Network de su sistema" #: ../data/rh_register.glade.h:128 msgid "• The address to your Red Hat Network Satellite (optional)" -msgstr "• La dirección de si Red Hat Network Satellite (opcional)" +msgstr "• La dirección para su Red Hat Network Satellite (opcional)" #: ../data/rh_register.glade.h:129 msgid "• Your Red Hat Network or Red Hat Network Satellite login " -msgstr "• Su login de Red Hat Network o Red Hat Network Satellite" +msgstr "• Su nombre de cuenta de Red Hat Network o Red Hat Network Satellite" #: ../rhn_register.desktop.in.h:1 -#, fuzzy msgid "RHN Registration" -msgstr "registration_number" +msgstr "Registro de RHN" #: ../rhn_register.desktop.in.h:2 msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network" -msgstr "" +msgstr "Registro a Spacewalk/Satellite/Red Hat Network." #: ../rhn_register.desktop.in.h:3 -#, fuzzy msgid "Register to Spacewalk/Satellite/Red Hat Network." -msgstr "Registrarse con Red Hat Network" +msgstr "Registrarse a Spacewalk/Satellite/Red Hat Network." commit 89adb533a9117464004a6225cc6d5d1d40d300c6 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Jun 3 14:53:01 2010 +0200 Automatic commit of package [spacewalk-backend] release [1.1.19-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 1684e9a..103f39f 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -8,7 +8,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 1.1.18 +Version: 1.1.19 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -631,6 +631,8 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Thu Jun 03 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.1.19-1 +- removed duplicated code from export routines * Mon May 31 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.1.18-1 - fixed package build error diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index a2faabf..3d31023 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -1.1.18-1 backend/ +1.1.19-1 backend/ commit 909ae679269dbf98c261ac1b31b683600e91faf6 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Jun 1 15:50:13 2010 +0200 since ErrataSynopsisDumper removal, ErrataDumper and ErrataDumperEx are equal diff --git a/backend/satellite_tools/disk_dumper/dumper.py b/backend/satellite_tools/disk_dumper/dumper.py index b98b00b..c82865b 100644 --- a/backend/satellite_tools/disk_dumper/dumper.py +++ b/backend/satellite_tools/disk_dumper/dumper.py @@ -751,7 +751,7 @@ class XML_DumperEx(XML_Dumper): writer = self._get_xml_writer() dumper = SatelliteDumper(writer, - ErrataDumperEx(writer, errata_hash.values())) + ErrataDumper(writer, errata_hash.values())) dumper.dump() writer.flush() log_debug(4, "OK") @@ -1305,40 +1305,6 @@ class ErrataDumper(CachedDumper, exportLib.ErrataDumper): log_debug(6, data) return exportLib.ErrataDumper.dump_subelement(self, data) -class ErrataDumperEx(CachedDumper, exportLib.ErrataDumper): - def __init__(self, writer, errata): - h = rhnSQL.prepare(""" - select - e.id, - e.org_id, - e.advisory_name, - e.advisory, - e.advisory_type, - e.advisory_rel, - e.product, - e.description, - e.synopsis, - e.topic, - e.solution, - TO_CHAR(e.issue_date, 'YYYYMMDDHH24MISS') issue_date, - TO_CHAR(e.update_date, 'YYYYMMDDHH24MISS') update_date, - TO_CHAR(e.last_modified, 'YYYYMMDDHH24MISS') last_modified, - e.refers_to, - e.notes - from rhnErrata e - where e.id = :errata_id - """) - CachedDumper.__init__(self, writer, statement=h, params=errata) - - def _get_key(self, params): - errata_id = str(params['errata_id']) - hash_val = rhnLib.hash_object_id(errata_id, 1) - return "xml-errata/%s/rhn-erratum-%s.xml" % (hash_val, errata_id) - - def _dump_subelement(self, data): - log_debug(6, data) - return exportLib.ErrataDumper.dump_subelement(self, data) - class KickstartableTreesDumper(CachedDumper, exportLib.KickstartableTreesDumper): _query_lookup_ks_tree = rhnSQL.Statement(""" select kt.id, commit 473815c490e42e4e5e76eb47aa9f3a90b14bae0e Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Jun 1 15:46:30 2010 +0200 once synposis_column has been removed from ErrataDumper, ErrataSynopsisDumper is equal to ErrataDumper diff --git a/backend/satellite_tools/disk_dumper/dumper.py b/backend/satellite_tools/disk_dumper/dumper.py index 0c385e8..b98b00b 100644 --- a/backend/satellite_tools/disk_dumper/dumper.py +++ b/backend/satellite_tools/disk_dumper/dumper.py @@ -1305,7 +1305,7 @@ class ErrataDumper(CachedDumper, exportLib.ErrataDumper): log_debug(6, data) return exportLib.ErrataDumper.dump_subelement(self, data) -class ErrataDumperEx(CachedDumper, exportLib.ErrataSynopsisDumper): +class ErrataDumperEx(CachedDumper, exportLib.ErrataDumper): def __init__(self, writer, errata): h = rhnSQL.prepare(""" select @@ -1337,7 +1337,7 @@ class ErrataDumperEx(CachedDumper, exportLib.ErrataSynopsisDumper): def _dump_subelement(self, data): log_debug(6, data) - return exportLib.ErrataSynopsisDumper.dump_subelement(self, data) + return exportLib.ErrataDumper.dump_subelement(self, data) class KickstartableTreesDumper(CachedDumper, exportLib.KickstartableTreesDumper): _query_lookup_ks_tree = rhnSQL.Statement(""" diff --git a/backend/satellite_tools/exporter/exportLib.py b/backend/satellite_tools/exporter/exportLib.py index e9f8e69..55a2872 100644 --- a/backend/satellite_tools/exporter/exportLib.py +++ b/backend/satellite_tools/exporter/exportLib.py @@ -1017,17 +1017,6 @@ class _ErratumDumper(BaseRowDumper): return ArrayIterator(arr) -class ErrataSynopsisDumper(ErrataDumper): - # include severity into synopsis before - # exporting to satellite. - # Also ignore the first 18 characters in - # the label(errata.sev.label.) from - # rhnErrataSeverity table - synposis_column = """ - (select SUBSTR(label,18) || ':' - from rhnErrataSeverity - where id = e.severity_id) || e.synopsis synposis,""" - class _ErratumKeywordDumper(BaseDumper): tag_name = 'rhn-erratum-keywords' commit 5d28295e8e4be69ba9187d66cc805544f91e97ef Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Jun 1 15:42:22 2010 +0200 removed query not unsed anywhere, because all subclasses set iterator in their __init__() moreover there has been a syntax error (e.synposis) diff --git a/backend/satellite_tools/exporter/exportLib.py b/backend/satellite_tools/exporter/exportLib.py index 5a6ca8a..e9f8e69 100644 --- a/backend/satellite_tools/exporter/exportLib.py +++ b/backend/satellite_tools/exporter/exportLib.py @@ -906,36 +906,10 @@ class _PackageFilesDumper(BaseDumper): class ErrataDumper(BaseDumper): tag_name = 'rhn-errata' - synposis_column = "e.synposis," - def set_iterator(self): if self._iterator: return self._iterator - - _query_errata_info = """ - select - e.id, - e.org_id, - e.advisory_name, - e.advisory, - e.advisory_type, - e.advisory_rel, - e.product, - e.description, - %s - e.topic, - e.solution, - TO_CHAR(e.issue_date, 'YYYYMMDDHH24MISS') issue_date, - TO_CHAR(e.update_date, 'YYYYMMDDHH24MISS') update_date, - TO_CHAR(e.last_modified, 'YYYYMMDDHH24MISS') last_modified, - e.refers_to, - e.notes - from rhnErrata e - where rownum < 3 - """ - h = rhnSQL.prepare(_query_errata_info % self.synposis_column) - h.execute() - return h + raise NotImplementedError, "To be overridden in a child class" def dump_subelement(self, data): d = _ErratumDumper(self._writer, data) commit 8beaf5a5178e1c56d1fa42537f6a83674cb69325 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Jun 1 14:33:45 2010 +0200 _ErratumSynopsisDumper not used anywhere diff --git a/backend/satellite_tools/exporter/exportLib.py b/backend/satellite_tools/exporter/exportLib.py index 6b69a3a..5a6ca8a 100644 --- a/backend/satellite_tools/exporter/exportLib.py +++ b/backend/satellite_tools/exporter/exportLib.py @@ -1054,13 +1054,6 @@ class ErrataSynopsisDumper(ErrataDumper): from rhnErrataSeverity where id = e.severity_id) || e.synopsis synposis,""" -class _ErratumSynopsisDumper(_ErratumDumper): - # SATSYNC: Ignore the Oval files stuff(typeid=4) - # while exporting errata File info to satellite - type_id_column = """and ef.type != (select id - from rhnErrataFileType - where label = 'OVAL')""" - class _ErratumKeywordDumper(BaseDumper): tag_name = 'rhn-erratum-keywords' commit f306db35a6f6a7b2d209ea57a19ed7d290c0c1cf Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Jun 1 12:08:51 2010 +0200 removed ChannelsDumper.__init__() which only call __init__() from its parrent diff --git a/backend/satellite_tools/disk_dumper/dumper.py b/backend/satellite_tools/disk_dumper/dumper.py index c721c4a..0c385e8 100644 --- a/backend/satellite_tools/disk_dumper/dumper.py +++ b/backend/satellite_tools/disk_dumper/dumper.py @@ -974,8 +974,6 @@ class ChannelsDumper(exportLib.ChannelsDumper): and c.parent_channel = pc.id (+) and c.checksum_type_id = ct.id (+) """) - def __init__(self, writer, channels): - exportLib.ChannelsDumper.__init__(self, writer, channels) def dump_subelement(self, data): log_debug(6, data) commit c1b998d6b0685573a4d7f3c2433e18ed66fcceda Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Jun 1 11:56:28 2010 +0200 removed methods and queries from _ChannelsDumper which are exact copies of exportLib._ChannelDumper's ones diff --git a/backend/satellite_tools/disk_dumper/dumper.py b/backend/satellite_tools/disk_dumper/dumper.py index 41f392c..c721c4a 100644 --- a/backend/satellite_tools/disk_dumper/dumper.py +++ b/backend/satellite_tools/disk_dumper/dumper.py @@ -994,39 +994,6 @@ class ChannelsDumper(exportLib.ChannelsDumper): class _ChannelsDumper(exportLib._ChannelDumper): tag_name = 'rhn-channel' - def set_attributes(self): - channel_id = self._row['id'] - - packages = map(lambda x: "rhn-package-%s" % x, self._get_package_ids()) - # XXX channel-errata is deprecated and should go away in dump version - # 3 or higher - we now dump that information in its own subelement - # rhn-channel-errata - errata = map(lambda x: "rhn-erratum-%s" % x, self._get_errata_ids()) - ks_trees = self._get_kickstartable_trees() - - return { - 'channel-id' : 'rhn-channel-%s' % channel_id, - 'org_id' : self._row['org_id'], - 'label' : self._row['label'], - 'channel-arch' : self._row['channel_arch'], - 'packages' : string.join(packages), - 'channel-errata' : string.join(errata), - 'kickstartable-trees' : string.join(ks_trees), - } - - _query_channel_families = rhnSQL.Statement(""" - select cf.id, cf.label - from rhnChannelFamily cf, rhnChannelFamilyMembers cfm - where cfm.channel_family_id = cf.id - and cfm.channel_id = :channel_id - """) - _query_dist_channel_map = rhnSQL.Statement(""" - select dcm.os, dcm.release, ca.label channel_arch - from rhnDistChannelMap dcm, rhnChannelArch ca - where dcm.channel_id = :channel_id - and dcm.channel_arch_id = ca.id - """) - def set_iterator(self): channel_id = self._row['id'] arr = [] @@ -1103,32 +1070,6 @@ class _ChannelsDumper(exportLib._ChannelDumper): h.execute(channel_id=channel_id) return map(lambda x: x['package_id'], h.fetchall_dict() or []) - _query_get_source_package_ids = rhnSQL.Statement(""" - select distinct ps.id, sr.name source_rpm, - TO_CHAR(ps.last_modified, 'YYYYMMDDHH24MISS') last_modified - from rhnChannelPackage cp, rhnPackage p, rhnPackageSource ps, - rhnSourceRPM sr - where cp.channel_id = :channel_id - and cp.package_id = p.id - and p.source_rpm_id = ps.source_rpm_id - and ((p.org_id is null and ps.org_id is null) or - p.org_id = ps.org_id) - and ps.source_rpm_id = sr.id - """) - def _get_cursor_source_packages(self): - channel_id = self._row['id'] - h = rhnSQL.prepare(self._query_get_source_package_ids) - h.execute(channel_id=channel_id) - return h - - _query__get_errata_ids = rhnSQL.Statement(""" - select ce.errata_id, e.advisory_name, - TO_CHAR(e.last_modified, 'YYYYMMDDHH24MISS') last_modified - from rhnChannelErrata ce, rhnErrata e - where ce.channel_id = :channel_id - and ce.errata_id = e.id - """) - _query__get_errata_ids_by_limits = rhnSQL.Statement(""" select ce.errata_id, e.advisory_name, TO_CHAR(e.last_modified, 'YYYYMMDDHH24MISS') last_modified @@ -1152,13 +1093,6 @@ class _ChannelsDumper(exportLib._ChannelDumper): h.execute(channel_id=channel_id) return map(lambda x: x['errata_id'], h.fetchall_dict() or []) - _query_get_kickstartable_trees = rhnSQL.Statement(""" - select kt.label - from rhnKickstartableTree kt - where kt.channel_id = :channel_id - and kt.org_id is null - """) - _query_get_kickstartable_trees_by_limits = rhnSQL.Statement(""" select kt.label from rhnKickstartableTree kt commit e0d23ec6d08a059df18ed63c5d799c87a4c9a461 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Sat May 29 00:26:17 2010 +0200 removed unused import diff --git a/backend/satellite_tools/disk_dumper/dumper.py b/backend/satellite_tools/disk_dumper/dumper.py index 72afad3..41f392c 100644 --- a/backend/satellite_tools/disk_dumper/dumper.py +++ b/backend/satellite_tools/disk_dumper/dumper.py @@ -15,7 +15,6 @@ # import time -import math import gzip import string import tempfile commit 2b578920101c3e57f8d3b541ee4916c576241721 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Sat May 29 00:21:46 2010 +0200 removed dump_blacklist_obsoletes(), dump_arches(), dump_server_group_type_server_arches() and _cache_channel_packages_short() from XML_DumperEx because they are identical to those in XML_Dumper which it's inherited from diff --git a/backend/satellite_tools/disk_dumper/dumper.py b/backend/satellite_tools/disk_dumper/dumper.py index a067239..72afad3 100644 --- a/backend/satellite_tools/disk_dumper/dumper.py +++ b/backend/satellite_tools/disk_dumper/dumper.py @@ -609,55 +609,6 @@ class XML_DumperEx(XML_Dumper): log_debug(3, "Closed") # Dumper functions here - def dump_blacklist_obsoletes(self): - log_debug(2) - writer = self._get_xml_writer() - dumper = SatelliteDumper(writer, - exportLib.BlacklistObsoletesDumper(writer)) - dumper.dump() - writer.flush() - log_debug(4, "OK") - self.close() - return 0 - - def dump_arches(self, rpm_arch_type_only=0): - log_debug(2) - writer = self._get_xml_writer() - dumper = SatelliteDumper(writer, - exportLib.ChannelArchesDumper(writer, - rpm_arch_type_only=rpm_arch_type_only), - exportLib.PackageArchesDumper(writer, - rpm_arch_type_only=rpm_arch_type_only), - exportLib.ServerArchesDumper(writer, - rpm_arch_type_only=rpm_arch_type_only), - exportLib.CPUArchesDumper(writer), - exportLib.ServerPackageArchCompatDumper(writer, - rpm_arch_type_only=rpm_arch_type_only), - exportLib.ServerChannelArchCompatDumper(writer, - rpm_arch_type_only=rpm_arch_type_only), - exportLib.ChannelPackageArchCompatDumper(writer, - rpm_arch_type_only=rpm_arch_type_only), - ) - dumper.dump() - writer.flush() - log_debug(4, "OK") - self.close() - return 0 - - def dump_server_group_type_server_arches(self, rpm_arch_type_only=0, - virt_filter=0): - log_debug(2) - writer = self._get_xml_writer() - dumper = SatelliteDumper(writer, - exportLib.ServerGroupTypeServerArchCompatDumper(writer, - rpm_arch_type_only=rpm_arch_type_only, virt_filter=virt_filter), - ) - dumper.dump() - writer.flush() - log_debug(4, "OK") - self.close() - return 0 - def dump_channel_families(self, virt_filter=0): log_debug(2) @@ -736,36 +687,6 @@ class XML_DumperEx(XML_Dumper): # We're done return 0 - def _cache_channel_packages_short(self, channel_id, key, last_modified): - """ Caches the short package entries for channel_id """ - # Create a temporary file - temp_stream = tempfile.TemporaryFile() - # Always compress the result - compress_level = 5 - stream = gzip.GzipFile(None, "wb", compress_level, temp_stream) - writer = xmlWriter.XMLWriter(stream=stream) - - # Fetch packages - h = rhnSQL.prepare(self._query_get_channel_packages) - h.execute(channel_id=channel_id) - package_ids = h.fetchall_dict() or [] - # Sort packages - package_ids.sort(lambda a, b: cmp(a['package_id'], b['package_id'])) - - dumper = SatelliteDumper(writer, - ShortPackagesDumper(writer, package_ids)) - dumper.dump() - writer.flush() - # We're done with the stream object - stream.close() - del stream - temp_stream.seek(0, 0) - # Set the value in the cache. We don't recompress the result since - # it's already compressed - rhnCache.set(key, temp_stream.read(), modified=last_modified, - compressed=0, raw=1) - return self._normalize_compressed_stream(temp_stream) - def _packages(self, packages, prefix, dump_class, sources=0): if sources: h = self.get_source_packages_statement() commit 1a9000ae28b1677de5eaaf0a3bd372a4eae41d23 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Sat May 29 00:09:14 2010 +0200 removed SatelliteDumperEx; it's equivalent of SatelliteDumper diff --git a/backend/satellite_tools/disk_dumper/dumper.py b/backend/satellite_tools/disk_dumper/dumper.py index 4799997..a067239 100644 --- a/backend/satellite_tools/disk_dumper/dumper.py +++ b/backend/satellite_tools/disk_dumper/dumper.py @@ -612,7 +612,7 @@ class XML_DumperEx(XML_Dumper): def dump_blacklist_obsoletes(self): log_debug(2) writer = self._get_xml_writer() - dumper = SatelliteDumperEx(writer, + dumper = SatelliteDumper(writer, exportLib.BlacklistObsoletesDumper(writer)) dumper.dump() writer.flush() @@ -623,7 +623,7 @@ class XML_DumperEx(XML_Dumper): def dump_arches(self, rpm_arch_type_only=0): log_debug(2) writer = self._get_xml_writer() - dumper = SatelliteDumperEx(writer, + dumper = SatelliteDumper(writer, exportLib.ChannelArchesDumper(writer, rpm_arch_type_only=rpm_arch_type_only), exportLib.PackageArchesDumper(writer, @@ -648,7 +648,7 @@ class XML_DumperEx(XML_Dumper): virt_filter=0): log_debug(2) writer = self._get_xml_writer() - dumper = SatelliteDumperEx(writer, + dumper = SatelliteDumper(writer, exportLib.ServerGroupTypeServerArchCompatDumper(writer, rpm_arch_type_only=rpm_arch_type_only, virt_filter=virt_filter), ) @@ -665,7 +665,7 @@ class XML_DumperEx(XML_Dumper): h.execute() writer = self._get_xml_writer() - dumper = SatelliteDumperEx(writer, + dumper = SatelliteDumper(writer, exportLib.ChannelFamiliesDumper(writer, data_iterator=h, null_max_members=0, virt_filter=virt_filter),) dumper.dump() @@ -679,7 +679,7 @@ class XML_DumperEx(XML_Dumper): channels = self._validate_channels(channel_labels=channel_labels) writer = self._get_xml_writer() - dumper = SatelliteDumperEx(writer, ChannelsDumperEx(writer, + dumper = SatelliteDumper(writer, ChannelsDumperEx(writer, channels=channels.values())) dumper.dump() writer.flush() @@ -752,7 +752,7 @@ class XML_DumperEx(XML_Dumper): # Sort packages package_ids.sort(lambda a, b: cmp(a['package_id'], b['package_id'])) - dumper = SatelliteDumperEx(writer, + dumper = SatelliteDumper(writer, ShortPackagesDumper(writer, package_ids)) dumper.dump() writer.flush() @@ -794,7 +794,7 @@ class XML_DumperEx(XML_Dumper): packages_hash[package_id] = row writer = self._get_xml_writer() - dumper = SatelliteDumperEx(writer, + dumper = SatelliteDumper(writer, dump_class(writer, packages_hash.values())) dumper.dump() writer.flush() @@ -830,7 +830,7 @@ class XML_DumperEx(XML_Dumper): errata_hash[errata_id] = row writer = self._get_xml_writer() - dumper = SatelliteDumperEx(writer, + dumper = SatelliteDumper(writer, ErrataDumperEx(writer, errata_hash.values())) dumper.dump() writer.flush() @@ -844,7 +844,7 @@ class XML_DumperEx(XML_Dumper): kickstart_labels=kickstart_labels) writer = self._get_xml_writer() - dumper = SatelliteDumperEx(writer, + dumper = SatelliteDumper(writer, KickstartableTreesDumper(writer, kickstarts=kickstarts)) dumper.dump() writer.flush() @@ -855,7 +855,7 @@ class XML_DumperEx(XML_Dumper): def dump_product_names(self): log_debug(4) writer = self._get_xml_writer() - dumper = SatelliteDumperEx(writer, exportLib.ProductNamesDumper(writer)) + dumper = SatelliteDumper(writer, exportLib.ProductNamesDumper(writer)) dumper.dump() writer.flush() self.close() @@ -869,14 +869,6 @@ class SatelliteDumper(exportLib.SatelliteDumper): attributes['generation'] = CFG.SAT_CERT_GENERATION return attributes -class SatelliteDumperEx(SatelliteDumper): - def set_attributes(self): - """ Overriding with our own version """ - attributes = exportLib.SatelliteDumper.set_attributes(self) - attributes['version'] = constants.PROTOCOL_VERSION - attributes['generation'] = CFG.SAT_CERT_GENERATION - return attributes - class QueryIterator: """ A query iterator successively applies the list of params as execute() to the statement that was passed in, and presents the union of the result sets as a commit dbb8baadc9c3c0f27f86f57f8646fe91af0060da Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Sat May 29 00:06:39 2010 +0200 dumper should use export xml dump version diff --git a/backend/satellite_tools/disk_dumper/dumper.py b/backend/satellite_tools/disk_dumper/dumper.py index 67f49dd..4799997 100644 --- a/backend/satellite_tools/disk_dumper/dumper.py +++ b/backend/satellite_tools/disk_dumper/dumper.py @@ -865,7 +865,7 @@ class SatelliteDumper(exportLib.SatelliteDumper): def set_attributes(self): """ Overriding with our own version """ attributes = exportLib.SatelliteDumper.set_attributes(self) - attributes['version'] = CFG.XML_DUMP_VERSION + attributes['version'] = constants.PROTOCOL_VERSION attributes['generation'] = CFG.SAT_CERT_GENERATION return attributes commit 7f1741ce692dadfea6829b5087ac16d922dbea7d Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Sat May 29 00:05:53 2010 +0200 added comments to distinguish exported and imported xml dump versions diff --git a/backend/rhn-conf/rhn_server_iss.conf b/backend/rhn-conf/rhn_server_iss.conf index c3ff4ce..cdc226a 100644 --- a/backend/rhn-conf/rhn_server_iss.conf +++ b/backend/rhn-conf/rhn_server_iss.conf @@ -1,10 +1,11 @@ # ** DO NOT EDIT ** -# RHN config for requests traveling through the /SAT-XML-DUMP receiver +# RHN config for requests traveling through the /SAT receiver # ISS - Inter Spacewalk Sync # variables which affects live synchronization between two Spacewalk or # between Satellite and hosted. -xml_dump_version = 3.5 +# newest XML dump version we can import +xml_dump_version = 3.6 use_database_cache = 0 diff --git a/backend/satellite_tools/constants.py b/backend/satellite_tools/constants.py index baebe1a..1dd2eb8 100644 --- a/backend/satellite_tools/constants.py +++ b/backend/satellite_tools/constants.py @@ -16,7 +16,9 @@ Constant values (protocol versions, etc) for satellite sync/exporter. """ +# XML dump version we export PROTOCOL_VERSION = 3.6 + ALLOWED_SYNC_PROTOCOL_VERSIONS = ['3.6', '3.5', '3.4', '3.3', '3.2', '3.1', '3.0'] # Support for checksums other then md5 commit 4965fe20bc0b537511e56aaeb21aca75aa2fb7da Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri May 28 23:52:05 2010 +0200 fixed handler name to which this config file belongs diff --git a/backend/rhn-conf/rhn_server_satexport_internal.conf b/backend/rhn-conf/rhn_server_satexport_internal.conf index 3979f9d..9805602 100644 --- a/backend/rhn-conf/rhn_server_satexport_internal.conf +++ b/backend/rhn-conf/rhn_server_satexport_internal.conf @@ -1,5 +1,5 @@ # ** DO NOT EDIT ** -# RHN config for requests traveling through the /SAT-XML-DUMP receiver +# RHN config for requests traveling through the /SAT-DUMP-INTERNAL receiver # log_file = /var/log/rhn/rhn_sat_export_internal.log commit 8f54461ff8b74576351d4b989a2bdf100d27eb20 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri May 28 23:41:28 2010 +0200 removed rhn_server_satexport.conf from spec diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index a02aba6..1684e9a 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -494,7 +494,6 @@ rm -f %{rhnconf}/rhnSecret.py* # config files %attr(640,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-sat-export-internal.conf %config %{_sysconfdir}/logrotate.d/rhn_sat_export_internal -%attr(640,root,apache) %{rhnconf}/default/rhn_server_satexport.conf %attr(640,root,apache) %{rhnconf}/default/rhn_server_satexport_internal.conf commit fded56b062035277bc3adbb2a5cbec57c74a02af Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri May 28 23:35:21 2010 +0200 there is no /SAT-XML-DUMP and this file is not used anywhere diff --git a/backend/rhn-conf/rhn_server_satexport.conf b/backend/rhn-conf/rhn_server_satexport.conf deleted file mode 100644 index 9d67d71..0000000 --- a/backend/rhn-conf/rhn_server_satexport.conf +++ /dev/null @@ -1,7 +0,0 @@ -# ** DO NOT EDIT ** -# RHN config for requests traveling through the /SAT-XML-DUMP receiver -# - -use_database_cache = 0 - -sat_cert_generation = 2 commit f955f71174c0655d899684396e8c72a1711df2c9 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Thu Jun 3 11:55:04 2010 +0200 598890 - always return product version as string This is to avoid registration (tui) errors: Traceback (most recent call last): File "/usr/sbin/rhn_register", line 75, in <module> app.run() File "/usr/share/rhn/up2date_client/rhncli.py", line 74, in run sys.exit(self.main() or 0) File "/usr/sbin/rhn_register", line 57, in main ui.main() File "/usr/share/rhn/up2date_client/tui.py", line 1203, in main tui.run() File "/usr/share/rhn/up2date_client/tui.py", line 1151, in run win = self.windows[index](self.screen, self) File "/usr/share/rhn/up2date_client/tui.py", line 603, in __init__ hardware_text += _("Version: ") + up2dateUtils.getVersion() + " " <type 'exceptions.TypeError'>: cannot concatenate 'str' and 'int' objects diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py b/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py index f2eded1..117c9d0 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py @@ -41,7 +41,7 @@ def getVersion(): Returns the version of redhat-release rpm ''' os_release, version, release = _getOSVersionAndRelease() - return version + return str(version) def getOSRelease(): ''' commit 90bc0e9bc981db16a4b30fc4d74115d356847ca2 Author: gguerrer <gguerrer(a)fedoraproject.org> Date: Thu Jun 3 07:01:41 2010 +0000 l10n: Updates to Spanish (Castilian) (es) translation Transmitted-via: Transifex (translate.fedoraproject.org) diff --git a/client/rhel/rhn-client-tools/po/es.po b/client/rhel/rhn-client-tools/po/es.po index 0115309..b64bc9d 100644 --- a/client/rhel/rhn-client-tools/po/es.po +++ b/client/rhel/rhn-client-tools/po/es.po @@ -1,26 +1,26 @@ -# translation of es.po to Spanish -# translation of es.po to Portuguese +# translation of spacewalk.rhn-client-tools.es.po to Spanish # Translation of up2date to Spanish (Español) -# Copyright (C) 2003,2004, 2005, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2003,2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc. # Nuria Soriano <nsoriano(a)redhat.es> 2001 +# # Luis Mayoral <mayoral(a)linuxadicto.org>, 2003. # Rodolfo M. Raya <rmraya(a)maxprograms.com>, 2004,2005. # Yelitza Louze <ylouze(a)redhat.com>, 2004. # David Barzilay <barzilay(a)redhat.com>, 2004. # Manuel Ospina <mospina(a)redhat.com>, 2005, 2006, 2007. -# +# Gladys Guerrero <gguerrer(a)redhat.com>, 2010. msgid "" msgstr "" -"Project-Id-Version: es\n" +"Project-Id-Version: spacewalk.rhn-client-tools.es\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-07 13:34+0200\n" -"PO-Revision-Date: 2007-02-01 11:27+1000\n" -"Last-Translator: Manuel Ospina <mospina(a)redhat.com>\n" -"Language-Team: Spanish <en(a)li.org>\n" +"PO-Revision-Date: 2010-06-03 16:45+1000\n" +"Last-Translator: Gladys Guerrero <gguerrer(a)redhat.com>\n" +"Language-Team: Spanish <es(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.9.1\n" +"X-Generator: KBabel 1.11.4\n" #: ../src/up2date_client/capabilities.py:88 #, python-format @@ -48,12 +48,11 @@ msgstr "Finalizando la configuración de actualizaciones de software" #: ../src/up2date_client/gui.py:301 msgid "_Exit" -msgstr "" +msgstr "Salida" #: ../src/up2date_client/gui.py:302 -#, fuzzy msgid "Software updates setup unsuccessful" -msgstr "Configuración de las actualizaciones de software fallido" +msgstr "Configuración de actualizaciones de software fallida" #: ../src/up2date_client/gui.py:312 msgid "You must run rhn_register as root." @@ -78,8 +77,7 @@ msgstr "Error leyendo la información de la red:" #: ../src/up2date_client/hardware.py:693 msgid "Error reading install method information:" -msgstr "" -"Error durante la lectura de la información sobre el método de instalación:" +msgstr "Error durante la lectura de la información sobre el método de instalación:" #: ../src/up2date_client/hardware.py:701 msgid "Error reading network interface information:" @@ -103,16 +101,15 @@ msgstr "Diálogo sí/no:" #: ../src/up2date_client/messageWindow.py:123 msgid "Question dialog:" -msgstr "Diálogo de preguntas:" +msgstr "Cuadro de diálogo de preguntas:" #: ../src/up2date_client/rhnChannel.py:97 msgid "Unable to Locate SystemId" -msgstr "" +msgstr "No se pudo Locate Systemld" #: ../src/up2date_client/rhnChannel.py:114 msgid "This system may not be updated until it is associated with a channel." -msgstr "" -"Este sistema no podrá ser actualizado hasta que esté asociado a un canal." +msgstr "Este sistema no podrá ser actualizado hasta que esté asociado a un canal." #: ../src/up2date_client/rhncli.py:47 msgid "Show additional output" @@ -124,8 +121,7 @@ msgstr "Especifique el proxy http a usar" #: ../src/up2date_client/rhncli.py:51 msgid "Specify a username to use with an authenticated http proxy" -msgstr "" -"Especifique un nombre de usuario para usar con un proxy http autenticado" +msgstr "Especifique un nombre de usuario para usar con un proxy http autenticado" #: ../src/up2date_client/rhncli.py:53 msgid "Specify a password to use with an authenticated http proxy" @@ -145,14 +141,13 @@ msgid "An unexpected OS error occurred: %s\n" msgstr "Ha ocurrido un error del SO no esperado: %s\n" #: ../src/up2date_client/rhncli.py:83 -#, fuzzy msgid "A connection was attempted with a malformed URI.\n" -msgstr "Se intentó una conexión con un URI mal formado.\n" +msgstr "Se intentó una conexión con una URI mal formada.\n" #: ../src/up2date_client/rhncli.py:85 -#, fuzzy, python-format +#, python-format msgid "A connection was attempted with a malformed URI: %s.\n" -msgstr "Se intentó una conexión con un URI mal formado: %s.\n" +msgstr "Se intentó una conexión con una URI mal formada: %s.\n" #: ../src/up2date_client/rhncli.py:87 #, python-format @@ -192,7 +187,7 @@ msgid "Unable to open gui. Try `up2date --nox`" msgstr "No se puede usar modo gráfico. Pruebe con `up2date --nox`" #: ../src/up2date_client/rhncli.py:184 -#, fuzzy, python-format +#, python-format msgid "" "%%prog (Red Hat Network Client Tools) %s\n" "Copyright (C) 1999--2010 Red Hat, Inc.\n" @@ -200,7 +195,7 @@ msgid "" msgstr "" "%%prog (Red Hat Network Client Tools) %s\n" "Copyright (C) 1999-2006 Red Hat, Inc.\n" -"Licenciado bajo los términos del GPL." +"Licenciado bajo los términos del GPLv2." #: ../src/up2date_client/rhncli.py:204 msgid "An error has occurred:" @@ -211,9 +206,8 @@ msgid "See /var/log/up2date for more information" msgstr "Vea /var/log/up2date para obtener mayor información" #: ../src/up2date_client/rhnreg_constants.py:13 -#, fuzzy msgid "Copyright © 2006--2010 Red Hat, Inc. All rights reserved." -msgstr "Copyright Â© 2006 Red Hat, Inc. Todos los derechos reservados." +msgstr "Copyright © 2006--2010 Red Hat, Inc. Todos los derechos reservados." #. Connect Window #: ../src/up2date_client/rhnreg_constants.py:16 @@ -344,22 +338,20 @@ msgid "Software update setup unsuccessful" msgstr "Configuración de las actualizaciones de software fallido" #: ../src/up2date_client/rhnreg_constants.py:60 -#, fuzzy msgid "" "Are you sure you don't want to connect your system to Red Hat Network? " "You'll miss out on the benefits of a Red Hat Enterprise Linux subscription:\n" msgstr "" -"¿Está seguro de no querer conectar su sistema con Red Hat Network? Perderá " -"los beneficios de una suscripción de Red Hat Enterprise Linux:" +"¿Está seguro de no querer conectar su sistema a Red Hat Network? Perderá " +"los beneficios de una suscripción de Red Hat Enterprise Lin\nux:\n" #: ../src/up2date_client/rhnreg_constants.py:62 -#, fuzzy msgid "" "You will not be able to take advantage of these subscription privileges " "without connecting your system to Red Hat Network.\n" msgstr "" -"Usted no podrá aprovechar las ventajas de los privilegios de esta " -"suscripción si no conecta su sistema a Red Hat Network." +"No podrá aprovechar las ventajas de estos privilegios de " +"suscripción si no conecta su sistema a Red Hat Network.\n" #: ../src/up2date_client/rhnreg_constants.py:65 msgid "I'll register later." @@ -421,13 +413,12 @@ msgstr "" "\n" #: ../src/up2date_client/rhnreg_constants.py:82 -#, fuzzy msgid "" "Tip: Forgot your login or password? Visit: https://rhn.redhat.com/rhn/sales/" "LoginInfo.do" msgstr "" -"Consejo: ¿ Se olvidó de su nombre de cuenta o contraseña ?\n" -"Búsquela en https://www.redhat.com/wapps/sso/rhn/lostPassword.html" +"Consejo: ¿Olvidó su nombre de cuenta o contraseña? Vaya a " +"https://rhn.redhat.com/rhn/sales/LoginInfo.do" #: ../src/up2date_client/rhnreg_constants.py:84 msgid "*Email Address:" @@ -776,7 +767,7 @@ msgstr "" "nuevamente con un servidor más nuevo." #: ../src/up2date_client/rhnreg_constants.py:229 -#, fuzzy, python-format +#, python-format msgid "" "Incompatible Certificate File\n" "\n" @@ -790,8 +781,8 @@ msgstr "" "Archivo de certificado incompatible\n" "\n" "El certificado que proporcionó, %s, no es compatible con el servidor " -"Red Hat Network en %s. Puede revisar que haya proporcionado un " -"archivo de certificado válido. ¿Está seguro de haber proporcionado un " +"Red Hat Network en %s. Revise si el " +"archivo de certificado proporcionado es válido. ¿Está seguro de haber proporcionado un " "certificado correcto y que el archivo del certificado no esté dañado?\n" "\n" "Por favor intente nuevamente con un archivo de certificado diferente." @@ -803,11 +794,13 @@ msgid "" " The certificate is expired. Please ensure you have the correct certificate " "and your system time is correct." msgstr "" +"Archivo de certificado incompatible\n" +"\n" +" El certificado expiró. Por favor verifique si tiene el certificado correcto y su tiempo de sistema es correcto." #: ../src/up2date_client/rhnreg_constants.py:241 msgid "Please verify the value of sslCACert in /etc/sysconfig/rhn/up2date" -msgstr "" -"Por favor verifique el valor de sslCACert en /etc/sysconfig/rhn/up2date" +msgstr "Por favor verifique el valor de sslCACert en /etc/sysconfig/rhn/up2date" #: ../src/up2date_client/rhnreg_constants.py:244 msgid "" @@ -836,12 +829,15 @@ msgid "" " Tip: Minor releases with a '*' are currently supported by Red Hat.\n" "\n" msgstr "" +"\n" +" Consejo: Los lanzamientos menores con un '*' están soportados actualmente por Red Hat.\n" +"\n" #: ../src/up2date_client/rhnreg_constants.py:260 msgid "" "Warning:You will not be able to limit this system to minor release that is " "older than the recent minor release if you select this option.\n" -msgstr "" +msgstr "Advertencia: Si selecciona esta opción, no podrá limitar este sistema a un lanzamiento menor anterior al lanzamiento menor reciente.\n" #: ../src/up2date_client/rhnreg_constants.py:265 #, python-format @@ -852,6 +848,11 @@ msgid "" "(you will be able to move to a newer release.)\n" "Are you sure you Would like to Continue?" msgstr "" +"Su sistema no estará suscrito a %s \n" +"canal de software base. No podrá\n" +"desplazar este sistema a uno anterior\n" +"(no podrá desplazarse a un lanzamiento más reciente.)\n" +"¿Está seguro de continuar?" #. Navigation #: ../src/up2date_client/rhnreg_constants.py:274 @@ -901,22 +902,18 @@ msgid "Notice" msgstr "Notificación" #: ../src/up2date_client/rhnregGui.py:261 -#, fuzzy msgid "There was an error while applying your choice." -msgstr "Se produjo un error mientras se completaba el perfil." +msgstr "Se produjo un error mientras hacía su elección." #: ../src/up2date_client/rhnregGui.py:287 msgid "You specified an invalid protocol. Only https and http are allowed." msgstr "Especificó un protocolo no válido. Solo https y http son permitidos." #: ../src/up2date_client/rhnregGui.py:300 -#, fuzzy msgid "" "You will not be able to successfully register this system without contacting " "a Red Hat Network server." -msgstr "" -"Usted no podrá aprovechar las ventajas de los privilegios de esta " -"suscripción si no conecta su sistema a Red Hat Network." +msgstr "No podrá registrar este sistema exitósamente si no contacta al servidor de Red Hat Network." #: ../src/up2date_client/rhnregGui.py:325 #, python-format @@ -957,48 +954,43 @@ msgstr "Se produjo un error al conectarse con Red Hat Network." #: ../src/up2date_client/rhnregGui.py:351 msgid "The server may be in outage mode. You may have to try connecting later." msgstr "" -"El servidor podría estar temporalmente fuera de servicio. Puede intentarlo " -"posteriormente." +"El servidor está temporalmente fuera de servicio. Puede intentarlo " +"más tarde." #: ../src/up2date_client/rhnregGui.py:353 msgid "You may be running a client that is incompatible with the server." -msgstr "" -"Usted podría estar ejecutando un cliente que es incompatible con el servidor." +msgstr "Podría estar ejecutando un cliente incompatible con el servidor." #: ../src/up2date_client/rhnregGui.py:396 -#, fuzzy, python-format +#, python-format msgid "" "Please enter your account information for the %s Red Hat Network " "Satellite:" msgstr "" -"Por favor introduzca su información de login para el %s Red Hat Network " -"Satellite:\n" -"\n" +"Por favor ingrese su información de cuenta para %s Red Hat Network " +"Satellite:" #: ../src/up2date_client/rhnregGui.py:445 msgid "You must enter a login." -msgstr "Debe introducir un login." +msgstr "Debe introducir un nombre de ingreso." #: ../src/up2date_client/rhnregGui.py:451 msgid "You must enter a password." msgstr "Debe introducir una contraseña." #: ../src/up2date_client/rhnregGui.py:465 -#, fuzzy msgid "There was an error while logging in." -msgstr "Se presentó un problema durante el registro." +msgstr "Se presentó un error durante el registro." #: ../src/up2date_client/rhnregGui.py:489 msgid "" "There was an error communicating with the registration server. The message " "was:\n" -msgstr "" -"Se produjo un error conectando al servidor de registros. El mensaje era:\n" +msgstr "Se produjo un error conectando al servidor de registros. El mensaje era:\n" #: ../src/up2date_client/rhnregGui.py:631 -#, fuzzy msgid "There was an error while assembling information for the profile." -msgstr "Se produjo un error mientras se completaba el perfil." +msgstr "Se produjo un error mientras se reunía información para el perfil." #: ../src/up2date_client/rhnregGui.py:652 msgid "Error running hardware profile" @@ -1013,9 +1005,8 @@ msgid "You must choose a name for this profile." msgstr "Debe escoger un nombre para este perfil." #: ../src/up2date_client/rhnregGui.py:714 -#, fuzzy msgid "There was an error while creating the profile." -msgstr "Se produjo un error mientras se completaba el perfil." +msgstr "Se produjo un error durante la creación del perfil." #: ../src/up2date_client/rhnregGui.py:725 msgid "Sending your profile information to Red Hat Network. Please wait." @@ -1093,9 +1084,8 @@ msgid "Problem registering personal information" msgstr "Problemas registrando la información personal" #: ../src/up2date_client/rhnregGui.py:940 -#, fuzzy msgid "There was an error while installing the certificate." -msgstr "Se produjo un error mientras se completaba el perfil." +msgstr "Se produjo un error mientras se instalaba el perfil." #: ../src/up2date_client/rhnregGui.py:966 msgid "You must select a certificate." @@ -1123,9 +1113,8 @@ msgid "unknown" msgstr "desconocido" #: ../src/up2date_client/rhnregGui.py:1138 -#, fuzzy msgid "There was an error getting the list of hardware." -msgstr "Se produjo un error mientras se completaba el perfil." +msgstr "Se produjo un error durante la obtención de la lista de hardware." #: ../src/up2date_client/rhnregGui.py:1150 ../src/up2date_client/tui.py:631 #, python-format @@ -1138,9 +1127,8 @@ msgid "%s MB" msgstr "%s MB" #: ../src/up2date_client/rhnregGui.py:1198 -#, fuzzy msgid "There was an error building the list of packages." -msgstr "Se produjo un error fatal instalando el paquete:\n" +msgstr "Se produjo un error fatal durante la creación de la lista de paquetes." #: ../src/up2date_client/rhnregGui.py:1213 msgid "Package" @@ -1189,13 +1177,12 @@ msgid "Warning: unable to enable rhnsd with chkconfig" msgstr "Advertencia: no es posible habilitar rhnsd con chkconfig" #: ../src/up2date_client/rhnreg.py:65 -#, fuzzy msgid "Warning: unable to run rhn_check" -msgstr "Advertencia: no es posible habilitar rhnsd con chkconfig" +msgstr "Advertencia: no es posible ejecutar rhn_check" #: ../src/up2date_client/rpcServer.py:47 msgid "Error: Server Unavailable. Please try later." -msgstr "" +msgstr "Error: El servidor no está disponible. Por favor intente más tarde." #: ../src/up2date_client/rpcServer.py:171 msgid "ERROR: can not find RHNS CA file" @@ -1218,56 +1205,50 @@ msgid "System software updates already set up" msgstr "Las actualizaciones de software del sistema ya han sido configuradas" #: ../src/up2date_client/tui.py:115 -#, fuzzy msgid "Red Hat Network Location:" msgstr "Ubicación de Red Hat Network:" #: ../src/up2date_client/tui.py:117 -#, fuzzy msgid "System ID:" -msgstr "" -"\n" -"ID del sistema:" +msgstr "ID del sistema:" #: ../src/up2date_client/tui.py:371 msgid "The server indicated an error:\n" msgstr "El servidor indicó un error:\n" #: ../src/up2date_client/tui.py:375 -#, fuzzy msgid "There was an error communicating with the registration server:\n" -msgstr "" -"Se produjo un error conectando al servidor de registros. El mensaje era:\n" +msgstr "Se produjo un error al comunicarse con el servidor de registros:\n" #: ../src/up2date_client/tui.py:434 msgid "Select Operating System Release" -msgstr "" +msgstr "Seleccione el lanzamiento de sistema operativo" #: ../src/up2date_client/tui.py:438 msgid "Operating System version:" -msgstr "" +msgstr "Versión de sistema operativo:" #: ../src/up2date_client/tui.py:440 msgid "Limited Updates Only" -msgstr "" +msgstr "Actualizaciones limitadas únicamente" #: ../src/up2date_client/tui.py:452 msgid " Minor Release: " -msgstr "" +msgstr "Lanzamiento menor:" #: ../src/up2date_client/tui.py:467 msgid "All available updates" -msgstr "" +msgstr "Todas las actualizaciones disponibles" #: ../src/up2date_client/tui.py:520 msgid "Confirm operating system release selection" -msgstr "" +msgstr "Confirmar selección de lanzamiento de sistema operativo" #: ../src/up2date_client/tui.py:528 msgid "" "Your system will be subscribed to the base software channel to receive all " "available updates." -msgstr "" +msgstr "Su sistema estará suscrito al canal de software base para recibir todas las actualizaciones disponibles." #: ../src/up2date_client/tui.py:572 msgid "Register a System Profile - Hardware" @@ -1342,8 +1323,7 @@ msgstr "" #: ../src/up2date_client/tui.py:694 msgid "Include RPM packages installed on this system in my System Profile" -msgstr "" -"Incluir paquetes RPM instalados en este sistema en mi Perfil de Sistema." +msgstr "Incluir paquetes RPM instalados en este sistema en mi Perfil de Sistema." #: ../src/up2date_client/tui.py:698 msgid "You may deselect individual packages by unchecking them below." @@ -1386,8 +1366,7 @@ msgid "You specified an invalid protocol." msgstr "Especificó un protocolo no válido." #: ../src/up2date_client/tui.py:1106 -msgid "" -" <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen" +msgid " <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen" msgstr "" " <Tab>/<Alt-Tab> entre elementos | <Espacio> selecciona | <F12> pantalla " "siguiente" @@ -1458,16 +1437,14 @@ msgstr "Error de retardo del servidor. El mensaje fue:\n" #: ../src/up2date_client/up2dateErrors.py:204 #, python-format msgid "Could not remove package \"%s\". It was on the RemoveSkipList" -msgstr "" -"No se puede eliminar el paquete \"%s\". Está en la lista de borrados a omitir" +msgstr "No se puede eliminar el paquete \"%s\". Está en la lista de borrados a omitir" #: ../src/up2date_client/up2dateErrors.py:227 msgid "GPG is not installed properly." msgstr "No se ha instalado GPG de forma adecuada." #: ../src/up2date_client/up2dateErrors.py:237 -msgid "" -"GPG keyring does not include the Red Hat, Inc. public package-signing key" +msgid "GPG keyring does not include the Red Hat, Inc. public package-signing key" msgstr "" "El llavero GPG no incluye la clave pública para firma de paquetres de Red " "Hat, Inc." @@ -1529,10 +1506,24 @@ msgid "" "retry to avoid\n" " requiring a Management entitlement." msgstr "" +"\n" +" Su organización no tiene suficientes derechos administrativos para registrar este\n" +" sistema a Red Hat Network. Por favor informe al administrador de su organización sobre " +"este error. \n" +" Debe registrar este sistema después de que su organización libere los derechos " +"existentes \n" +" o derechos de compra adicionales. Los derechos adicionales pueden ser adquiridos por el administrador de su organización\n" +" ingresando a Red Hat Network y visitando\n" +" la página de 'Administración de suscripción' en 'Su sección RHN' de RHN.\n" +" \n" +" Una causa común de este código de error se debe a haber configurado equivocadamente una\n" +" llave de activación establecida como universal predeterminada. Si la llave de activación está establecida\n" +" en la cuenta como universal predeterminada, puede desactivarla y volver a intentar para evitar\n" +" que se le solicite un derecho administrativo." #: ../src/firstboot/rhn_choose_server_gui.py:40 ../data/rh_register.glade.h:43 msgid "Choose Server" -msgstr "Escoja un servidor" +msgstr "Elija un servidor" #: ../src/firstboot/rhn_choose_server_gui.py:42 msgid "Choose a Red Hat Network server" @@ -1565,8 +1556,7 @@ msgid "There was a communication error with the server: %s" msgstr "Se produjo un error en la comunicación con el servidor: %s" #: ../src/firstboot/rhn_login_gui.py:106 -msgid "" -"Would you like to try changing the network configuration and trying again?" +msgid "Would you like to try changing the network configuration and trying again?" msgstr "¿Quiere probar cambiar la configuración de la red y reintentar?" #: ../src/firstboot/rhn_provide_certificate_gui.py:40 @@ -1638,14 +1628,15 @@ msgid "Specify an activation key" msgstr "Especifique una llave de activación" #: ../src/bin/rhnreg_ks.py:58 -msgid "" -"Subscribe this system to the EUS channel tied to the system's redhat-release" -msgstr "" +msgid "Subscribe this system to the EUS channel tied to the system's redhat-release" +msgstr "Suscriba este sistema al canal EUS ligado a la versión de redhat del sistema" #: ../src/bin/rhnreg_ks.py:60 -#, fuzzy msgid "[Deprecated] Read contact info from stdin" -msgstr "Leer la información de contacto desde stdin " +msgstr "" +"" +"[Descontinuado] Lea la información de contacto desde stdin" +"Leer la información de contacto desde stdin " #: ../src/bin/rhnreg_ks.py:62 msgid "Do not probe or upload any hardware info" @@ -1669,8 +1660,7 @@ msgstr "Registre el sistema incluso si ya ha sido registrado" #: ../src/bin/rhnreg_ks.py:80 msgid "A username and password are required to register a system." -msgstr "" -"Se necesita un nombre de usuario y una contraseña para registrar un sistema." +msgstr "Se necesita un nombre de usuario y una contraseña para registrar un sistema." #: ../src/bin/rhnreg_ks.py:85 msgid "This system is already registered. Use --force to override" @@ -1681,19 +1671,18 @@ msgid "" "Usage of --use-eus-channel option with --activationkey is not supported. " "Please use username and password instead." msgstr "" +"No está soportado el uso de la opción --use-eus-channel con --activationkey. " +"Por favor use nombre de usuario y contraseña en su lugar." #: ../src/bin/rhnreg_ks.py:122 -#, fuzzy msgid "The server you are registering against does not support EUS." -msgstr "" -"El servidor al cual está intentando registrarse no soporta esta versión del " -"cliente." +msgstr "El servidor al cual está intentando registrarse no soporta EUS." #: ../src/bin/rhnreg_ks.py:152 msgid "" "Warning: --contactinfo option has been deprecated. Please login to the " "server web user Interface and update your contactinfo. " -msgstr "" +msgstr "Advertencia: la opción --contactinfo ha sido depreciada. Por favor ingrese a la interfaz de usuario de servidor de web y actualice su información de contacto." #: ../src/bin/rhnreg_ks.py:192 msgid "" @@ -1725,22 +1714,23 @@ msgstr "Registrándose para actualizaciones de software" #: ../data/gui.glade.h:7 msgid "Select operating system release" -msgstr "" +msgstr "Seleccione la versión de sistema operativo" #: ../data/progress.glade.h:1 msgid "Progress Dialog" -msgstr "Ventana de progreso" +msgstr "Cuadro de diálogo de progreso" #: ../data/rh_register.glade.h:1 -#, fuzzy msgid "" "\n" "Are you sure you would like to continue?" -msgstr "¿Está seguro de querer continuar?" +msgstr "" +"\n" +"¿Está seguro de querer continuar?" #: ../data/rh_register.glade.h:3 msgid " " -msgstr "" +msgstr " " #: ../data/rh_register.glade.h:4 msgid "Compliance:" @@ -1787,6 +1777,8 @@ msgid "" "Tip: Minor releases with a '*' are currently fully supported by Red " "Hat." msgstr "" +"Consejo: Las versiones menores con un '*' son actualmente soportadas totalmente por Red " +"Hat." #: ../data/rh_register.glade.h:14 msgid "" @@ -1891,10 +1883,8 @@ msgstr "" "(incluyendo su login y contraseña) sean seguros." #: ../data/rh_register.glade.h:34 -msgid "" -"Activate a previously purchased subscription you have not yet activated." -msgstr "" -"Activar una suscripción comprada previamente y que no haya sido activada." +msgid "Activate a previously purchased subscription you have not yet activated." +msgstr "Activar una suscripción comprada previamente y que no haya sido activada." #: ../data/rh_register.glade.h:35 msgid "Advanced Network Configuration" @@ -2143,8 +2133,7 @@ msgstr "¿Para qué registrarse?" msgid "" "Would you like to register your system at this time? (Strongly " "recommended.)" -msgstr "" -"¿Le gustaría registrar su sistema ahora? (Altamente recomendado)." +msgstr "¿Le gustaría registrar su sistema ahora? (Altamente recomendado)." #: ../data/rh_register.glade.h:93 msgid "" @@ -2200,8 +2189,7 @@ msgstr "" #: ../data/rh_register.glade.h:100 msgid "Your system is not setup for software updates." -msgstr "" -"Su sistema no ha sido configurado para recibir actualizaciones de software." +msgstr "Su sistema no ha sido configurado para recibir actualizaciones de software." #: ../data/rh_register.glade.h:101 msgid "" @@ -2353,1272 +2341,3 @@ msgstr "" msgid "Register to Spacewalk/Satellite/Red Hat Network." msgstr "Registrarse con Red Hat Network" -#~ msgid "_Exit software update setup" -#~ msgstr "Salir d_el configurador del actualizador de software" - -#~ msgid "software updates setup unsuccessful" -#~ msgstr "falló la configuración de las actualizaciones de software" - -#~ msgid "" -#~ "If you do not have a Red Hat Login, this assistant will allow you to " -#~ "create one." -#~ msgstr "" -#~ "Si no tiene un login de Red Hat, este asistente le ayudará a crear uno." - -#~ msgid "Step 1: Review the Red Hat Privacy Statement" -#~ msgstr "Paso 1: Revisar la política de privacidad de Red Hat" - -#~ msgid "Review the Red Hat Network Terms And Conditions" -#~ msgstr "Revisar los términos y condiciones de Red Hat Network" - -#~ msgid "" -#~ "Are you sure you don't want to connect your system to Red Hat Network? " -#~ "You'll miss out on the benefits of a Red Hat Enterprise Linux " -#~ "subscription:\n" -#~ "\n" -#~ "Security & Updates:\n" -#~ "Receive the latest software updates, including security updates, keeping " -#~ "this Red Hat Enterprise Linux system updated and secure.\n" -#~ "\n" -#~ "Downloads & Upgrades:\n" -#~ "Download installation images for Red Hat Enterprise Linux releases, " -#~ "including new releases.\n" -#~ "\n" -#~ "Support:\n" -#~ "Access to the technical support experts at Red Hat or Red Hat's partners " -#~ "for help with any issues you might encounter with this system.\n" -#~ "\n" -#~ "Compliance:\n" -#~ "Stay in compliance with your subscription agreement and manage " -#~ "subscriptions for systems connected to your account at http://rhn.redhat." -#~ "com/.\n" -#~ "\n" -#~ "You will not be able to take advantage of these subscription privileges " -#~ "without connecting your system to Red Hat Network.\n" -#~ "\n" -#~ "Tip: Red Hat values your privacy: http://www.redhat.com/legal/" -#~ "privacy_statement.html" -#~ msgstr "" -#~ "¿Esta seguro de no querer conectar su sistema a Red Hat Network? Perderá " -#~ "los beneficios de la suscripción de Red Hat Enterprise Linux:\n" -#~ "\n" -#~ "Seguridad y actualizaciones:\n" -#~ "Reciba las últimas actualizaciones de software, incluyendo " -#~ "actualizaciones de seguridad, para mantener su sistema Red Hat Enterprise " -#~ "Linux actualizado y seguro.\n" -#~ "\n" -#~ "Descargas y actualizaciones:\n" -#~ "Descargue las imágenes de instalación de los lanzamientos de Red Hat " -#~ "Enterprise Linux, incluyendo las nuevas versiones.\n" -#~ "\n" -#~ "Asistencia:\n" -#~ "Acceda a la asistencia técnica por parte de los expertos en Red Hat o " -#~ "alguno de sus socios para obtener ayuda con cualquier problema que pueda " -#~ "encontrar con el sistema.\n" -#~ "\n" -#~ "Conformidad:\n" -#~ "Permanezca en conformidad con los acuerdos de suscripción y administre " -#~ "las suscripciones para los sistemas que se conectan a su cuenta en http://" -#~ "rhn.redhat.com.\n" -#~ "Usted no podrá aprovechar estos privilegios de suscripción si no conecta " -#~ "su sistema con Red Hat Network.\n" -#~ "\n" -#~ "Sugerencia: Red Hat valora su privacidad: http://www.redhat.com/legal/" -#~ "privacy_statement.html" - -#~ msgid "No thanks. I'll connect later." -#~ msgstr "No gracias. Me conectaré después." - -#~ msgid "Create a New Login ..." -#~ msgstr "Crear un nuevo login..." - -#~ msgid "" -#~ "The two passwords you entered don't match. Please re-type your passwords." -#~ msgstr "" -#~ "Las dos contraseñas que introdujo no coinciden. Por favor escriba su " -#~ "contraseña nuevamente." - -#~ msgid "Create a new Red Hat login" -#~ msgstr "Crear un nuevo Red Hat Login" - -#~ msgid "" -#~ "Fill in the form below to create a new Red Hat login for use with Red Hat " -#~ "Network (http://rhn.redhat.com/). Required information is marked with a " -#~ "'*':" -#~ msgstr "" -#~ "Complete el formulario dado a continuación para crear un nuevo login de " -#~ "Red Hat para usar en Red Hat Network (http://rhn.redhat.com/). La " -#~ "información obligatoria está marcada con un '*':" - -#~ msgid "*Desired Login:" -#~ msgstr "*Login deseado:" - -#~ msgid "Examples: user(a)domain.com" -#~ msgstr "Ejemplos: usuario(a)dominio.com" - -#~ msgid "*Desired Password:" -#~ msgstr "* Contraseña deseada:" - -#~ msgid "*Confirm Password:" -#~ msgstr "* Confirmar contraseña:" - -#~ msgid "Tip: Leave blank if not with a company." -#~ msgstr "" -#~ "Sugerencia: Por favor deje en blanco si no está asociado con ninguna " -#~ "compañía." - -#~ msgid "" -#~ "Tip: Red Hat values your privacy. View our privacy policy at: http://" -#~ msgstr "" -#~ "Sugerencia: Red Hat valora su privacidad: Vea nuestra política de " -#~ "privacidad en: http://" - -#~ msgid "Please enter your first name." -#~ msgstr "Por favor introduzca su nombre." - -#~ msgid "Please enter your last name." -#~ msgstr "Por favor introduzca su apellido." - -#~ msgid "Please enter your email address." -#~ msgstr "Por favor introduzca su dirección de correo electrónico." - -#~ msgid "Please enter a valid email address." -#~ msgstr "Por favor introduzca una dirección de correo electrónico válida." - -#~ msgid "Please enter your country." -#~ msgstr "Por favor introduzca su país." - -#~ msgid "Please enter a longer login." -#~ msgstr "Por favor, ingrese un login más largo." - -#~ msgid "Please enter a longer password." -#~ msgstr "Por favor introduzca una contraseña más larga." - -#~ msgid "Please enter a shorter password." -#~ msgstr "Por favor introduzca una contraseña más corta." - -#~ msgid "" -#~ "It appears this system has attempted to register to the Red Hat Network.\n" -#~ "The system may already be set up for software updates.\n" -#~ "\n" -#~ "Are you sure you would like to continue?" -#~ msgstr "" -#~ "Parece que este sistema ha intentado registrarse a Red Hat Network.\n" -#~ "El sistema puede ya haber sido configurado para recibir actualizaciones " -#~ "de software.\n" -#~ "\n" -#~ "¿Está seguro que desea continuar?" - -#~ msgid "Select Organization" -#~ msgstr "Seleccione la organización" - -#~ msgid "" -#~ "Your login, %s, is associated with multiple organizations. You will need " -#~ "to select an organization to connect this system to." -#~ msgstr "" -#~ "Su cuenta, %s, está asociada con diferentes organizaciones. Usted " -#~ "necesitará seleccionar una organización para registrar su sistema." - -#~ msgid "Organization:" -#~ msgstr "Organización:" - -#~ msgid "You must select an organization." -#~ msgstr "Debe seleccionar una organización." - -#~ msgid "Access a subscription" -#~ msgstr "Acceda a su suscripción" - -#~ msgid "" -#~ "You have no active subscriptions available in your account. You will " -#~ "need to do one of the following to create an active subscription in your " -#~ "account before this system can connect to Red Hat Network:" -#~ msgstr "" -#~ "No tiene suscripciones activas disponible en su cuenta. Necesitará hacer " -#~ "uno de los siguientes para crear una suscripción activa en su cuenta " -#~ "antes que este sistema se pueda conectar a la Red de Red Hat:" - -#~ msgid "Activate a new subscription with an installation number:" -#~ msgstr "Active una nueva suscripción con un número de instalación:" - -#~ msgid "" -#~ "You have already activated this installation number during this " -#~ "registration." -#~ msgstr "" -#~ "Usted ya ha activado este número de instalación durante este proceso de " -#~ "registro." - -#~ msgid "Installation Number:" -#~ msgstr "Número de instalación:" - -#, fuzzy -#~ msgid "Example: XXXX-XXXX-XXXX-XXXX" -#~ msgstr "Ejemplo: XXXX-XXXX-XXXX-XXXX-XXXX" - -#~ msgid "" -#~ "Congratulations, you have successfully completed software updates set up " -#~ "for this system.\n" -#~ "\n" -#~ "Your system is now ready to receive the software updates that will keep " -#~ "it secure and supported.\n" -#~ "\n" -#~ "You'll know when software updates are available when a package icon " -#~ "appears in the notification area of you desktop (usually in the upper-" -#~ "right corner.) Clicking on this icon, when available, will guide you " -#~ "through applying any updates that are available." -#~ msgstr "" -#~ "Felicitaciones, ha completado la configuración para recibir " -#~ "actualizaciones de software para este sistema.\n" -#~ "\n" -#~ "Sus sistema está listo para recibir actualizaciones de software que lo " -#~ "mantendrán seguro y soportado.\n" -#~ "\n" -#~ "Usted sabrá que hay actualizaciones de software cuando aparezca un icono " -#~ "de paquete en el área de notificación de su escritorio (generalmente en " -#~ "la esquina superior derecha). Si hace clic sobre el icono, cuando éste " -#~ "está disponible, lo guiará a través de la aplicación de actualizaciones." - -#~ msgid "Subscriptions Activated:" -#~ msgstr "Suscripciones activadas:" - -#~ msgid "" -#~ "A subscription-activating installation number was found on disk, but we " -#~ "were not able to activate it (An unknown error occurred.) We used " -#~ "existing active subscription slots available in the rhn account instead. " -#~ "You may wish to contact Red Hat customer service regarding this issue: " -#~ "http://www.redhat.com/apps/support/" -#~ msgstr "" -#~ "Un número de instalación de suscripción-activación se encontró en el " -#~ "disco, pero no fue posible activarlo (ocurrió un error desconocido). " -#~ "Usamos espacios de suscripciones activas disponibles en su cuenta de rhn. " -#~ "Si desea contactar el servicio al cliente de Red Hat acerca de este " -#~ "problema, vaya a http://www.redhat.com/apps/support/" - -#~ msgid "A installation number was found on disk, but we " -#~ msgstr "Un número de instalación se encontró en el disco, pero nosotros" - -#~ msgid "" -#~ "The installation number you have provided (%s) is invalid.\n" -#~ "\n" -#~ "Please check the number and try again or try another option listed on the " -#~ "'Access a Subscription' screen." -#~ msgstr "" -#~ "El número de instalación provisto (%s) es inválido.\n" -#~ "\n" -#~ "Por favor, verifique el número e intente nuevamente, o intente otra " -#~ "opción listada en la pantalla 'Acceder a una Suscripción'." - -#~ msgid "" -#~ "The installation number you provided is valid but was already activated " -#~ "and the subscriptions have already been used by systems in your " -#~ "organization or is not usable for this system.\n" -#~ "\n" -#~ "Please try a different number or try another option listed on the 'Access " -#~ "a Subscription' screen." -#~ msgstr "" -#~ "El número de instalación proporcionado es válido pero ya ha sido activado " -#~ "y las suscripciones ya han sido utilizadas por otros sistemas en su " -#~ "organización o no puede ser utilizado por este sistema.\n" -#~ "\n" -#~ " Por favor intente un número diferente o intente otra de las opciones " -#~ "listadas en la pantalla 'Acceso a la Suscripción'" - -#~ msgid "" -#~ "The installation number you provided does not have subscriptions " -#~ "associated with it.\n" -#~ "\n" -#~ "Please try a different number or try another option listed in the 'Access " -#~ "a Subscription' screen." -#~ msgstr "" -#~ "El número de instalación proporcionado no tiene suscripciones asociadas a " -#~ "él.\n" -#~ "\n" -#~ "Por favor intente un número diferente o intente otra de las opciones " -#~ "listadas en la pantalla 'Acceso a la Suscripción'" - -#~ msgid "" -#~ "There was a problem logging in:\n" -#~ "%s" -#~ msgstr "" -#~ "Se presentó un problema durante el registro:\n" -#~ "%s" - -#~ msgid "There was problem logging in." -#~ msgstr "Se presentó un problema durante el registro." - -#, fuzzy -#~ msgid "There was an error while getting the list of organizations." -#~ msgstr "Se produjo un error mientras se completaba el perfil." - -#, fuzzy -#~ msgid "You must enter an installation number." -#~ msgstr "Debe introducir un número de instalación." - -#, fuzzy -#~ msgid "There was an error activating your number." -#~ msgstr "Se produjo un error al conectarse con Red Hat Network." - -#~ msgid "This installation number has already been activated." -#~ msgstr "Este número de instalación ya ha sido activado." - -#, fuzzy -#~ msgid "There was an error retrieving the privacy statement." -#~ msgstr "Se produjo un error mientras se completaba el perfil." - -#~ msgid "Unable to access the server. Please check your network settings." -#~ msgstr "" -#~ "Incapaz de acceder al servidor. Por favor revise la configuración de su " -#~ "red." - -#~ msgid "" -#~ "The server you are attempting to register against does not support this " -#~ "version of the client." -#~ msgstr "" -#~ "El servidor al cual está intentando registrarse no soporta esta versión " -#~ "del cliente." - -#~ msgid "You must enter an Installation Number that " -#~ msgstr "Debe introducir un número de instalación que" - -#~ msgid "Problem registering login name:\n" -#~ msgstr "Problemas al registrar el nombre de usuario:\n" - -#~ msgid "Problem registering login name." -#~ msgstr "Problemas al registrar el nombre de usuario." - -#~ msgid ", quantity:" -#~ msgstr ", cantidad:" - -#~ msgid "" -#~ "\n" -#~ "\n" -#~ "Red Hat Network Location: " -#~ msgstr "" -#~ "\n" -#~ "\n" -#~ "Ubicación de Red Hat Network:" - -#~ msgid "" -#~ "\n" -#~ "RHN Login: " -#~ msgstr "" -#~ "\n" -#~ "RHN Login: " - -#~ msgid "Access Subscription" -#~ msgstr "Acceda a su suscripción" - -#~ msgid "Choose Organization" -#~ msgstr "Escoja una organización" - -#~ msgid "Choose an organization to use with this username" -#~ msgstr "Escoja una organización para utilizar con este nombre de usuario" - -#~ msgid "Specify an email address" -#~ msgstr "Especifique una dirección de correo electrónico." - -#, fuzzy -#~ msgid "Specify a installation number to use" -#~ msgstr "Especifique un número de subscripción a utilizar" - -#~ msgid "Important Registration Info" -#~ msgstr "Información de registro importante" - -#~ msgid "Registration information" -#~ msgstr "Información de registro" - -#~ msgid "Select organization" -#~ msgstr "Seleccione la organización" - -#~ msgid "Tip: Red Hat values your privacy." -#~ msgstr "Sugerencia: Red Hat valora su privacidad." - -#~ msgid "Privacy Statement" -#~ msgstr "Política de privacidad" - -#~ msgid "Red Hat Privacy Statement" -#~ msgstr "Política de privacidad de Red Hat" - -#, fuzzy -#~ msgid "" -#~ "Your account is associated with multiple organizations. You will " -#~ "need to select an organization to register this system to." -#~ msgstr "" -#~ "Su cuenta está asociada con diferentes organizaciones. Usted " -#~ "necesitará seleccionar una organización para registrar su sistema." - -#~ msgid "_Organization:" -#~ msgstr "_Organización:" - -#~ msgid "" -#~ "were not able to activate it (An unknown error occurred.) We used " -#~ "existing " -#~ msgstr "pero no pudimos activarlo (ocurrió un error desconocido). Usamos " - -#~ msgid "" -#~ "active subscription slots available in the rhn account instead. You may " -#~ "wish " -#~ msgstr "" -#~ "campos de suscripciones activas disponibles en la cuenta de rhn. Si desea" - -#~ msgid "to contact Red Hat customer service regarding this issue: " -#~ msgstr "" -#~ "contactar el equipo de servicio al usuario de Red Hat sobre este problema:" - -#~ msgid "http://www.redhat.com/apps/support/" -#~ msgstr "http://www.redhat.com/apps/support/" - -#~ msgid "activates subscriptions in your account." -#~ msgstr "active las suscripciones en su cuenta." - -#~ msgid "Only https and http are allowed." -#~ msgstr "Solo https y http son permitidos." - -#~ msgid "Error reading hardware information:" -#~ msgstr "Error al leer la información sobre el hardware:" - -#~ msgid "Error reading DMI information:" -#~ msgstr "Error durante la lectura de la información DMI:" - -#~ msgid "That user account and password is not valid\n" -#~ msgstr "Esa cuenta de usuario y contraseña no son válidas\n" - -#~ msgid "You must enter a user name." -#~ msgstr "Debe introducir un nombre de usuario." - -#~ msgid "You must enter and verify a password." -#~ msgstr "Debe introducir y verificar una contraseña." - -#~ msgid "" -#~ "Problem registering login:\n" -#~ "%s" -#~ msgstr "" -#~ "Problema al registrar el login:\n" -#~ "%s" - -#~ msgid "Problem registering login." -#~ msgstr "Problemas al registrar el login." - -#~ msgid "United States" -#~ msgstr "Estados Unidos de América" - -#~ msgid "Canada" -#~ msgstr "Canadá" - -#~ msgid "Login Information:" -#~ msgstr "Información de registro:" - -#~ msgid "Account Information:" -#~ msgstr "Información de la cuenta:" - -#~ msgid "*First Name:" -#~ msgstr "*Nombre:" - -#~ msgid "*Last Name:" -#~ msgstr "*Apellido:" - -#~ msgid "*Company Name:" -#~ msgstr "*Nombre de la compañía:" - -#~ msgid "Street Address:" -#~ msgstr "* Dirección:" - -#~ msgid "City:" -#~ msgstr "Ciudad:" - -#~ msgid "State/Province:" -#~ msgstr "Estado / Provincia:" - -#~ msgid "Zip/Post Code:" -#~ msgstr "Código postal" - -#~ msgid "*Country:" -#~ msgstr "*País:" - -#~ msgid " Address 2:" -#~ msgstr " Dirección 2:" - -#~ msgid " Address:" -#~ msgstr " Dirección:" - -#~ msgid " C_ity:" -#~ msgstr " _Ciudad:" - -#~ msgid " Co_mpany Name:" -#~ msgstr " Nombre de la co_mpañía:" - -#~ msgid " _State/Province:" -#~ msgstr " E_stado/Provincia:" - -#~ msgid " _Zip/Postal code:" -#~ msgstr " Código postal:" - -#~ msgid "* C_onfirm password: " -#~ msgstr "* _Confirme la contraseña:" - -#~ msgid "* Co_untry:" -#~ msgstr "* País:" - -#~ msgid "* Desired _Login:" -#~ msgstr "* _Login deseado:" - -#~ msgid "* Desired _Password:" -#~ msgstr "* C_ontraseña deseada:" - -#~ msgid "* Last _Name:" -#~ msgstr "* Apellido:" - -#~ msgid "* _Email Address: " -#~ msgstr "* Correo _electrónico: " - -#~ msgid "* _First Name:" -#~ msgstr "* Nombre:" - -#~ msgid "Account Information:" -#~ msgstr "Información de la cuenta:" - -#~ msgid "Login Information:" -#~ msgstr "Información de Ingreso:" - -#~ msgid "Examples: user(a)domain.com" -#~ msgstr "Ejemplos: usuario(a)dominio.com" - -#~ msgid "Tip: Leave blank if not with a company." -#~ msgstr "" -#~ "Sugerencia: Deje en blanco si no es parte de una compañía.</" -#~ "small>" - -#~ msgid "Afghanistan" -#~ msgstr "Afganistán" - -#~ msgid "Albania" -#~ msgstr "Albania" - -#~ msgid "Algeria" -#~ msgstr "Algeria" - -#~ msgid "American Samoa" -#~ msgstr "Samoa Americana" - -#~ msgid "Andorra" -#~ msgstr "Andorra" - -#~ msgid "Angola" -#~ msgstr "Angola" - -#~ msgid "Anguilla" -#~ msgstr "Anguila" - -#~ msgid "Antarctica" -#~ msgstr "Antártida" - -#~ msgid "Antigua and Barbuda" -#~ msgstr "Antigua y Barbuda" - -#~ msgid "Argentina" -#~ msgstr "Argentina" - -#~ msgid "Armenia" -#~ msgstr "Armenia" - -#~ msgid "Aruba" -#~ msgstr "Aruba" - -#~ msgid "Australia" -#~ msgstr "Australia" - -#~ msgid "Austria" -#~ msgstr "Austria" - -#~ msgid "Azerbaijan" -#~ msgstr "Azerbaiyán" - -#~ msgid "Bahamas" -#~ msgstr "Bahamas" - -#~ msgid "Bahrain" -#~ msgstr "Bahrain" - -#~ msgid "Bangladesh" -#~ msgstr "Bangladesh" - -#~ msgid "Barbados" -#~ msgstr "Barbados" - -#~ msgid "Belarus" -#~ msgstr "Bielorrusia" - -#~ msgid "Belgium" -#~ msgstr "Bélgica" - -#~ msgid "Belize" -#~ msgstr "Belice" - -#~ msgid "Benin" -#~ msgstr "Benín" - -#~ msgid "Bermuda" -#~ msgstr "Bermuda" - -#~ msgid "Bhutan" -#~ msgstr "Bután" - -#~ msgid "Bolivia" -#~ msgstr "Bolivia" - -#~ msgid "Bosnia and Herzegovina" -#~ msgstr "Bosnia y Hercegovina" - -#~ msgid "Botswana" -#~ msgstr "Botsuana" - -#~ msgid "Bouvet Island" -#~ msgstr "Isla Bouvet" - -#~ msgid "Brazil" -#~ msgstr "Brasil" - -#~ msgid "British Indian Ocean Territory" -#~ msgstr "Territorio Británico del Oceano Índico" - -#~ msgid "Brunei Darussalam" -#~ msgstr "Brunéi" - -#~ msgid "Bulgaria" -#~ msgstr "Bulgaria" - -#~ msgid "Burkina Faso" -#~ msgstr "Burkina Faso" - -#~ msgid "Burundi" -#~ msgstr "Burundi" - -#~ msgid "C_reate new login" -#~ msgstr "_Crear nuevo login" - -#~ msgid "Cambodia" -#~ msgstr "Camboya" - -#~ msgid "Cameroon" -#~ msgstr "Camerún" - -#~ msgid "Cape Verde" -#~ msgstr "Cabo Verde" - -#~ msgid "Cayman Islands" -#~ msgstr "Islas Caimán" - -#~ msgid "Central African Republic" -#~ msgstr "República Centroafricana" - -#~ msgid "Chad" -#~ msgstr "Chad" - -#~ msgid "Chile" -#~ msgstr "Chile" - -#~ msgid "China" -#~ msgstr "China" - -#~ msgid "Christmas Island" -#~ msgstr "Isla Christmas" - -#~ msgid "Cocos (Keeling) Islands" -#~ msgstr "Islas Cocos" - -#~ msgid "Colombia" -#~ msgstr "Colombia" - -#~ msgid "Comoros" -#~ msgstr "Comoras" - -#~ msgid "Congo" -#~ msgstr "Congo" - -#~ msgid "Cook Islands" -#~ msgstr "Islas Cook" - -#~ msgid "Costa Rica" -#~ msgstr "Costa Rica" - -#~ msgid "Cote d'Ivoire" -#~ msgstr "Costa de Marfil" - -#~ msgid "Create a _New Login" -#~ msgstr "Crear un _nuevo login" - -#~ msgid "Create a new Red Hat Network login" -#~ msgstr "Crear un nuevo login de Red Hat Network " - -#~ msgid "Croatia" -#~ msgstr "Croacia" - -#~ msgid "Cuba" -#~ msgstr "Cuba" - -#~ msgid "Cyprus" -#~ msgstr "Chipre" - -#~ msgid "Czech Republic" -#~ msgstr "República Checa" - -#~ msgid "Denmark" -#~ msgstr "Dinamarca" - -#~ msgid "Djibouti" -#~ msgstr "Djibouti" - -#~ msgid "Dominica" -#~ msgstr "Dominica" - -#~ msgid "Dominican Republic" -#~ msgstr "República Dominicana" - -#~ msgid "East Timor" -#~ msgstr "Timor Oriental" - -#~ msgid "Ecuador" -#~ msgstr "Ecuador" - -#~ msgid "Egypt" -#~ msgstr "Egipto" - -#~ msgid "El Salvador" -#~ msgstr "El Salvador" - -#~ msgid "Equatorial Guinea" -#~ msgstr "Guinea Ecuatorial" - -#~ msgid "Eritrea" -#~ msgstr "Eritrea" - -#~ msgid "Estonia" -#~ msgstr "Estonia" - -#~ msgid "Ethiopia" -#~ msgstr "Etiopía" - -#~ msgid "Falkland Islands (Malvinas)" -#~ msgstr "Islas Malvinas" - -#~ msgid "Faroe Islands" -#~ msgstr "Islas Feroe" - -#~ msgid "Fiji" -#~ msgstr "Fiji" - -#~ msgid "" -#~ "Fill in the form below to create a new Red Hat login. Required " -#~ "information is marked with a '*':" -#~ msgstr "" -#~ "Complete el formulario dado a continuación para crear un nuevo login de " -#~ "Red Hat. La información obligatoria está marcada con un '*':" - -#~ msgid "Finland" -#~ msgstr "Finlandia" - -#~ msgid "France" -#~ msgstr "Francia" - -#~ msgid "France, Metropolitan" -#~ msgstr "Francia, área Metropolitana" - -#~ msgid "French Guiana" -#~ msgstr "Guyana Francesa" - -#~ msgid "French Polynesia" -#~ msgstr "Polinesia Francesa" - -#~ msgid "French Southern Territories" -#~ msgstr "Territorios Australes Franceses" - -#~ msgid "Gabon" -#~ msgstr "Gabón" - -#~ msgid "Gambia" -#~ msgstr "Gambia" - -#~ msgid "Georgia" -#~ msgstr "Georgia" - -#~ msgid "Germany" -#~ msgstr "Alemania" - -#~ msgid "Ghana" -#~ msgstr "Ghana" - -#~ msgid "Gibraltar" -#~ msgstr "Gibraltar" - -#~ msgid "Greece" -#~ msgstr "Grecia" - -#~ msgid "Greenland" -#~ msgstr "Groenlandia" - -#~ msgid "Grenada" -#~ msgstr "Granada" - -#~ msgid "Guadeloupe" -#~ msgstr "Guadalupe" - -#~ msgid "Guam" -#~ msgstr "Guam" - -#~ msgid "Guatemala" -#~ msgstr "Guatemala" - -#~ msgid "Guinea" -#~ msgstr "Guinea" - -#~ msgid "Guinea-Bissau" -#~ msgstr "Guinea-Bissau" - -#~ msgid "Guyana" -#~ msgstr "Guyana" - -#~ msgid "Haiti" -#~ msgstr "Haiti" - -#~ msgid "Heard Island and McDonald Islands" -#~ msgstr "Islas Heard y McDonald" - -#~ msgid "Honduras" -#~ msgstr "Honduras" - -#~ msgid "Hong Kong" -#~ msgstr "Hong Kong" - -#~ msgid "Hungary" -#~ msgstr "Hungría" - -#~ msgid "Iceland" -#~ msgstr "Islandia" - -#~ msgid "India" -#~ msgstr "India" - -#~ msgid "Indonesia" -#~ msgstr "Indonesia" - -#~ msgid "Iran (Islamic Republic of)" -#~ msgstr "Irán" - -#~ msgid "Iraq" -#~ msgstr "Iraq" - -#~ msgid "Ireland" -#~ msgstr "Irlanda" - -#~ msgid "Israel" -#~ msgstr "Israel" - -#~ msgid "Italy" -#~ msgstr "Italia" - -#~ msgid "Jamaica" -#~ msgstr "Jamaica" - -#~ msgid "Japan" -#~ msgstr "Japón" - -#~ msgid "Jordan" -#~ msgstr "Jordania" - -#~ msgid "Kazakhstan" -#~ msgstr "Kazajistán" - -#~ msgid "Kenya" -#~ msgstr "Kenia" - -#~ msgid "Kiribati" -#~ msgstr "Kiribati" - -#~ msgid "Korea, Democratic People's Republic of" -#~ msgstr "Corea del Norte" - -#~ msgid "Korea, Republic of" -#~ msgstr "Corea del Sur" - -#~ msgid "Kuwait" -#~ msgstr "Kuwait" - -#~ msgid "Kyrgyzstan" -#~ msgstr "Kirguizistán" - -#~ msgid "Lao People's Democratic Republic" -#~ msgstr "Laos" - -#~ msgid "Latin America" -#~ msgstr "América Latina" - -#~ msgid "Latvia" -#~ msgstr "Latvia" - -#~ msgid "Lebanon" -#~ msgstr "Líbano" - -#~ msgid "Lesotho" -#~ msgstr "Lesoto" - -#~ msgid "Liberia" -#~ msgstr "Liberia" - -#~ msgid "Libyan Arab Jamahiriya" -#~ msgstr "Libia" - -#~ msgid "Liechtenstein" -#~ msgstr "Liechtenstein" - -#~ msgid "Lithuania" -#~ msgstr "Lituania" - -#~ msgid "Luxembourg" -#~ msgstr "Luxemburgo" - -#~ msgid "Macau" -#~ msgstr "Macao" - -#~ msgid "Macedonia" -#~ msgstr "Macedonia" - -#~ msgid "Madagascar" -#~ msgstr "Madagascar" - -#~ msgid "Malawi" -#~ msgstr "Malaui" - -#~ msgid "Malaysia" -#~ msgstr "Malasia" - -#~ msgid "Maldives" -#~ msgstr "Maldivas" - -#~ msgid "Mali" -#~ msgstr "Malí" - -#~ msgid "Malta" -#~ msgstr "Malta" - -#~ msgid "Marshall Islands" -#~ msgstr "Islas Marshall" - -#~ msgid "Martinique" -#~ msgstr "Martinica" - -#~ msgid "Mauritania" -#~ msgstr "Mauritania" - -#~ msgid "Mauritius" -#~ msgstr "Mauricio" - -#~ msgid "Mayotte" -#~ msgstr "Mayotte" - -#~ msgid "Mexico" -#~ msgstr "México" - -#~ msgid "Micronesia (Federated States of)" -#~ msgstr "Micronesia" - -#~ msgid "Moldova" -#~ msgstr "Moldavia" - -#~ msgid "Monaco" -#~ msgstr "Mónaco" - -#~ msgid "Mongolia" -#~ msgstr "Mongolia" - -#~ msgid "Montserrat" -#~ msgstr "Montserrat" - -#~ msgid "Morocco" -#~ msgstr "Marruecos" - -#~ msgid "Mozambique" -#~ msgstr "Mozambique" - -#~ msgid "Myanmar" -#~ msgstr "Birmania" - -#~ msgid "Namibia" -#~ msgstr "Namibia" - -#~ msgid "Nauru" -#~ msgstr "Nauru" - -#~ msgid "Nepal" -#~ msgstr "Nepal" - -#~ msgid "Netherlands" -#~ msgstr "Holanda" - -#~ msgid "Netherlands Antilles" -#~ msgstr "Antillas Neerlandesas" - -#~ msgid "New Caledonia" -#~ msgstr "Nueva Caledonia" - -#~ msgid "New Zealand" -#~ msgstr "Nueva Zelanda" - -#~ msgid "Nicaragua" -#~ msgstr "Nicaragua" - -#~ msgid "Niger" -#~ msgstr "Níger" - -#~ msgid "Nigeria" -#~ msgstr "Nigeria" - -#~ msgid "Niue" -#~ msgstr "Niue" - -#~ msgid "Norfolk Island" -#~ msgstr "Isla Norfolk" - -#~ msgid "Northern Mariana Islands" -#~ msgstr "Islas Marianas del Norte" - -#~ msgid "Norway" -#~ msgstr "Noruega" - -#~ msgid "Oman" -#~ msgstr "Omán" - -#~ msgid "Pakistan" -#~ msgstr "Pakistán" - -#~ msgid "Palau" -#~ msgstr "Palau" - -#~ msgid "Panama" -#~ msgstr "Panamá" - -#~ msgid "Papua New Guinea" -#~ msgstr "Papúa - Nueva Guinea" - -#~ msgid "Paraguay" -#~ msgstr "Paraguay" - -#~ msgid "Peru" -#~ msgstr "Perú" - -#~ msgid "Philippines" -#~ msgstr "Filipinas" - -#~ msgid "Pitcairn" -#~ msgstr "Islas Pitcairn" - -#~ msgid "Poland" -#~ msgstr "Polonia" - -#~ msgid "Portugal" -#~ msgstr "Portugal" - -#~ msgid "Puerto Rico" -#~ msgstr "Puerto Rico" - -#~ msgid "Qatar" -#~ msgstr "Qatar" - -#~ msgid "" -#~ "Red Hat Logins and Passwords must be at least 5 alphanumeric characters" -#~ msgstr "" -#~ "Los logins y contraseñas de Red Hat deben tener al menos 5 caracteres " -#~ "alfanuméricos" - -#~ msgid "Reunion" -#~ msgstr "Reunión" - -#~ msgid "Romania" -#~ msgstr "Rumania" - -#~ msgid "Russian Federation" -#~ msgstr "Rusia" - -#~ msgid "Rwanda" -#~ msgstr "Ruanda" - -#~ msgid "Saint Helena" -#~ msgstr "Santa Helena" - -#~ msgid "Saint Kitts and Nevis" -#~ msgstr "San Cristobal y Nieves" - -#~ msgid "Saint Lucia" -#~ msgstr "Santa Lucía" - -#~ msgid "Saint Pierre and Miquelon " -#~ msgstr "San Pedro y Miquelón " - -#~ msgid "Saint Vincent and the Grenadines" -#~ msgstr "San Vicente y las Granadinas" - -#~ msgid "Samoa" -#~ msgstr "Samoa" - -#~ msgid "San Marino" -#~ msgstr "San Marino" - -#~ msgid "Sao Tome and Principe" -#~ msgstr "Santo Tomé y Príncipe" - -#~ msgid "Saudi Arabia" -#~ msgstr "Arabia Saudí" - -#~ msgid "Senegal" -#~ msgstr "Senegal" - -#~ msgid "Seychelles" -#~ msgstr "Seychelles" - -#~ msgid "Sierra Leone" -#~ msgstr "Sierra Leona" - -#~ msgid "Singapore" -#~ msgstr "Singapur" - -#~ msgid "Slovakia" -#~ msgstr "Eslovaquia" - -#~ msgid "Slovenia" -#~ msgstr "Eslovenia" - -#~ msgid "Solomon Islands" -#~ msgstr "Islas Salomón" - -#~ msgid "Somalia" -#~ msgstr "Somalia" - -#~ msgid "South Africa" -#~ msgstr "Sudáfrica" - -#~ msgid "South Georgia and the South Sandwich Island" -#~ msgstr "Islas Georgia del Sur y Sandwich del Sur" - -#~ msgid "Spain" -#~ msgstr "España" - -#~ msgid "Sri Lanka" -#~ msgstr "Sri Lanka" - -#~ msgid "Sudan" -#~ msgstr "Sudán" - -#~ msgid "Suriname" -#~ msgstr "Surinam" - -#~ msgid "Svalbard and Jan Mayen Islands" -#~ msgstr "Islas Svalvard y Jan Mayen" - -#~ msgid "Swaziland" -#~ msgstr "Suazilandia" - -#~ msgid "Sweden" -#~ msgstr "Suecia" - -#~ msgid "Switzerland" -#~ msgstr "Suiza" - -#~ msgid "Syrian Arab Republic" -#~ msgstr "Siria" - -#~ msgid "Taiwan" -#~ msgstr "Taiwán" - -#~ msgid "Tajikistan" -#~ msgstr "Tayikistán" - -#~ msgid "Tanzania, United Republic of" -#~ msgstr "Tanzania" - -#~ msgid "Thailand" -#~ msgstr "Tailandia" - -#~ msgid "Togo" -#~ msgstr "Togo" - -#~ msgid "Tokelau" -#~ msgstr "Tokelau" - -#~ msgid "Tonga" -#~ msgstr "Tonga" - -#~ msgid "Trinidad and Tobago" -#~ msgstr "Trinidad y Tobago" - -#~ msgid "Tunisia" -#~ msgstr "Túnez" - -#~ msgid "Turkey" -#~ msgstr "Turquía" - -#~ msgid "Turkmenistan" -#~ msgstr "Turkmenistán" - -#~ msgid "Turks and Caicos Islands" -#~ msgstr "Islas Turcas y Caicos" - -#~ msgid "Tuvalu" -#~ msgstr "Tuvalu" - -#~ msgid "Uganda" -#~ msgstr "Uganda" - -#~ msgid "Ukraine" -#~ msgstr "Ucrania" - -#~ msgid "United Arab Emirates" -#~ msgstr "Emiratos Árabes Unidos" - -#~ msgid "United Kingdom" -#~ msgstr "Reino Unido" - -#~ msgid "United States Minor Outlying Islands" -#~ msgstr "Islas menores alejadas de los Estados Unidos" - -#~ msgid "Uruguay" -#~ msgstr "Uruguay" - -#~ msgid "Uzbekistan" -#~ msgstr "Uzbekistán" - -#~ msgid "Vanuatu" -#~ msgstr "Vanuatu" - -#~ msgid "Vatican City State (Holy See)" -#~ msgstr "El Vaticano" - -#~ msgid "Venezuela" -#~ msgstr "Venezuela" - -#~ msgid "Viet Nam" -#~ msgstr "Vietnam" - -#~ msgid "Virgin Islands (British)" -#~ msgstr "Islas Vírgenes Británicas" - -#~ msgid "Virgin Islands (U.S.)" -#~ msgstr "Islas Vírgenes Americanas" - -#~ msgid "Wallis and Futuna Islands" -#~ msgstr "Islas Wallis y Futuna" - -#~ msgid "Western Sahara" -#~ msgstr "Sahara Occidental" - -#~ msgid "Yemen" -#~ msgstr "Yemen" - -#~ msgid "Yugoslavia" -#~ msgstr "Yugoslavia" - -#~ msgid "Zaire" -#~ msgstr "Zaire" - -#~ msgid "Zambia" -#~ msgstr "Zambia" - -#~ msgid "Zimbabwe" -#~ msgstr "Zimbabue" commit 5c2e088cc665688d056a7c00b57181b7745a2614 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Wed Jun 2 13:48:43 2010 +0200 Remove three more exceptions that are not used in our code base. RpmInstallError UnsolvedDependencyError SkipListError diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py index 6c234aa..ded7ea8 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py @@ -31,18 +31,6 @@ class RpmError(Error): log.log_me(msg) return msg -class RpmInstallError(Error): - """Raise when a package fails to install properly""" - def __init__(self, msg, pkg = None): - self.errmsg = msg - self.pkg = pkg - def __repr__(self): - msg = _("There was a fatal error installing the package:\n") - msg = msg + self.errmsg - log = up2dateLog.initLog() - log.log_me(msg) - return msg - class RhnServerException(Error): pass @@ -68,29 +56,6 @@ class DependencyError(Error): log.log_me(msg) return msg -class UnsolvedDependencyError(Error): - """Raise when we have a dependency that the server can not find""" - def __init__(self, msg, dep=None, pkgs=None): - self.errmsg = msg - self.dep = dep - self.pkgs = pkgs - def __repr__(self): - msg = _("RPM dependency error. The message was:\n") + self.errmsg - log = up2dateLog.initLog() - log.log_me(msg) - return msg - -class SkipListError(Error): - """Raise when all the packages you want updated are on a skip list""" - def __init__(self, msg, pkglist=None): - self.errmsg = msg - self.pkglist = pkglist - def __repr__(self): - msg = _("Package Skip List error. The message was:\n") + self.errmsg - log = up2dateLog.initLog() - log.log_me(msg) - return msg - class CommunicationError(RhnServerException): """Indicates a problem doing xml-rpc http communication with the server"""

14 years

1
0
0 / 0

2 commits - java/code

by Tomas Lestach

java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 15 ++-------- java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 10 +++--- 2 files changed, 9 insertions(+), 16 deletions(-) New commits: commit 924fd71169227161d3d804c7261a399392ca0145 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Jun 8 15:35:29 2010 +0200 601656 - fix channel permission check for errata.clone diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java index da694e3..1015da7 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java @@ -42,11 +42,13 @@ import com.redhat.rhn.frontend.xmlrpc.InvalidPackageException; import com.redhat.rhn.frontend.xmlrpc.MissingErrataAttributeException; import com.redhat.rhn.frontend.xmlrpc.NoChannelsSelectedException; import com.redhat.rhn.frontend.xmlrpc.NoSuchChannelException; +import com.redhat.rhn.frontend.xmlrpc.PermissionCheckFailureException; import com.redhat.rhn.frontend.xmlrpc.packages.PackageHelper; import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.errata.ErrataManager; import com.redhat.rhn.manager.errata.cache.ErrataCacheManager; import com.redhat.rhn.manager.rhnpackage.PackageManager; +import com.redhat.rhn.manager.user.UserManager; import org.apache.commons.collections.IteratorUtils; import org.apache.commons.lang.StringUtils; @@ -869,13 +871,11 @@ public class ErrataHandler extends BaseHandler { if (channel == null) { throw new NoSuchChannelException(); } - //do a user permission check - if (!ChannelManager.verifyChannelAdmin(loggedInUser, channel.getId())) { - throw new InvalidChannelRoleException(channel.getLabel()); + + if (!UserManager.verifyChannelAdmin(loggedInUser, channel)) { + throw new PermissionCheckFailureException(); } - channel = ChannelFactory.lookupByIdAndUser(channel.getId(), loggedInUser); - List errataToClone = new ArrayList(); List toReturn = new ArrayList(); commit 878dcf859c4c87891c10537dea726305ea1d4b5d Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Jun 8 14:39:18 2010 +0200 601656 - fix channel permission check for channel.software.mergePackages diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java index bf6b001..f8072e2 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java @@ -20,7 +20,6 @@ import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.SelectMode; import com.redhat.rhn.common.db.datasource.WriteMode; import com.redhat.rhn.common.hibernate.LookupException; -import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.messaging.MessageQueue; import com.redhat.rhn.common.security.PermissionException; import com.redhat.rhn.domain.channel.Channel; @@ -1904,17 +1903,11 @@ public class ChannelSoftwareHandler extends BaseHandler { Channel mergeFrom = lookupChannelByLabel(loggedInUser, mergeFromLabel); Channel mergeTo = lookupChannelByLabel(loggedInUser, mergeToLabel); - - try { - ChannelManager.verifyChannelAdmin(loggedInUser, mergeTo.getId()); - } - catch (InvalidChannelRoleException e) { - LocalizationService ls = LocalizationService.getInstance(); - throw new PermissionException(ls.getMessage( - "frontend.xmlrpc.channels.software.merge.permsfailure", - mergeTo.getLabel())); + + if (!UserManager.verifyChannelAdmin(loggedInUser, mergeTo)) { + throw new PermissionCheckFailureException(); } - + List<Package> differentPackages = new ArrayList<Package>(); Set<Package> toPacks = mergeTo.getPackages();

14 years

1
0
0 / 0

java/code

by Justin Sherrill

java/code/src/com/redhat/rhn/frontend/dto/PackageOverview.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 6cabba164fa96f091c042b2576cbf30911278080 Author: Justin Sherrill <jsherril(a)redhat.com> Date: Tue Jun 8 09:36:05 2010 -0400 fixing issue where package summary could be null, causing NPE diff --git a/java/code/src/com/redhat/rhn/frontend/dto/PackageOverview.java b/java/code/src/com/redhat/rhn/frontend/dto/PackageOverview.java index 6c75756..32bd4dc 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/PackageOverview.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/PackageOverview.java @@ -14,6 +14,8 @@ */ package com.redhat.rhn.frontend.dto; +import org.apache.commons.lang.StringUtils; + import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.List; @@ -108,7 +110,7 @@ public class PackageOverview extends BaseDto { * @return Returns the summary. */ public String getSummary() { - return summary.trim(); + return StringUtils.defaultString(summary).trim(); } /** * @param summaryIn The summary to set.

14 years

1
0
0 / 0

backend/satellite_tools

by Michael Mraka

backend/satellite_tools/disk_dumper/dumper.py | 16 +++++++--- backend/satellite_tools/disk_dumper/iss.py | 40 +++++++++++++++++++------- 2 files changed, 42 insertions(+), 14 deletions(-) New commits: commit af0a6d6fdd421e57146675d1a2bac2c19a92cfeb Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Jun 8 14:34:08 2010 +0200 589524 - select packages, erratas and kickstart trees according to import date diff --git a/backend/satellite_tools/disk_dumper/dumper.py b/backend/satellite_tools/disk_dumper/dumper.py index c82865b..b8d9b16 100644 --- a/backend/satellite_tools/disk_dumper/dumper.py +++ b/backend/satellite_tools/disk_dumper/dumper.py @@ -1051,8 +1051,12 @@ class _ChannelsDumper(exportLib._ChannelDumper): from rhnPackage rp, rhnChannelPackage rcp where rcp.channel_id = :channel_id and rcp.package_id = rp.id - and rp.last_modified >= TO_Date(:lower_limit, 'YYYYMMDDHH24MISS') - and rp.last_modified <= TO_Date(:upper_limit, 'YYYYMMDDHH24MISS') + and (rcp.modified >= TO_Date(:lower_limit, 'YYYYMMDDHH24MISS') + or rp.last_modified >= TO_Date(:lower_limit, 'YYYYMMDDHH24MISS') + ) + and (rcp.modified <= TO_Date(:upper_limit, 'YYYYMMDDHH24MISS') + and rp.last_modified <= TO_Date(:upper_limit, 'YYYYMMDDHH24MISS') + ) """) # Things that can be overwriten in subclasses @@ -1074,8 +1078,12 @@ class _ChannelsDumper(exportLib._ChannelDumper): from rhnChannelErrata ce, rhnErrata e where ce.channel_id = :channel_id and ce.errata_id = e.id - and e.last_modified >= TO_Date(:lower_limit, 'YYYYMMDDHH24MISS') - and e.last_modified <= TO_Date(:upper_limit, 'YYYYMMDDHH24MISS') + and (ce.modified >= TO_Date(:lower_limit, 'YYYYMMDDHH24MISS') + or e.last_modified >= TO_Date(:lower_limit, 'YYYYMMDDHH24MISS') + ) + and (ce.modified <= TO_Date(:upper_limit, 'YYYYMMDDHH24MISS') + and e.last_modified <= TO_Date(:upper_limit, 'YYYYMMDDHH24MISS') + ) """) def _get_errata_ids(self): diff --git a/backend/satellite_tools/disk_dumper/iss.py b/backend/satellite_tools/disk_dumper/iss.py index 3359358..c9e2b02 100644 --- a/backend/satellite_tools/disk_dumper/iss.py +++ b/backend/satellite_tools/disk_dumper/iss.py @@ -245,8 +245,12 @@ class Dumper(dumper.XML_Dumper): """ if self.start_date: query += """ - and rp.last_modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS') - and rp.last_modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS') + and (rcp.modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS') + or rp.last_modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS') + ) + and (rcp.modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS') + and rp.last_modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS') + ) """ self.brpm_query = rhnSQL.Statement(query) brpm_data = rhnSQL.prepare(self.brpm_query) @@ -276,8 +280,12 @@ class Dumper(dumper.XML_Dumper): """ if self.start_date: query += """ - and rp.last_modified >= TO_DATE(:start_date,'YYYYMMDDHH24MISS') - and rp.last_modified <= TO_DATE(:end_date,'YYYYMMDDHH24MISS') + and (rcp.modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS') + or rp.last_modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS') + ) + and (rcp.modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS') + and rp.last_modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS') + ) """ self.package_query = rhnSQL.Statement(query) package_data = rhnSQL.prepare(self.package_query) @@ -311,8 +319,12 @@ class Dumper(dumper.XML_Dumper): """ if self.start_date: query += """ - where ps.last_modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS') - and ps.last_modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS') + where (ps.modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS') + or ps.last_modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS') + ) + and (ps.modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS') + and ps.last_modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS') + ) """ self.source_package_query = rhnSQL.Statement(query) source_package_data = rhnSQL.prepare(self.source_package_query) @@ -343,8 +355,12 @@ class Dumper(dumper.XML_Dumper): """ if self.start_date: query += """ - and e.last_modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS') - and e.last_modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS') + and (ce.modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS') + or e.last_modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS') + ) + and (ce.modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS') + and e.last_modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS') + ) """ self.errata_query = rhnSQL.Statement(query) errata_data = rhnSQL.prepare(self.errata_query) @@ -374,8 +390,12 @@ class Dumper(dumper.XML_Dumper): """ if self.start_date: query += """ - and kt.last_modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS') - and kt.last_modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS') + and (kt.last_modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS') + or kt.modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS') + ) + and (kt.last_modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS') + and kt.modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS') + ) and kt.org_id is Null """ self.kickstart_trees_query = rhnSQL.Statement(query)

14 years

1
0
0 / 0

java/code

by Tomas Lestach

java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 20 ++-------- 1 file changed, 4 insertions(+), 16 deletions(-) New commits: commit 877a9e218e517e4b75e8c7e1d0cc22174244ce52 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Jun 8 14:26:23 2010 +0200 601656 - fix channel permission check diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java index b552262..bf6b001 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java @@ -1761,14 +1761,8 @@ public class ChannelSoftwareHandler extends BaseHandler { Channel mergeFrom = lookupChannelByLabel(loggedInUser, mergeFromLabel); Channel mergeTo = lookupChannelByLabel(loggedInUser, mergeToLabel); - try { - ChannelManager.verifyChannelAdmin(loggedInUser, mergeTo.getId()); - } - catch (InvalidChannelRoleException e) { - LocalizationService ls = LocalizationService.getInstance(); - throw new PermissionException(ls.getMessage( - "frontend.xmlrpc.channels.software.merge.permsfailure", - mergeTo.getLabel())); + if (!UserManager.verifyChannelAdmin(loggedInUser, mergeTo)) { + throw new PermissionCheckFailureException(); } Set<Errata> mergedErrata = @@ -1809,14 +1803,8 @@ public class ChannelSoftwareHandler extends BaseHandler { Channel mergeFrom = lookupChannelByLabel(loggedInUser, mergeFromLabel); Channel mergeTo = lookupChannelByLabel(loggedInUser, mergeToLabel); - try { - ChannelManager.verifyChannelAdmin(loggedInUser, mergeTo.getId()); - } - catch (InvalidChannelRoleException e) { - LocalizationService ls = LocalizationService.getInstance(); - throw new PermissionException(ls.getMessage( - "frontend.xmlrpc.channels.software.merge.permsfailure", - mergeTo.getLabel())); + if (!UserManager.verifyChannelAdmin(loggedInUser, mergeTo)) { + throw new PermissionCheckFailureException(); } Set<Errata> toErrata = mergeTo.getErratas();

14 years

1
0
0 / 0

2 commits - java/code

by Tomas Lestach

java/code/src/com/redhat/rhn/domain/errata/AbstractErrata.java | 2 java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 73 ++++++---- 2 files changed, 52 insertions(+), 23 deletions(-) New commits: commit 5c14ba73da7e5f19bdc73092bbfa51f632cb536a Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Jun 8 14:00:00 2010 +0200 591291 - clone errata instead of associating them to custom channels diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java index b17d64e..b552262 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java @@ -30,6 +30,7 @@ import com.redhat.rhn.domain.channel.InvalidChannelRoleException; import com.redhat.rhn.domain.channel.NewChannelHelper; import com.redhat.rhn.domain.errata.Errata; import com.redhat.rhn.domain.errata.ErrataFactory; +import com.redhat.rhn.domain.errata.impl.PublishedClonedErrata; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.rhnpackage.Package; import com.redhat.rhn.domain.rhnpackage.PackageFactory; @@ -57,6 +58,7 @@ import com.redhat.rhn.frontend.xmlrpc.user.XmlRpcUserHelper; import com.redhat.rhn.manager.channel.ChannelEditor; import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.channel.CreateChannelCommand; +import com.redhat.rhn.manager.errata.ErrataManager; import com.redhat.rhn.manager.errata.cache.ErrataCacheManager; import com.redhat.rhn.manager.system.IncompatibleArchException; import com.redhat.rhn.manager.system.SystemManager; @@ -1769,13 +1771,10 @@ public class ChannelSoftwareHandler extends BaseHandler { mergeTo.getLabel())); } - Set<Errata> toErrata = mergeTo.getErratas(); - Set<Errata> fromErrata = mergeFrom.getErratas(); - Set<Errata> differentErrata = errataDiff(fromErrata, toErrata); + Set<Errata> mergedErrata = + mergeErrataToChannel(loggedInUser, mergeFrom.getErratas(), mergeTo); - mergeTo.getErratas().addAll(differentErrata); - ChannelFactory.save(mergeTo); - return differentErrata.toArray(); + return mergedErrata.toArray(); } /** @@ -1823,30 +1822,60 @@ public class ChannelSoftwareHandler extends BaseHandler { Set<Errata> toErrata = mergeTo.getErratas(); List<Errata> fromErrata = ErrataFactory.lookupByChannelBetweenDates( loggedInUser.getOrg(), mergeFrom, startDate, endDate); - Set<Errata> differentErrata = errataDiff(new HashSet(fromErrata), toErrata); - mergeTo.getErratas().addAll(differentErrata); - ChannelFactory.save(mergeTo); - return differentErrata.toArray(); + Set<Errata> mergedErrata = + mergeErrataToChannel(loggedInUser, mergeFrom.getErratas(), mergeTo); + + return mergedErrata.toArray(); } - private Set<Errata> errataDiff(Set<Errata> from, Set<Errata> to) { - Set<Errata> diff = new HashSet<Errata>(); - for (Errata errata : from) { - if (!errataInSet(to, errata)) { - diff.add(errata); + private Set<Errata> mergeErrataToChannel(User user, Set<Errata> fromErrata, + Channel toChannel) { + Set<Errata> toErrata = toChannel.getErratas(); + Set<Errata> diffErrata = new HashSet(fromErrata); + + for (Iterator iter = fromErrata.iterator(); iter.hasNext();) { + Errata errata = (Errata) iter.next(); + if (toErrata.contains(errata)) { + // remove errata already in channel + diffErrata.remove(errata); + } + else if (errata.isCloned()) { + Errata origErrata = ((PublishedClonedErrata) errata).getOriginal(); + if (cloneInSet(user, origErrata, toErrata)) { + // remove errata those brothers already in channel + // (different clones of the same original) + diffErrata.remove(errata); + } + } + else { + if (cloneInSet(user, errata, toErrata)) { + // remove errata those clones already in channel + diffErrata.remove(errata); + } } } - return diff; + + ErrataManager.publishErrataToChannel(toChannel, getErrataIds(diffErrata), user); + ChannelFactory.save(toChannel); + + return diffErrata; } - private boolean errataInSet(Set<Errata> where, Errata what) { - for (Errata errata : where) { - if (errata.equals(what)) { - return true; - } + private Set<Long> getErrataIds(Set<Errata> errata) { + Set<Long> ids = new HashSet(); + for (Errata erratum : errata) { + ids.add(erratum.getId()); } - return false; + return ids; + } + + private Boolean cloneInSet(User user, Errata original, Set<Errata> set) { + List<Errata> clones = ErrataManager.lookupPublishedByOriginal( + user, original); + int numOfClones = clones.size(); + clones.removeAll(set); + return (clones.size() != numOfClones); } /* commit 7021edfc653b6d422e9863a033171a792e545fb2 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Jun 8 09:56:35 2010 +0200 fixing hashCode for Errata the bug prevented to work errata comparism, errata set operations, ... diff --git a/java/code/src/com/redhat/rhn/domain/errata/AbstractErrata.java b/java/code/src/com/redhat/rhn/domain/errata/AbstractErrata.java index b903f59..7d302d6 100644 --- a/java/code/src/com/redhat/rhn/domain/errata/AbstractErrata.java +++ b/java/code/src/com/redhat/rhn/domain/errata/AbstractErrata.java @@ -649,6 +649,6 @@ public abstract class AbstractErrata extends BaseDomainHelper implements eb.append(this.getAdvisoryRel()); eb.append(this.getAdvisorySynopsis()); eb.append(this.getOrg()); - return eb.hashCode(); + return eb.toHashCode(); } }

14 years

1
0
0 / 0

5 commits - client/rhel

by Milan Zazrivec

client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py | 49 ++++++++- client/rhel/rhn-client-tools/src/up2date_client/tui.py | 50 ++++------ 2 files changed, 64 insertions(+), 35 deletions(-) New commits: commit 18f23c924e962b7e3a640d49fea8b1ecdc0f1876 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Tue Jun 8 13:25:35 2010 +0200 596237 - use constants in SendingWindow diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py index b21b284..313dece 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py @@ -129,6 +129,9 @@ SEND_WINDOW_DESC = _("We are finished collecting information for the System Prof "You can run the registration program later by " "typing `rhn_register` at the command line.") +# Sending Window +SENDING_WINDOW = _("Sending Profile to Red Hat Network") + # Finish Window FINISH_WINDOW = _("Finish setting up software updates") FINISH_WINDOW_TEXT_TUI = _("You may now run 'yum update' from this system's " diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py b/client/rhel/rhn-client-tools/src/up2date_client/tui.py index 5e208e1..cb64223 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py @@ -793,8 +793,7 @@ class SendingWindow: self.name = "SendingWindow" size = snack._snack.size() - self.pwin = snack.GridForm(screen, _("Sending Profile to Red Hat Network"), - 1, 1) + self.pwin = snack.GridForm(screen, SENDING_WINDOW, 1, 1) self.scale = snack.Scale(40, 100) self.pwin.add(self.scale, 0, 0) commit abd6b45fd407b3ada03bc440d92f76342c58632e Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Tue Jun 8 13:22:35 2010 +0200 596237 - use constants in SendWindow diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py index c32996b..b21b284 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py @@ -122,11 +122,12 @@ SYSTEM_ALREADY_REGISTERED = _("It appears this system has already been set up fo SYSTEM_ALREADY_REGISTERED_CONT = _("Are you sure you would like to continue?") # Send Window -SEND_WINDOW = _("We are finished collecting information for the System Profile.\n\n" - "Press \"Next\" to send this System Profile to Red Hat Network. " - "Click \"Cancel\" and no information will be sent. " - "You can run the registration program later by " - "typing `rhn_register` at the command line.") +SEND_WINDOW = _("Send Profile Information to Red Hat Network") +SEND_WINDOW_DESC = _("We are finished collecting information for the System Profile.\n\n" + "Press \"Next\" to send this System Profile to Red Hat Network. " + "Click \"Cancel\" and no information will be sent. " + "You can run the registration program later by " + "typing `rhn_register` at the command line.") # Finish Window FINISH_WINDOW = _("Finish setting up software updates") diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py b/client/rhel/rhn-client-tools/src/up2date_client/tui.py index 096256e..5e208e1 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py @@ -757,10 +757,9 @@ class SendWindow: self.name = "SendWindow" size = snack._snack.size() - toplevel = snack.GridForm(screen, _("Send Profile Information to Red Hat Network"), - 1, 2) + toplevel = snack.GridForm(screen, SEND_WINDOW, 1, 2) - text = snack.TextboxReflowed(size[0]-15, SEND_WINDOW) + text = snack.TextboxReflowed(size[0]-15, SEND_WINDOW_DESC) toplevel.add(text, 0, 0) # BUTTON BAR commit 10ac58f27079f27b289be6be0d598029152f3508 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Tue Jun 8 13:19:18 2010 +0200 596237 - use constants in PackagesWindow diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py index 8fb8b7e..c32996b 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py @@ -99,6 +99,17 @@ HARDWARE_WINDOW_DESC2 = _("Additional hardware information including PCI" HARDWARE_WINDOW_CHECKBOX = _("Include the following information about hardware" " and network:") +# Packages Window +PACKAGES_WINDOW = _("Register a System Profile - Packages") +PACKAGES_WINDOW_DESC1 = _("RPM information is important to determine what" + " updated software packages are relevant to this" + " system.") +PACKAGES_WINDOW_DESC2 = _("Include RPM packages installed on this system" + " in my System Profile") +PACKAGES_WINDOW_UNCHECK = _("You may deselect individual packages by" + " unchecking them below.") +PACKAGES_WINDOW_PKGLIST = _("Building Package List") + # Product Window HOSTED_LOGIN_PROMPT = _("Please enter your login information for Red " "Hat Network (http://rhn.redhat.com/):\n\n") diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py b/client/rhel/rhn-client-tools/src/up2date_client/tui.py index a0d33e9..096256e 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py @@ -676,20 +676,19 @@ class PackagesWindow: self.screen = screen self.tui = tui size = snack._snack.size() - toplevel = snack.GridForm(screen, _("Register a System Profile - Packages"), - 1, 5) + toplevel = snack.GridForm(screen, PACKAGES_WINDOW, 1, 5) self.g = toplevel - text = snack.TextboxReflowed(size[0]-10, _("RPM information is important to determine what updated software packages are relevant to this system.")) + text = snack.TextboxReflowed(size[0]-10, PACKAGES_WINDOW_DESC1) toplevel.add(text, 0, 0, anchorLeft = 1) - self.packagesButton = snack.Checkbox(_("Include RPM packages installed on this system in my System Profile"), 1) + self.packagesButton = snack.Checkbox(PACKAGES_WINDOW_DESC2, 1) toplevel.add(self.packagesButton, 0, 1, padding = (0, 1, 0, 1), anchorLeft = 1) - label = snack.Label(_("You may deselect individual packages by unchecking them below.")) + label = snack.Label(PACKAGES_WINDOW_UNCHECK) toplevel.add(label, 0, 2, anchorLeft = 1) #self.packageList = snack.Listbox(size[1]-18, 1, width = size[0]-10) @@ -698,8 +697,7 @@ class PackagesWindow: # do we need to read the packages from disk? if tui.packageList == []: - self.pwin = snack.GridForm(screen, _("Building Package List"), - 1, 1) + self.pwin = snack.GridForm(screen, PACKAGES_WINDOW_PKGLIST, 1, 1) self.scale = snack.Scale(40, 100) self.pwin.add(self.scale, 0, 0) commit 790678be341a0d43b69a10a7dbf85b98a91ec18b Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Tue Jun 8 13:10:34 2010 +0200 596237 - use constants in HardwareWindow diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py index aca761d..8fb8b7e 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py @@ -87,6 +87,18 @@ CONFIRM_OS_ALL = _("Your system will be subscribed to the base" " software channel to receive all available" " updates.") +# Hardware Window +HARDWARE_WINDOW = _("Register a System Profile - Hardware") +HARDWARE_WINDOW_DESC1 = _("A Profile Name is a descriptive name that" + " you choose to identify this System Profile" + " on the Red Hat Network web pages. Optionally," + " include a computer serial or identification number.") +HARDWARE_WINDOW_DESC2 = _("Additional hardware information including PCI" + " devices, disk sizes and mount points will be" + " included in the profile.") +HARDWARE_WINDOW_CHECKBOX = _("Include the following information about hardware" + " and network:") + # Product Window HOSTED_LOGIN_PROMPT = _("Please enter your login information for Red " "Hat Network (http://rhn.redhat.com/):\n\n") diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py b/client/rhel/rhn-client-tools/src/up2date_client/tui.py index c34e313..a0d33e9 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py @@ -564,10 +564,9 @@ class HardwareWindow: # read all hardware in tui.hardware = hardware.Hardware() - toplevel = snack.GridForm(screen, _("Register a System Profile - Hardware"), - 1, 7) + toplevel = snack.GridForm(screen, HARDWARE_WINDOW, 1, 7) - text = snack.TextboxReflowed(70, _("A Profile Name is a descriptive name that you choose to identify this System Profile on the Red Hat Network web pages. Optionally, include a computer serial or identification number.")) + text = snack.TextboxReflowed(70, HARDWARE_WINDOW_DESCRIPTION) toplevel.add(text, 0, 0, anchorLeft = 1) @@ -582,9 +581,9 @@ class HardwareWindow: toplevel.add(grid, 0, 1, anchorLeft = 1) if tui.includeHardware: - self.hardwareButton = snack.Checkbox(_("Include the following information about hardware and network:"), isOn = 1) + self.hardwareButton = snack.Checkbox(HARDWARE_WINDOW_CHECKBOX, isOn = 1) else: - self.hardwareButton = snack.Checkbox(_("Include the following information about hardware and network:")) + self.hardwareButton = snack.Checkbox(HARDWARE_WINDOW_CHECKBOX) toplevel.add(self.hardwareButton, 0, 2, padding = (0, 1, 0, 0), anchorLeft = 1) @@ -640,7 +639,7 @@ class HardwareWindow: tb = snack.TextboxReflowed(80, hardware_text) toplevel.add(tb, 0, 4) - self.additionalHWLabel = snack.TextboxReflowed(size[0]-10, _("Additional hardware information including PCI devices, disk sizes and mount points will be included in the profile.")) + self.additionalHWLabel = snack.TextboxReflowed(size[0]-10, HARDWARE_WINDOW_DESC2) toplevel.add(self.additionalHWLabel, 0, 5, padding = (0, 1, 0, 0), anchorLeft = 1) commit a7e6566dfb5a723b56ee0b6229451a33f28fee41 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Tue Jun 8 12:59:04 2010 +0200 596237 - use constants in OSReleaseWindow & AlreadyRegisteredWindow diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py index 2edde34..aca761d 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py @@ -76,6 +76,17 @@ LOGIN_TIP = _("Tip: Forgot your login or password? Contact your " USER_REQUIRED = _("Please enter a desired login.") PASSWORD_REQUIRED = _("Please enter and verify a password.") +# OS Release Window +SELECT_OSRELEASE = _("Select Operating System Release") +OS_VERSION = _("Operating System version:") +MINOR_RELEASE = _(" Minor Release: ") +LIMITED_UPDATES = _("Limited Updates Only") +ALL_UPDATES = _("All available updates") +CONFIRM_OS_RELEASE_SELECTION = _("Confirm operating system release selection") +CONFIRM_OS_ALL = _("Your system will be subscribed to the base" + " software channel to receive all available" + " updates.") + # Product Window HOSTED_LOGIN_PROMPT = _("Please enter your login information for Red " "Hat Network (http://rhn.redhat.com/):\n\n") @@ -83,6 +94,7 @@ HOSTED_LOGIN_TIP = _("Tip: Forgot your login or password? " "Visit: https://rhn.redhat.com/rhn/sales/LoginInfo.do") EMAIL = _("*Email Address:") +SYSTEM_ALREADY_SETUP = _("System software updates already set up") SYSTEM_ALREADY_REGISTERED = _("It appears this system has already been set up for software updates:") SYSTEM_ALREADY_REGISTERED_CONT = _("Are you sure you would like to continue?") diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py b/client/rhel/rhn-client-tools/src/up2date_client/tui.py index 618cf52..c34e313 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py @@ -109,7 +109,7 @@ class AlreadyRegisteredWindow: oldUsername = systemIdXml[0][0]['username'] oldsystemId = systemIdXml[0][0]['system_id'] - toplevel = snack.GridForm(self.screen, _("System software updates already set up"), 1, 2) + toplevel = snack.GridForm(self.screen, SYSTEM_ALREADY_SETUP, 1, 2) self.bb = snack.ButtonBar(self.screen, [(YES_CONT, "next"), (NO_CANCEL, "exit")]) @@ -430,14 +430,12 @@ class OSReleaseWindow: self.selectChannel = False - toplevel = snack.GridForm(self.screen, - _("Select Operating System Release"), 1, 7) + toplevel = snack.GridForm(self.screen, SELECT_OSRELEASE, 1, 7) self.g = toplevel - self.ostext = snack.TextboxReflowed(self.size[0]-10, - _("Operating System version:")) + self.ostext = snack.TextboxReflowed(self.size[0]-10, OS_VERSION) toplevel.add(self.ostext, 0, 0, anchorLeft = 1) - optiontext1 = _("Limited Updates Only") + optiontext1 = LIMITED_UPDATES if self.tui.limited_updates_button: self.limited_updates_button = snack.SingleRadioButton(optiontext1, @@ -449,7 +447,7 @@ class OSReleaseWindow: toplevel.add(self.limited_updates_button, 0, 1, padding = (0, 1, 0, 1), anchorLeft = 1) - self.sublabel = snack.Label(_(" Minor Release: ")) + self.sublabel = snack.Label(MINOR_RELEASE) toplevel.add(self.sublabel, 0, 2, anchorLeft = 1) self.channelList = snack.Listbox(self.size[1]-22, 1, @@ -464,7 +462,7 @@ class OSReleaseWindow: self.tip = snack.TextboxReflowed(self.size[0]-10, CHANNEL_PAGE_TIP) toplevel.add(self.tip, 0, 4, anchorLeft = 1) - optiontext2 = _("All available updates") + optiontext2 = ALL_UPDATES if self.tui.all_updates_button: self.all_updates_button = snack.SingleRadioButton(optiontext2, @@ -517,7 +515,7 @@ class OSReleaseWindow: later_release = self.channelList.current() != \ self.available_channels['default_channel'] - title = _("Confirm operating system release selection") + title = CONFIRM_OS_RELEASE_SELECTION if later_release: msgbox = snack.ButtonChoiceWindow(self.screen, title, CONFIRM_OS_WARNING % self.channelList.current(), @@ -525,9 +523,6 @@ class OSReleaseWindow: return msgbox if self.all_updates_button.selected() or later_release: - CONFIRM_OS_ALL = _("Your system will be subscribed to the base" - " software channel to receive all available" - " updates.") msgbox = snack.ButtonChoiceWindow(self.screen, title, CONFIRM_OS_ALL, buttons =[OK, CANCEL]) return msgbox

14 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits June 2010