diff -ruN rhn-client-tools-2.7.16.orig/data/gui.glade rhn-client-tools-2.7.16/data/gui.glade --- rhn-client-tools-2.7.16.orig/data/gui.glade 2017-08-09 09:58:44.000000000 -0700 +++ rhn-client-tools-2.7.16/data/gui.glade 2017-08-25 12:59:14.283621157 -0700 @@ -77,7 +77,7 @@ confirm - Red Hat Account + Spacewalk Account @@logo@@ True diff -ruN rhn-client-tools-2.7.16.orig/data/rh_register.glade rhn-client-tools-2.7.16/data/rh_register.glade --- rhn-client-tools-2.7.16.orig/data/rh_register.glade 2017-08-09 09:58:44.000000000 -0700 +++ rhn-client-tools-2.7.16/data/rh_register.glade 2017-08-25 12:59:14.354111984 -0700 @@ -85,7 +85,7 @@ True - This system will <b>not</b> be able to successfully receive software updates, including security updates, from Red Hat without connecting to a Red Hat Satellite or Red Hat Network Classic. + This system will <b>not</b> be able to successfully receive software updates, including security updates, from Oracle without connecting to Spacewalk or the Unbreakable Linux Network. To keep your system updated, secure, and supported, please register this system at your earliest convenience. False @@ -173,7 +173,7 @@ True - I'd like to register with an Red Hat Satellite or Red Hat Satellite Proxy + I'd like to register with Spacewalk or a Spacewalk Proxy False True GTK_JUSTIFY_LEFT @@ -188,7 +188,7 @@ False 0 - I'd like to register with an Red Hat Satellite or Red Hat Satellite Proxy + I'd like to register with Spacewalk or a Spacewalk Proxy @@ -282,7 +282,7 @@ • False - satellite server location + Spacewalk server location @@ -352,7 +352,7 @@ True - Red Hat Account + Spacewalk account GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -366,7 +366,7 @@ True False - Red Hat Account + Spacewalk account @@ -379,7 +379,7 @@ True - Please enter your Red Hat account information: + Please enter your Spacewalk account information: False True GTK_JUSTIFY_LEFT @@ -394,7 +394,7 @@ False 0 - Please enter your Red Hat account information: + Please enter your Spacewalk account information: @@ -588,7 +588,7 @@ - <small>Tip: Forgot your login or password? Contact your Satellite's <i>Organization Administrator</i>.</small> + <small>Tip: Forgot your login or password? Contact your Spacewalk's <i>Organization Administrator</i>.</small> False True GTK_JUSTIFY_LEFT @@ -662,7 +662,7 @@ True - Red Hat Linux Version: + Oracle Linux Version: False False GTK_JUSTIFY_RIGHT @@ -1198,7 +1198,7 @@ True - This assistant will guide you through the process of registering your system with Red Hat to receive software updates and other benefits. You will need the following to register: + This assistant will guide you through the process of registering your system with Oracle to receive software updates and other benefits. You will need the following to register: False False GTK_JUSTIFY_LEFT @@ -1213,7 +1213,7 @@ False 0 - This assistant will guide you through the process of registering your system with Red Hat to receive software updates and other benefits. You will need the following to register: + This assistant will guide you through the process of registering your system with Oracle to receive software updates and other benefits. You will need the following to register: @@ -1297,7 +1297,7 @@ True - • The address of an Red Hat Satellite or Red Hat Satellite Proxy + • The address of a Spacewalk server or Spacewalk Proxy False False GTK_JUSTIFY_LEFT @@ -1535,7 +1535,7 @@ True - Purchase an additional Red Hat Enterprise Linux subscription at http://www.redhat.com/store/. + Purchase an additional Oracle Linux subscription at https://shop.oracle.com/pls/ostore/f?p=dstore:2:0::NO:RIR,RP,2:PROD_HIER_ID:4510272175861805728468. False False GTK_JUSTIFY_LEFT @@ -1562,7 +1562,7 @@ True - Log in to http://rhn.redhat.com/ and unentitle an inactive system at Your RHN > Subscription Management > System Entitlements. + Log in to http://linux.oracle.com/ and unentitle an inactive system at Your ULN > Subscription Management > System Entitlements. False False GTK_JUSTIFY_LEFT @@ -2483,7 +2483,7 @@ 600 True - Registering your system with Red Hat allows you to take full advantage of the benefits of a paid subscription, including: + Registering your system with Oracle allows you to take full advantage of the benefits of a paid subscription, including: False False GTK_JUSTIFY_LEFT @@ -2498,7 +2498,7 @@ False 0 - Registering your system with Red Hat allows you to take full advantage of the benefits of a paid subscription, including: + Registering your system with Oracle allows you to take full advantage of the benefits of a paid subscription, including: @@ -2629,7 +2629,7 @@ 460 True - Receive the latest software updates, including security updates, keeping this Red Hat Enterprise Linux system <b>updated</b> and <b>secure</b>. + Receive the latest software updates, including security updates, keeping this Oracle Linux system <b>updated</b> and <b>secure</b>. False True GTK_JUSTIFY_LEFT @@ -2724,7 +2724,7 @@ 460 True - Download installation images for Red Hat Enterprise Linux releases, including new releases. + Download installation images for Oracle Linux releases, including new releases. False True GTK_JUSTIFY_LEFT @@ -2819,7 +2819,7 @@ 460 True - 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. + Access to the technical support experts at Oracle for help with any issues you might encounter with this system. False True GTK_JUSTIFY_LEFT @@ -2917,7 +2917,7 @@ 460 True - Manage subscriptions and systems registered to Customer Portal via access.redhat.com or through one of our other subscription management services. + Manage subscriptions and systems registered to the Unbreakable Linux Network via linux.oracle.com. False True GTK_JUSTIFY_LEFT @@ -2932,7 +2932,7 @@ False 0 - Manage subscriptions and systems registered to Customer Portal via access.redhat.com or through one of our other subscription management services. + Manage subscriptions and systems registered to the Unbreakable Linux Network via linux.oracle.com. @@ -2986,7 +2986,7 @@ True - <small><b>Tip:</b> Red Hat values your privacy: http://www.redhat.com/legal/privacy_statement.html.</small> + <small><b>Tip:</b> Oracle values your privacy: http://www.oracle.com/us/legal/privacy/overview/index.html.</small> False True GTK_JUSTIFY_LEFT @@ -4055,7 +4055,7 @@ 600 True - Are you sure you don't want to register your system with Red Hat? You'll miss out on the benefits of a Red Hat Enterprise Linux Subscription: + Are you sure you don't want to register your system with Spacewalk? You'll miss out on the benefits of a Oracle Linux Subscription: False False GTK_JUSTIFY_LEFT @@ -4070,7 +4070,7 @@ False 0 - Are you sure you don't want to register your system with Red Hat? You'll miss out on the benefits of a Red Hat Enterprise Linux Subscription: + Are you sure you don't want to register your system with Oracle? You'll miss out on the benefits of a Oracle Linux Subscription: @@ -4162,7 +4162,7 @@ 460 True - Receive the latest software updates, including security updates, keeping this Red Hat Enterprise Linux system <b>updated</b> and <b>secure</b>. + Receive the latest software updates, including security updates, keeping this Oracle Linux system <b>updated</b> and <b>secure</b>. False True GTK_JUSTIFY_LEFT @@ -4257,7 +4257,7 @@ 460 True - Download installation images for Red Hat Enterprise Linux releases, including new releases. + Download installation images for Oracle Linux releases, including new releases. False True GTK_JUSTIFY_LEFT @@ -4352,7 +4352,7 @@ 460 True - 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. + Access to the technical support experts at Oracle for help with any issues you might encounter with this system. False True GTK_JUSTIFY_LEFT @@ -4451,7 +4451,7 @@ 460 True True - Manage subscriptions and systems registered to Customer Portal via access.redhat.com or through one of our other subscription management services. + Manage subscriptions and systems registered to the Unbreakable Linux Network via linux.oracle.com. False True GTK_JUSTIFY_LEFT @@ -4466,7 +4466,7 @@ False 0 - Manage subscriptions and systems registered to Customer Portal via access.redhat.com or through one of our other subscription management services. + Manage subscriptions and systems registered to the Unbreakable Linux Network via linux.oracle.com. @@ -4947,7 +4947,7 @@ True - This system has already been registered with RHN using RHN certificate-based technology. + This system has already been registered with ULN using ULN certificate-based technology. False False GTK_JUSTIFY_LEFT @@ -4972,7 +4972,7 @@ True - Your system is being registered again using RHN Classic technology. Red Hat recommends that customers only register once. + Your system is being registered again. Oracle recommends that customers only register once. False False GTK_JUSTIFY_LEFT @@ -4997,7 +4997,7 @@ True - To learn more about RHN registration and technologies please consult this Knowledge Base Article: <a href="https://access.redhat.com/kb/docs/DOC-45563">https://access.redhat.com/kb/docs/DOC-45563</a> + To learn more about Spacewalk registration and technologies please consult the Oracle Linux Documentation Library: <a href="http://docs.oracle.com/cd/E37670_01/index.html">http://docs.oracle.com/cd/E37670_01/index.html</a> False True @@ -5161,7 +5161,7 @@ True - puplet-screenshot.png + /usr/share/pixmaps/puplet-screenshot.png 0.5 0.5 0 @@ -5403,7 +5403,7 @@ True - <b>Tip:</b> Minor releases with a '*' are currently fully supported by Red Hat. + <b>Tip:</b> Minor releases with a '*' are currently fully supported by Oracle. True True GTK_JUSTIFY_LEFT @@ -5464,7 +5464,7 @@ True - <b>_All available updates</b> will be provided to this system. If kept updated, this system will always be equivalent to the latest minor release in the main 'Red Hat Enterprise Linux x' software channel. + <b>_All available updates</b> will be provided to this system. If kept updated, this system will always be equivalent to the latest minor release in the main 'Oracle Linux x' software channel. True True GTK_JUSTIFY_LEFT @@ -5479,7 +5479,7 @@ False 0 - All available updates will be provided to this system. If kept updated, this system will always be equivalent to the latest minor release in the main 'Red Hat Enterprise Linux x' software channel. + All available updates will be provided to this system. If kept updated, this system will always be equivalent to the latest minor release in the main 'Oracle Linux x' software channel. @@ -5698,7 +5698,7 @@ True - puplet-screenshot.png + /usr/share/pixmaps/puplet-screenshot.png 0.5 0.5 0 diff -ruN rhn-client-tools-2.7.16.orig/rhn_register.desktop.in rhn-client-tools-2.7.16/rhn_register.desktop.in --- rhn-client-tools-2.7.16.orig/rhn_register.desktop.in 2017-08-09 09:58:44.000000000 -0700 +++ rhn-client-tools-2.7.16/rhn_register.desktop.in 2017-08-25 12:59:14.417506710 -0700 @@ -1,8 +1,8 @@ [Desktop Entry] Encoding=UTF-8 -_Name=RHN Registration -_GenericName=Register for software updates from Spacewalk/Red Hat Satellite/Red Hat Network Classic -_Comment=Register to Spacewalk/Red Hat Satellite/Red Hat Network Classic. +_Name=Spacewalk Registration +_GenericName=Register for software updates from Spacewalk +_Comment=Register to Spacewalk Exec=rhn_register Icon=up2date Terminal=false diff -ruN rhn-client-tools-2.7.16.orig/src/firstboot-legacy-rhel6/rhn_choose_server_gui.py rhn-client-tools-2.7.16/src/firstboot-legacy-rhel6/rhn_choose_server_gui.py --- rhn-client-tools-2.7.16.orig/src/firstboot-legacy-rhel6/rhn_choose_server_gui.py 2017-08-09 09:58:44.000000000 -0700 +++ rhn-client-tools-2.7.16/src/firstboot-legacy-rhel6/rhn_choose_server_gui.py 2017-08-25 12:59:14.484481715 -0700 @@ -66,7 +66,7 @@ try: self.rhsmActive = False if self.chooseServerPage.chooseServerPageApply() is False: - interface.moveToPage(moduleTitle=_("Red Hat Account")) + interface.moveToPage(moduleTitle=_("Spacewalk account")) return RESULT_JUMP else: return RESULT_FAILURE diff -ruN rhn-client-tools-2.7.16.orig/src/firstboot-legacy-rhel6/rhn_login_gui.py rhn-client-tools-2.7.16/src/firstboot-legacy-rhel6/rhn_login_gui.py --- rhn-client-tools-2.7.16.orig/src/firstboot-legacy-rhel6/rhn_login_gui.py 2017-08-09 09:58:44.000000000 -0700 +++ rhn-client-tools-2.7.16/src/firstboot-legacy-rhel6/rhn_login_gui.py 2017-08-25 12:59:14.578448881 -0700 @@ -37,8 +37,8 @@ def __init__(self): Module.__init__(self) self.priority = 108.5 - self.sidebarTitle = _("Red Hat Account") - self.title = _("Red Hat Account") + self.sidebarTitle = _("Spacewalk account") + self.title = _("Spacewalk account") def needsNetwork(self): return True diff -ruN rhn-client-tools-2.7.16.orig/src/up2date_client/rhnreg_constants.py rhn-client-tools-2.7.16/src/up2date_client/rhnreg_constants.py --- rhn-client-tools-2.7.16.orig/src/up2date_client/rhnreg_constants.py 2017-08-09 09:58:44.000000000 -0700 +++ rhn-client-tools-2.7.16/src/up2date_client/rhnreg_constants.py 2017-08-25 12:59:14.648060321 -0700 @@ -19,77 +19,77 @@ COPYRIGHT_TEXT = _(u"Copyright © 2006--2014 Red Hat, Inc. All rights reserved.") # Satellite URL Window -SATELLITE_URL_WINDOW = _("Enter your Red Hat Satellite URL.") -SATELLITE_URL_TEXT = _("Please enter the location of your Red Hat Satellite " +SATELLITE_URL_WINDOW = _("Enter your Spacewalk URL.") +SATELLITE_URL_TEXT = _("Please enter the location of your Spacewalk " "server and of its SSL " "certificate. The SSL certificate is only required " "if you will be connecting over https (recommended).") -SATELLITE_URL_PROMPT = _("Satellite URL:") +SATELLITE_URL_PROMPT = _("Spacewalk URL:") SATELLITE_URL_PROMPT2 = _("SSL certificate:") -SATELLITE_REQUIRED = _("You must enter a valid Satellite URL.") +SATELLITE_REQUIRED = _("You must enter a valid Spacewalk URL.") SSL_REQUIRED = _("If you are using https you must enter the location " "of a valid SSL certificate.") # Connect Window CONNECT_WINDOW = _("Attempting to contact the Spacewalk server.") -CONNECT_WINDOW_TEXT = _("We are attempting to contact the Red Hat " - "Network server at %s.") +CONNECT_WINDOW_TEXT = _("We are attempting to contact the Spacewalk " + " server at %s.") CONNECT_WINDOW_TEXT2 = _("A proxy was specified at %s.") # Start Window START_REGISTER_WINDOW = _("System Registration") START_REGISTER_TEXT = _("This assistant will guide you through " "connecting your system to " - "Red Hat Satellite to receive software " + "Spacewalk server to receive software " "updates, including " "security updates, to keep your system supported " "and compliant. " "You will need the following at this time:\n\n" " * A network connection\n" - " * Your Red Hat Login & password\n" - " * The location of a Red Hat Satellite " - "or Proxy\n\n") + " * Your Spacewalk Login & password\n" + " * The location of a Spacewalk server " + "or Spacewalk Proxy\n\n") # Why Register Window -WHY_REGISTER = _("Why Should I Connect to RHN? ...") +WHY_REGISTER = _("Why Should I Connect to Spacewalk? ...") WHY_REGISTER_WINDOW = _("Why Register") -WHY_REGISTER_TEXT = _("Connecting your system to Red Hat Satellite allows you to take full " +WHY_REGISTER_TEXT = _("Connecting your system to Spacewalk allows you to take full " "advantage of the benefits of a paid subscription, including:") WHY_REGISTER_SEC = _("Security & Updates:") WHY_REGISTER_DLD = _("Downloads & Upgrades:") WHY_REGISTER_SUPP = _("Support:") WHY_REGISTER_COMP = _("Compliance:") WHY_REGISTER_SEC_TXT = _("Receive the latest software updates, including security updates, keeping this " - "Red Hat Enterprise Linux system updated and secure.") -WHY_REGISTER_DLD_TXT = _("Download installation images for Red Hat Enterprise Linux releases, " + "Oracle Linux system updated and secure.") +WHY_REGISTER_DLD_TXT = _("Download installation images for Oracle Linux releases, " "including new releases.") -WHY_REGISTER_SUPP_TXT = _("Access to the technical support experts at Red Hat or Red Hat's partners for help " +WHY_REGISTER_SUPP_TXT = _("Access to the technical support experts at Oracle for help " "with any issues you might encounter with this system.") WHY_REGISTER_COMP_TXT = _("Stay in compliance with your subscription agreement " "and manage subscriptions " "for systems connected to your account.") -WHY_REGISTER_TIP = _("Tip: Red Hat values your privacy: " - "http://www.redhat.com/legal/privacy_statement.html") +WHY_REGISTER_TIP = _("Tip: Oracle values your privacy: " + "http://www.oracle.com/us/legal/privacy/overview/index.htm") BACK_REGISTER = _("Take me back to the registration") # Confirm Quit Window CONFIRM_QUIT = _("Software Update Not Set Up") -CONFIRM_QUIT_SURE = _("Are you sure you don't want to connect your system to Red Hat Satellite? " - "You'll miss out on the benefits of a Red Hat Enterprise Linux subscription:\n") +CONFIRM_QUIT_SURE = _("Are you sure you don't want to connect your system to a Spacewalk server? " + "You'll miss out on the benefits of a Oracle Linux subscription:\n") CONFIRM_QUIT_WILLNOT = _("You will not be able to take advantage of these subscription privileges without connecting " - "your system to Red Hat Satellite.\n") + "your system to a Spacewalk server.\n") CONTINUE_REGISTERING = _("Take me back to the setup process.") REGISTER_LATER2 = _("I'll register later.") # Info Window -REGISTER_WINDOW = _("Red Hat Account") -LOGIN_PROMPT = _("Please enter your login information for the %s Red " - "Hat Network Satellite:\n\n") -HOSTED_LOGIN = _("Red Hat Login:") +REGISTER_WINDOW = _("Spacewalk Account") +LOGIN_PROMPT = _("Please enter your login information for the %s Spacewalk " + "server:\n\n") +HOSTED_LOGIN = _("Spacewalk Login:") LOGIN = _("Login:") PASSWORD = _("Password:") LOGIN_TIP = _("Tip: Forgot your login or password? Contact your " - "Satellite's Organization Administrator.") + "Spacewalk's Organization Administrator.") USER_REQUIRED = _("Please enter a desired login.") PASSWORD_REQUIRED = _("Please enter and verify a password.") @@ -108,7 +108,7 @@ HARDWARE_WINDOW = _("Create Profile - Hardware") HARDWARE_WINDOW_DESC1 = _("A Profile Name is a descriptive name that" " you choose to identify this System Profile" - " on the Red Hat Satellite web pages. Optionally," + " on the Spacewalk 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" @@ -135,52 +135,50 @@ SYSTEM_ALREADY_REGISTERED_CONT = _("Are you sure you would like to continue?") RHSM_SYSTEM_ALREADY_REGISTERED = _("This system has already been registered using Red Hat Subscription Management.\n\n" - "Your system is being registered again using Red Hat Satellite" - " or Red Hat Satellite Proxy technology. Red Hat recommends that customers only register once.\n\n" - "To learn more about RHN Classic/Red Hat Satellite registration and technologies please consult this" - " Knowledge Base Article: https://access.redhat.com/kb/docs/DOC-45563") + "Your system is being registered again to a Spacewalk server" + " or Spacewalk Proxy. Oracle recommends that customers only register once.\n\n" + "To learn more about Spacewalk registration and technologies please consult the" + " Spacewalk documentation library: http://docs.oracle.com/cd/E37670_01/index.html") # Send Window -SEND_WINDOW = _("Send Profile Information to Red Hat Satellite") +SEND_WINDOW = _("Send Profile Information to Spacewalk") SEND_WINDOW_DESC = _("We are finished collecting information for the System Profile.\n\n" - "Press \"Next\" to send this System Profile to Red Hat Satellite. " + "Press \"Next\" to send this System Profile to Spacewalk. " "Click \"Cancel\" and no information will be sent. " "You can run the registration program later by " "typing `rhn_register` at the command line.") # Sending Window -SENDING_WINDOW = _("Sending Profile to Red Hat Satellite") +SENDING_WINDOW = _("Sending Profile to Spacewalk") # Finish Window FINISH_WINDOW = _("Updates Configured") FINISH_WINDOW_TEXT_TUI = _("You may now run '%s update' from this system's " "command line to get the latest " - "software updates from Red Hat Satellite. You will need to run this " + "software updates from Spacewalk. You will need to run this " "periodically to " "get the latest updates. Alternatively, you may configure this " "system for automatic software updates (also known as 'auto errata update') " - "via the Red Hat Satellite web interface. (Instructions for this are in chapter 6 " - "of the RHN Reference Guide, available from the 'Help' button in the main Red " - "Hat Network Satellite web interface.)") % PM_NAME + "via the Spacewalk web interface. (Instructions for this are in chapter 6 " + "of the Reference Guide, available from the 'Help' button in the main " + "Spacewalk web interface.)") % PM_NAME # Review Window REVIEW_WINDOW = _("Review Subscription") REVIEW_WINDOW_PROMPT = _("Please review the subscription details below:") SUB_NUM = _("The installation number %s was activated during " - "this system's initial connection to Red Hat Satellite.") + "this system's initial connection to Spacewalk.") SUB_NUM_RESULT = _("Subscriptions have been activated for the following " - "Red Hat products/services:") + "Oracle products/services:") CHANNELS_TITLE = _("Software Channel Subscriptions:") OK_CHANNELS = _("This system will receive updates from the " "following software channels:") CHANNELS_SAT_WARNING = _("Warning: Only installed product listed above will receive " "updates and support. If you would like " "to receive updates for additional products, please " - "login to your satellite web interface " + "login to your Spacewalk web interface " "and subscribe this system to the appropriate " - "software channels. See Kbase article " - "for more details. " - "(http://kbase.redhat.com/faq/docs/DOC-11313)") + "software channels. ") PM_PLUGIN_WARNING = _("Warning: %s is not present, could not enable it.\n" "Automatic updates will not work.") % (PM_PLUGIN_NAME) PM_PLUGIN_CONF_CHANGED = _("Note: %s has been enabled.") % (PM_PLUGIN_NAME) @@ -193,17 +191,17 @@ NO_BASE_CHANNEL = _( "This system was unable to subscribe to any software channels. Your system " "will not receive any software updates to keep it secure and supported. " -"Contact your Satellite administrator about this problem. Once you make the " +"Contact your Spacewalk administrator about this problem. Once you make the " "appropriate active subscriptions available in your account, you may browse " -"to this system's profile in the RHN web interface and subscribe this system " +"to this system's profile in the Spacewalk web interface and subscribe this system " "to software channels via the software > software channels tab.") SLOTS_TITLE = _("Service Level:") -OK_SLOTS = _("Depending on what Red Hat Satellite modules are associated with a system, you'll " +OK_SLOTS = _("Depending on what Spacewalk modules are associated with a system, you'll " "enjoy different benefits. The following are the " - "Red Hat Satellite modules associated with this system:") + "Spacewalk modules associated with this system:") SLOTS = SLOTS_TITLE + "\n" + OK_SLOTS + "\n%s" FAILED_SLOTS = _("This system was unable to be associated with the " - "following RHN module(s) because there were " + "following Spacewalk module(s) because there were " "insufficient subscriptions available in your account:") MANAGEMENT = _("Management module: automatic updates, systems " "grouping, systems permissions, system package profiling, " @@ -215,40 +213,38 @@ VIRT_FAILED = _("Warning: Any guest systems you create on this system " - "and register to RHN will consume Red Hat Enterprise Linux " + "and register to Spacewalk will consume " "subscriptions beyond this host system's subscription. You will need " "to: (1) make a virtualization system entitlement available and " "(2) apply that system entitlement to this " - "system in RHN's web interface if you do not want virtual guests of " + "system in Spacewalk's web interface if you do not want virtual guests of " "this system to consume additional subscriptions.") NO_SYS_ENTITLEMENT = _("This system was unable to be associated with " -"any RHN service level modules. This system will not receive any software " -"updates to keep it secure and supported. Contace your Satellite administrator " +"any Spacewalk service level modules. This system will not receive any software " +"updates to keep it secure and supported. Contace your Spacewalk administrator " "about this problem. Once you make the " "appropriate active subscriptions available in your account, you may browse " -"to this system's profile in the RHN web interface, delete the profile, and " -"re-connect this system to Red Hat Satellite.") +"to this system's profile in the Spacewalk web interface, delete the profile, and " +"re-connect this system to the Spacewalk server.") ACTIVATION_KEY = _("Universal default activation key detected\n" "A universal default activation key was detected in your account. " "This means that a set of properties (software channel subscriptions, " "package installations, system group memberships, etc.) " - "for your system's connection to Red Hat Satellite or Red Hat Satellite Proxy" + "for your system's connection to Spacewalk or a Spacewalk Proxy" "have been determined by the activation key rather than your " "installation number. " - "You may also refer to the RHN Reference Guide, section 6.4.6 for more details " - "about activation keys (http://access.redhat.com/knowledge/docs/Red_Hat_Network/)\n" "Universal Default activation key: %s") # Error Messages. FATAL_ERROR = _("Fatal Error") WARNING = _("Warning") -HOSTED_CONNECTION_ERROR = _("We can't contact the Red Hat Satellite.\n\n" +HOSTED_CONNECTION_ERROR = _("We can't contact Spacewalk.\n\n" "Double check the location provided - is '%s' correct?\n" "If not, you can correct it and try again.\n\n" "Make sure that the network connection on this system is operational.\n\n" "This system will not be able to successfully receive software updates " - "from Red Hat without connecting to a Red Hat Satellite server") + "from Red Hat without connecting to a Spacewalk server") BASECHANNELERROR = _("Architecture: %s, OS Release: %s, OS " "Version: %s") @@ -260,7 +256,7 @@ SSL_CERT_ERROR_MSG = _("Incompatible Certificate File\n\n" "The certificate you provided, %s, is not compatible with " - " the Red Hat Satellite server at %s. You may want to double-check" + " the Spacewalk server at %s. You may want to double-check" " that you have provided a valid certificate file." " Are you sure you have provided the correct certificate, and that" " the certificate file has not been corrupted?\n\n" @@ -273,24 +269,21 @@ SSL_CERT_FILE_NOT_FOUND_ERRER = _("Please verify the values of sslCACert and serverURL in " "/etc/sysconfig/rhn/up2date. You can either make the " "serverURL use http instead of https, or you can " - "download the SSL cert from your Satellite, place it " + "download the SSL cert from your Spacewalk server, place it " "in /usr/share/rhn, and ensure sslCACert points to it.") ACT_KEY_USAGE_LIMIT_ERROR = _("Problem registering system.\n\n" "A universal default activation key limits the " "number of systems which can connect to " - "the RHN organization associated with your " + "the Spacewalk organization associated with your " "login. To allow this system to connect, " - "please contact your RHN organization " + "please contact your Spacewalk organization " "administrator to increase the number of " "systems allowed to connect or to disable " - "this 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 ") + "this universal default activation key. ") CHANNEL_PAGE_TIP = _("\n Tip: Minor releases with a '*' are currently" - " supported by Red Hat.\n\n") + " supported by Oracle.\n\n") CHANNEL_PAGE_WARNING = _("Warning:You will not be able to limit this" " system to minor release that is older than" diff -ruN rhn-client-tools-2.7.16.orig/src/up2date_client/rhnregGui.py rhn-client-tools-2.7.16/src/up2date_client/rhnregGui.py --- rhn-client-tools-2.7.16.orig/src/up2date_client/rhnregGui.py 2017-08-09 09:58:44.000000000 -0700 +++ rhn-client-tools-2.7.16/src/up2date_client/rhnregGui.py 2017-08-25 12:59:14.742079268 -0700 @@ -329,7 +329,7 @@ log.log_exception(*sys.exc_info()) protocol, host, path, parameters, query, fragmentIdentifier = urlparse.urlparse(config.getServerlURL()[0]) dialog = messageWindow.BulletedOkDialog(_("Cannot contact selected server")) - dialog.add_text(_("We could not contact the Satellite or Proxy " + dialog.add_text(_("We could not contact the Spacewalk server or Proxy " "at '%s.'") % host) dialog.add_bullet(_("Double-check the location - is '%s' " "correct? If not, you can correct it and " @@ -1324,7 +1324,7 @@ logFile = cfg['logFile'] or '/var/log/up2date' message = message + "\n" + (_("This error shouldn't have happened. If you'd " "like to help us improve this program, please " - "file a bug at bugzilla.redhat.com. Including " + "file a SR at My Oracle Support . Including " "the relevant parts of '%s' would be very " "helpful. Thanks!") % logFile) errorWindow(message) diff -ruN rhn-client-tools-2.7.16.orig/src/up2date_client/up2dateErrors.py rhn-client-tools-2.7.16/src/up2date_client/up2dateErrors.py --- rhn-client-tools-2.7.16.orig/src/up2date_client/up2dateErrors.py 2017-08-09 09:58:44.000000000 -0700 +++ rhn-client-tools-2.7.16/src/up2date_client/up2dateErrors.py 2017-08-25 12:59:14.835558916 -0700 @@ -300,11 +300,9 @@ def changeExplanation(self, msg): newExpln = _(""" Your organization does not have enough Management entitlements to register this - system to Red Hat Satellite. Please notify your organization administrator of this error. + system to Spacewalk. Please notify your organization administrator of this error. You should be able to register this system after your organization frees existing - or purchases additional entitlements. Additional entitlements may be purchased by your - organization administrator by logging into Red Hat Network Classic and visiting - the 'Subscription Management' page in the 'Your RHN' section of RHN. + or purchases additional entitlements. A common cause of this error code is due to having mistakenly setup an Activation Key which is set as the universal default. If an activation key is set