spacewalk-commits
December 2013
spacewalk-commits@lists.fedorahosted.org
- 11 participants
- 227 discussions
java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java | 157 +------
java/code/src/com/redhat/rhn/frontend/configuration/tags/test/ConfigChannelTagTest.java | 200 ----------
java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java | 1
3 files changed, 31 insertions(+), 327 deletions(-)
New commits:
commit 8da6ecedda9ef8297bc8c6c49bb510f77d369111
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Dec 12 16:01:57 2013 +0100
remove obsolete unit test as tag was rewritten
diff --git a/java/code/src/com/redhat/rhn/frontend/configuration/tags/test/ConfigChannelTagTest.java b/java/code/src/com/redhat/rhn/frontend/configuration/tags/test/ConfigChannelTagTest.java
deleted file mode 100644
index 1df7aa4..0000000
--- a/java/code/src/com/redhat/rhn/frontend/configuration/tags/test/ConfigChannelTagTest.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/**
- * Copyright (c) 2009--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.configuration.tags.test;
-
-import com.redhat.rhn.common.localization.LocalizationService;
-import com.redhat.rhn.domain.config.ConfigChannelType;
-import com.redhat.rhn.frontend.configuration.tags.ConfigChannelTag;
-import com.redhat.rhn.frontend.configuration.tags.ConfigTagHelper;
-import com.redhat.rhn.testing.RhnBaseTestCase;
-import com.redhat.rhn.testing.RhnMockHttpServletRequest;
-import com.redhat.rhn.testing.RhnMockJspWriter;
-import com.redhat.rhn.testing.TagTestUtils;
-
-import com.mockobjects.helpers.TagTestHelper;
-
-import java.net.URL;
-
-import javax.servlet.jsp.tagext.Tag;
-
-/**
- * ConfigChannelTagTest
- * @version $Rev$
- */
-public class ConfigChannelTagTest extends RhnBaseTestCase {
- /**
- * Called once per test method.
- * @throws Exception if an error occurs during setup.
- */
- protected void setUp() throws Exception {
- super.setUp();
- ConfigChannelTag tag = new ConfigChannelTag();
- RhnMockHttpServletRequest request = new RhnMockHttpServletRequest();
- TagTestHelper tth = TagTestUtils.setupTagTest(tag,
- new URL("http://localhost"),
- request);
- tag.setPageContext(tth.getPageContext());
- }
-
- /** Test tag output for central
- */
- public void testCentral() throws Exception {
-
- String alt = ConfigChannelTag.CENTRAL_ALT_KEY;
- String imgName = ConfigChannelTag.CENTRAL_LIST_ICON;
-
- execTest(0, "bar",
- ConfigChannelType.global().getLabel(),
- false, alt, imgName);
-
- execTest(1, "bar1", "central", false, alt, imgName);
-
- execTest(2, "bar2", "global", false, alt, imgName);
- //also checking case sensititvity
- execTest(2, "bar2", "gloBal", false, alt, imgName);
- execTest(-2, "bar2", "gloBal", false, alt, imgName);
- execTest(2, "bar2", "global", true, alt, imgName);
- }
-
- /** Test tag output for central
- */
- public void testLocal() throws Exception {
-
- String alt = ConfigChannelTag.LOCAL_ALT_KEY;
- String imgName = ConfigChannelTag.LOCAL_LIST_ICON;
- execTest(0, "bar",
- ConfigChannelType.local().getLabel(),
- false, alt, imgName);
- execTest(1, "bar1", "local", false, alt, imgName);
- }
-
- public void testSandbox() throws Exception {
-
- String alt = ConfigChannelTag.SANDBOX_ALT_KEY;
- String imgName = ConfigChannelTag.SANDBOX_LIST_ICON;
- execTest(0, "bar",
- ConfigChannelType.sandbox().getLabel(),
- false, alt, imgName);
- execTest(1, "bar1", "sandbox", false, alt, imgName);
- }
-
- public void testFailure() throws Exception {
-
- ConfigChannelTag tag = new ConfigChannelTag();
- RhnMockHttpServletRequest request = new RhnMockHttpServletRequest();
- TagTestHelper tth = TagTestUtils.setupTagTest(tag,
- new URL("http://localhost"),
- request);
- tag.setPageContext(tth.getPageContext());
- tag.setId(String.valueOf(1));
- tag.setName("FOO");
-
- String type = "FAILURE";
- tag.setType(type);
-
- // ok let's test the tag
- tth.assertDoStartTag(Tag.SKIP_BODY);
- tth.assertDoEndTag(Tag.SKIP_BODY);
- RhnMockJspWriter rout = (RhnMockJspWriter) tth.getPageContext().getOut();
- assertTrue(rout.toString().
- indexOf(ConfigTagHelper.CONFIG_ERROR_ALT_TEXT) > -1);
- assertTrue(rout.toString().
- indexOf(ConfigTagHelper.CONFIG_ERROR_IMG) > -1);
- }
-
- public void execTest(int id, String name,
- String type, boolean nolink,
- String altKey, String imgName) throws Exception {
- ConfigChannelTag tag = new ConfigChannelTag();
- RhnMockHttpServletRequest request = new RhnMockHttpServletRequest();
- TagTestHelper tth = TagTestUtils.setupTagTest(tag,
- new URL("http://localhost"),
- request);
- tag.setPageContext(tth.getPageContext());
- if (id >= 0) {
- tag.setId(String.valueOf(id));
- }
-
- tag.setName(name);
- tag.setType(type);
- tag.setNolink(String.valueOf(nolink));
-
- // ok let's test the tag
- tth.assertDoStartTag(Tag.SKIP_BODY);
- tth.assertDoEndTag(Tag.SKIP_BODY);
-
- RhnMockJspWriter rout = (RhnMockJspWriter) tth.getPageContext().getOut();
-
- assertTrue(rout.toString().indexOf(name) > -1);
- assertFalse(rout.toString().indexOf("alt = \"\"") > -1);
-
- LocalizationService service = LocalizationService.getInstance();
- String alt = service.getMessage(altKey);
- assertTrue(rout.toString().indexOf(alt) > -1);
- assertTrue(rout.toString().indexOf(imgName) > -1);
- if (!nolink && id >= 0) {
- String url = "<a href=\"" + ConfigChannelTag.CHANNEL_URL +
- "?ccid=" + id;
- assertTrue(rout.toString().startsWith(url));
- }
- else {
- assertFalse(rout.toString().startsWith("<a href"));
- }
- }
-
- public void testFunctions() {
- checkFunctions(ConfigChannelTag.CENTRAL_HEADER_ICON,
- ConfigChannelTag.CENTRAL_ALT_KEY,
- "global");
- //also checking case sensititvity
- checkFunctions(ConfigChannelTag.CENTRAL_HEADER_ICON,
- ConfigChannelTag.CENTRAL_ALT_KEY,
- "cenTral");
-
- checkFunctions(ConfigChannelTag.CENTRAL_HEADER_ICON,
- ConfigChannelTag.CENTRAL_ALT_KEY,
- ConfigChannelType.global().getLabel());
-
-
-
- checkFunctions(ConfigChannelTag.LOCAL_HEADER_ICON,
- ConfigChannelTag.LOCAL_ALT_KEY,
- "local");
-
-
- checkFunctions(ConfigChannelTag.LOCAL_HEADER_ICON,
- ConfigChannelTag.LOCAL_ALT_KEY,
- ConfigChannelType.local().getLabel());
-
-
- checkFunctions(ConfigChannelTag.SANDBOX_HEADER_ICON,
- ConfigChannelTag.SANDBOX_ALT_KEY,
- "sandbox");
-
-
- checkFunctions(ConfigChannelTag.SANDBOX_HEADER_ICON,
- ConfigChannelTag.SANDBOX_ALT_KEY,
- ConfigChannelType.sandbox().getLabel());
-
- String url = ConfigChannelTag.makeConfigChannelUrl("" + 1);
- assertTrue(url.indexOf("ccid=1") > -1);
- assertTrue(url.startsWith(ConfigChannelTag.CHANNEL_URL));
- }
-
- private void checkFunctions(String icon, String altKey, String type) {
- assertEquals(altKey, ConfigChannelTag.getAltKeyFor(type));
- assertEquals(icon, ConfigChannelTag.getHeaderIconFor(type));
- }
-}
commit 8d477a93ec7c04b1cb0837b606e50f82b4177a91
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Dec 12 16:01:40 2013 +0100
simplify logic in cfg:channel tag
diff --git a/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java b/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java
index 718e2ce..d52cca9 100644
--- a/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java
@@ -14,18 +14,15 @@
*/
package com.redhat.rhn.frontend.configuration.tags;
-import com.redhat.rhn.domain.config.ConfigChannelType;
+import com.redhat.rhn.frontend.taglibs.IconTag;
-import org.apache.log4j.Logger;
-
-import java.util.HashMap;
-import java.util.Map;
+import java.io.IOException;
import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.tagext.BodyTagSupport;
import javax.servlet.jsp.tagext.TagSupport;
-
/**
* ConfigChannelTag
* @version $Rev$
@@ -39,20 +36,6 @@ public class ConfigChannelTag extends TagSupport {
private String name;
private String type;
private boolean nolink;
- private static final Logger LOG = Logger.getLogger(ConfigChannelTag.class);
- private static final Map ICON_PATH_RETRIEVER = new HashMap();
-
- public static final String CENTRAL_ALT_KEY = "config.common.globalAlt";
- public static final String LOCAL_ALT_KEY = "config.common.localAlt";
- public static final String SANDBOX_ALT_KEY = "config.common.sandboxAlt";
-
- public static final String CENTRAL_LIST_ICON = "/img/rhn-listicon-channel.gif";
- public static final String LOCAL_LIST_ICON = "/img/rhn-listicon-system.gif";
- public static final String SANDBOX_LIST_ICON = "/img/rhn-listicon-sandbox.gif";
-
- public static final String CENTRAL_HEADER_ICON = "/img/rhn-config_central.gif";
- public static final String LOCAL_HEADER_ICON = "/img/rhn-config_system.gif";
- public static final String SANDBOX_HEADER_ICON = "/img/rhn-config_sandbox.gif";
public static final String CHANNEL_URL =
"/rhn/configuration/ChannelOverview.do";
@@ -67,16 +50,23 @@ public class ConfigChannelTag extends TagSupport {
* {@inheritDoc}
*/
public int doEndTag() throws JspException {
+ StringBuilder result = new StringBuilder();
if (nolink || id == null) {
writeIcon();
- ConfigTagHelper.write(" " + name, pageContext);
+ result.append(name);
}
else {
- ConfigTagHelper.write("<a href=\"" +
- ConfigChannelTag.makeConfigChannelUrl(id) +
- "\">", pageContext);
- writeIcon();
- ConfigTagHelper.write(" " + name + "</a>", pageContext);
+ result.append("<a href=\"" +
+ ConfigChannelTag.makeConfigChannelUrl(id) + "\">");
+ result.append(writeIcon());
+ result.append(name + "</a>");
+ }
+ JspWriter writer = pageContext.getOut();
+ try {
+ writer.write(result.toString());
+ }
+ catch (IOException e) {
+ throw new JspException(e);
}
return BodyTagSupport.SKIP_BODY;
}
@@ -118,79 +108,31 @@ public class ConfigChannelTag extends TagSupport {
}
/**
- * Checks to see if no invalid values are specified
- */
- private boolean checkType() {
- try {
- ConfigChannelType.lookup(type);
- return true;
- }
- catch (IllegalArgumentException ie) {
- LOG.warn(ie.getMessage());
- return false;
- }
-
-
- }
-
-
- /**
* @param value the value to set
*/
public void setName(String value) {
this.name = value;
}
- private void writeIcon() throws JspException {
- if (checkType()) {
- Map iconMap = getIconMap();
-
- String imgPath = (String)iconMap.get("LIST_" + type.toUpperCase());
- String altKey = (String)iconMap.get("KEY_" + type.toUpperCase());
- ConfigTagHelper.writeIcon(imgPath, altKey, pageContext);
+ private String writeIcon() throws JspException {
+ IconTag i = new IconTag();
+ i.setParent(getParent());
+ i.setPageContext(pageContext);
+ if (type.equals("central") || type.equals("global")) {
+ i.setType("header-channel-configuration");
}
- else {
- ConfigTagHelper.writeErrorIcon(pageContext);
+ else if (type.equals("local_override")) {
+ i.setType("header-system");
}
-
- }
-
- private static Map getIconMap() {
- if (ICON_PATH_RETRIEVER.isEmpty()) {
- ICON_PATH_RETRIEVER.put("LIST_LOCAL_OVERRIDE", LOCAL_LIST_ICON);
- ICON_PATH_RETRIEVER.put("HEADER_LOCAL_OVERRIDE", LOCAL_HEADER_ICON);
- ICON_PATH_RETRIEVER.put("KEY_LOCAL_OVERRIDE", LOCAL_ALT_KEY);
-
- ICON_PATH_RETRIEVER.put("LIST_LOCAL", LOCAL_LIST_ICON);
- ICON_PATH_RETRIEVER.put("HEADER_LOCAL", LOCAL_HEADER_ICON);
- ICON_PATH_RETRIEVER.put("KEY_LOCAL", LOCAL_ALT_KEY);
-
-
- ICON_PATH_RETRIEVER.put("LIST_NORMAL", CENTRAL_LIST_ICON);
- ICON_PATH_RETRIEVER.put("HEADER_NORMAL", CENTRAL_HEADER_ICON);
- ICON_PATH_RETRIEVER.put("KEY_NORMAL", CENTRAL_ALT_KEY);
-
- ICON_PATH_RETRIEVER.put("LIST_CENTRAL", CENTRAL_LIST_ICON);
- ICON_PATH_RETRIEVER.put("HEADER_CENTRAL", CENTRAL_HEADER_ICON);
- ICON_PATH_RETRIEVER.put("KEY_CENTRAL", CENTRAL_ALT_KEY);
-
- ICON_PATH_RETRIEVER.put("LIST_GLOBAL", CENTRAL_LIST_ICON);
- ICON_PATH_RETRIEVER.put("HEADER_GLOBAL", CENTRAL_HEADER_ICON);
- ICON_PATH_RETRIEVER.put("KEY_GLOBAL", CENTRAL_ALT_KEY);
-
- ICON_PATH_RETRIEVER.put("LIST_SERVER_IMPORT", SANDBOX_LIST_ICON);
- ICON_PATH_RETRIEVER.put("HEADER_SERVER_IMPORT", SANDBOX_HEADER_ICON);
- ICON_PATH_RETRIEVER.put("KEY_SERVER_IMPORT", SANDBOX_ALT_KEY);
-
- ICON_PATH_RETRIEVER.put("LIST_SANDBOX", SANDBOX_LIST_ICON);
- ICON_PATH_RETRIEVER.put("HEADER_SANDBOX", SANDBOX_HEADER_ICON);
- ICON_PATH_RETRIEVER.put("KEY_SANDBOX", SANDBOX_ALT_KEY);
+ else {
+ i.setType("sandbox");
+ i.setTitle(type);
}
-
- return ICON_PATH_RETRIEVER;
+ String result = i.renderStartTag();
+ i.release();
+ return result;
}
-
/**
* Returns the URL to view a config channel
* This method may also be used with the el expression
@@ -204,43 +146,4 @@ public class ConfigChannelTag extends TagSupport {
public static String makeConfigChannelUrl(String ccId) {
return CHANNEL_URL + "?ccid=" + ccId;
}
-
- /**
- * Returns the Header icon image path for a given channel type
- * This method is public static because
- * EL functions defined in a TLD file,
- * need to be public static methods..
- * @param type the config channel type
- * @return the image path
- */
- public static final String getHeaderIconFor(String type) {
- Map map = getIconMap();
- return (String) map.get("HEADER_" + type.toUpperCase());
- }
-
- /**
- * Returns the list icon image path for a given channel type
- * This method is public static because
- * EL functions defined in a TLD file,
- * need to be public static methods..
- * @param type the config channel type
- * @return the image path
- */
- public static final String getListIconFor(String type) {
- Map map = getIconMap();
- return (String) map.get("LIST_" + type.toUpperCase());
- }
-
- /**
- * Returns the Header alt key for a given channel type
- * This method is public static because
- * EL functions defined in a TLD file,
- * need to be public static methods..
- * @param type the config channel type
- * @return the alt key
- */
- public static final String getAltKeyFor(String type) {
- Map map = getIconMap();
- return (String) map.get("KEY_" + type.toUpperCase());
- }
}
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
index a12b89a..0f871fc 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
@@ -103,6 +103,7 @@ public class IconTag extends TagSupport {
icons.put("nav-bullet", "fa fa-caret-right");
icons.put("nav-right", "fa fa-arrow-right");
icons.put("nav-up", "fa fa-caret-up");
+ icons.put("sandbox", "fa spacewalk-icon-sandbox");
icons.put("system-crit", "fa fa-exclamation-circle fa-1-5x text-danger");
icons.put("system-kickstarting", "fa fa-rocket fa-1-5x");
icons.put("system-locked", "fa fa-1-5x spacewalk-icon-locked-system");
1
0
java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9809e7aa6db346ed4894a8a42a757d6f5bb748b0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Dec 12 14:49:43 2013 +0100
fixed unterminated tag
fixing
/root/rpmbuild/BUILD/spacewalk-java-git-0.9cf52da/build.xml:644: org.apache.jasper.JasperException: file:/root/rpmbuild/BUILD/spacewalk-java-git-0.9cf52da/build/webapp/rhnjava/WEB-INF/includes/legends/system-group-legend.jsp(11,0) Unterminated <rhn:icon tag
diff --git a/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp
index ebc2d39..88da003 100644
--- a/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp
@@ -5,7 +5,7 @@
<h4><bean:message key="system-group-legend.jsp.title"/></h4>
<ul>
<li><rhn:icon type="system-ok" /><bean:message key="system-group-legend.jsp.fully"/></li>
- <li><rhn:icon type="system-crit"><bean:message key="system-group-legend.jsp.updates"/></li>
- <li><rhn:icon type="system-warn"><bean:message key="system-group-legend.jsp.critical"/></li>
+ <li><rhn:icon type="system-crit" /><bean:message key="system-group-legend.jsp.updates"/></li>
+ <li><rhn:icon type="system-warn" /><bean:message key="system-group-legend.jsp.critical"/></li>
</ul>
</div>
1
0
Tag 'spacewalk-java-2.1.98-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-12-12 13:40 +0000
Tagging package [spacewalk-java] version [2.1.98-1] in directory [java/].
Changes since rhn-client-tools-2.1.13-1:
Michael Mraka (2):
replaced icons with icon tag
Automatic commit of package [spacewalk-java] release [2.1.98-1].
---
java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java | 15 +++++++
java/code/webapp/WEB-INF/includes/header.jsp | 8 ++--
java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp | 6 +--
java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp | 6 +--
java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp | 8 ++--
java/code/webapp/WEB-INF/pages/admin/iss/master.jsp | 8 ++--
java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp | 4 +-
java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp | 4 +-
java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp | 2 -
java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp | 6 +--
java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp | 4 +-
java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp | 6 +--
java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/erratalist.jsp | 6 +--
java/code/webapp/WEB-INF/pages/channel/manage/add.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp | 6 +--
java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp | 6 +--
java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp | 6 +--
java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp | 4 +-
java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp | 8 ++--
java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp | 2 -
java/code/webapp/WEB-INF/pages/common/errors/404.jsp | 2 -
java/code/webapp/WEB-INF/pages/common/errors/500.jsp | 2 -
java/code/webapp/WEB-INF/pages/common/errors/badcsvaction.jsp | 2 -
java/code/webapp/WEB-INF/pages/common/errors/baddownloadaction.jsp | 2 -
java/code/webapp/WEB-INF/pages/common/errors/badparam.jsp | 2 -
java/code/webapp/WEB-INF/pages/common/errors/loginerror.jsp | 2 -
java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp | 2 -
java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp | 2 -
java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp | 2 -
java/code/webapp/WEB-INF/pages/common/errors/permission.jsp | 2 -
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp | 4 +-
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp | 4 +-
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp | 2 -
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp | 6 +--
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp | 2 -
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp | 8 ++--
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp | 20 +++++-----
java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp | 4 +-
java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp | 4 +-
java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp | 4 +-
java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp | 4 +-
java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp | 6 +--
java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp | 4 +-
java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp | 4 +-
java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp | 2 -
java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp | 2 -
java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp | 14 +++----
java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp | 2 -
java/code/webapp/WEB-INF/pages/errata/packages/list.jsp | 2 -
java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp | 2 -
java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp | 2 -
java/code/webapp/WEB-INF/pages/groups/detail.jsp | 6 +--
java/code/webapp/WEB-INF/pages/help/docsearch.jsp | 2 -
java/code/webapp/WEB-INF/pages/help/helpindex.jsp | 2 -
java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp | 2 -
java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp | 4 +-
java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp | 2 -
java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp | 4 +-
java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/fifth.jsp | 2 -
java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp | 2 -
java/code/webapp/WEB-INF/pages/monitoring/probes.jsp | 2 -
java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp | 6 +--
java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp | 2 -
java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp | 6 +--
java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp | 4 +-
java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp | 2 -
java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp | 2 -
java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp | 2 -
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp | 2 -
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp | 4 +-
java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp | 6 +--
java/code/webapp/WEB-INF/pages/systems/errata.jsp | 8 ++--
java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp | 8 ++--
java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp | 4 +-
java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp | 2 -
java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp | 2 -
java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 8 ++--
java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp | 2 -
java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp | 18 ++++-----
java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp | 2 -
java/spacewalk-java.spec | 11 +++++
rel-eng/packages/spacewalk-java | 2 -
116 files changed, 231 insertions(+), 207 deletions(-)
---
1
0
12 Dec '13
java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java | 15 +++++++
java/code/webapp/WEB-INF/includes/header.jsp | 8 ++--
java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp | 6 +--
java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp | 6 +--
java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp | 8 ++--
java/code/webapp/WEB-INF/pages/admin/iss/master.jsp | 8 ++--
java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp | 4 +-
java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp | 4 +-
java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp | 2 -
java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp | 6 +--
java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp | 4 +-
java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp | 6 +--
java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/erratalist.jsp | 6 +--
java/code/webapp/WEB-INF/pages/channel/manage/add.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp | 6 +--
java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp | 6 +--
java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp | 6 +--
java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp | 4 +-
java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp | 8 ++--
java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp | 2 -
java/code/webapp/WEB-INF/pages/common/errors/404.jsp | 2 -
java/code/webapp/WEB-INF/pages/common/errors/500.jsp | 2 -
java/code/webapp/WEB-INF/pages/common/errors/badcsvaction.jsp | 2 -
java/code/webapp/WEB-INF/pages/common/errors/baddownloadaction.jsp | 2 -
java/code/webapp/WEB-INF/pages/common/errors/badparam.jsp | 2 -
java/code/webapp/WEB-INF/pages/common/errors/loginerror.jsp | 2 -
java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp | 2 -
java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp | 2 -
java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp | 2 -
java/code/webapp/WEB-INF/pages/common/errors/permission.jsp | 2 -
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp | 4 +-
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp | 4 +-
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp | 2 -
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp | 6 +--
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp | 2 -
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp | 8 ++--
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp | 20 +++++-----
java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp | 4 +-
java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp | 4 +-
java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp | 4 +-
java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp | 4 +-
java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp | 6 +--
java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp | 4 +-
java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp | 4 +-
java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp | 2 -
java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp | 2 -
java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp | 14 +++----
java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp | 2 -
java/code/webapp/WEB-INF/pages/errata/packages/list.jsp | 2 -
java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp | 2 -
java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp | 2 -
java/code/webapp/WEB-INF/pages/groups/detail.jsp | 6 +--
java/code/webapp/WEB-INF/pages/help/docsearch.jsp | 2 -
java/code/webapp/WEB-INF/pages/help/helpindex.jsp | 2 -
java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp | 2 -
java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp | 4 +-
java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp | 2 -
java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp | 4 +-
java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/fifth.jsp | 2 -
java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp | 2 -
java/code/webapp/WEB-INF/pages/monitoring/probes.jsp | 2 -
java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp | 6 +--
java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp | 2 -
java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp | 6 +--
java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp | 4 +-
java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp | 2 -
java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp | 2 -
java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp | 2 -
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp | 2 -
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp | 4 +-
java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp | 6 +--
java/code/webapp/WEB-INF/pages/systems/errata.jsp | 8 ++--
java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp | 8 ++--
java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp | 4 +-
java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp | 2 -
java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp | 2 -
java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 8 ++--
java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp | 2 -
java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp | 18 ++++-----
java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp | 2 -
java/spacewalk-java.spec | 11 +++++
rel-eng/packages/spacewalk-java | 2 -
116 files changed, 231 insertions(+), 207 deletions(-)
New commits:
commit 9cf52da2f3d70f15e71452d84ed98b6ada3ba285
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Dec 12 14:40:44 2013 +0100
Automatic commit of package [spacewalk-java] release [2.1.98-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 0b492a1..985c6ea 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.97
+Version: 2.1.98
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -785,6 +785,15 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Dec 12 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.98-1
+- replaced icons with icon tag
+- system group edit properties - linking + cleanup
+- alter system group create page to do editing
+- use rhn:toolbar tag instead of creating html inside .jsp + unify icons
+- fix icons on config file details page
+- icon for file download
+- unify configuration management icons
+
* Wed Dec 11 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.97-1
- use new icon aliases in more places
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index a4cd024..a19e19b 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.97-1 java/
+2.1.98-1 java/
commit 74d9e2a4dcf0a0a5bb7a696f9b747ea6039e85cb
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Dec 12 12:32:16 2013 +0100
replaced icons with icon tag
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
index 393821b..a12b89a 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
@@ -58,28 +58,40 @@ public class IconTag extends TagSupport {
icons.put("header-configuration", "fa spacewalk-icon-manage-configuration-files");
icons.put("header-crash", "spacewalk-icon-bug-ex");
icons.put("header-errata", "fa spacewalk-icon-patches");
+ icons.put("header-errata-add", "fa spacewalk-icon-patch-install");
+ icons.put("header-errata-del", "fa spacewalk-icon-patch-remove");
+ icons.put("header-errata-set", "fa spacewalk-icon-patch-set");
+ icons.put("header-errata-set-add", "fa pacewalk-icon-patchset-install");
+ icons.put("header-event-history", "fa fa-suitcase");
icons.put("header-globe", "fa fa-globe");
icons.put("header-info", "fa fa-info-circle");
icons.put("header-list", "fa fa-list");
icons.put("header-kickstart", "fa fa-rocket");
+ icons.put("header-multiorg-big", "fa fa-sitemap fa-3x");
icons.put("header-organisation", "fa fa-group");
icons.put("header-package", "fa spacewalk-icon-packages");
icons.put("header-preferences", "fa fa-cogs");
+ icons.put("header-proxy", "fa spacewalk-icon-proxy");
icons.put("header-search", "fa fa-search");
icons.put("header-signout", "fa fa-sign-out");
icons.put("header-sitemap", "fa fa-sitemap");
icons.put("header-snapshot", "fa fa-camera");
+ icons.put("header-snapshot-rollback", "fa spacewalk-icon-snapshot-rollback");
+ icons.put("header-subscriptions-big", "fa fa-list-alt fa-3x");
icons.put("header-system", "fa fa-desktop");
icons.put("header-system-groups", "fa spacewalk-icon-system-groups");
icons.put("header-system-physical", "fa fa-desktop");
icons.put("header-system-virt-guest", "fa spacewalk-icon-virtual-guest");
icons.put("header-system-virt-host", "fa spacewalk-icon-virtual-host");
icons.put("header-user", "fa fa-user");
+ icons.put("header-users-big", "fa fa-group fa-3x");
icons.put("header-taskomatic", "fa fa-tachometer");
icons.put("item-add", "fa fa-plus");
icons.put("item-clone", "fa fa-files-o");
icons.put("item-del", "fa fa-trash-o");
icons.put("item-download", "fa fa-download");
+ icons.put("item-disabled", "fa fa-circle-o text-muted");
+ icons.put("item-enabled", "fa fa-check text-success");
icons.put("item-ssm-add", "fa fa-plus-circle");
icons.put("item-ssm-del", "fa fa-minus-circle");
icons.put("monitoring-crit", "fa fa-1-5x spacewalk-icon-health text-danger");
@@ -88,6 +100,9 @@ public class IconTag extends TagSupport {
icons.put("monitoring-status", "fa fa-1-5x spacewalk-icon-monitoring-status");
icons.put("monitoring-unknown", "fa fa-1-5x spacewalk-icon-health-unknown");
icons.put("monitoring-warn", "fa fa-1-5x spacewalk-icon-health text-warning");
+ icons.put("nav-bullet", "fa fa-caret-right");
+ icons.put("nav-right", "fa fa-arrow-right");
+ icons.put("nav-up", "fa fa-caret-up");
icons.put("system-crit", "fa fa-exclamation-circle fa-1-5x text-danger");
icons.put("system-kickstarting", "fa fa-rocket fa-1-5x");
icons.put("system-locked", "fa fa-1-5x spacewalk-icon-locked-system");
diff --git a/java/code/webapp/WEB-INF/includes/header.jsp b/java/code/webapp/WEB-INF/includes/header.jsp
index 9c0e89f..b3ae493 100644
--- a/java/code/webapp/WEB-INF/includes/header.jsp
+++ b/java/code/webapp/WEB-INF/includes/header.jsp
@@ -32,13 +32,13 @@
<a href="/rhn/account/UserDetails.do"><rhn:icon type="header-user" /><c:out escapeXml="true" value="${requestScope.session.user.login}" /></a>
</li>
<li class="hidden-sm hidden-xs hidden-md">
- <span class="spacewalk-header-non-link"><i class="fa fa-sitemap"></i><c:out escapeXml="true" value="${requestScope.session.user.org.name}" /></span>
+ <span class="spacewalk-header-non-link"><rhn:icon type="header-sitemap" /><c:out escapeXml="true" value="${requestScope.session.user.org.name}" /></span>
</li>
<li>
- <a href="/rhn/account/UserPreferences.do"><i class="fa fa-cogs" title="<bean:message key='header.jsp.preferences' />"></i></a>
+ <a href="/rhn/account/UserPreferences.do"><rhn:icon type="header-preferences" title="<bean:message key='header.jsp.preferences' />" /></a>
</li>
<li>
- <html:link forward="logout"><i class="fa fa-sign-out" title="<bean:message key='header.jsp.signout' />"></i></html:link>
+ <html:link forward="logout"><rhn:icon type="header-signout" title="<bean:message key='header.jsp.signout' />" /></html:link>
</li>
</ul>
@@ -59,7 +59,7 @@
<div class="form-group">
<input type="hidden" name="submitted" value="true" />
<button type="submit" class="btn btn-info input-sm">
- <i class="fa fa-search"></i>
+ <rhn:icon type="header-search" />
</button>
</div>
</form>
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp b/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp
index 52f1c7d..ec0e1aa 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp
@@ -21,7 +21,7 @@
<p><bean:message key="general.jsp.org.summary3"/></p>
<table class="table">
<tr>
- <td><i class="fa fa-sitemap fa-3x"></i></td>
+ <td><rhn:icon type="header-multiorg-big" /></td>
<td><bean:message key="general.jsp.org.tbl.header1"/>:</td>
<td>
<p>
@@ -33,7 +33,7 @@
</td>
</tr>
<tr>
- <td><i class="fa fa-list-alt fa-3x"></i></td>
+ <td><rhn:icon type="header-subscriptions-big" /></td>
<td><bean:message key="general.jsp.org.tbl.header2"/>:</td>
<td>
<p>
@@ -45,7 +45,7 @@
</td>
</tr>
<tr>
- <td><i class="fa fa-group fa-3x"></i></td>
+ <td><rhn:icon type="header-users-big" /></td>
<td><bean:message key="general.jsp.org.tbl.header3"/>:</td>
<td>
<p>
diff --git a/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp
index 3c2052a..fe331d3 100644
--- a/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp
@@ -17,13 +17,13 @@
<rhn:listdisplay button="deleteconfirm.jsp.confirm">
<rhn:column header="erratalist.jsp.type">
<c:if test="${current.securityAdvisory}">
- <i class="fa fa-lock"></i>
+ <rhn:icon type="errata-security" />
</c:if>
<c:if test="${current.bugFix}">
- <i class="fa fa-bug"></i>
+ <rhn:icon type="errata-bugfix" />
</c:if>
<c:if test="${current.productEnhancement}">
- <i class="fa spacewalk-icon-enhancement"></i>
+ <rhn:icon type="errata-enhance" />
</c:if>
</rhn:column>
<rhn:column header="erratalist.jsp.advisory">
diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp
index c090206..d43f0b8 100644
--- a/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp
@@ -27,19 +27,19 @@
<rl:column bound="false" headerkey="iss.slave.isEnabled"
sortattr="enabled">
<c:if test="${current.enabled == 'Y'}">
- <i class="fa fa-check text-success" title="<bean:message key='iss.slave.enabled'/>"></i>
+ <rhn:icon type="item-enabled" title="<bean:message key='iss.slave.enabled' />" />
</c:if>
<c:if test="${current.enabled != 'Y'}">
- <i class="fa fa-circle-o" title="<bean:message key='iss.slave.disabled'/>"></i>
+ <rhn:icon type="item-disabled" title="<bean:message key='iss.slave.disabled' />" />
</c:if>
</rl:column>
<rl:column bound="false" headerkey="iss.slave.toAll"
sortattr="allOrgs">
<c:if test="${current.allowAllOrgs == 'Y'}">
- <i class="fa fa-check text-success" title="<bean:message key='iss.slave.all'/>"></i>
+ <rhn:icon type="item-enabled" title="<bean:message key='iss.slave.all' />" />
</c:if>
<c:if test="${current.allowAllOrgs != 'Y'}">
- <i class="fa fa-circle-o" title="<bean:message key='iss.slave.notAll'/>"></i>
+ <rhn:icon type="item-disabled" title="<bean:message key='iss.slave.notAll' />" />
</c:if>
</rl:column>
</rl:list>
diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp
index e85e59f..a82ef20 100644
--- a/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp
@@ -39,19 +39,19 @@
<rl:column bound="false" headerkey="iss.slave.isEnabled"
sortattr="enabled" styleclass="center" headerclass="center">
<c:if test="${current.enabled == 'Y'}">
- <i class="fa fa-check text-success" title="<bean:message key='iss.slave.enabled'/>"></i>
+ <rhn:icon type="item-enabled" title="<bean:message key='iss.slave.enabled' />" />
</c:if>
<c:if test="${current.enabled != 'Y'}">
- <i class="fa fa-circle-o" title="<bean:message key='iss.slave.disabled'/>"></i>
+ <rhn:icon type="item-disabled" title="<bean:message key='iss.slave.disabled' />" />
</c:if>
</rl:column>
<rl:column bound="false" headerkey="iss.slave.toAll"
sortattr="allOrgs" styleclass="center" headerclass="center">
<c:if test="${current.allowAllOrgs == 'Y'}">
- <i class="fa fa-check text-success" title="<bean:message key='iss.slave.all'/>"></i>
+ <rhn:icon type="item-enabled" title="<bean:message key='iss.slave.all' />" />
</c:if>
<c:if test="${current.allowAllOrgs != 'Y'}">
- <i class="fa fa-circle-o" title="<bean:message key='iss.slave.notAll'/>"></i>
+ <rhn:icon type="item-disabled" title="<bean:message key='iss.slave.notAll' />" />
</c:if>
</rl:column>
<rl:column bound="false" headerkey="iss.slave.num-orgs-allowed"
diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp
index ee0cc23..76915e6 100644
--- a/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp
@@ -32,10 +32,10 @@
<rl:column bound="false" headerkey="iss.master.isDefault"
styleclass="center" headerclass="center">
<c:if test="${current.defaultMaster}">
- <i class="fa fa-check text-success" title="<bean:message key='iss.master.isDefault'/>"></i>
+ <rhn:icon type="item-enabled" title="<bean:message key='iss.master.isDefault' />" />
</c:if>
<c:if test="${not current.defaultMaster}">
- <i class="fa fa-circle-o" title="<bean:message key='iss.master.notDefault'/>"></i>
+ <rhn:icon type="item-disabled" title="<bean:message key='iss.master.notDefault' />" />
</c:if>
</rl:column>
<rl:column headerkey="iss.num.master.orgs" styleclass="center" headerclass="center">
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp
index 5cf962c..ff8e50e 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp
@@ -86,10 +86,10 @@
attr="orgAdmin">
<c:choose>
<c:when test="${current.orgAdmin == 1}">
- <i class="fa fa-check"></i>
+ <rhn:icon type="item-enabled" />
</c:when>
<c:otherwise>
- <img src="/img/rhn-listicon-unchecked_immutable.gif">
+ <rhn:icon type="item-disabled" />
</c:otherwise>
</c:choose>
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp
index 97bf073..72b9e33 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp
@@ -72,7 +72,7 @@
<bean:message key="org.active.users.jsp"/>:
</label>
<div class="col-lg-6">
- <a class="btn btn-default btn-sm" href="/rhn/admin/multiorg/OrgUsers.do?oid=${param.oid}"><i class="fa fa-group"></i><bean:write name="orgDetailsForm" property="users"/></a>
+ <a class="btn btn-default btn-sm" href="/rhn/admin/multiorg/OrgUsers.do?oid=${param.oid}"><rhn:icon type="header-organisation" /><bean:write name="orgDetailsForm" property="users"/></a>
</div>
</div>
<div class="form-group">
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp
index f17cfe4..2136f55 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp
@@ -67,7 +67,7 @@
attr="orgAdmin">
<c:choose>
<c:when test="${current.orgAdmin == 1}">
- <i class="fa fa-check"></i>
+ <rhn:icon type="item-enabled" />
</c:when>
<c:otherwise>
<img src="/img/rhn-listicon-unchecked_immutable.gif">
@@ -81,12 +81,12 @@
<c:choose>
<c:when test="${current.satAdmin == 1}">
<a href="/rhn/admin/multiorg/ToggleSatAdmin.do?uid=${current.id}">
- <i class="fa fa-check text-success"></i>
+ <rhn:icon type="item-enabled" />
</a>
</c:when>
<c:otherwise>
<a href="/rhn/admin/multiorg/ToggleSatAdmin.do?uid=${current.id}">
- <i class="fa fa-circle-o"></i>
+ <rhn:icon type="item-disabled" />
</a>
</c:otherwise>
</c:choose>
diff --git a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
index e2e247c..25855fd 100644
--- a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
@@ -83,7 +83,7 @@
<rhn:submitted />
<div class="text-right form-group">
<button type="submit" class="btn btn-success">
- <i class="fa fa-search"></i>
+ <rhn:icon type="header-search" />
<bean:message key="button.search"/>
</button>
</div>
@@ -173,7 +173,7 @@
</div>
<div class="text-right">
<button type="submit" class="btn btn-success">
- <i class="fa fa-search"></i>
+ <rhn:icon type="header-search" />
<bean:message key="button.search"/>
</button>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
index df95677..7d02037 100644
--- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
@@ -41,7 +41,7 @@
</div>
<div class="form-group">
<button type="submit" class="btn btn-default btn-sm">
- <i class="fa fa-search"></i>
+ <rhn:icon type="header-search" />
<bean:message key="button.search"/>
</button>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp b/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp
index 0f24fec..152dced 100644
--- a/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp
@@ -41,7 +41,7 @@
</c:if>
<c:if test="${!empty channel.parentChannel}">
<a class="btn btn-info" href="/rhn/channels/ChannelDetail.do?cid=${channel.parentChannel.id}">
- <c:out value="${channel.parentChannel.name}" /> <i class="fa fa-arrow-right"></i>
+ <c:out value="${channel.parentChannel.name}" /> <rhn:icon type="nav-right" />
</a>
</c:if>
</div>
@@ -146,7 +146,7 @@
</label>
<div class="col-lg-6">
<a class="btn btn-info" href="/rhn/channels/ChannelPackages.do?cid=${channel.id}">
- ${pack_size} <i class="fa fa-arrow-right"></i>
+ ${pack_size} <rhn:icon type="nav-right" />
</a>
</div>
</div>
@@ -193,7 +193,7 @@
</label>
<div class="col-lg-6">
<a class="btn btn-info" href="/rhn/channels/ChannelSubscribers.do?cid=${channel.id}">
- ${systems_subscribed} <i class="fa fa-arrow-right"></i>
+ ${systems_subscribed} <rhn:icon type="nav-right" />
</a>
</div>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp
index 5eb818a..ccd29b3 100755
--- a/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp
@@ -15,7 +15,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/channel/channel_header.jspf" %>
<BR>
<h2>
- <i class="fa fa-desktop" title="system"></i>
+ <rhn:icon type="header-system-physical" title="system" />
<bean:message key="channeltarget.confirm.jsp.header1"/>
</h2>
diff --git a/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp b/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp
index ea2846d..688cc74 100644
--- a/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp
@@ -29,13 +29,13 @@
headerkey="erratalist.jsp.type">
<c:if test="${current.securityAdvisory}">
- <i class="fa fa-lock" title="<bean:message key='erratalist.jsp.securityadvisory' />"></i>
+ <rhn:icon type="errata-security" title="<bean:message key='erratalist.jsp.securityadvisory' />" />
</c:if>
<c:if test="${current.bugFix}">
- <i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory' />"></i>
+ <rhn:icon type="errata-bugfix" title="<bean:message key='erratalist.jsp.bugadvisory' />" />
</c:if>
<c:if test="${current.productEnhancement}">
- <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />"></i>
+ <rhn:icon type="errata-enhance" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />" />
</c:if>
</rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp
index cd22ec1..bf5eedc 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp
@@ -12,7 +12,7 @@
<body>
<%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-patches" title="erratum"></i> <bean:message key="header.jsp.errata.add"/>
+ <rhn:icon type="header-errata" title="erratum" /> <bean:message key="header.jsp.errata.add"/>
</h2>
<table class="details">
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp
index 883d041..ed9017a 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp
@@ -94,13 +94,13 @@
styleclass="center"
headerclass="thin-column">
<c:if test="${current.securityAdvisory}">
- <i class="fa fa-lock" title="<bean:message key='erratalist.jsp.securityadvisory'/>"></i>
+ <rhn:icon type="errata-security" title="<bean:message key='erratalist.jsp.securityadvisory' />" />
</c:if>
<c:if test="${current.bugFix}">
- <i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory'/>"></i>
+ <rhn:icon type="errata-bugfix" title="<bean:message key='erratalist.jsp.bugadvisory' />" />
</c:if>
<c:if test="${current.productEnhancement}">
- <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"></i>
+ <rhn:icon type="errata-enhance" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />" />
</c:if>
</rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp
index acac8dc..da69858 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp
@@ -116,13 +116,13 @@
styleclass="center"
headerclass="thin-column">
<c:if test="${current.securityAdvisory}">
- <i class="fa fa-lock" title="<bean:message key='erratalist.jsp.securityadvisory'/>"></i>
+ <rhn:icon type="errata-security" title="<bean:message key='erratalist.jsp.securityadvisory' />" />
</c:if>
<c:if test="${current.bugFix}">
- <i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory'/>"></i>
+ <rhn:icon type="errata-bugfix" title="<bean:message key='erratalist.jsp.bugadvisory' />" />
</c:if>
<c:if test="${current.productEnhancement}">
- <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"></i>
+ <rhn:icon type="errata-enhance" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />" />
</c:if>
</rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp
index 2e87e21..eac9bee 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp
@@ -28,7 +28,7 @@
<rhn:csrf />
<input type="hidden" name="cid" value="${cid}">
<bean:message key="channel.jsp.package.addmessage"/>
-<h2><i class="fa spacewalk-icon-packages"></i> <bean:message key="channel.jsp.package.addtitle"/></h2>
+<h2><rhn:icon type="header-package" /> <bean:message key="channel.jsp.package.addtitle"/></h2>
<%@ include file="/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf" %>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp
index 7d4e0a8..2096b7b 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp
@@ -14,7 +14,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %>
<BR>
-<h2><i class="fa spacewalk-icon-packages"></i> <bean:message key="repos.jsp.channel.repos"/></h2>
+<h2><rhn:icon type="header-package" /> <bean:message key="repos.jsp.channel.repos"/></h2>
<rl:listset name="packageSet">
<rhn:csrf />
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp
index 5274cfe..6a44866 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp
@@ -14,7 +14,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %>
<BR>
<h2>
- <i class="fa spacewalk-icon-packages"></i>
+ <rhn:icon type="header-package" />
<bean:message key="channel.jsp.package.add.confirm.title"/>
</h2>
<bean:message key="channel.jsp.package.add.confirm.msg"/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp
index 51a5020..73a1ced 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp
@@ -24,19 +24,19 @@
<h2>Errata Summary:</h2>
<table class="details">
<tr>
- <th><i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory'/>"></i>
+ <th><rhn:icon type="errata-bugfix" title="<bean:message key='erratalist.jsp.bugadvisory' />" />
Bug Fix Advisory:
</th>
<td>${bug_count}</td>
</tr>
<tr>
- <th><i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"></i>
+ <th><rhn:icon type="errata-enhance" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />" />
Product Enhancement Advisory:
</th>
<td>${enhance_count}</td>
</tr>
<tr>
- <th><i class="fa fa-lock" title="<bean:message key='erratalist.jsp.securityadvisory'/>"></i>
+ <th><rhn:icon type="errata-security" title="<bean:message key='erratalist.jsp.securityadvisory' />" />
Security Advisory:
</th>
<td>${secure_count}</td>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp
index f4d2987..a6a56be 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp
@@ -12,7 +12,7 @@
<body>
<%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-patches" title="erratum"></i> <bean:message key="header.jsp.errata"/>
+ <rhn:icon type="header-errata" title="erratum" /> <bean:message key="header.jsp.errata"/>
</h2>
<bean:message key="channel.jsp.errata.remove.confirmmessage"/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp
index c85aaf9..968110e 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp
@@ -17,7 +17,7 @@
<br/>
<h2>
- <i class="fa spacewalk-icon-packages"></i>
+ <rhn:icon type="header-package" />
<bean:message key="confirmprivate.jsp.title"/>
</h2>
<p><bean:message key="confirmprotected.jsp.confirmmsg"/></p>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp
index 9ee03e8..f2f8bd7 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp
@@ -14,7 +14,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %>
<BR>
<h2>
- <i class="fa spacewalk-icon-packages"></i>
+ <rhn:icon type="header-package" />
Confirm Package Removal
</h2>
<bean:message key="channel.jsp.package.remove"/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp
index 75a9478..4455bee 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp
@@ -69,10 +69,10 @@
>
<c:choose>
<c:when test="${current.org != null}">
- <i class="fa fa-check text-success"></i>
+ <rhn:icon type="item-enabled" />
</c:when>
<c:otherwise>
- <i class="fa fa-circle-o"></i>
+ <rhn:icon type="item-disabled" />
</c:otherwise>
</c:choose>
</rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp
index c73f58a..7df0baf 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp
@@ -12,7 +12,7 @@
<body>
<%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-patches" title="erratum"></i> <bean:message key="header.jsp.errata"/>
+ <rhn:icon type="header-errata" title="erratum"/> <bean:message key="header.jsp.errata"/>
</h2>
<ul>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp
index 4711637..34e35d9 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp
@@ -14,7 +14,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %>
<BR>
-<h2><i class="fa spacewalk-icon-packages"></i> <bean:message key="header.jsp.errata.sync.packagepush"/></h2>
+<h2><rhn:icon type="header-package" /> <bean:message key="header.jsp.errata.sync.packagepush"/></h2>
<bean:message key="channel.jsp.errata.sync.packages.message"/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp
index c8d2abe..5a7547b 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp
@@ -12,7 +12,7 @@
<body>
<%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-patches" title="erratum"></i> <bean:message key="header.jsp.errata.sync"/>
+ <rhn:icon type="header-errata" title="erratum" /> <bean:message key="header.jsp.errata.sync"/>
</h2>
<bean:message key="channel.jsp.errata.sync.message"/>
@@ -42,13 +42,13 @@
headerclass="thin-column"
sortattr="advisoryType">
<c:if test="${current.advisoryType == 'Product Enhancement Advisory'}">
- <i class="fa spacewalk-icon-enhancement" title="Product Enhancement Advisory"></i>
+ <rhn:icon type="errata-enhance" title="Product Enhancement Advisory" />
</c:if>
<c:if test="${current.advisoryType == 'Security Advisory'}">
- <i class="fa fa-lock" title="Security Advisory"></i>
+ <rhn:icon type="errata-security" title="Security Advisory" />
</c:if>
<c:if test="${current.advisoryType == 'Bug Fix Advisory'}">
- <i class="fa fa-bug" title="Bug Fix Advisory"></i>
+ <rhn:icon type="errata-bugfix" title="Bug Fix Advisory" />
</c:if>
</rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp
index 0086bf3..aa32335 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp
@@ -14,7 +14,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %>
<BR>
-<h2><i class="fa spacewalk-icon-packages"></i> <bean:message key="channel.jsp.package.list"/></h2>
+<h2><rhn:icon type="header-package" /> <bean:message key="channel.jsp.package.list"/></h2>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp
index dec517a..03e7fca 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp
@@ -13,7 +13,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-packages" title="package"></i> Packages
+ <rhn:icon type="header-package" title="package" /> Packages
</h2>
<ul>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp
index 89e358f..318bc13 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp
@@ -14,7 +14,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %>
<BR>
-<h2><i class="fa spacewalk-icon-packages"></i> <bean:message key="repos.jsp.channel.repos"/></h2>
+<h2><rhn:icon type="header-package" /> <bean:message key="repos.jsp.channel.repos"/></h2>
<rl:listset name="packageSet">
<rhn:csrf />
diff --git a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
index 5a46003..6a1e9cb 100644
--- a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
@@ -27,7 +27,7 @@
name="search_string" value="${search_string}" accesskey="4"/>
<span class="input-group-btn">
<button type="submit" class="btn btn-default">
- <i class="fa fa-search"></i>
+ <rhn:icon type="header-search" />
</button>
</span>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp
index 31d770b..4224e7d 100644
--- a/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp
@@ -13,7 +13,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/channel/channel_header.jspf" %>
<h2>
- <i class="fa fa-desktop"></i>
+ <rhn:icon type="header-system-physical" />
<bean:message key="channelsystems.jsp.header2"/>
</h2>
diff --git a/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp
index 690f417..a6b19ba 100755
--- a/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp
@@ -15,7 +15,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/channel/channel_header.jspf" %>
<BR>
<h2>
- <i class="fa fa-desktop" title="system"></i>
+ <rhn:icon type="header-system-physical" title="system" />
<bean:message key="channeltarget.jsp.header1"/>
</h2>
diff --git a/java/code/webapp/WEB-INF/pages/common/errors/404.jsp b/java/code/webapp/WEB-INF/pages/common/errors/404.jsp
index d33b193..7ac4908 100644
--- a/java/code/webapp/WEB-INF/pages/common/errors/404.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/errors/404.jsp
@@ -11,7 +11,7 @@
<c:set var="escapedUrl" value="${fn:escapeXml(errorUrl)}"/>
<h1>
- <i class="fa fa-warning text-warning" title="<bean:message key='500.jsp.imgAlt' />"></i>
+ <rhn:icon type="system-warn" title="<bean:message key='500.jsp.imgAlt' />" />
<bean:message key="404.jsp.title"/>
</h1>
<p><bean:message key="404.jsp.summary" arg0="${escapedUrl}"/></p>
diff --git a/java/code/webapp/WEB-INF/pages/common/errors/500.jsp b/java/code/webapp/WEB-INF/pages/common/errors/500.jsp
index 9c0bd92..7f9218d 100644
--- a/java/code/webapp/WEB-INF/pages/common/errors/500.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/errors/500.jsp
@@ -6,7 +6,7 @@
<page:applyDecorator name="layout_c">
<body>
<h1>
- <i class="fa fa-warning text-warning" title="<bean:message key='500.jsp.imgAlt' />"></i>
+ <rhn:icon type="system-warn" title="<bean:message key='500.jsp.imgAlt' />" />
<bean:message key="500.jsp.title"/>
</h1>
<p><bean:message key="500.jsp.summary"/></p>
diff --git a/java/code/webapp/WEB-INF/pages/common/errors/badcsvaction.jsp b/java/code/webapp/WEB-INF/pages/common/errors/badcsvaction.jsp
index 2c97f17..e42296c 100644
--- a/java/code/webapp/WEB-INF/pages/common/errors/badcsvaction.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/errors/badcsvaction.jsp
@@ -6,7 +6,7 @@
<rhn:require acl="user_authenticated()">
-<h1><i class="fa fa-warning text-warning"></i><bean:message key="badcsvaction.jsp.title"/></h1>
+<h1><rhn:icon type="system-warn" /><bean:message key="badcsvaction.jsp.title"/></h1>
<p><bean:message key="badcsvaction.jsp.summary"/></p>
<ol>
diff --git a/java/code/webapp/WEB-INF/pages/common/errors/baddownloadaction.jsp b/java/code/webapp/WEB-INF/pages/common/errors/baddownloadaction.jsp
index e2296e0..2f16211 100644
--- a/java/code/webapp/WEB-INF/pages/common/errors/baddownloadaction.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/errors/baddownloadaction.jsp
@@ -4,7 +4,7 @@
<html>
<body>
-<h1><i class="fa fa-warning text-warning"></i><bean:message key="baddownload.jsp.title"/></h1>
+<h1><rhn:icon type="system-warn" /><bean:message key="baddownload.jsp.title"/></h1>
<p><bean:message key="baddownload.jsp.summary"/></p>
<ol>
diff --git a/java/code/webapp/WEB-INF/pages/common/errors/badparam.jsp b/java/code/webapp/WEB-INF/pages/common/errors/badparam.jsp
index fde7d24..a728458 100644
--- a/java/code/webapp/WEB-INF/pages/common/errors/badparam.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/errors/badparam.jsp
@@ -6,7 +6,7 @@
<rhn:require acl="user_authenticated()">
-<h1><i class="fa fa-warning text-warning"></i><bean:message key="badparam.jsp.title"/></h1>
+<h1><rhn:icon type="system-warn" /><bean:message key="badparam.jsp.title"/></h1>
<p><bean:message key="badparam.jsp.summary"/></p>
<ol>
diff --git a/java/code/webapp/WEB-INF/pages/common/errors/loginerror.jsp b/java/code/webapp/WEB-INF/pages/common/errors/loginerror.jsp
index a640b0c..9aa68d5 100644
--- a/java/code/webapp/WEB-INF/pages/common/errors/loginerror.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/errors/loginerror.jsp
@@ -4,7 +4,7 @@
<html>
<body>
-<h1><i class="fa fa-warning text-warning"></i><bean:message key="login.jsp.error.header"/></h1>
+<h1><rhn:icon type="system-warn" /><bean:message key="login.jsp.error.header"/></h1>
<p><bean:message key="login.jsp.error.message"/></p>
diff --git a/java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp b/java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp
index 9ad6f69..252bfd4 100644
--- a/java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp
@@ -7,7 +7,7 @@
<rhn:require acl="user_authenticated()">
<h1>
- <i class="fa fa-warning text-warning" title="<bean:message key='error.common.errorAlt' />"></i>
+ <rhn:icon type="system-warn" title="<bean:message key='error.common.errorAlt' />" />
${error.localizedTitle}
</h1>
diff --git a/java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp b/java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp
index dac3c5f..74e68a2 100644
--- a/java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp
@@ -5,7 +5,7 @@
<body>
<h1>
- <i class="fa fa-warning text-warning" title="<bean:message key='error.common.errorAlt' />"></i>
+ <rhn:icon type="system-warn" title="<bean:message key='error.common.errorAlt' />" />
<bean:message key="unknown.kickstart" />:
</h1>
diff --git a/java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp b/java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp
index cf7f712..59de36c 100644
--- a/java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp
@@ -5,7 +5,7 @@
<body>
<h1>
- <i class="fa fa-warning text-warning" title="<bean:message key='error.common.errorAlt' />"></i>
+ <rhn:icon type="system-warn" title="<bean:message key='error.common.errorAlt' />" />
<bean:message key="unknown.package" />:
</h1>
diff --git a/java/code/webapp/WEB-INF/pages/common/errors/permission.jsp b/java/code/webapp/WEB-INF/pages/common/errors/permission.jsp
index 28e31f5..7ff26b2 100644
--- a/java/code/webapp/WEB-INF/pages/common/errors/permission.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/errors/permission.jsp
@@ -5,7 +5,7 @@
<body>
<h1>
- <i class="fa fa-warning text-warning" title="<bean:message key='error.common.errorAlt' />"></i>
+ <rhn:icon type="system-warn" title="<bean:message key='error.common.errorAlt' />" />
${error.localizedTitle}
</h1>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp
index a962600..a6ce4c4 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp
@@ -25,10 +25,10 @@
url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}">
<c:choose>
<c:when test="${requestScope.type == 'central'}">
- <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i>
+ <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" />
</c:when>
<c:when test="${requestScope.type == 'local'}">
- <i class="fa fa-desktop" title="<bean:message key="config.common.localAlt" />"></i>
+ <rhn:icon type="header-system-physical" title="<bean:message key='config.common.localAlt' />" />
</c:when>
<c:otherwise>
<i class="fa spacewalk-icon-sandbox" title="<bean:message key="config.common.sandboxAlt" />"></i>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp
index c9a8a2d..97a7def 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp
@@ -26,10 +26,10 @@
<i class="fa spacewalk-icon-sandbox" title="<bean:message key="config.common.sandboxAlt" />"></i>
</c:when>
<c:when test="${mychan.configChannelType.label == 'local_override'}">
- <i class="fa fa-desktop" title="<bean:message key="config.common.localAlt" />"></i>
+ <rhn:icon type="header-system-physical" title="<bean:message key='config.common.localAlt' />" />
</c:when>
<c:otherwise>
- <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i>
+ <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" />
</c:otherwise>
</c:choose>
${mychan.name}
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp
index 4451d25..76a2b50 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp
@@ -14,7 +14,7 @@
description="yourrhn.jsp.relevanterrata.description">
<rhn:column header="yourrhn.jsp.securityerrata">
- <i class="fa fa-lock" title="<bean:message key='errata-legend.jsp.security'/>"></i>
+ <rhn:icon type="errata-security" title="<bean:message key='errata-legend.jsp.security' />" />
<a href="/rhn/errata/details/Details.do?eid=${current.id}">${current.advisoryName}</a>
</rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp
index 4ebed53..7b56ee8 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp
@@ -32,17 +32,17 @@
<rl:column headerkey="yourrhn.jsp.criticalsystems.securityerrata"
headerclass="row-2 text-align: center;">
- <i class="fa fa-lock" title="<bean:message key='errata-legend.jsp.security'/>"></i>${current.securityErrata}
+ <rhn:icon type="errata-security" title="<bean:message key='errata-legend.jsp.security' />" />${current.securityErrata}
</rl:column>
<rl:column headerkey="yourrhn.jsp.criticalsystems.bugfixerrata"
headerclass="row-2 text-align: center;">
- <i class="fa fa-bug" title="<bean:message key='errata-legend.jsp.bugfix'/>"></i>${current.bugErrata}
+ <rhn:icon type="errata-bugfix" title="<bean:message key='errata-legend.jsp.bugfix' />" />${current.bugErrata}
</rl:column>
<rl:column headerkey="yourrhn.jsp.criticalsystems.enhancementerrata"
headerclass="row-2 text-align: center;">
- <i class="fa spacewalk-icon-enhancement" title="<bean:message key='errata-legend.jsp.enhancement'/>"></i>${current.enhancementErrata}
+ <rhn:icon type="errata-enhance" title="<bean:message key='errata-legend.jsp.enhancement' />" />${current.enhancementErrata}
</rl:column>
</rl:list>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp
index 8e2d6cd..97f3b33 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp
@@ -26,7 +26,7 @@
<i class="fa fa-times-circle-o text-danger" title="<bean:message key='yourrhn.jsp.actions.failed'/>"></i>
</c:when>
<c:otherwise>
- <i class="spacewalk-icon-unknown-system" title="<bean:message key='yourrhn.jsp.actions.unknown'/>"></i>
+ <rhn:icon type="system-unknown" title="<bean:message key='yourrhn.jsp.actions.unknown' />" />
</c:otherwise>
</c:choose>
<a href="/rhn/schedule/ActionDetails.do?aid=${current.id}"><c:out value="${current.actionName}" /></a>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp
index 5dcd19b..77f7dac 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp
@@ -18,13 +18,13 @@
<a href="/network/systems/groups/errata_list.pxt?sgid=${current.id}">
<c:choose>
<c:when test="${current.mostSevereErrata == 'Security Advisory'}">
- <i class="fa fa-exclamation-triangle fa-1-5x text-danger" title="<bean:message key='grouplist.jsp.security'/>"></i>
+ <rhn:icon type="system-crit" title="<bean:message key='grouplist.jsp.security' />" />
</c:when>
<c:when test="${current.mostSevereErrata == 'Bug Fix Advisory' or current.mostSevereErrata == 'Product Enhancement Advisory'}">
- <i class="fa fa-exclamation-circle fa-1-5x text-warning" title="<bean:message key='grouplist.jsp.updates'/>"></i>
+ <rhn:icon type="system-warn" title="<bean:message key='grouplist.jsp.updates' />" />
</c:when>
<c:otherwise>
- <rhn:icon type="system-ok" title="<bean:message key='grouplist.jsp.noerrata'/>" />
+ <rhn:icon type="system-ok" title="<bean:message key='grouplist.jsp.noerrata'/>" />
</c:otherwise>
</c:choose>
</a>
@@ -45,7 +45,7 @@
</rl:list>
<a href="/rhn/systems/SystemGroupList.do">
- <div class="btn btn-default spacewalk-btn-margin-vertical"><i class="spacewalk-icon-system-groups"></i><bean:message key="yourrhn.jsp.allgroups" /></div>
+ <div class="btn btn-default spacewalk-btn-margin-vertical"><rhn:icon type="header-system-groups" /><bean:message key="yourrhn.jsp.allgroups" /></div>
</a>
</rl:listset>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp
index 59e6fe6..0e434b2 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp
@@ -18,7 +18,7 @@
<rhn:require acl="not user_role(satellite_admin)">
<rhn:require acl="user_role(org_admin)">
<li class="list-group-item">
- <i class="fa fa-caret-right"></i> <a
+ <rhn:icon type="nav-bullet" /> <a
href="/rhn/systems/SystemEntitlements.do"> <bean:message
key="yourrhn.jsp.tasks.subscriptions" />
</a>
@@ -29,7 +29,7 @@
<rhn:require acl="user_role(satellite_admin)">
<rhn:require acl="user_role(org_admin)">
<li class="list-group-item">
- <i class="fa fa-caret-right"></i> <bean:message
+ <rhn:icon type="nav-bullet" /> <bean:message
key="yourrhn.jsp.task.manage_subscriptions" /> <br>
   <a href="/rhn/systems/SystemEntitlements.do">
<bean:message key="header.jsp.my_organization" />
@@ -42,7 +42,7 @@
<rhn:require acl="user_role(satellite_admin)">
<rhn:require acl="not user_role(org_admin)">
- <li class="list-group-item"><i class="fa fa-caret-right"></i> <a
+ <li class="list-group-item"><rhn:icon type="nav-bullet" /> <a
href="/rhn/admin/multiorg/SoftwareEntitlements.do"> <bean:message
key="yourrhn.jsp.tasks.subscriptions" />
</a>
@@ -52,7 +52,7 @@
<c:if test="${documentation == 'true'}">
<li class="list-group-item">
- <i class="fa fa-caret-right"></i> <a
+ <rhn:icon type="nav-bullet" /> <a
href="/rhn/help/client-config/en-US/index.jsp"> <bean:message
key="yourrhn.jsp.tasks.registersystem" />
</a>
@@ -62,7 +62,7 @@
<rhn:require
acl="org_entitlement(sw_mgr_enterprise); user_role(activation_key_admin)">
<li class="list-group-item">
- <i class="fa fa-caret-right"></i> <a
+ <rhn:icon type="nav-bullet" /> <a
href="/rhn/activationkeys/List.do"> <bean:message
key="yourrhn.jsp.tasks.activationkeys" />
</a>
@@ -73,14 +73,14 @@
<rhn:require
acl="org_entitlement(rhn_provisioning); user_role(config_admin)">
<li class="list-group-item">
- <i class="fa fa-caret-right"></i> <a
+ <rhn:icon type="nav-bullet" /> <a
href="/rhn/kickstart/KickstartOverview.do"> <bean:message
key="yourrhn.jsp.tasks.kickstart" />
</a>
</li>
<li class="list-group-item">
- <i class="fa fa-caret-right"></i> <a
+ <rhn:icon type="nav-bullet" /> <a
href="/rhn/configuration/file/GlobalConfigFileList.do">
<bean:message key="yourrhn.jsp.tasks.configuration" />
</a>
@@ -89,7 +89,7 @@
<rhn:require acl="show_monitoring();"
mixins="com.redhat.rhn.common.security.acl.MonitoringAclHandler">
<li class="list-group-item">
- <i class="fa fa-caret-right"></i> <a
+ <rhn:icon type="nav-bullet" /> <a
href="/rhn/monitoring/ProbeList.do"> <bean:message
key="yourrhn.jsp.tasks.monitoring" />
</a>
@@ -98,7 +98,7 @@
<rhn:require acl="user_role(satellite_admin)">
<li class="list-group-item">
- <i class="fa fa-caret-right"></i> <a
+ <rhn:icon type="nav-bullet" /> <a
href="/rhn/admin/multiorg/Organizations.do"> <bean:message
key="yourrhn.jsp.tasks.manage_sat_orgs" />
</a>
@@ -109,7 +109,7 @@
<rhn:require acl="user_role(satellite_admin)">
<li class="list-group-item">
- <i class="fa fa-caret-right"></i> <a
+ <rhn:icon type="nav-bullet" /> <a
href="/rhn/admin/config/GeneralConfig.do"> <bean:message
key="yourrhn.jsp.tasks.config_sat" />
</a>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.jsp
index b3f9330..5042c07 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.jsp
@@ -42,7 +42,7 @@
<rhn:column header="system.common.systemName"
url="/rhn/systems/details/configuration/Overview.do?sid=${current.id}">
- <i class="fa fa-desktop"></i>
+ <rhn:icon type="header-system-physical" />
${fn:escapeXml(current.name)}
</rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp
index 866fde7..5c45789 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp
@@ -33,7 +33,7 @@
sortable="true"
sortattr="name">
<a href="/rhn/systems/details/configuration/Overview.do?sid=${current.id}">
- <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i>
+ <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" />
${current.name}
</a>
</rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp
index 9057a62..be72710 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp
@@ -61,7 +61,7 @@
styleclass="list" emptykey="deployconfirm.jsp.noSystems" width="100%"
filter="com.redhat.rhn.frontend.action.configuration.ConfigSystemFilter" >
<rl:column headerkey="system.common.systemName" sortable="true" sortattr="name">
- <i class="fa fa-desktop" title="<bean:message key="system.common.systemAlt"/>"></i>
+ <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" />
<a href="/rhn/systems/details/configuration/Overview.do?system_detail_navi_node=selected_configfiles&sid=${current.id}">
${fn:escapeXml(current.name)}
</a>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp
index 561d261..e162200 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp
@@ -30,7 +30,7 @@
<rhn:column header="system.common.systemName">
<a href="/rhn/systems/details/configuration/Overview.do?sid=${current.id}">
- <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i>
+ <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" />
<c:out value="${current.name}" />
</a>
</rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp
index dc130dd..62815da 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp
@@ -36,7 +36,7 @@
<rhn:set value="${current.id}"/>
<rhn:column header="system.common.systemName"
url="/rhn/systems/details/Overview.do?sid=${current.id}">
- <i class="fa fa-desktop"></i>
+ <rhn:icon type="header-system-physical" />
<c:out value="${current.name}" escapeXml="true" />
</rhn:column>
</rhn:listdisplay>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp
index 51f6f30..d03f45b 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp
@@ -26,12 +26,12 @@
<rhn:column header="comparechannel.jsp.channel"
url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}">
<c:if test="${current.type == 'normal'}">
- <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i>
+ <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" />
${current.name}
</c:if>
<c:if test="${current.type == 'local_override'}">
- <i class="fa fa-desktop" title="<bean:message key="config.common.localAlt" />"></i>
+ <rhn:icon type="header-system-physical" title="<bean:message key='config.common.localAlt' />" />
${current.name}
</c:if>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp
index 1fa2d73..884999a 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp
@@ -29,7 +29,7 @@
<rhn:column header="configsystemfilter.name"
url="/rhn/systems/details/configuration/ViewModifyLocalPaths.do?sid=${current.id}">
- <i class="fa fa-desktop" title="<bean:message key="config.common.localAlt" />"></i>
+ <rhn:icon type="header-system-physical" title="<bean:message key='config.common.localAlt' />" />
${fn:escapeXml(current.name)}
</rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp
index 81b3f2a..3e6d684 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp
@@ -28,7 +28,7 @@
<rhn:column header="localfilelist.jsp.system"
url="/rhn/systems/details/configuration/Overview.do?sid=${current.serverId}">
- <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i>
+ <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" />
${current.serverName}
</rhn:column>
</rhn:listdisplay>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp
index 4c8438b..4f3ae30 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp
@@ -27,7 +27,7 @@
<rhn:listdisplay filterBy="system.common.systemName">
<rhn:column header="system.common.systemName"
url="/rhn/systems/details/configuration/Overview.do?sid=${current.id}">
- <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i>
+ <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" />
<c:out value="${current.name}" />
</rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp
index ddaa6b5..db7af56 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp
@@ -73,7 +73,7 @@
</c:if>
<c:if test="${current.configChannelType == 'local_override'}">
- <i class="fa fa-desktop"></i>
+ <rhn:icon type="header-system-physical" />
${current.channelNameDisplay}
</c:if>
@@ -102,7 +102,7 @@
<rhn:listdisplay>
<rhn:column header="configoverview.jsp.system"
url="/rhn/systems/details/configuration/Overview.do?sid=${current.serverId}">
- <i class="fa fa-desktop"></i>
+ <rhn:icon type="header-system-physical" />
${fn:escapeXml(current.serverName)}
</rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp
index 9dd03f5..b31c3ce 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp
@@ -30,7 +30,7 @@
<rhn:set value="${current.id}"/>
<rhn:column header="sdc.configlist.jsp.name"
url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}">
- <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i>
+ <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" />
${current.name}
</rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp
index 3121346..9f3e728 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp
@@ -41,11 +41,11 @@
<i><bean:message key="sdcimportconfirm.jsp.new" /></i>
</c:when>
<c:when test="${current.configChannelType == 'normal'}">
- <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i>
+ <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" />
${current.channelNameDisplay}
</c:when>
<c:when test="${current.configChannelType == 'local_override'}">
- <i class="fa fa-desktop" title="<bean:message key="config.common.localAlt" />"></i>
+ <rhn:icon type="header-system-physical" title="<bean:message key='config.common.localAlt' />" />
${current.channelNameDisplay}
</c:when>
<c:otherwise>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp
index c0db434..9adb803 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp
@@ -33,7 +33,7 @@
<rhn:set value="${current.id}"/>
<rhn:column header="sdc.config.subscriptions.jsp.channel"
url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}">
- <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i>
+ <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" />
${current.name}
</rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp
index 3a7679c..7f2b9d5 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp
@@ -9,7 +9,7 @@
<body>
<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-manage-configuration-files" title="<bean:message key="ssmdiff.jsp.imgAlt" />"></i>
+ <rhn:icon type="header-configuration" title="<bean:message key='ssmdiff.jsp.imgAlt' />" />
<bean:message key="ssmchannelsystems.jsp.header" />
</h2>
@@ -33,7 +33,7 @@
<rhn:listdisplay filterBy="ssmchannelsystems.jsp.system">
<rhn:column header="ssmchannelsystems.jsp.system"
url="/rhn/systems/details/configuration/Overview.do?system_detail_navi_node=selected_configfiles&sid=${current.id}">
- <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i>
+ <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" />
${current.name}
</rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp
index e08a440..e1a3eb2 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp
@@ -8,7 +8,7 @@
<body>
<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-manage-configuration-files" title="<bean:message key="ssmdiff.jsp.imgAlt" />"></i>
+ <rhn:icon type="header-configuration" title="<bean:message key='ssmdiff.jsp.imgAlt' />" />
<bean:message key="ssmdeploy.jsp.header" />
</h2>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp
index 83740b5..bcc3c18 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp
@@ -8,7 +8,7 @@
<body>
<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-manage-configuration-files" title="<bean:message key="ssmdiff.jsp.imgAlt" />"></i>
+ <rhn:icon type="header-configuration" title="<bean:message key='ssmdiff.jsp.imgAlt' />" />
<bean:message key="deployconfirm.jsp.header" />
</h2>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp
index 0e89eec..15c5744 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp
@@ -8,7 +8,7 @@
<body>
<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-manage-configuration-files" title="<bean:message key="ssmdiff.jsp.imgAlt" />"></i>
+ <rhn:icon type="header-configuration" title="<bean:message key='ssmdiff.jsp.imgAlt' />" />
<bean:message key="ssmdiff.jsp.header" />
</h2>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp
index 6569cc7..a711607 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp
@@ -8,7 +8,7 @@
<body>
<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-manage-configuration-files" title="<bean:message key="ssmdiff.jsp.imgAlt" />"></i>
+ <rhn:icon type="header-configuration" title="<bean:message key='ssmdiff.jsp.imgAlt' />" />
<bean:message key="diffconfirm.jsp.header" />
</h2>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp
index f8b1f73..439da5d 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp
@@ -8,7 +8,7 @@
<body>
<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-manage-configuration-files" title="<bean:message key="ssmdiff.jsp.imgAlt" />"></i>
+ <rhn:icon type="header-configuration" title="<bean:message key='ssmdiff.jsp.imgAlt' />" />
<bean:message key="difffiles.jsp.header" />
</h2>
@@ -53,12 +53,12 @@
<rhn:column header="config.common.configChannel"
url="/rhn/configuration/ChannelOverview.do?ccid=${current.configChannelId}">
<c:if test="${current.configChannelType == 'normal'}">
- <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i>
+ <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" />
${current.channelNameDisplay}
</c:if>
<c:if test="${current.configChannelType == 'local_override'}">
- <i class="fa fa-desktop" title="<bean:message key="config.common.localAlt" />"></i>
+ <rhn:icon type="header-system-physical" title="<bean:message key='config.common.localAlt' />" />
${current.channelNameDisplay}
</c:if>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp
index e549fb3..0ba4ed3 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp
@@ -9,7 +9,7 @@
<body>
<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-manage-configuration-files" title="<bean:message key="ssmdiff.jsp.imgAlt" />"></i>
+ <rhn:icon type="header-configuration" title="<bean:message key='ssmdiff.jsp.imgAlt' />" />
<bean:message key="diffsystems.jsp.header" />
</h2>
@@ -31,7 +31,7 @@
<rhn:listdisplay filterBy="system.common.systemName">
<rhn:column header="system.common.systemName"
url="/rhn/systems/details/configuration/Overview.do?sid=${current.id}">
- <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i>
+ <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" />
${fn:escapeXml(current.name)}
</rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp
index 8f4eb75..9c7c8dc 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp
@@ -9,7 +9,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-manage-configuration-files" title="<bean:message key="ssmdiff.jsp.imgAlt" />"></i>
+ <rhn:icon type="header-configuration" title="<bean:message key='ssmdiff.jsp.imgAlt' />" />
<bean:message key="ssmenable.jsp.header"/>
</h2>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp
index 6c195e1..58127fd 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp
@@ -9,7 +9,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-manage-configuration-files" title="<bean:message key="ssmdiff.jsp.imgAlt" />"></i>
+ <rhn:icon type="header-configuration" title="<bean:message key='ssmdiff.jsp.imgAlt' />" />
<bean:message key="summary.jsp.toolbar"/>
</h2>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp
index c08472a..326f56a 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp
@@ -32,7 +32,7 @@
<rhn:column header="config.common.configChannel"
url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}">
- <i class="fa spacewalk-icon-software-channels" title="<bean:message key='config.common.globalAlt' />"></i>
+ <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" />
${current.name}
</rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp
index 9d6164c..4e2d9e8 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp
@@ -47,7 +47,7 @@
headerkey="system.common.systemName"
attr="name">
<a href="/rhn/systems/details/configuration/Overview.do?sid=${current.id}">
- <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i>
+ <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" />
${current.name}
</a>
</rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp
index 6d115d4..ac9a932 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp
@@ -16,7 +16,7 @@
<p>
<c:set var="beanarg" scope="request">
<a href="/rhn/systems/details/configuration/Overview.do?sid=${system.id}"
- <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i>
+ <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" />
${system.name}
</a>
</c:set>
@@ -34,7 +34,7 @@
<rhn:listdisplay filterBy="config.common.configChannel">
<rhn:column header="config.common.configChannel"
url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}">
- <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i>
+ <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" />
${current.name}
</rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp
index b9a0d3c..6ae0ba6 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp
@@ -29,7 +29,7 @@
<rhn:column header="config.common.configChannel"
url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}">
- <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i>
+ <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" />
${current.name}
</rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp
index cbbaf50..e0b65f1 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp
@@ -33,7 +33,7 @@
button="unsubscribeconfirm.jsp.confirm">
<rhn:column header="unsubscribeconfirm.jsp.system"
url="/rhn/systems/details/configuration/Overview.do?sid=${current.id}">
- <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i>
+ <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" />
${current.name}
</rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp b/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp
index 4c2c26f..a34bbb1 100644
--- a/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp
@@ -13,7 +13,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/errata/errata-header.jspf" %>
<h2>
- <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i>
+ <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" />
<bean:message key="affectedsystems.jsp.header"/>
</h2>
diff --git a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
index 6dd6f40..e2f932e 100644
--- a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
@@ -76,19 +76,19 @@
<td>
<div class="checkbox">
<html:checkbox property="errata_type_bug">
- <i class="fa fa-bug"></i>
+ <rhn:icon type="errata-bugfix" />
<bean:message key="erratalist.jsp.bugadvisory"/>
</html:checkbox>
</div>
<div class="checkbox">
<html:checkbox property="errata_type_security">
- <i class="fa fa-lock"></i>
+ <rhn:icon type="errata-security" />
<bean:message key="erratalist.jsp.securityadvisory"/>
</html:checkbox>
</div>
<div class="checkbox">
<html:checkbox property="errata_type_enhancement">
- <i class="fa spacewalk-icon-enhancement"></i>
+ <rhn:icon type="errata-enhance" />
<bean:message key="erratalist.jsp.productenhancementadvisory"/>
</html:checkbox>
</div>
@@ -142,7 +142,7 @@
</td>
<td>
<button type="submit" class="btn btn-success btn-sm">
- <i class="fa fa-search"></i>
+ <rhn:icon type="header-search" />
<bean:message key="button.search"/>
</button>
</td>
@@ -167,13 +167,13 @@
<rl:column bound="false" sortable="true" sortattr="securityAdvisory"
headerkey="erratalist.jsp.type">
<c:if test="${current.securityAdvisory}">
- <i class="fa fa-lock"></i>
+ <rhn:icon type="errata-security" />
</c:if>
<c:if test="${current.bugFix}">
- <i class="fa fa-bug"></i>
+ <rhn:icon type="errata-bugfix" />
</c:if>
<c:if test="${current.productEnhancement}">
- <i class="fa spacewalk-icon-enhancement"></i>
+ <rhn:icon type="errata-enhance" />
</c:if>
</rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp b/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp
index 721d2d1..e08d587 100644
--- a/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp
@@ -18,7 +18,7 @@
<rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/manage_errata.xml"
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
- <h2><i class="fa spacewalk-icon-packages"></i>
+ <h2><rhn:icon type="header-package" />
<bean:message key="errata.edit.packages.confirm.confirmpackageaddition"/></h2>
<p><bean:message key="errata.edit.packages.confirm.instructions"/></p>
diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp b/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp
index 34198c9..8d54e2f 100644
--- a/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp
@@ -17,7 +17,7 @@
<rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/manage_errata.xml"
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
- <h2><i class="fa spacewalk-icon-packages" title="<bean:message key='errata.common.packageAlt' />"></i>
+ <h2><rhn:icon type="header-package" title="<bean:message key='errata.common.packageAlt' />" />
<bean:message key="errata.edit.packages.list.erratapackages"/></h2>
<p><bean:message key="errata.edit.packages.list.instructions"/></p>
diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp b/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp
index fb3f782..a969d22 100644
--- a/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp
@@ -19,7 +19,7 @@
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
<h2>
- <i class="fa spacewalk-icon-packages" title="<bean:message key='errata.common.packageAlt' />"></i>
+ <rhn:icon type="header-package" title="<bean:message key='errata.common.packageAlt' />" />
<bean:message key="errata.edit.packages.erratapackages"/>
</h2>
diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp b/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp
index d85c492..1220f06 100644
--- a/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp
@@ -17,7 +17,7 @@
<rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/manage_errata.xml"
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
- <h2><i class="fa spacewalk-icon-packages"></i>
+ <h2><rhn:icon type="header-package" />
<bean:message key="errata.edit.packages.confirm.confirmpackageremoval"/></h2>
<p><bean:message key="errata.edit.packages.confirm.remove.instructions"/></p>
diff --git a/java/code/webapp/WEB-INF/pages/groups/detail.jsp b/java/code/webapp/WEB-INF/pages/groups/detail.jsp
index cb60828..2816f20 100644
--- a/java/code/webapp/WEB-INF/pages/groups/detail.jsp
+++ b/java/code/webapp/WEB-INF/pages/groups/detail.jsp
@@ -28,12 +28,12 @@
<c:if test="${errata_counts['se'] > 0}">
<rhn:icon type="system-crit" />
<span class="system-status-critical-updates"><bean:message key="systemgroup.details.criticalupdates"/></span>
- <a class="btn btn-danger" href="/network/systems/groups/errata_list.pxt?sgid=${id}">${errata_counts['se']} <i class="fa fa-arrow-right"></i></a>
+ <a class="btn btn-danger" href="/network/systems/groups/errata_list.pxt?sgid=${id}">${errata_counts['se']} <rhn:icon type="nav-right" /></a>
</c:if>
<c:if test="${(errata_counts['se'] == 0) && ((errata_counts['be'] > 0) || (errata_counts['ee'] > 0))}">
<rhn:icon type="system-warn" />
<span class="system-status-updates"><bean:message key="systemgroup.details.someupdates"/></span>
- <a class="btn btn-warning" href="/network/systems/groups/errata_list.pxt?sgid=${id}"><i class="fa fa-arrow-right"></i></a>
+ <a class="btn btn-warning" href="/network/systems/groups/errata_list.pxt?sgid=${id}"><rhn:icon type="nav-right" /></a>
</c:if>
<c:if test="${(errata_counts['se'] == 0) && (errata_counts['be'] == 0) && (errata_counts['ee'] == 0)}">
<rhn:icon type="system-ok" />
@@ -63,7 +63,7 @@
<th><bean:message key="systemgroup.details.systems"/></th>
<td>
<c:if test="${system_count > 0}">
- <a class="btn btn-info" href="/rhn/groups/ListRemoveSystems.do?sgid=${id}">${system_count} <i class="fa fa-arrow-right"></i></a>
+ <a class="btn btn-info" href="/rhn/groups/ListRemoveSystems.do?sgid=${id}">${system_count} <rhn:icon type="nav-right" /></a>
</c:if>
<c:if test="${system_count == 0}">
<span class="no-details"><bean:message key="systemgroup.details.none"/></span>
diff --git a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
index 89609e7..c52041a 100644
--- a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
@@ -53,7 +53,7 @@
<div class="form-group">
<div class="col-md-offset-2 col-md-10">
<button type="submit" class="btn btn-success btn-sm">
- <i class="fa fa-search"></i>
+ <rhn:icon type="header-search" />
<bean:message key="button.search"/>
</button>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/help/helpindex.jsp b/java/code/webapp/WEB-INF/pages/help/helpindex.jsp
index e7a3b51..ff8f8bf 100644
--- a/java/code/webapp/WEB-INF/pages/help/helpindex.jsp
+++ b/java/code/webapp/WEB-INF/pages/help/helpindex.jsp
@@ -10,7 +10,7 @@
</head>
<body>
- <h1><i class="fa fa-info-circle"></i><bean:message key="help.jsp.helpdesk"/></h1>
+ <h1><rhn:icon type="header-info" /><bean:message key="help.jsp.helpdesk"/></h1>
<ul id="help-url-list">
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp
index 9a03ab6..6099455 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp
@@ -24,7 +24,7 @@
<c:choose>
<c:when test="${invalid_channel}">
<tr><td>
- <i class="fa fa-warning text-warning" title="<bean:message key='error.common.errorAlt' />"></i>
+ <rhn:icon type="system-warn" title="<bean:message key='error.common.errorAlt' />" />
<bean:message key="kickstartdownload.jsp.invalidchannel"/>
</td></tr>
</c:when>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp
index 3b33956..0f463c5 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp
@@ -51,7 +51,7 @@
</rl:column>
<rl:column bound="false" headerkey="kickstart.jsp.active" sortattr="active">
<c:if test="${current.active}">
- <i class="fa fa-check text-success" title="<bean:message key='kickstart.jsp.active'/>"></i>
+ <rhn:icon type="item-enabled" title="<bean:message key='kickstart.jsp.active' />" />
</c:if>
<c:if test="${not current.active}">
<i class="fa fa-times-circle text-danger" title="<bean:message key='kickstart.jsp.inactive'/>"></i>
@@ -66,7 +66,7 @@
<i class="fa fa-times-circle text-danger"></i>
</c:when>
<c:otherwise>
- <i class="fa fa-check text-success"></i>
+ <rhn:icon type="item-enabled" />
</c:otherwise>
</c:choose>
</rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp
index e70582b..948c628 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp
@@ -40,7 +40,7 @@
<rl:column headertext="${rhn:localize('kickstart.distro.is-valid.jsp')}?*" sortattr="valid">
<c:choose>
<c:when test="${current.valid}">
- <i class="fa fa-check text-success"></i>
+ <rhn:icon type="item-enabled" />
</c:when>
<c:otherwise>
<i class="fa fa-times-circle text-danger"></i>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp
index 4d5368a..9ce4179 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp
@@ -10,7 +10,7 @@
<body>
<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %>
<h2>
- <i class="fa fa-rocket" title="<bean:message key='system.common.kickstartAlt' />"></i>
+ <rhn:icon type="header-kickstart" title="<bean:message key='system.common.kickstartAlt' />" />
<bean:message key="kickstart.schedule.heading1.jsp" />
</h2>
@@ -53,7 +53,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf" %>
<br/>
-<h2><i class="fa fa-rocket"></i><bean:message key="kickstart.schedule.heading4.jsp" /></h2>
+<h2><rhn:icon type="header-kickstart" /><bean:message key="kickstart.schedule.heading4.jsp" /></h2>
<table class="details">
<%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/network-options.jspf" %>
<tr>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/fifth.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/fifth.jsp
index 2b294e2..d10fd81 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/fifth.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/fifth.jsp
@@ -28,7 +28,7 @@ function setContinue() {
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<br />
<h2>
- <i class="fa fa-rocket" title="<bean:message key='system.common.kickstartAlt' />"></i>
+ <rhn:icon type="header-kickstart" title="<bean:message key='system.common.kickstartAlt' />" />
<bean:message key="kickstart.schedule.heading1.jsp" />
</h2>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp
index d42aab3..7920b77 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp
@@ -27,7 +27,7 @@ function setStep(stepName) {
<br />
<h2>
- <i class="fa fa-rocket" title="<bean:message key='system.common.kickstartAlt' />"></i>
+ <rhn:icon type="header-kickstart" title="<bean:message key='system.common.kickstartAlt' />" />
<bean:message key="kickstart.schedule.heading1.jsp" />
</h2>
diff --git a/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp b/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp
index 6af12b8..408fae2 100644
--- a/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp
+++ b/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp
@@ -17,7 +17,7 @@
<li class="${warningClass}"><a href="/rhn/monitoring/ProbeList.do?state=WARNING"><i class="fa fa-exclamation-triangle text-warning"></i><bean:message key="Warning"/><span class="badge">${warningCount}</span></a></li>
<li class="${unknownClass}"><a href="/rhn/monitoring/ProbeList.do?state=UNKNOWN"><i class="fa fa-question-circle text-info"></i><bean:message key="Unknown"/><span class="badge">${unknownCount}</span></a></li>
<li class="${pendingClass}"><a href="/rhn/monitoring/ProbeList.do?state=PENDING"><i class="fa fa-clock-o text-info"></i><bean:message key="Pending"/><span class="badge">${pendingCount}</span></a></li>
- <li class="${okClass}"><a href="/rhn/monitoring/ProbeList.do?state=OK"><i class="fa fa-check text-success"></i><bean:message key="OK"/><span class="badge">${okCount}</span></a></li>
+ <li class="${okClass}"><a href="/rhn/monitoring/ProbeList.do?state=OK"><rhn:icon type="item-enabled" /><bean:message key="OK"/><span class="badge">${okCount}</span></a></li>
<li class="${allClass}"><a href="/rhn/monitoring/ProbeList.do"><bean:message key="All"/><span class="badge">${allCount}</span></a></li>
</ul>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp
index f147469..3653f64 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp
@@ -53,13 +53,13 @@
<rl:column headerkey="ssm.package.upgrade.select.advisory" bound="false">
<c:if test="${not empty current.advisory}">
<c:if test="${current.advisoryType == 'Security Advisory'}">
- <i class="fa fa-lock" title="<bean:message key='erratalist.jsp.securityadvisory' />"></i>
+ <rhn:icon type="errata-security" title="<bean:message key='erratalist.jsp.securityadvisory' />" />
</c:if>
<c:if test="${current.advisoryType == 'Bug Fix Advisory'}">
- <i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory' />"></i>
+ <rhn:icon type="errata-bugfix" title="<bean:message key='erratalist.jsp.bugadvisory' />" />
</c:if>
<c:if test="${current.advisoryType == 'Product Enhancement Advisory'}">
- <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />"></i>
+ <rhn:icon type="errata-enhance" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />" />
</c:if>
<a href="/rhn/errata/details/Details.do?eid=${current.advisoryId}">${current.advisory}</a><br/>
</c:if>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp
index ca39ac7..d6d70f9 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp
@@ -49,7 +49,7 @@
<rl:column headerkey="systemlist.jsp.system" bound="false" sortattr="name" sortable="true">
<c:choose>
<c:when test="${current.locked > 0}">
- <i class="fa fa-lock"></i>
+ <rhn:icon type="errata-security" />
<a href="/rhn/systems/details/Overview.do?sid=${current.id}">${current.name}</a>
</c:when>
<c:otherwise>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp
index 1cfec32..2650387 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp
@@ -39,13 +39,13 @@
<rl:column headerkey="erratalist.jsp.type" styleclass="text-align: center;" bound="false">
<c:if test="${current.securityAdvisory}">
- <i class="fa fa-lock"></i>
+ <rhn:icon type="errata-security" />
</c:if>
<c:if test="${current.bugFix}">
- <i class="fa fa-bug"></i>
+ <rhn:icon type="errata-bugfix" />
</c:if>
<c:if test="${current.productEnhancement}">
- <i class="fa spacewalk-icon-enhancement"></i>
+ <rhn:icon type="errata-enhance" />
</c:if>
</rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp b/java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp
index 5ecf46e..6e1fb7f 100644
--- a/java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp
@@ -15,12 +15,12 @@
<div class="toolbar">
<span class="toolbar">
<a href="/rhn/systems/details/EditCrashNote.do?crid=${crid}&sid=${sid}">
- <i class="fa fa-plus-circle text-success" title="<bean:message key='toolbar.create.crashnote'/>"></i>
+ <rhn:icon type="item-ssm-add" title="<bean:message key='toolbar.create.crashnote' />" />
<bean:message key="toolbar.create.crashnote"/>
</a>
|
<a href="/rhn/systems/details/SoftwareCrashDelete.do?crid=${crid}&sid=${sid}">
- <i class="fa fa-minus-circle text-danger" title="<bean:message key='toolbar.delete.crash'/>"></i>
+ <rhn:icon type="item-ssm-del" title="<bean:message key='toolbar.delete.crash' />" />
<bean:message key="toolbar.delete.crash"/>
</a>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp
index 7e86d15..1d99218 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp
@@ -26,7 +26,7 @@
<rl:column headerkey="system.audit.xccdfdeleteconfirm.jsp.deletable">
<c:choose>
<c:when test="${current.deletable}">
- <i class="fa fa-check"></i>
+ <rhn:icon type="item-enabled" />
</c:when>
<c:otherwise>
<img src="/img/rhn-listicon-unchecked_immutable.gif">
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp
index 6d258a4..abe728d 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp
@@ -11,7 +11,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-packages"></i>
+ <rhn:icon type="header-package" />
<bean:message key="${requestScope.header}" />
</h2>
<rhn:systemtimemessage server="${requestScope.system}" />
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp
index 8471a89..4c15e2f 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp
@@ -13,7 +13,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-packages" title="<bean:message key='errata.common.packageAlt' />"></i>
+ <rhn:icon type="header-package" title="<bean:message key='errata.common.packageAlt' />" />
<bean:message key="packagesindex.jsp.header"/>
</h2>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp
index c0fbcac..1cde015 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp
@@ -11,7 +11,7 @@
<body>
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
-<h2><i class="fa spacewalk-icon-packages"></i>
+<h2><rhn:icon type="header-package" />
<bean:message key="compare.jsp.compareto" arg0="${fn:escapeXml(requestScope.systemname)}" />
</h2>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp
index b0c4ad1..644957a 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp
@@ -10,7 +10,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-packages" title="<bean:message key='errata.common.packageAlt' />"></i>
+ <rhn:icon type="header-package" title="<bean:message key='errata.common.packageAlt' />" />
<bean:message key="profile.jsp.comparetostoredprofile"/>
</h2>
@@ -35,7 +35,7 @@
</p>
</div>
<h2>
- <i class="fa spacewalk-icon-packages" title="<bean:message key='errata.common.packageAlt' />"></i>
+ <rhn:icon type="header-package" title="<bean:message key='errata.common.packageAlt' />" />
<bean:message key="profile.jsp.comparetosystem"/>
</h2>
<div class="page-summary">
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp
index a1cc508..f27e68b 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp
@@ -53,13 +53,13 @@
<c:forEach items="${current.errata}" var="errata">
<c:if test="${not empty errata.advisory}">
<c:if test="${errata.type == 'Security Advisory'}">
- <i class="fa fa-lock" title="<bean:message key='erratalist.jsp.securityadvisory' />"></i>
+ <rhn:icon type="errata-security" title="<bean:message key='erratalist.jsp.securityadvisory' />" />
</c:if>
<c:if test="${errata.type == 'Bug Fix Advisory'}">
- <i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory' />"></i>
+ <rhn:icon type="errata-bugfix" title="<bean:message key='erratalist.jsp.bugadvisory' />" />
</c:if>
<c:if test="${errata.type == 'Product Enhancement Advisory'}">
- <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />"></i>
+ <rhn:icon type="errata-enhance" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />" />
</c:if>
<a href="/rhn/errata/details/Details.do?eid=${errata.id}">${errata.advisory}</a><br/>
</c:if>
diff --git a/java/code/webapp/WEB-INF/pages/systems/errata.jsp b/java/code/webapp/WEB-INF/pages/systems/errata.jsp
index 351bdf1..46154ad 100644
--- a/java/code/webapp/WEB-INF/pages/systems/errata.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/errata.jsp
@@ -25,7 +25,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-patches" title="<bean:message key='errata.common.errataAlt' />"></i>
+ <rhn:icon type="header-errata" title="<bean:message key='errata.common.errataAlt' />" />
<bean:message key="errata.jsp.header"/>
</h2>
@@ -82,13 +82,13 @@
<rl:column headerkey="erratalist.jsp.type" styleclass="text-align: center;"
bound="false">
<c:if test="${current.securityAdvisory}">
- <i class="fa fa-lock"></i>
+ <rhn:icon type="errata-security" />
</c:if>
<c:if test="${current.bugFix}">
- <i class="fa fa-bug"></i>
+ <rhn:icon type="errata-bugfix" />
</c:if>
<c:if test="${current.productEnhancement}">
- <i class="fa spacewalk-icon-enhancement"></i>
+ <rhn:icon type="errata-enhance" />
</c:if>
</rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
index 1e499b6..0a61f37 100644
--- a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
@@ -13,7 +13,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
-<h2><i class="fa spacewalk-icon-patches"></i><bean:message key="errataconfirm.jsp.header"/></h2>
+<h2><rhn:icon type="header-errata" /><bean:message key="errataconfirm.jsp.header"/></h2>
<rhn:systemtimemessage server="${system}" />
@@ -31,13 +31,13 @@
<rl:column headerkey="erratalist.jsp.type" styleclass="text-align: center;">
<c:if test="${current.securityAdvisory}">
- <i class="fa fa-lock"></i>
+ <rhn:icon type="errata-security" />
</c:if>
<c:if test="${current.bugFix}">
- <i class="fa fa-bug"></i>
+ <rhn:icon type="errata-bugfix" />
</c:if>
<c:if test="${current.productEnhancement}">
- <i class="fa spacewalk-icon-enhancement"></i>
+ <rhn:icon type="errata-enhance" />
</c:if>
</rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp
index a34c9c3..328af9f 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp
@@ -8,7 +8,7 @@
<body>
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-software-channels" title="channel"></i>
+ <rhn:icon type="header-channel" title="channel" />
<bean:message key="sdc.channels.edit.header2"/>
</h2>
<html:form method="post" action="/systems/details/SystemChannels.do?sid=${system.id}">
@@ -101,7 +101,7 @@
<rhn:require acl="not system_is_proxy(); not system_is_satellite()" mixins="com.redhat.rhn.common.security.acl.SystemAclHandler">
<h2>
- <i class="fa spacewalk-icon-software-channels"></i>
+ <rhn:icon type="header-channel" />
<bean:message key="sdc.channels.edit.base_software_channel"/>
</h2>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp
index 712b4ea..d718c7a 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp
@@ -7,7 +7,7 @@
<body>
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-software-channels" title="channel"></i>
+ <rhn:icon type="header-channel" title="channel" />
<bean:message key="sdc.channels.confirmNewBase.header.confirm"/>
</h2>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp
index 9df91d8..c6adb07 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp
@@ -13,7 +13,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<div class="toolbar-h2">
<div class="toolbar"></div>
- <i class="fa fa-warning text-warning" title=""></i>
+ <rhn:icon type="system-warn" title="" />
<bean:message key="system.jsp.customdata.deletetitle"/>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
index 2133762..a9bb2aa 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
@@ -15,11 +15,11 @@
<div class="panel-body">
<c:choose>
<c:when test="${unentitled}">
- <i class="spacewalk-icon-Unentitled"></i> <bean:message key="sdc.details.overview.unentitled" arg0="/rhn/systems/details/Edit.do?sid=${system.id}"/>
+ <rhn:icon type="system-unentitled" /> <bean:message key="sdc.details.overview.unentitled" arg0="/rhn/systems/details/Edit.do?sid=${system.id}"/>
</c:when>
<c:when test="${systemInactive}">
- <i class="spacewalk-icon-unknown-system"/></i> <bean:message key="sdc.details.overview.inactive1"/>
+ <rhn:icon type="system-unknown" /> <bean:message key="sdc.details.overview.inactive1"/>
<c:if test="${documentation == 'true'}">
<bean:message key="sdc.details.overview.inactive2" arg0="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-list"/>
</c:if>
@@ -80,7 +80,7 @@
<i class="fa fa-circle text-danger"></i>
</c:when>
<c:otherwise>
- <i class="fa fa-warning text-warning"></i>
+ <rhn:icon type="system-warn" />
</c:otherwise>
</c:choose>
<a href="/rhn/systems/details/probes/ProbeDetails.do?sid=${system.id}&probe_id=${probe.id}">${probe.description}</a><br/>
@@ -195,7 +195,7 @@
<td>
<c:choose>
<c:when test="${serverLock != null}">
- <i class="fa fa-lock"></i>
+ <rhn:icon type="errata-security" />
<bean:message key="sdc.details.overview.locked"
arg0="${serverLock.locker.login}"
arg1="${serverLock.reason}" /><br/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp
index 4452446..9012d14 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp
@@ -20,7 +20,7 @@
</a>
</span>
</div>
- <i class="fa fa-info-circle"></i>
+ <rhn:icon type="header-info" />
<bean:message key="system.jsp.customkey.updatetitle"/>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp b/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp
index e3aff88..1036871 100644
--- a/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp
@@ -37,7 +37,7 @@
bound="false"
headerkey="systemlist.jsp.system"
sortattr="name" >
- <i class="fa fa-desktop" title="<bean:message key='systemlist.jsp.nonvirt'/>"></i>
+ <rhn:icon type="header-system-physical" title="<bean:message key='systemlist.jsp.nonvirt' />" />
<c:out value="<a href=\"/rhn/systems/details/Overview.do?sid=${current.id}\">" escapeXml="false" />
<c:choose>
<c:when test="${empty current.name}">
@@ -64,10 +64,10 @@
</c:choose>
<c:choose>
<c:when test="${current.critical >= 10}">
- <i class="fa fa-exclamation-circle text-danger"></i>
+ <rhn:icon type="system-crit" />
</c:when>
<c:when test="${current.critical >= 5}">
- <i class="fa fa-warning text-warning"></i>
+ <rhn:icon type="system-warn" />
</c:when>
</c:choose>
</rl:column>
@@ -86,10 +86,10 @@
</c:choose>
<c:choose>
<c:when test="${current.important >= 15}">
- <i class="fa fa-exclamation-circle text-danger"></i>
+ <rhn:icon type="system-crit" />
</c:when>
<c:when test="${current.important >= 10}">
- <i class="fa fa-warning text-warning"></i>
+ <rhn:icon type="system-warn" />
</c:when>
</c:choose>
</rl:column>
@@ -108,10 +108,10 @@
</c:choose>
<c:choose>
<c:when test="${current.moderate >= 20}">
- <i class="fa fa-exclamation-circle text-danger"></i>
+ <rhn:icon type="system-crit" />
</c:when>
<c:when test="${current.moderate >= 15}">
- <i class="fa fa-warning text-warning"></i>
+ <rhn:icon type="system-warn" />
</c:when>
</c:choose>
</rl:column>
@@ -130,10 +130,10 @@
</c:choose>
<c:choose>
<c:when test="${current.low >= 25}">
- <i class="fa fa-exclamation-circle text-danger"></i>
+ <rhn:icon type="system-crit" />
</c:when>
<c:when test="${current.low >= 20}">
- <i class="fa fa-warning text-warning"></i>
+ <rhn:icon type="system-warn" />
</c:when>
</c:choose>
</rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
index aa84681..ec6da4d 100644
--- a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
@@ -29,7 +29,7 @@
value="${search_string}" maxlength="100" accesskey="4"/>
<span class="input-group-btn">
<button type="submit" class="btn btn-default">
- <i class="fa fa-search"></i>
+ <rhn:icon type="header-search" />
</button>
</span>
</div>
1
0
Tag 'rhn-client-tools-2.1.13-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2013-12-12 13:25 +0000
Tagging package [rhn-client-tools] version [2.1.13-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-search-2.1.9-1:
Milan Zazrivec (3):
1038694 - new error icon in gnome3
1038694 - remove text from registration screen
Automatic commit of package [rhn-client-tools] release [2.1.13-1].
---
client/rhel/rhn-client-tools/data/Makefile | 5 +++
client/rhel/rhn-client-tools/data/rh_register.glade | 10 +------
client/rhel/rhn-client-tools/po/aln.po | 15 +---------
client/rhel/rhn-client-tools/po/ar.po | 15 +---------
client/rhel/rhn-client-tools/po/as.po | 22 ++-------------
client/rhel/rhn-client-tools/po/ast.po | 15 +---------
client/rhel/rhn-client-tools/po/bg.po | 15 +---------
client/rhel/rhn-client-tools/po/bn.po | 15 +---------
client/rhel/rhn-client-tools/po/bn_BD.po | 15 +---------
client/rhel/rhn-client-tools/po/bn_IN.po | 22 ++-------------
client/rhel/rhn-client-tools/po/bs.po | 15 +---------
client/rhel/rhn-client-tools/po/ca.po | 15 +---------
client/rhel/rhn-client-tools/po/cs.po | 15 +---------
client/rhel/rhn-client-tools/po/cy.po | 15 +---------
client/rhel/rhn-client-tools/po/da.po | 15 +---------
client/rhel/rhn-client-tools/po/de.po | 21 ++-------------
client/rhel/rhn-client-tools/po/el.po | 15 +---------
client/rhel/rhn-client-tools/po/en_GB.po | 15 +---------
client/rhel/rhn-client-tools/po/es.po | 25 ++---------------
client/rhel/rhn-client-tools/po/et.po | 15 +---------
client/rhel/rhn-client-tools/po/eu.po | 15 +---------
client/rhel/rhn-client-tools/po/fa.po | 15 +---------
client/rhel/rhn-client-tools/po/fa_IR.po | 15 +---------
client/rhel/rhn-client-tools/po/fi.po | 15 +---------
client/rhel/rhn-client-tools/po/fr.po | 23 ++--------------
client/rhel/rhn-client-tools/po/gu.po | 22 ++-------------
client/rhel/rhn-client-tools/po/he.po | 15 +---------
client/rhel/rhn-client-tools/po/hi.po | 20 ++------------
client/rhel/rhn-client-tools/po/hr.po | 15 +---------
client/rhel/rhn-client-tools/po/hu.po | 15 +---------
client/rhel/rhn-client-tools/po/hy.po | 15 +---------
client/rhel/rhn-client-tools/po/id.po | 15 +---------
client/rhel/rhn-client-tools/po/is.po | 15 +---------
client/rhel/rhn-client-tools/po/it.po | 22 ++-------------
client/rhel/rhn-client-tools/po/ja.po | 22 ++-------------
client/rhel/rhn-client-tools/po/ja_JP.po | 15 +---------
client/rhel/rhn-client-tools/po/ka.po | 15 +---------
client/rhel/rhn-client-tools/po/kn.po | 22 ++-------------
client/rhel/rhn-client-tools/po/ko.po | 21 ++-------------
client/rhel/rhn-client-tools/po/ku.po | 15 +---------
client/rhel/rhn-client-tools/po/lo.po | 15 +---------
client/rhel/rhn-client-tools/po/mk.po | 15 +---------
client/rhel/rhn-client-tools/po/ml.po | 22 ++-------------
client/rhel/rhn-client-tools/po/mr.po | 22 ++-------------
client/rhel/rhn-client-tools/po/ms.po | 15 +---------
client/rhel/rhn-client-tools/po/my.po | 15 +---------
client/rhel/rhn-client-tools/po/nb.po | 15 +---------
client/rhel/rhn-client-tools/po/nl.po | 15 +---------
client/rhel/rhn-client-tools/po/nn.po | 15 +---------
client/rhel/rhn-client-tools/po/no.po | 15 +---------
client/rhel/rhn-client-tools/po/or.po | 22 ++-------------
client/rhel/rhn-client-tools/po/pa.po | 22 ++-------------
client/rhel/rhn-client-tools/po/pl.po | 15 +---------
client/rhel/rhn-client-tools/po/pt.po | 15 +---------
client/rhel/rhn-client-tools/po/pt_BR.po | 22 ++-------------
client/rhel/rhn-client-tools/po/ro.po | 15 +---------
client/rhel/rhn-client-tools/po/ru.po | 22 ++-------------
client/rhel/rhn-client-tools/po/si.po | 15 +---------
client/rhel/rhn-client-tools/po/sk.po | 15 +---------
client/rhel/rhn-client-tools/po/sl.po | 15 +---------
client/rhel/rhn-client-tools/po/sq.po | 15 +---------
client/rhel/rhn-client-tools/po/sr.po | 15 +---------
client/rhel/rhn-client-tools/po/sr(a)Latn.po | 7 -----
client/rhel/rhn-client-tools/po/sv.po | 15 +---------
client/rhel/rhn-client-tools/po/ta.po | 22 ++-------------
client/rhel/rhn-client-tools/po/te.po | 22 ++-------------
client/rhel/rhn-client-tools/po/tg.po | 15 +---------
client/rhel/rhn-client-tools/po/tr.po | 15 +---------
client/rhel/rhn-client-tools/po/uk.po | 28 ++------------------
client/rhel/rhn-client-tools/po/ur.po | 15 +---------
client/rhel/rhn-client-tools/po/vi.po | 15 +---------
client/rhel/rhn-client-tools/po/zh_CN.GB2312.po | 15 +---------
client/rhel/rhn-client-tools/po/zh_CN.po | 20 ++------------
client/rhel/rhn-client-tools/po/zh_TW.Big5.po | 15 +---------
client/rhel/rhn-client-tools/po/zh_TW.po | 20 ++------------
client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++-
rel-eng/packages/rhn-client-tools | 2 -
77 files changed, 183 insertions(+), 1083 deletions(-)
---
1
0
client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit d920005375a5850b79280fff9a769bc15f521b70
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Dec 12 14:25:44 2013 +0100
Automatic commit of package [rhn-client-tools] release [2.1.13-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 3e239fd..f52100f 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 2.1.12
+Version: 2.1.13
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -361,6 +361,10 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Thu Dec 12 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.13-1
+- 1038694 - remove text from registration screen
+- 1038694 - new error icon in gnome3
+
* Mon Dec 09 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.12-1
- 1037778 - new registration icons
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index b1b0107..9238185 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-2.1.12-1 client/rhel/rhn-client-tools/
+2.1.13-1 client/rhel/rhn-client-tools/
1
0
client/rhel/rhn-client-tools/data/Makefile | 5 +++
client/rhel/rhn-client-tools/data/rh_register.glade | 10 +------
client/rhel/rhn-client-tools/po/aln.po | 15 +---------
client/rhel/rhn-client-tools/po/ar.po | 15 +---------
client/rhel/rhn-client-tools/po/as.po | 22 ++-------------
client/rhel/rhn-client-tools/po/ast.po | 15 +---------
client/rhel/rhn-client-tools/po/bg.po | 15 +---------
client/rhel/rhn-client-tools/po/bn.po | 15 +---------
client/rhel/rhn-client-tools/po/bn_BD.po | 15 +---------
client/rhel/rhn-client-tools/po/bn_IN.po | 22 ++-------------
client/rhel/rhn-client-tools/po/bs.po | 15 +---------
client/rhel/rhn-client-tools/po/ca.po | 15 +---------
client/rhel/rhn-client-tools/po/cs.po | 15 +---------
client/rhel/rhn-client-tools/po/cy.po | 15 +---------
client/rhel/rhn-client-tools/po/da.po | 15 +---------
client/rhel/rhn-client-tools/po/de.po | 21 ++-------------
client/rhel/rhn-client-tools/po/el.po | 15 +---------
client/rhel/rhn-client-tools/po/en_GB.po | 15 +---------
client/rhel/rhn-client-tools/po/es.po | 25 ++---------------
client/rhel/rhn-client-tools/po/et.po | 15 +---------
client/rhel/rhn-client-tools/po/eu.po | 15 +---------
client/rhel/rhn-client-tools/po/fa.po | 15 +---------
client/rhel/rhn-client-tools/po/fa_IR.po | 15 +---------
client/rhel/rhn-client-tools/po/fi.po | 15 +---------
client/rhel/rhn-client-tools/po/fr.po | 23 ++--------------
client/rhel/rhn-client-tools/po/gu.po | 22 ++-------------
client/rhel/rhn-client-tools/po/he.po | 15 +---------
client/rhel/rhn-client-tools/po/hi.po | 20 ++------------
client/rhel/rhn-client-tools/po/hr.po | 15 +---------
client/rhel/rhn-client-tools/po/hu.po | 15 +---------
client/rhel/rhn-client-tools/po/hy.po | 15 +---------
client/rhel/rhn-client-tools/po/id.po | 15 +---------
client/rhel/rhn-client-tools/po/is.po | 15 +---------
client/rhel/rhn-client-tools/po/it.po | 22 ++-------------
client/rhel/rhn-client-tools/po/ja.po | 22 ++-------------
client/rhel/rhn-client-tools/po/ja_JP.po | 15 +---------
client/rhel/rhn-client-tools/po/ka.po | 15 +---------
client/rhel/rhn-client-tools/po/kn.po | 22 ++-------------
client/rhel/rhn-client-tools/po/ko.po | 21 ++-------------
client/rhel/rhn-client-tools/po/ku.po | 15 +---------
client/rhel/rhn-client-tools/po/lo.po | 15 +---------
client/rhel/rhn-client-tools/po/mk.po | 15 +---------
client/rhel/rhn-client-tools/po/ml.po | 22 ++-------------
client/rhel/rhn-client-tools/po/mr.po | 22 ++-------------
client/rhel/rhn-client-tools/po/ms.po | 15 +---------
client/rhel/rhn-client-tools/po/my.po | 15 +---------
client/rhel/rhn-client-tools/po/nb.po | 15 +---------
client/rhel/rhn-client-tools/po/nl.po | 15 +---------
client/rhel/rhn-client-tools/po/nn.po | 15 +---------
client/rhel/rhn-client-tools/po/no.po | 15 +---------
client/rhel/rhn-client-tools/po/or.po | 22 ++-------------
client/rhel/rhn-client-tools/po/pa.po | 22 ++-------------
client/rhel/rhn-client-tools/po/pl.po | 15 +---------
client/rhel/rhn-client-tools/po/pt.po | 15 +---------
client/rhel/rhn-client-tools/po/pt_BR.po | 22 ++-------------
client/rhel/rhn-client-tools/po/ro.po | 15 +---------
client/rhel/rhn-client-tools/po/ru.po | 22 ++-------------
client/rhel/rhn-client-tools/po/si.po | 15 +---------
client/rhel/rhn-client-tools/po/sk.po | 15 +---------
client/rhel/rhn-client-tools/po/sl.po | 15 +---------
client/rhel/rhn-client-tools/po/sq.po | 15 +---------
client/rhel/rhn-client-tools/po/sr.po | 15 +---------
client/rhel/rhn-client-tools/po/sr(a)Latn.po | 7 -----
client/rhel/rhn-client-tools/po/sv.po | 15 +---------
client/rhel/rhn-client-tools/po/ta.po | 22 ++-------------
client/rhel/rhn-client-tools/po/te.po | 22 ++-------------
client/rhel/rhn-client-tools/po/tg.po | 15 +---------
client/rhel/rhn-client-tools/po/tr.po | 15 +---------
client/rhel/rhn-client-tools/po/uk.po | 28 ++------------------
client/rhel/rhn-client-tools/po/ur.po | 15 +---------
client/rhel/rhn-client-tools/po/vi.po | 15 +---------
client/rhel/rhn-client-tools/po/zh_CN.GB2312.po | 15 +---------
client/rhel/rhn-client-tools/po/zh_CN.po | 20 ++------------
client/rhel/rhn-client-tools/po/zh_TW.Big5.po | 15 +---------
client/rhel/rhn-client-tools/po/zh_TW.po | 20 ++------------
75 files changed, 177 insertions(+), 1081 deletions(-)
New commits:
commit 433ccd87f878e66f622b6346c76ceca30ac7097b
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Dec 12 13:42:38 2013 +0100
1038694 - remove text from registration screen
diff --git a/client/rhel/rhn-client-tools/data/rh_register.glade b/client/rhel/rhn-client-tools/data/rh_register.glade
index c9c5b0a..d66aff7 100644
--- a/client/rhel/rhn-client-tools/data/rh_register.glade
+++ b/client/rhel/rhn-client-tools/data/rh_register.glade
@@ -87,10 +87,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">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.
-To keep your system updated, secure, and supported, please register this system at your earliest convenience.
-
-You may access the RHN registration tool by running <b>RHN Registration</b> in the <b>System > Administration</b> menu.
-You may access the software update tool by running <b>Software Update</b> in the <b>System > Administration</b> menu.</property>
+To keep your system updated, secure, and supported, please register this system at your earliest convenience.</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3326,10 +3323,7 @@ A security certificate, using SSL technology, is necessary to ensure that data c
<child>
<widget class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="label" translatable="yes">You won't be able to receive software updates, including security updates, for this system.
-
-You may access the RHN registration tool by running <b>RHN Registration</b> or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> menu.
-You may access the software update tool by running <b>Software Update</b> in the <b>System > Administration</b> menu.</property>
+ <property name="label" translatable="yes">You won't be able to receive software updates, including security updates, for this system.</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
diff --git a/client/rhel/rhn-client-tools/po/aln.po b/client/rhel/rhn-client-tools/po/aln.po
index e29f8d3..a05e021 100644
--- a/client/rhel/rhn-client-tools/po/aln.po
+++ b/client/rhel/rhn-client-tools/po/aln.po
@@ -1495,12 +1495,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1856,13 +1851,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/ar.po b/client/rhel/rhn-client-tools/po/ar.po
index a5220e7..d75f707 100644
--- a/client/rhel/rhn-client-tools/po/ar.po
+++ b/client/rhel/rhn-client-tools/po/ar.po
@@ -1522,12 +1522,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1883,13 +1878,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/as.po b/client/rhel/rhn-client-tools/po/as.po
index 75e6134..cab6c3a 100644
--- a/client/rhel/rhn-client-tools/po/as.po
+++ b/client/rhel/rhn-client-tools/po/as.po
@@ -1697,23 +1697,13 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
"এই চিস্টেমে Red Hat Network চাৰ্ভাৰৰ লগত সংযোগ নকৰাকৈ Red Hat ৰ পৰা সফল ভাবে "
"চফ্টওৱেৰ আপডেইটসমূহ গ্ৰহণ কৰিব <b>নোৱাৰিব।</b> \n"
"\n"
"আপোনাৰ চিস্টেমক আপডেইটেড, সুৰক্ষিত আৰু সমৰ্থিত ৰাখিবলৈ, অনুগ্ৰহ কৰি ইয়াক শীঘ্ৰে "
-"ৰেজিস্টাৰ কৰিব।\n"
-"\n"
-"RHN ৰেজিস্ট্ৰেষণ সঁজুলি উপক্ৰম কৰিবলে <b>চিস্টেম > প্ৰশাসন</b> মেনুত থকা <b>RHN "
-"ৰেজিস্ট্ৰেষণ</b> চলাওক।\n"
-"চফ্টওৱেৰ আপডেইট সঁজুলি উপক্ৰম কৰিবলে <b>চিস্টেম > প্ৰশাসন</b> মেনুত থকা <b>চফ্টওৱেৰ "
-"আপডেইট</b> চলাওক।"
+"ৰেজিস্টাৰ কৰিব।"
#: ../data/rh_register.glade.h:10
msgid "I'd like to register with an Red Hat Satellite or Red Hat Proxy"
@@ -2071,13 +2061,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/ast.po b/client/rhel/rhn-client-tools/po/ast.po
index fb894a0..8ee1a73 100644
--- a/client/rhel/rhn-client-tools/po/ast.po
+++ b/client/rhel/rhn-client-tools/po/ast.po
@@ -1496,12 +1496,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1857,13 +1852,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/bg.po b/client/rhel/rhn-client-tools/po/bg.po
index ae7cdac..4dd3661 100644
--- a/client/rhel/rhn-client-tools/po/bg.po
+++ b/client/rhel/rhn-client-tools/po/bg.po
@@ -1668,12 +1668,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -2031,13 +2026,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/bn.po b/client/rhel/rhn-client-tools/po/bn.po
index cb87c96..791b08b 100644
--- a/client/rhel/rhn-client-tools/po/bn.po
+++ b/client/rhel/rhn-client-tools/po/bn.po
@@ -1576,12 +1576,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1951,13 +1946,7 @@ msgstr "আপনার সিস্টেমের সফ্টওয়্য
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/bn_BD.po b/client/rhel/rhn-client-tools/po/bn_BD.po
index bd23519..814dd41 100644
--- a/client/rhel/rhn-client-tools/po/bn_BD.po
+++ b/client/rhel/rhn-client-tools/po/bn_BD.po
@@ -1495,12 +1495,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1856,13 +1851,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/bn_IN.po b/client/rhel/rhn-client-tools/po/bn_IN.po
index a9ccc72..866f9f5 100644
--- a/client/rhel/rhn-client-tools/po/bn_IN.po
+++ b/client/rhel/rhn-client-tools/po/bn_IN.po
@@ -1710,23 +1710,13 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
"Red Hat Network সার্ভারের সাথে সিস্টেম সংযুক্ত না করা হলে সিস্টেমটি Red Hat থেকে "
"সফ্টওয়্যার আপডেট যেমন নিরাপত্তা সংক্রান্ত আপডেট প্রাপ্ত করতে সক্ষম <b>হবে না</b>।\n"
"\n"
"সিস্টেমটি আপডেট করতে ও নিরাপদ ও সমর্থিত অবস্থায় রাখতে অনুগ্রহ করে যথাশীঘ্র সম্ভব "
-"সিস্টেমটি নিবন্ধন করুন।\n"
-"\n"
-"<b>সিস্টেম > প্রশাসনিক কর্ম</b> মেনুর মধ্যে <b>RHN নিবন্ধন</b>-র সাহায্যে এই RHN "
-"নিবন্ধন ব্যবস্থা ব্যবহার করা যাবে।\n"
-"<b>সিস্টেম > প্রশাসনিক কর্ম</b> মেনুর মধ্যে <b>সফ্টওয়্যার আপডেট</b> মেনুর সাহায্যে "
-"সফ্টওয়্যার আপডেট ব্যবস্থা ব্যবহার করা যাবে।"
+"সিস্টেমটি নিবন্ধন করুন।"
#: ../data/rh_register.glade.h:10
msgid "I'd like to register with an Red Hat Satellite or Red Hat Proxy"
@@ -2084,13 +2074,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/bs.po b/client/rhel/rhn-client-tools/po/bs.po
index 70c225e..6e8d4ed 100644
--- a/client/rhel/rhn-client-tools/po/bs.po
+++ b/client/rhel/rhn-client-tools/po/bs.po
@@ -1497,12 +1497,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1858,13 +1853,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/ca.po b/client/rhel/rhn-client-tools/po/ca.po
index 9c1f7c0..a1e9c5f 100644
--- a/client/rhel/rhn-client-tools/po/ca.po
+++ b/client/rhel/rhn-client-tools/po/ca.po
@@ -1539,12 +1539,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1900,13 +1895,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/cs.po b/client/rhel/rhn-client-tools/po/cs.po
index f79332f..c64d169 100644
--- a/client/rhel/rhn-client-tools/po/cs.po
+++ b/client/rhel/rhn-client-tools/po/cs.po
@@ -1591,12 +1591,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1954,13 +1949,7 @@ msgstr "Váš systém není nastaven pro aktualizaci software."
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/cy.po b/client/rhel/rhn-client-tools/po/cy.po
index 57e20c1..6f00468 100644
--- a/client/rhel/rhn-client-tools/po/cy.po
+++ b/client/rhel/rhn-client-tools/po/cy.po
@@ -1526,12 +1526,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1887,13 +1882,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/da.po b/client/rhel/rhn-client-tools/po/da.po
index 89037c1..15fdb60 100644
--- a/client/rhel/rhn-client-tools/po/da.po
+++ b/client/rhel/rhn-client-tools/po/da.po
@@ -1533,12 +1533,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1894,13 +1889,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/de.po b/client/rhel/rhn-client-tools/po/de.po
index dcf9346..f52fd22 100644
--- a/client/rhel/rhn-client-tools/po/de.po
+++ b/client/rhel/rhn-client-tools/po/de.po
@@ -1762,23 +1762,14 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
"Dieses System kann <b>keine</b> Software-Updates erfolgreich von Red Hat "
"Network, inklusive Sicherheitsupdates, abrufen, ohne sich mit eine, Red Hat "
"Network Server zu verbinden.\n"
"\n"
"Um Ihr System aktuell, sicher und unterstützt zu halten, registrieren Sie "
-"dieses bitte bei nächster Gelegenheit.\n"
-"Sie können das RHN-Update-Tool jederzeit vom Menü <b>RHN-Registrierung</b> "
-"in <b>System > Administration</b> ausführen.\n"
-"Sie können das Software-Update-Tool jederzeit vom Menü <b>Software-Update</"
-"b> in <b>System > Administration</b> ausführen."
+"dieses bitte bei nächster Gelegenheit."
#: ../data/rh_register.glade.h:10
msgid "I'd like to register with an Red Hat Satellite or Red Hat Proxy"
@@ -2140,13 +2131,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/el.po b/client/rhel/rhn-client-tools/po/el.po
index fbceb23..fd22311 100644
--- a/client/rhel/rhn-client-tools/po/el.po
+++ b/client/rhel/rhn-client-tools/po/el.po
@@ -1504,12 +1504,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1865,13 +1860,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/en_GB.po b/client/rhel/rhn-client-tools/po/en_GB.po
index 0ea81e6..9a8b015 100644
--- a/client/rhel/rhn-client-tools/po/en_GB.po
+++ b/client/rhel/rhn-client-tools/po/en_GB.po
@@ -1497,12 +1497,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1858,13 +1853,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/es.po b/client/rhel/rhn-client-tools/po/es.po
index bdb803a..1f289c8 100644
--- a/client/rhel/rhn-client-tools/po/es.po
+++ b/client/rhel/rhn-client-tools/po/es.po
@@ -1784,23 +1784,14 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
"Este sistema <b>no</b> podrá recibir actualizaciones de software ni "
"actualizaciones de seguridad de Red Hat sin una conexión al servidor de Red "
"Hat Network.\n"
"\n"
"Para mantener este sistema actualizado, seguro y soportado, por favor "
-"regístrelo lo antes posible.\n"
-"\n"
-"Puede acceder a la herramienta de actualización de software si ejecuta "
-"<b>Actualización de software</b> en el menú de <b>System > Administración</"
-"b>."
+"regístrelo lo antes posible."
#: ../data/rh_register.glade.h:10
#, fuzzy
@@ -2194,18 +2185,10 @@ msgstr "Su sistema no está configurado para las actualizaciones de sotware."
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
"No será capaz de recibir actualizaciones software, incluyendo "
-"actualizaciones de seguridad, para este sistema. Usted puede acceder a la "
-"herramienta de registro RHN ejecutando <b>RHN Registration</b> o <b>Red Hat "
-"Subscription Manager</b> en el menú <b>System > Administration</b>."
+"actualizaciones de seguridad, para este sistema."
#: ../data/rh_register.glade.h:100
msgid "Proxy Configuration"
diff --git a/client/rhel/rhn-client-tools/po/et.po b/client/rhel/rhn-client-tools/po/et.po
index 4811f7b..de6bef4 100644
--- a/client/rhel/rhn-client-tools/po/et.po
+++ b/client/rhel/rhn-client-tools/po/et.po
@@ -1522,12 +1522,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1883,13 +1878,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/eu.po b/client/rhel/rhn-client-tools/po/eu.po
index 45d6f35..5ef25c5 100644
--- a/client/rhel/rhn-client-tools/po/eu.po
+++ b/client/rhel/rhn-client-tools/po/eu.po
@@ -1497,12 +1497,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1858,13 +1853,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/fa.po b/client/rhel/rhn-client-tools/po/fa.po
index d0ea4c3..7c8549b 100644
--- a/client/rhel/rhn-client-tools/po/fa.po
+++ b/client/rhel/rhn-client-tools/po/fa.po
@@ -1497,12 +1497,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1858,13 +1853,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/fa_IR.po b/client/rhel/rhn-client-tools/po/fa_IR.po
index d693b37..fc7527d 100644
--- a/client/rhel/rhn-client-tools/po/fa_IR.po
+++ b/client/rhel/rhn-client-tools/po/fa_IR.po
@@ -1495,12 +1495,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1856,13 +1851,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/fi.po b/client/rhel/rhn-client-tools/po/fi.po
index a348163..a66b74a 100644
--- a/client/rhel/rhn-client-tools/po/fi.po
+++ b/client/rhel/rhn-client-tools/po/fi.po
@@ -1535,12 +1535,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1896,13 +1891,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/fr.po b/client/rhel/rhn-client-tools/po/fr.po
index 182cb3e..b182c6e 100644
--- a/client/rhel/rhn-client-tools/po/fr.po
+++ b/client/rhel/rhn-client-tools/po/fr.po
@@ -1762,25 +1762,14 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
"Ce système <b>ne</b> sera <b>pas</b> capable de recevoir correctement les "
"mises à jour logicielles, incluant les mises à jour de sécurité, à partir de "
"Red Hat sans se connecter à un serveur Red Hat Network.\n"
"\n"
"Pour garder votre système à jour, sécurisé et supporté, veuillez enregistrer "
-"ce système dès que cela vous sera possible.\n"
-"\n"
-"Vous pouvez accéder à l'outil d'enregistrement à RHN en lançant "
-"<b>Enregistrement RHN</b> du menu <b>Administration</b>.\n"
-"Vous pouvez accéder à l'outil de mise à jour logicielle en exécutant "
-"<b>Mises à jour du logiciel</b> dans le menu <b>Système > Administration </"
-"b>."
+"ce système dès que cela vous sera possible."
#: ../data/rh_register.glade.h:10
#, fuzzy
@@ -2162,13 +2151,7 @@ msgstr "Votre système n'est pas configuré pour les mises à jour logicielles."
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/gu.po b/client/rhel/rhn-client-tools/po/gu.po
index c256300..5085df0 100644
--- a/client/rhel/rhn-client-tools/po/gu.po
+++ b/client/rhel/rhn-client-tools/po/gu.po
@@ -1674,23 +1674,13 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
"આ સિસ્ટમ Red Hat Network સર્વર સાથે જોડાયા વિના Red Hat માંથી સોફ્ટવેર સુધારાઓ, "
"સુરક્ષા સુધારાઓને સમાવીને, સફળતાપૂર્વક મેળવવા માટે સમર્થ હશે <b>નહિં</b>.\n"
"\n"
"તમારી સિસ્ટમ સુધારાયેલ, સુરક્ષિત, અને આધારભૂત રાખવા માટે, મહેરબાની કરીને આ સિસ્ટમને "
-"તમારી વહેલી સુગમતાએ મહેરબાની કરીને રજીસ્ટર કરો. \n"
-"\n"
-"તમે <b>સિસ્ટમ > સંચાલન</b> મેનુમાં <b>RHN રજીસ્ટ્રેશન</b> ચલાવતી વખતે RHN રજીસ્ટ્રેશન "
-"સાધનને વાપરી શકો છો.\n"
-"તમે <b>સિસ્ટમ > સંચાલન</b> મેનુમાં <b>સોફ્ટવેર સુધારા</b> ચલાવતી વખતે સોફ્ટવેર સુધારા "
-"સાધનને વાપરી શકો છો."
+"તમારી વહેલી સુગમતાએ મહેરબાની કરીને રજીસ્ટર કરો. "
#: ../data/rh_register.glade.h:10
msgid "I'd like to register with an Red Hat Satellite or Red Hat Proxy"
@@ -2048,13 +2038,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/he.po b/client/rhel/rhn-client-tools/po/he.po
index 37e0eed..bc94075 100644
--- a/client/rhel/rhn-client-tools/po/he.po
+++ b/client/rhel/rhn-client-tools/po/he.po
@@ -1496,12 +1496,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1857,13 +1852,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/hi.po b/client/rhel/rhn-client-tools/po/hi.po
index 2ead216..53e20cc 100644
--- a/client/rhel/rhn-client-tools/po/hi.po
+++ b/client/rhel/rhn-client-tools/po/hi.po
@@ -1672,20 +1672,14 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
"यह सिस्टम सफलतापूर्वर सॉफ्टवयेर अद्यतन में सुरक्षा अद्यतन के साथ सफल <b>नहीं</b> होगा Red "
"Hat Network सर्वर में Red Hat से बिना कनेक्ट हुए .\n"
"\n"
"अपने सिस्टम को अद्यतन, सुरक्षित, और समर्थित रखने के लिये, कृपया अपने सिस्टम को यथाशीघ्र "
-"सुविधानुसार पंजीकृत करें.\n"
-"आप इस RHN पंजीयन औजार की पहुँच <b>RHN Registration</b> को <b>तंत्र > प्रशासन</b> "
-"मेनू में चलाकर कर सकते हैं."
+"सुविधानुसार पंजीकृत करें."
+
#: ../data/rh_register.glade.h:10
msgid "I'd like to register with an Red Hat Satellite or Red Hat Proxy"
@@ -2043,13 +2037,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/hr.po b/client/rhel/rhn-client-tools/po/hr.po
index df91719..90acd69 100644
--- a/client/rhel/rhn-client-tools/po/hr.po
+++ b/client/rhel/rhn-client-tools/po/hr.po
@@ -1648,12 +1648,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -2012,13 +2007,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/hu.po b/client/rhel/rhn-client-tools/po/hu.po
index 24e44da..03ea325 100644
--- a/client/rhel/rhn-client-tools/po/hu.po
+++ b/client/rhel/rhn-client-tools/po/hu.po
@@ -1540,12 +1540,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1901,13 +1896,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/hy.po b/client/rhel/rhn-client-tools/po/hy.po
index 7014218..ce4e3db 100644
--- a/client/rhel/rhn-client-tools/po/hy.po
+++ b/client/rhel/rhn-client-tools/po/hy.po
@@ -1495,12 +1495,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1856,13 +1851,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/id.po b/client/rhel/rhn-client-tools/po/id.po
index 12f7491..d444585 100644
--- a/client/rhel/rhn-client-tools/po/id.po
+++ b/client/rhel/rhn-client-tools/po/id.po
@@ -1499,12 +1499,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1860,13 +1855,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/is.po b/client/rhel/rhn-client-tools/po/is.po
index 18808f5..7dbab85 100644
--- a/client/rhel/rhn-client-tools/po/is.po
+++ b/client/rhel/rhn-client-tools/po/is.po
@@ -1527,12 +1527,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1888,13 +1883,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/it.po b/client/rhel/rhn-client-tools/po/it.po
index 6ded8f5..241c060 100644
--- a/client/rhel/rhn-client-tools/po/it.po
+++ b/client/rhel/rhn-client-tools/po/it.po
@@ -1757,24 +1757,14 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
"Questo sistema <b>non</b> sarà in grado di ricevere aggiornamenti software, "
"incluso gli aggiornamenti sulla sicurezza, da Red Hat senza collegarsi prima "
"ad un server di Red Hat Network.\n"
"\n"
"Per mantenere il sistema aggiornato, sicuro e supportato, vi preghiamo di "
-"registrarlo quanto prima.\n"
-"\n"
-"È possibile accedere al tool di registrazione di RHN eseguendo <b>RHN "
-"Registration</b> nel menu <b>Sistema > Amministrazione</b>.\n"
-"Potrete accedere al tool di aggiornamento software eseguendo <b>Software "
-"Update</b> nel menu <b>Sistema > Amministrazione</b>."
+"registrarlo quanto prima."
#: ../data/rh_register.glade.h:10
msgid "I'd like to register with an Red Hat Satellite or Red Hat Proxy"
@@ -2132,13 +2122,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/ja.po b/client/rhel/rhn-client-tools/po/ja.po
index 80a26a7..bf3d183 100644
--- a/client/rhel/rhn-client-tools/po/ja.po
+++ b/client/rhel/rhn-client-tools/po/ja.po
@@ -1714,23 +1714,13 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
"このシステムは、 Red Hat Network サーバーに接続しないと Red Hat からセキュリ"
"ティ更新などのソフトウェア更新を正しく受信することが<b>できません</b>。\n"
"\n"
"システムが安全且つ最新の状態でサポートされているよう維持するため、なるべく早"
-"くこのシステムを登録するようにしてください。 \n"
-"\n"
-"<b>システム > 管理</b> メニュー内の <b>RHN に登録</b> を実行すると RHN 登録"
-"ツールにアクセスできます。\n"
-"<b>システム > 管理</b> メニュー内の <b>ソフトウェアの更新</b> を実行すると ソ"
-"フトウェア更新ツールにアクセスできます。"
+"くこのシステムを登録するようにしてください。 "
#: ../data/rh_register.glade.h:10
msgid "I'd like to register with an Red Hat Satellite or Red Hat Proxy"
@@ -2088,13 +2078,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/ja_JP.po b/client/rhel/rhn-client-tools/po/ja_JP.po
index 25d2499..6f9db15 100644
--- a/client/rhel/rhn-client-tools/po/ja_JP.po
+++ b/client/rhel/rhn-client-tools/po/ja_JP.po
@@ -1495,12 +1495,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1856,13 +1851,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/ka.po b/client/rhel/rhn-client-tools/po/ka.po
index fb93d9d..4119fb0 100644
--- a/client/rhel/rhn-client-tools/po/ka.po
+++ b/client/rhel/rhn-client-tools/po/ka.po
@@ -1503,12 +1503,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1864,13 +1859,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/kn.po b/client/rhel/rhn-client-tools/po/kn.po
index bfe9133..29ea9b6 100644
--- a/client/rhel/rhn-client-tools/po/kn.po
+++ b/client/rhel/rhn-client-tools/po/kn.po
@@ -1708,23 +1708,13 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
"ಈ ಗಣಕವು Red Hat Network ಪರಿಚಾರಕಕ್ಕೆ ಸಂಪರ್ಕಿತಗೊಳ್ಳದೆ Red Hat ನಿಂದ ಸುರಕ್ಷತಾ "
"ಅಪ್ಡೇಟುಗಳನ್ನು ಒಳಗೊಂಡಂತಹ ತಂತ್ರಾಂಶ ಅಪ್ಡೇಟುಗಳನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಪಡೆಯಲು <b>ಸಾಧ್ಯವಿಲ್ಲ</b>.\n"
"\n"
"ನಿಮ್ಮ ಗಣಕವನ್ನು ಅಪ್ಡೇಟ್, ಸುರಕ್ಷಿತ ಹಾಗು ಬೆಂಬಲಿತವಾಗಿಡಲು, ದಯವಿಟ್ಟು ಈ ಗಣಕವನ್ನು "
-"ಸಾಧ್ಯವಾದಷ್ಟು ತ್ವರಿತವಾಗಿ ನೋಂದಾಯಿಸಿ. \n"
-"\n"
-"<b> ವ್ಯವಸ್ಥೆ > ನಿರ್ವಹಣೆ </b> ಮೆನುವಿನಲ್ಲಿರುವ <b>RHN ನೋಂದಣಿ</b>ಯನ್ನು ಚಲಾಯಿಸುವ ಮೂಲಕ "
-"RHN ನೋಂದಣಿ ಉಪಕರಣವನ್ನು ನೀವು ನಿಲುಕಿಸಕೊಳ್ಳಬಹುದಾಗಿದೆ. <b> ವ್ಯವಸ್ಥೆ > ನಿರ್ವಹಣೆ</b> "
-"ಮೆನುವಿನಲ್ಲಿರುವ <b> ತಂತ್ರಾಂಶ ಅಪ್ಡೇಟರ್ </b>ಅನ್ನು ಚಲಾಯಿಸು ಮೂಲಕವೂ ಸಹ ತಂತ್ರಾಂಶ ಅಪ್ಡೇಟ್ "
-"ಉಪಕರಣವನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಬಹುದಾಗಿರುತ್ತದೆ."
+"ಸಾಧ್ಯವಾದಷ್ಟು ತ್ವರಿತವಾಗಿ ನೋಂದಾಯಿಸಿ. "
#: ../data/rh_register.glade.h:10
msgid "I'd like to register with an Red Hat Satellite or Red Hat Proxy"
@@ -2082,13 +2072,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/ko.po b/client/rhel/rhn-client-tools/po/ko.po
index 6cdfd5d..651ff82 100644
--- a/client/rhel/rhn-client-tools/po/ko.po
+++ b/client/rhel/rhn-client-tools/po/ko.po
@@ -1688,22 +1688,13 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
"Red Hat Network 서버에 연결하지 않고 Red Hat에서 시스템으로 보안 업데이트를 "
"포함한 소프트웨어를 성공적으로 업데이트할 수 <b>없습니다.</b>\n"
"\n"
"시스템을 지속적으로 업데이트, 보안, 및 지원하시려면 가능한 빠른 시일내에 시스"
-"템을 등록하시기 바랍니다.\n"
-"n 이러한 RHN 등록 도구는 <b>시스템 > 관리</b> 메뉴의 <b>RHN 등록</b>를 실행하"
-"면 됩니다.\n"
-"소프트웨어 업데이트 도구는 <b>시스템 > 관리</b> 메뉴의 <b>소프트웨어 업데이"
-"트</b>를 실행하면 됩니다."
+"템을 등록하시기 바랍니다."
#: ../data/rh_register.glade.h:10
msgid "I'd like to register with an Red Hat Satellite or Red Hat Proxy"
@@ -2061,13 +2052,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/ku.po b/client/rhel/rhn-client-tools/po/ku.po
index d0e1733..a99d7a3 100644
--- a/client/rhel/rhn-client-tools/po/ku.po
+++ b/client/rhel/rhn-client-tools/po/ku.po
@@ -1495,12 +1495,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1856,13 +1851,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/lo.po b/client/rhel/rhn-client-tools/po/lo.po
index 63b6bbb..8e1aa50 100644
--- a/client/rhel/rhn-client-tools/po/lo.po
+++ b/client/rhel/rhn-client-tools/po/lo.po
@@ -1495,12 +1495,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1856,13 +1851,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/mk.po b/client/rhel/rhn-client-tools/po/mk.po
index 3843f57..0850a22 100644
--- a/client/rhel/rhn-client-tools/po/mk.po
+++ b/client/rhel/rhn-client-tools/po/mk.po
@@ -1534,12 +1534,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1895,13 +1890,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/ml.po b/client/rhel/rhn-client-tools/po/ml.po
index ddae9a4..de99a11 100644
--- a/client/rhel/rhn-client-tools/po/ml.po
+++ b/client/rhel/rhn-client-tools/po/ml.po
@@ -1684,23 +1684,13 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
"ഒരു Red Hat നെറ്റ്വര്ക്ക് സര്വറിലേക്ക് കണക്ട് ചെയ്യാതെ Red Hat-ല് നിന്നും ഈ സിസ്റ്റത്തിനുള്ള "
"സുരക്ഷാ പരിഷ്കരണങ്ങള് ഉള്പ്പെടയുളള സോഫ്റ്റ്വെയര് പരിഷ്കരണങ്ങള് നിങ്ങള്ക്ക് <b>ലഭ്യമാകുകയില്ല</b>.\n"
"\n"
"നിങ്ങളുടെ സിസ്റ്റം പുതുക്കുന്നതിനും സൂക്ഷിക്കുന്നതിനും പിന്തുണയ്ക്കുന്നതിനും, ദയവായി ഉടന് തന്നെ "
-"രജിസ്ടര് ചെയ്യുക.\n"
-"\n"
-"ആര്എച്എന് രജിസ്ട്രേഷന് പ്രയോഗം ലഭ്യമാക്കുന്നതിനായി <b>സിസ്റ്റം > അഡ്മിനിസ്ട്രേഷന്</b> "
-"മെനുവിലുള്ള <b>ആര്എച്എന് രജിസ്ട്രേഷന്</b> ഉപയോഗിയ്ക്കുക.\n"
-"<b>സിസ്റ്റം > അഡ്മിനിസ്ട്രേഷന്</b> മെനുവിലുള്ള <b>സോഫ്റ്റ്വെയര് പരിഷ്കരണം</b> ഉപയോഗിച്ചു് "
-"നിങ്ങള്ക്ക് സോഫ്റ്റ്വെയര് പരിഷ്കരണത്തിനുള്ള പ്രയോഗം ലഭ്യമാക്കാം."
+"രജിസ്ടര് ചെയ്യുക."
#: ../data/rh_register.glade.h:10
msgid "I'd like to register with an Red Hat Satellite or Red Hat Proxy"
@@ -2058,13 +2048,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/mr.po b/client/rhel/rhn-client-tools/po/mr.po
index b639bb6..ce2c2ac 100644
--- a/client/rhel/rhn-client-tools/po/mr.po
+++ b/client/rhel/rhn-client-tools/po/mr.po
@@ -1674,22 +1674,12 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
"ही प्रणाली Red Hat Network सर्व्हरशी जोडणी केल्याविना, Red Hat पासून यशस्वीरित्या "
"सुरक्षा सुधारणांसह, सॉफ्टवेअर सुधारणा, प्राप्त करू शकणार <b>नाही</b>.\n"
"\n"
-"प्रणालीला सुधारीत, सुरक्षीत, व सपोर्टेड ठेवण्यासाठी, कृपया प्रणालीची नोंदणी करून घ्या.\n"
-"\n"
-"<b>प्रणाली > प्रशासन</b> मेन्यूमधील <b>RHN नोंदणी</b> चालवून RHN नोंदणी साधनकरीता "
-"प्रवेश प्राप्त करणे शक्य आहे.\n"
-"<b>प्रणली > प्रशासन</b> मेन्यूमधील <b>सॉफ्टवेअर सुधारणा</b> चालवून सॉफ्टवेअर सुधारणा "
-"साधनकरीता प्रवेश प्राप्त करणे शक्य आहे."
+"प्रणालीला सुधारीत, सुरक्षीत, व सपोर्टेड ठेवण्यासाठी, कृपया प्रणालीची नोंदणी करून घ्या."
#: ../data/rh_register.glade.h:10
msgid "I'd like to register with an Red Hat Satellite or Red Hat Proxy"
@@ -2047,13 +2037,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/ms.po b/client/rhel/rhn-client-tools/po/ms.po
index 0b0a611..e9e361f 100644
--- a/client/rhel/rhn-client-tools/po/ms.po
+++ b/client/rhel/rhn-client-tools/po/ms.po
@@ -1505,12 +1505,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1866,13 +1861,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/my.po b/client/rhel/rhn-client-tools/po/my.po
index f888c0d..0beea9f 100644
--- a/client/rhel/rhn-client-tools/po/my.po
+++ b/client/rhel/rhn-client-tools/po/my.po
@@ -1495,12 +1495,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1856,13 +1851,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/nb.po b/client/rhel/rhn-client-tools/po/nb.po
index 4c1492c..0e1be58 100644
--- a/client/rhel/rhn-client-tools/po/nb.po
+++ b/client/rhel/rhn-client-tools/po/nb.po
@@ -1531,12 +1531,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1892,13 +1887,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/nl.po b/client/rhel/rhn-client-tools/po/nl.po
index c310f5f..84f0916 100644
--- a/client/rhel/rhn-client-tools/po/nl.po
+++ b/client/rhel/rhn-client-tools/po/nl.po
@@ -1568,12 +1568,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1929,13 +1924,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/nn.po b/client/rhel/rhn-client-tools/po/nn.po
index 14e864d..c6db9e8 100644
--- a/client/rhel/rhn-client-tools/po/nn.po
+++ b/client/rhel/rhn-client-tools/po/nn.po
@@ -1495,12 +1495,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1856,13 +1851,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/no.po b/client/rhel/rhn-client-tools/po/no.po
index 3799260..6af649b 100644
--- a/client/rhel/rhn-client-tools/po/no.po
+++ b/client/rhel/rhn-client-tools/po/no.po
@@ -1528,12 +1528,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1889,13 +1884,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/or.po b/client/rhel/rhn-client-tools/po/or.po
index a903c98..f8b38b4 100644
--- a/client/rhel/rhn-client-tools/po/or.po
+++ b/client/rhel/rhn-client-tools/po/or.po
@@ -1680,23 +1680,13 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
"ଗୋଟିଏ Red Hat Network ସର୍ଭର ସହିତ ସଂଯୋଗ ନ କରି, ଏହି ତନ୍ତ୍ରଟି ଆପଣ ସୁରକ୍ଷା ଅଦ୍ଯତନ ମାନଙ୍କ ସହିତ "
"ଅନ୍ଯ କୌଣସି ସଫ୍ଟୱେର ଅଦ୍ଯତନ ମାନଙ୍କୁ Red Hat ରୁ ସଫଳତାର ସହିତ ପାଇପାରିବେ <b>ନାହିଁ</b>।\n"
"\n"
"ଆପଣଙ୍କ ତନ୍ତ୍ରକୁ ଅଦ୍ଯତିତ, ସୁରକ୍ଷିତ, ଏବଂ ସମର୍ଥିତ କରିବା ପାଇଁ, ଦୟାକରି ଏହି ତନ୍ତ୍ରକୁ ଯଥାଶୀଘ୍ର ପଞ୍ଜୀକୃତ "
-"କରନ୍ତୁ। \n"
-"\n"
-"ଆପଣ <b>RHN ପଞ୍ଜିକରଣ</b> କୁ <b>ତନ୍ତ୍ର > ପ୍ରଶାସନ</b> ତାଲିକାରେ ଚଲାଇ RHN ପଞ୍ଜିକରଣ ସାଧନକୁ "
-"ଅଭିଗମ୍ୟ କରିପାରିବେ।\n"
-"<b>ତନ୍ତ୍ର > ପ୍ରଶାସନ</b> ତାଲିକାରେ ଆପଣ <b>ସଫ୍ଟୱେର ଅଦ୍ଯତକକୁ</b> ଯେ କୌଣସି ସମୟରେ ଚଳାଇ ଆପଣ "
-"ଏହି ପଞ୍ଜୀକରଣ ଉପକରଣକୁ ଅଭିଗମ କରିପାରିବେ।"
+"କରନ୍ତୁ। "
#: ../data/rh_register.glade.h:10
msgid "I'd like to register with an Red Hat Satellite or Red Hat Proxy"
@@ -2054,13 +2044,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/pa.po b/client/rhel/rhn-client-tools/po/pa.po
index 145a2a5..17d0a71 100644
--- a/client/rhel/rhn-client-tools/po/pa.po
+++ b/client/rhel/rhn-client-tools/po/pa.po
@@ -1668,23 +1668,13 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
"ਇਸ ਸਿਸਟਮ Red Hat ਨੈੱਟਵਰਕ ਸਰਵਰ ਨਾਲ ਜੁੜੇ ਬਿਨਾਂ Red Hat ਤੋਂ ਸਾਫਟਵੇਅਰ ਅੱਪਡੇਟ ਲੈਣ ਲਈ ਯੋਗ "
"<b>ਨਹੀਂ</b> ਹੋਵੇਗਾ, ਜਿਵੇਂ ਸੁਰੱਖਿਆ ਅੱਪਡੇਟ।\n"
"\n"
"ਆਪਣਾ ਸਿਸਟਮ ਅੱਪਡੇਟ, ਸੁਰੱਖਿਅਤ, ਅਤੇ ਸਹਿਯੋਗੀ ਰੱਖਣ ਲਈ, ਕਿਰਪਾ ਕਰਕੇ ਇਸ ਸਿਸਟਮ ਨੂੰ ਜਲਦੀ ਰਜਿਟਰ "
-"ਕਰਾਓ।\n"
-"\n"
-"ਤੁਸੀਂ <b>ਸਿਸਟਮ > ਪ੍ਰਸ਼ਾਸ਼ਨ</b> ਮੇਨੂ ਵਿੱਚ <b>RHN ਰਜਿਸਟਰੇਸ਼ਨ</b> ਚਲਾ ਕੇ RHN ਰਜਿਸਟਰੇਸ਼ਨ ਜੰਤਰ "
-"ਵਰਤ ਸਕਦੇ ਹੋ।\n"
-"ਤੁਸੀਂ <b>ਸਿਸਟਮ > ਪ੍ਰਸ਼ਾਸ਼ਨ</b> ਮੇਨੂ ਵਿੱਚ <b>ਸਾਫਟਵੇਅਰ ਅੱਪਡੇਟ</b> ਚਲਾ ਕੇ ਸਾਫਟਵੇਅਰ ਅੱਪਡੇਟ ਜੰਤਰ "
-"ਵਰਤ ਸਕਦੇ ਹੋ।"
+"ਕਰਾਓ।"
#: ../data/rh_register.glade.h:10
msgid "I'd like to register with an Red Hat Satellite or Red Hat Proxy"
@@ -2041,13 +2031,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/pl.po b/client/rhel/rhn-client-tools/po/pl.po
index 33d8e69..11e99f9 100644
--- a/client/rhel/rhn-client-tools/po/pl.po
+++ b/client/rhel/rhn-client-tools/po/pl.po
@@ -1534,12 +1534,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1895,13 +1890,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/pt.po b/client/rhel/rhn-client-tools/po/pt.po
index 03dc375..f862882 100644
--- a/client/rhel/rhn-client-tools/po/pt.po
+++ b/client/rhel/rhn-client-tools/po/pt.po
@@ -1642,12 +1642,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -2006,13 +2001,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/pt_BR.po b/client/rhel/rhn-client-tools/po/pt_BR.po
index 56bc075..65a77e6 100644
--- a/client/rhel/rhn-client-tools/po/pt_BR.po
+++ b/client/rhel/rhn-client-tools/po/pt_BR.po
@@ -1730,24 +1730,14 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
"Este sistema <b>não</b> poderá receber atualizações de software da Red Hat, "
"incluindo atualizações de segurança, com sucesso sem se conectar a um "
"servidor do Red Hat Network.\n"
"\n"
"Para manter o seu sistema atualizado, seguro, e suportado, por favor "
-"registre este sistema assim que for conveniente.\n"
-"\n"
-"Você pode acessar esta ferramenta de registro rodando o <b>Registro do RHN</"
-"b> no menu <b>Sistemas > Administração</b>.\n"
-"Você pode acessar a ferramenta de atualização do software rodando "
-"<b>Atualização de Software</b> no menu <b>Sistemas> Administração</b>."
+"registre este sistema assim que for conveniente."
#: ../data/rh_register.glade.h:10
msgid "I'd like to register with an Red Hat Satellite or Red Hat Proxy"
@@ -2125,13 +2115,7 @@ msgstr "Seu sistema não está configurado para atualizações de software."
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/ro.po b/client/rhel/rhn-client-tools/po/ro.po
index 455201c..a00eb29 100644
--- a/client/rhel/rhn-client-tools/po/ro.po
+++ b/client/rhel/rhn-client-tools/po/ro.po
@@ -1504,12 +1504,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1865,13 +1860,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/ru.po b/client/rhel/rhn-client-tools/po/ru.po
index 421c51f..1244291 100644
--- a/client/rhel/rhn-client-tools/po/ru.po
+++ b/client/rhel/rhn-client-tools/po/ru.po
@@ -1702,23 +1702,13 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
"Без подключения к серверу Red Hat Network получение программных обновлений "
"(в том числе обновлений безопасности Red Hat) будет <b>невозможно</b>.\n"
"\n"
"Для поддержки системы в обновлённом и защищённом состоянии рекомендуется её "
-"зарегистрировать.\n"
-"\n"
-"Для запуска программы регистрации в меню <b>Система > Администрирование</b> "
-"выберите <b>Регистрация в RHN</b>.\n"
-"Для запуска программы обновления в меню <b>Система > Администрирование</b> "
-"выберите <b>Обновление программ</b>."
+"зарегистрировать."
#: ../data/rh_register.glade.h:10
msgid "I'd like to register with an Red Hat Satellite or Red Hat Proxy"
@@ -2079,13 +2069,7 @@ msgstr "Система не настроена на получение обно
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/si.po b/client/rhel/rhn-client-tools/po/si.po
index 811d657..4093285 100644
--- a/client/rhel/rhn-client-tools/po/si.po
+++ b/client/rhel/rhn-client-tools/po/si.po
@@ -1623,12 +1623,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1986,13 +1981,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/sk.po b/client/rhel/rhn-client-tools/po/sk.po
index d1049e0..1002ced 100644
--- a/client/rhel/rhn-client-tools/po/sk.po
+++ b/client/rhel/rhn-client-tools/po/sk.po
@@ -1529,12 +1529,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1890,13 +1885,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/sl.po b/client/rhel/rhn-client-tools/po/sl.po
index 5db5db9..99f905d 100644
--- a/client/rhel/rhn-client-tools/po/sl.po
+++ b/client/rhel/rhn-client-tools/po/sl.po
@@ -1521,12 +1521,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1882,13 +1877,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/sq.po b/client/rhel/rhn-client-tools/po/sq.po
index b027656..b31f277 100644
--- a/client/rhel/rhn-client-tools/po/sq.po
+++ b/client/rhel/rhn-client-tools/po/sq.po
@@ -1496,12 +1496,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1857,13 +1852,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/sr.po b/client/rhel/rhn-client-tools/po/sr.po
index 7c6c5ec..2a8f2dd 100644
--- a/client/rhel/rhn-client-tools/po/sr.po
+++ b/client/rhel/rhn-client-tools/po/sr.po
@@ -1521,12 +1521,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1882,13 +1877,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/sr(a)Latn.po b/client/rhel/rhn-client-tools/po/sr(a)Latn.po
index 75e53de..e81055d 100644
--- a/client/rhel/rhn-client-tools/po/sr(a)Latn.po
+++ b/client/rhel/rhn-client-tools/po/sr(a)Latn.po
@@ -1496,12 +1496,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
diff --git a/client/rhel/rhn-client-tools/po/sv.po b/client/rhel/rhn-client-tools/po/sv.po
index 1bb9fbc..a0163dd 100644
--- a/client/rhel/rhn-client-tools/po/sv.po
+++ b/client/rhel/rhn-client-tools/po/sv.po
@@ -1712,12 +1712,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -2079,13 +2074,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/ta.po b/client/rhel/rhn-client-tools/po/ta.po
index 107738a..4fa37cf 100644
--- a/client/rhel/rhn-client-tools/po/ta.po
+++ b/client/rhel/rhn-client-tools/po/ta.po
@@ -1687,24 +1687,14 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
"Red Hat Network சேவையகத்தில் இணைக்காமல் Red Hat இலிருந்து நீங்கள் பாதுகாப்பு "
"மேம்படுத்தல்களையும் சேர்த்து மென்பொருள் மேம்படுத்தல்களை இந்த கணினிக்குப் பெற <b>முடியாது</"
"b>.\n"
"\n"
"உங்கள் கணினியை மேம்படுத்தி, பாதுகாத்து மற்றும் துணைபுரிய, இந்த கணினியை விரைவாக பதிவு "
-"செய்யவும். \n"
-"\n"
-"இந்த RHN பதிவு கருவியை <b>கணினி > நிர்வாகம்</b> மெனுவில் <b>RHN பதிவு</b> "
-"என்பதில் அணுகலாம்.\n"
-"மென்பொருள் புதுப்பித்தல் கருவியை <b>கணினி > நிர்வாகம்</b> மெனுவில் <b>மென்பொருள் "
-"புதுப்பித்தல்</b> என்பதை இயக்கி அணுகலாம்."
+"செய்யவும். "
#: ../data/rh_register.glade.h:10
msgid "I'd like to register with an Red Hat Satellite or Red Hat Proxy"
@@ -2062,13 +2052,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/te.po b/client/rhel/rhn-client-tools/po/te.po
index 8252ae8..722a2a6 100644
--- a/client/rhel/rhn-client-tools/po/te.po
+++ b/client/rhel/rhn-client-tools/po/te.po
@@ -1663,23 +1663,13 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
"ఈ సిస్టమ్ Red Hat Network సర్వరుకు అనుసంధించబడకుండా Red Hat నుండీ సాఫ్టువేరు నవీకరణలను, "
"రక్షణ నవీకరణలతో సహా, వేటిని సమర్ధవంతంగా పొంద<b>లేదు</b>.\n"
"\n"
"మీ సిస్టమ్ నవీకరించబడుతూ, సురక్షితంగా, మరియు మద్దతించబడుతూ వుంచుట కొరకు, దయచేసి దానిని త్వరలో మీ "
-"వీలునిబట్టి నమోదుచేయండి.\n"
-"\n"
-"మీరు <b>సిస్టమ్ > నిర్వహణ</b> మెనూనందలి <b>RHN నమోదీకరణ</b> నడుపుట ద్వారా RHN నమోదీకరణ "
-"సాధనమును యాక్సెస్ చేయవచ్చును.\n"
-"మీరు <b>సిస్టమ్ > నిర్వహణ</b> మెనూనందలి <b>సాఫ్టువేర్ నవీకరణ</b> ను నడుపుట ద్వారా సాఫ్టువేర్ "
-"నవీకరణ సాధనమును యాక్సెస్ చేయవచ్చును."
+"వీలునిబట్టి నమోదుచేయండి."
#: ../data/rh_register.glade.h:10
msgid "I'd like to register with an Red Hat Satellite or Red Hat Proxy"
@@ -2036,13 +2026,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/tg.po b/client/rhel/rhn-client-tools/po/tg.po
index 07e57cb..6371a1f 100644
--- a/client/rhel/rhn-client-tools/po/tg.po
+++ b/client/rhel/rhn-client-tools/po/tg.po
@@ -1495,12 +1495,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1856,13 +1851,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/tr.po b/client/rhel/rhn-client-tools/po/tr.po
index e9b50aa..2f0c8a1 100644
--- a/client/rhel/rhn-client-tools/po/tr.po
+++ b/client/rhel/rhn-client-tools/po/tr.po
@@ -1532,12 +1532,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1893,13 +1888,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/uk.po b/client/rhel/rhn-client-tools/po/uk.po
index b0ed6bf..3c2e86f 100644
--- a/client/rhel/rhn-client-tools/po/uk.po
+++ b/client/rhel/rhn-client-tools/po/uk.po
@@ -1753,19 +1753,12 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
"Без з’єднання з сервером Red Hat Network ви <b>не</b> зможете отримувати "
"оновлення програмного забезпечення, зокрема оновлення безпеки Red Hat для "
"цієї системи. Для підтримки системи у оновленому та захищеному стані, "
-"зареєструйте її якомога раніше. Доступ до програми реєстрації можливий за "
-"допомогою пункту <b>Оновлення програмного забезпечення</b> у меню "
-"<b>Програми > Системні параметри</b>."
+"зареєструйте її якомога раніше."
#: ../data/rh_register.glade.h:10
#, fuzzy
@@ -2162,23 +2155,10 @@ msgstr "Вашу систему не налаштовано на оновлен
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
"Ви не зможете отримувати оновлення програмного забезпечення, зокрема "
-"оновлення, пов’язані із захистом системи для цієї системи.\n"
-"\n"
-"Доступ до засобу реєстрації у RHN можна отримати за допомогою пункту "
-"<b>Реєстрація у RHN</b> або <b>Керування передплатами Red Hat</b> у меню "
-"<b>Система > Адміністрування</b>.\n"
-"Доступ до засобу оновлення програмного забезпечення здійснюється за "
-"допомогою пункту <b>Оновлення програмного забезпечення</b> у меню <b>Система "
-"> Адміністрування</b>."
+"оновлення, пов’язані із захистом системи для цієї системи."
#: ../data/rh_register.glade.h:100
msgid "Proxy Configuration"
diff --git a/client/rhel/rhn-client-tools/po/ur.po b/client/rhel/rhn-client-tools/po/ur.po
index 81fc7b6..7aae28d 100644
--- a/client/rhel/rhn-client-tools/po/ur.po
+++ b/client/rhel/rhn-client-tools/po/ur.po
@@ -1496,12 +1496,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1857,13 +1852,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/vi.po b/client/rhel/rhn-client-tools/po/vi.po
index d635b12..994d5c9 100644
--- a/client/rhel/rhn-client-tools/po/vi.po
+++ b/client/rhel/rhn-client-tools/po/vi.po
@@ -1496,12 +1496,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1857,13 +1852,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/zh_CN.GB2312.po b/client/rhel/rhn-client-tools/po/zh_CN.GB2312.po
index 2a8063a..a503c54 100644
--- a/client/rhel/rhn-client-tools/po/zh_CN.GB2312.po
+++ b/client/rhel/rhn-client-tools/po/zh_CN.GB2312.po
@@ -1498,12 +1498,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1859,13 +1854,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/zh_CN.po b/client/rhel/rhn-client-tools/po/zh_CN.po
index b9215b5..8af4c75 100644
--- a/client/rhel/rhn-client-tools/po/zh_CN.po
+++ b/client/rhel/rhn-client-tools/po/zh_CN.po
@@ -1627,21 +1627,13 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
"如果没有连接到红帽网络服务器，这个系统将<b>不会</b>成功地从红帽接收软件更新，"
"其中包括安全更新。\n"
"\n"
"要保持您的系统更新、安全并被支持，请尽快支持您的系统。您可以通过运行 <b>应用"
-"程序 > 系统工具</b> 菜单中的 <b>软件更新程序</b> 获得这个支持工具。\n"
-"\n"
-"您可以在<b>系统 > 管理</b>菜单中运行<b> RHN 注册</b>访问 RHN 注册工具。\n"
-"您可以在<b>系统 > 管理</b>菜单中运行<b>软件更新</b>访问软件更新。"
+"程序 > 系统工具</b> 菜单中的 <b>软件更新程序</b> 获得这个支持工具。"
#: ../data/rh_register.glade.h:10
msgid "I'd like to register with an Red Hat Satellite or Red Hat Proxy"
@@ -2006,13 +1998,7 @@ msgstr "您的系统没有设置软件更新。"
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/zh_TW.Big5.po b/client/rhel/rhn-client-tools/po/zh_TW.Big5.po
index 1364442..d44d737 100644
--- a/client/rhel/rhn-client-tools/po/zh_TW.Big5.po
+++ b/client/rhel/rhn-client-tools/po/zh_TW.Big5.po
@@ -1568,12 +1568,7 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
#: ../data/rh_register.glade.h:10
@@ -1929,13 +1924,7 @@ msgstr ""
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
diff --git a/client/rhel/rhn-client-tools/po/zh_TW.po b/client/rhel/rhn-client-tools/po/zh_TW.po
index cf1e06c..6ccf9c2 100644
--- a/client/rhel/rhn-client-tools/po/zh_TW.po
+++ b/client/rhel/rhn-client-tools/po/zh_TW.po
@@ -1629,20 +1629,12 @@ msgid ""
"Red Hat Satellite or Red Hat Network Classic.\n"
"\n"
"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"in the <b>System > Administration</b> menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"system at your earliest convenience."
msgstr ""
"如果系統不連上 Red Hat Network 伺服器的話，這部系統將<b>無法</b>由 Red Hat 成"
"功地取得軟體更新，包括安全性更新。\n"
"\n"
-"要讓您的系統保持在最新、最安全與受支援的狀態，請儘早註冊這台系統。\n"
-"\n"
-"您可以透過<b>系統 > 管理</b>選單中的 <b>RHN 註冊</b>來執行 RHN 註冊工具。\n"
-"您可藉由執行<b>系統 > 管理</b>選單中的<b>軟體更新</b>來存取軟體更新工具。"
+"要讓您的系統保持在最新、最安全與受支援的狀態，請儘早註冊這台系統。"
#: ../data/rh_register.glade.h:10
msgid "I'd like to register with an Red Hat Satellite or Red Hat Proxy"
@@ -2000,13 +1992,7 @@ msgstr "系統未設置為接收軟體更新。"
#: ../data/rh_register.glade.h:96
msgid ""
"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"You may access the RHN registration tool by running <b>RHN Registration</b> "
-"or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> "
-"menu.\n"
-"You may access the software update tool by running <b>Software Update</b> in "
-"the <b>System > Administration</b> menu."
+"for this system."
msgstr ""
#: ../data/rh_register.glade.h:100
commit c6acee975298551443178ec77d2d3c39688abdbd
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Dec 12 11:22:02 2013 +0100
1038694 - new error icon in gnome3
diff --git a/client/rhel/rhn-client-tools/data/Makefile b/client/rhel/rhn-client-tools/data/Makefile
index 4b833a4..8dfd214 100644
--- a/client/rhel/rhn-client-tools/data/Makefile
+++ b/client/rhel/rhn-client-tools/data/Makefile
@@ -83,6 +83,11 @@ else
$(INSTALL_DATA) up2date-icons/48x48/up2date.png $(PNG48_DIR)/
endif
+ifeq ($(shell test $(RHEL) -ge 7 -o $(FEDORA) -ge 18 && echo "newerror"), newerror)
+ sed -i -e "s|gtk-dialog-error|dialog-error|g" \
+ $(RHNSHARE_DIR)/up2date_client/rh_register.glade
+endif
+
# this is lame and should be dealt with in the code
sed -i -e "s|@@logo@@|$(LOGO)|g" \
$(RHNSHARE_DIR)/up2date_client/*glade
1
0
Tag 'spacewalk-search-2.1.9-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-12-12 12:39 +0000
Tagging package [spacewalk-search] version [2.1.9-1] in directory [search-server/spacewalk-search/].
Changes since spacewalk-java-2.1.97-1:
Jan Dobes (2):
alter system group create page to do editing
system group edit properties - linking + cleanup
Michael Mraka (1):
fixed icon name
Tomas Kasparek (5):
unify configuration management icons
icon for file download
fix icons on config file details page
use rhn:toolbar tag instead of creating html inside .jsp + unify icons
system group legend needs rhn taglib
Tomas Lestach (4):
let spacewalk-search require c3p0 >= 0.9.1
there're no objectweb-asm on rhel5
do not let cleanindex log into the console
Automatic commit of package [spacewalk-search] release [2.1.9-1].
---
java/code/src/com/redhat/rhn/frontend/action/groups/CreateGroupAction.java | 88 -----
java/code/src/com/redhat/rhn/frontend/action/groups/EditGroupAction.java | 170 ++++++++++
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 3
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 11
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 2
java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java | 3
java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp | 1
java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf | 8
java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp | 6
java/code/webapp/WEB-INF/pages/configuration/sdc/createfile.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/sdc/rankchannels.jsp | 6
java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp | 6
java/code/webapp/WEB-INF/pages/configuration/sdc/uploadfile.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilescentral.jsp | 6
java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp | 6
java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilessandbox.jsp | 5
java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp | 2
java/code/webapp/WEB-INF/pages/groups/create.jsp | 67 ---
java/code/webapp/WEB-INF/pages/groups/detail.jsp | 2
java/code/webapp/WEB-INF/pages/groups/edit.jsp | 86 +++++
java/code/webapp/WEB-INF/pages/systems/grouplist.jsp | 2
java/code/webapp/WEB-INF/struts-config.xml | 18 -
rel-eng/packages/spacewalk-search | 2
search-server/spacewalk-search/spacewalk-search.spec | 15
search-server/spacewalk-search/src/config/rhn-search | 2
spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 6
web/html/network/systems/groups/edit_properties.pxt | 56 ---
web/html/network/systems/groups/probe_list.pxt | 2
48 files changed, 347 insertions(+), 282 deletions(-)
---
1
0
rel-eng/packages/spacewalk-search | 2 +-
search-server/spacewalk-search/spacewalk-search.spec | 15 ++++++++++++---
search-server/spacewalk-search/src/config/rhn-search | 2 +-
3 files changed, 14 insertions(+), 5 deletions(-)
New commits:
commit 1f3484e88826e8474b5bf1abfcf3142a7709f0ef
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Dec 12 13:39:01 2013 +0100
Automatic commit of package [spacewalk-search] release [2.1.9-1].
diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search
index a0a7bb2..c6d3eef 100644
--- a/rel-eng/packages/spacewalk-search
+++ b/rel-eng/packages/spacewalk-search
@@ -1 +1 @@
-2.1.8-1 search-server/spacewalk-search/
+2.1.9-1 search-server/spacewalk-search/
diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec
index fde2c4b..15e0963 100644
--- a/search-server/spacewalk-search/spacewalk-search.spec
+++ b/search-server/spacewalk-search/spacewalk-search.spec
@@ -4,7 +4,7 @@ Name: spacewalk-search
Summary: Spacewalk Full Text Search Server
Group: Applications/Internet
License: GPLv2
-Version: 2.1.8
+Version: 2.1.9
Release: 1%{?dist}
# This src.rpm is cannonical upstream
# You can obtain it using this set of commands
@@ -190,6 +190,11 @@ fi
%attr(755, root, root) %{_var}/lib/rhn/search/indexes/docs
%changelog
+* Thu Dec 12 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.9-1
+- do not let cleanindex log into the console
+- there're no objectweb-asm on rhel5
+- let spacewalk-search require c3p0 >= 0.9.1
+
* Wed Dec 11 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.8-1
- 1040540 - have package search return all matching results
commit 865d879b94b4b358864d60b9e1f799ff181d452d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Dec 12 13:28:41 2013 +0100
do not let cleanindex log into the console
diff --git a/search-server/spacewalk-search/src/config/rhn-search b/search-server/spacewalk-search/src/config/rhn-search
index 6bff688..dbaf4d9 100644
--- a/search-server/spacewalk-search/src/config/rhn-search
+++ b/search-server/spacewalk-search/src/config/rhn-search
@@ -77,7 +77,7 @@ unlock() {
removeindex() {
JAVA_LIBRARY_PATH='-Djava.library.path=/usr/lib/oracle/11.2/client/lib:/usr/lib/oracle/11.2/client64/lib:/usr/lib/gcj/postgresql-jdbc:/usr/lib64/gcj/postgresql-jdbc'
SEARCH_CLASS_PATH=`build-classpath-directory /usr/share/rhn/search/lib /usr/share/java/ojdbc14.jar /usr/share/java/postgresql-jdbc.jar /usr/share/java/cglib-nodep.jar /usr/share/java/objectweb-asm/asm.jar`
- CLASSPATH=${SEARCH_CLASS_PATH} java $JAVA_LIBRARY_PATH com.redhat.satellite.search.DeleteIndexes
+ CLASSPATH=${SEARCH_CLASS_PATH} java $JAVA_LIBRARY_PATH com.redhat.satellite.search.DeleteIndexes > /dev/null
}
# Do not modify anything beyond this point
commit c50870ffbb10fd252e5fcd19d8de3c24f7cc052e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Dec 11 17:11:09 2013 +0100
there're no objectweb-asm on rhel5
let's do it in the same way like spacewalk-java does
diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec
index 1672840..fde2c4b 100644
--- a/search-server/spacewalk-search/spacewalk-search.spec
+++ b/search-server/spacewalk-search/spacewalk-search.spec
@@ -37,7 +37,11 @@ Requires: jakarta-oro
Requires: oro
%endif
#Requires: lucene
+%if 0%{?fedora}
Requires: objectweb-asm
+%else
+Requires: asm
+%endif
Requires: quartz < 2.0
Conflicts: quartz >= 2.0
Requires: redstone-xmlrpc
commit d72488c1e575ba8da501079857f826c07b68fefc
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Dec 11 16:44:07 2013 +0100
let spacewalk-search require c3p0 >= 0.9.1
that supports ConnectionCustomizer
diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec
index e8f362c..1672840 100644
--- a/search-server/spacewalk-search/spacewalk-search.spec
+++ b/search-server/spacewalk-search/spacewalk-search.spec
@@ -17,7 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
#Requires: apache-ibatis-sqlmap
-Requires: c3p0
+Requires: c3p0 >= 0.9.1
Requires: cglib
Requires: doc-indexes
Requires: jakarta-commons-cli
@@ -47,7 +47,7 @@ Requires: simple-core
Obsoletes: rhn-search < 5.3.0
BuildRequires: ant
#BuildRequires: apache-ibatis-sqlmap
-BuildRequires: c3p0
+BuildRequires: c3p0 >= 0.9.1
BuildRequires: jakarta-commons-cli
BuildRequires: jakarta-commons-codec
BuildRequires: jakarta-commons-httpclient
1
0
web/html/network/systems/groups/probe_list.pxt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d705b64297ffa05ca33f4eb48424d9ea60b2a251
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Dec 12 12:12:50 2013 +0100
fixed icon name
diff --git a/web/html/network/systems/groups/probe_list.pxt b/web/html/network/systems/groups/probe_list.pxt
index 2432ae3..f7ce560 100644
--- a/web/html/network/systems/groups/probe_list.pxt
+++ b/web/html/network/systems/groups/probe_list.pxt
@@ -8,7 +8,7 @@
<pxt-include file="/network/components/system_groups/sgdc_header.pxi" />
- <rhn-toolbar base="h2" icon="spacewalk-icon-system-groups">
+ <rhn-toolbar base="h2" icon="header-system-groups">
Probe Status
</rhn-toolbar>
1
0