2 commits - java/code java/conf java/spacewalk-java.spec
by Partha Aji
java/code/src/com/redhat/rhn/common/db/datasource/xml/ssm_operation_queries.xml | 6
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 33 ++
java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java | 6
java/code/src/com/redhat/rhn/domain/kickstart/RegistrationType.java | 74 +++++
java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemDetailsEditAction.java | 8
java/code/src/com/redhat/rhn/frontend/action/ssm/ViewLogDetailsAction.java | 5
java/code/src/com/redhat/rhn/frontend/dto/OperationDetailsDto.java | 143 ++++++++++
java/code/src/com/redhat/rhn/frontend/events/SsmDeleteServersAction.java | 5
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java | 74 +++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/test/SystemDetailsHandlerTest.java | 19 +
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 94 +++++-
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java | 44 ++-
java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 26 +
java/code/src/com/redhat/rhn/manager/kickstart/SystemDetailsCommand.java | 19 +
java/code/src/com/redhat/rhn/manager/ssm/SsmOperationManager.java | 20 -
java/code/src/com/redhat/rhn/manager/ssm/test/SsmOperationManagerTest.java | 34 +-
java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp | 13
java/code/webapp/WEB-INF/pages/ssm/view-log-details.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/view-log.jsp | 2
java/code/webapp/WEB-INF/struts-config.xml | 1
java/conf/cobbler/snippets/post_delete_system | 14
java/spacewalk-java.spec | 2
22 files changed, 565 insertions(+), 81 deletions(-)
New commits:
commit 5d352f5e826a5c1f96346672d543d7cff8b01799
Author: Partha Aji <paji(a)redhat.com>
Date: Mon May 10 20:38:33 2010 -0400
Added an option to selectively delete instead of reactivate when a system is being reprovisioned
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
index 07faee6..c19e7ae 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
@@ -44,6 +44,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -72,7 +73,7 @@ public class KickstartData {
private Boolean nonChrootPost;
private Boolean verboseUp2date;
private String cobblerId;
-
+
private Set cryptoKeys;
private Set childChannels;
private Set defaultRegTokens;
@@ -94,7 +95,6 @@ public class KickstartData {
public static final String TYPE_WIZARD = "wizard";
public static final String TYPE_RAW = "raw";
-
private static String[] advancedOptions =
{"partitions", "raids", "logvols", "volgroups", "include",
"repo", "custom", "custom_partition"};
@@ -1574,6 +1574,35 @@ public class KickstartData {
}
return Profile.lookupById(con, getCobblerId());
}
+
+ /**
+ * Gets the Registration Type (i.e. the code that determines if
+ * the ks script needs to generate a reactivation key or not)
+ * @param user the user object needed to load the profile from cobbler
+ * @return the registration type
+ */
+ public RegistrationType getRegistrationType(User user) {
+ Profile prof = getCobblerObject(user);
+ if (prof == null) {
+ return RegistrationType.getDefault();
+ }
+
+ return RegistrationType.find((String)prof.getKsMeta().get(
+ RegistrationType.COBBLER_VAR));
+ }
+
+ /**
+ * Sets the registration type
+ * @param type the refgistration type
+ * @param user the user needed to load the profile form cobbler
+ */
+ public void setRegistrationType(RegistrationType type, User user) {
+ Profile prof = getCobblerObject(user);
+ Map<String, Object> meta = prof.getKsMeta();
+ meta.put(RegistrationType.COBBLER_VAR, type.getType());
+ prof.setKsMeta(meta);
+ prof.save();
+ }
/**
* Method to determine if the profile
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
index fc07a2e..564b8de 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
@@ -136,6 +136,9 @@ public class KickstartFactory extends HibernateFactory {
*/
public static KickstartData lookupKickstartDataByLabelAndOrgId(
String label, Long orgId) {
+ if (StringUtils.isBlank(label)) {
+ throw new IllegalArgumentException("kickstartLabel cannot be null");
+ }
return (KickstartData) HibernateFactory.getSession().
getNamedQuery("KickstartData.findByLabelAndOrg")
.setString("label", label)
@@ -150,6 +153,9 @@ public class KickstartFactory extends HibernateFactory {
*/
public static KickstartData lookupKickstartDataByLabel(
String label) {
+ if (StringUtils.isBlank(label)) {
+ throw new IllegalArgumentException("kickstartLabel cannot be null");
+ }
return (KickstartData) HibernateFactory.getSession().
getNamedQuery("KickstartData.findByLabel")
.setString("label", label)
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/RegistrationType.java b/java/code/src/com/redhat/rhn/domain/kickstart/RegistrationType.java
new file mode 100644
index 0000000..d256a58
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/RegistrationType.java
@@ -0,0 +1,74 @@
+/**
+ * Copyright (c) 2010 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+package com.redhat.rhn.domain.kickstart;
+
+
+/**
+ * RegistrationType
+ * @version $Rev$
+ */
+public enum RegistrationType {
+ REACTIVATION ("reactivation"),
+ DELETION ("deletion"),
+ NONE ("none");
+ public static final String COBBLER_VAR = "SPACEWALK_registration_type";
+ private String type;
+ RegistrationType(String regType) {
+ type = regType;
+ }
+
+ /**
+ * @return the registration type
+ */
+ public String getType() {
+ return type;
+ }
+
+ /**
+ * Find the registration type given a string
+ * @param regType the string to search on
+ * @return a registration type
+ */
+ public static RegistrationType find(String regType) {
+ return findDefault(regType, getDefault());
+ }
+
+ /**
+ * Find the registration type given a string
+ * @param regType the string to search on
+ * @param def is not registration type is found the default will be returned
+ * @return a registration type
+ */
+ public static RegistrationType findDefault(String regType, RegistrationType def) {
+ if (NONE.type.equals(regType)) {
+ return NONE;
+ }
+ else if (DELETION.type.equals(regType)) {
+ return DELETION;
+ }
+ else if (REACTIVATION.type.equals(regType)) {
+ return REACTIVATION;
+ }
+
+ return def;
+ }
+
+ /**
+ * @return the default registration type
+ */
+ public static RegistrationType getDefault() {
+ return REACTIVATION;
+ }
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemDetailsEditAction.java
index 0c343b9..b4aab6c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemDetailsEditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemDetailsEditAction.java
@@ -50,6 +50,7 @@ import javax.servlet.http.HttpServletResponse;
public class SystemDetailsEditAction extends RhnAction {
public static final String SE_LINUX_PARAM = "selinuxMode";
+ public static final String REGISTRATION_TYPE_PARAM = "registrationType";
/**
* {@inheritDoc}
@@ -159,6 +160,7 @@ public class SystemDetailsEditAction extends RhnAction {
if (!ksdata.isLegacyKickstart()) {
command.setMode(SELinuxMode.lookup(form.getString(SE_LINUX_PARAM)));
}
+ command.setRegistrationType(form.getString(REGISTRATION_TYPE_PARAM));
transferFlagEdits(form, command);
command.store();
}
@@ -166,6 +168,7 @@ public class SystemDetailsEditAction extends RhnAction {
private void prepareForm(DynaActionForm dynaForm, KickstartData ksdata,
RequestContext ctx) {
prepareSELinuxConfig(dynaForm, ksdata);
+ prepareRegistrationTypeConfig(dynaForm, ksdata, ctx.getLoggedInUser());
prepareFlags(dynaForm, ksdata);
dynaForm.set("submitted", Boolean.TRUE);
}
@@ -174,6 +177,11 @@ public class SystemDetailsEditAction extends RhnAction {
KickstartData ksdata) {
dynaForm.set(SE_LINUX_PARAM, ksdata.getSELinuxMode().getValue());
}
+ private void prepareRegistrationTypeConfig(DynaActionForm dynaForm,
+ KickstartData ksdata, User user) {
+ dynaForm.set(REGISTRATION_TYPE_PARAM,
+ ksdata.getRegistrationType(user).getType());
+ }
private void prepareFlags(DynaActionForm dynaForm, KickstartData ksdata) {
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java
index bf7fcf7..27aa69a 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java
@@ -720,4 +720,78 @@ public class SystemDetailsHandler extends BaseHandler {
command.store();
return 1;
}
+
+
+ /**
+ * Sets the registration type of a given kickstart profile.
+ *
+ * @param sessionKey identifies the user's session; cannot be <code>null</code>
+ * @param kickstartLabel identifies the profile; cannot be <code>null</code>
+ * @param registrationType registration type
+ * @throws FaultException A FaultException is thrown if:
+ * - The sessionKey is invalid
+ * - The kickstartLabel is invalid
+ * - registration type is not reactivation/deletion/none
+ * @return 1 if the associations were performed correctly
+ *
+ * @xmlrpc.doc Sets the registration type of a given kickstart profile.
+ * Registration Type can be one of reactivation/deletion/none
+ * These types determine the behaviour of the re registration when using
+ * this profile.
+ * @xmlrpc.param #param("string", "sessionKey")
+ * @xmlrpc.param #param("string", "kickstartLabel")
+ * @xmlrpc.param #param("string","registrationType")
+ * #options()
+ * #item_desc ("reactivation", "to try and generate a reactivation key
+ * and use that to register the system when reprovisioning a system.")
+ * #item_desc ("deletion", "to try and delete the existing system profile
+ * and reregister the system being reprovisioned as new")
+ * #item_desc ("none", "to preserve the status quo and leave the current system
+ * as a duplicate on a reprovision.")
+ * #options_end()
+ * @xmlrpc.returntype #return_int_success()
+ */
+ public int setRegistrationType(String sessionKey, String kickstartLabel,
+ String registrationType) {
+ User user = getLoggedInUser(sessionKey);
+ ensureConfigAdmin(user);
+ SystemDetailsCommand command = getSystemDetailsCommand(kickstartLabel, user);
+ command.setRegistrationType(registrationType);
+ command.store();
+ return 1;
+ }
+
+
+ /**
+ * Returns the registration type of a given kickstart profile.
+ *
+ * @param sessionKey identifies the user's session; cannot be <code>null</code>
+ * @param kickstartLabel identifies the profile; cannot be <code>null</code>
+ * @throws FaultException A FaultException is thrown if:
+ * - The sessionKey is invalid
+ * - The kickstartLabel is invalid
+ * @return the registration type -> one of reactivation/deletion/none
+ *
+ * @xmlrpc.doc returns the registration type of a given kickstart profile.
+ * Registration Type can be one of reactivation/deletion/none
+ * These types determine the behaviour of the registration when using
+ * this profile for reprovisioning.
+ * @xmlrpc.param #param("string", "sessionKey")
+ * @xmlrpc.param #param("string", "kickstartLabel")
+ * @xmlrpc.returntype
+ * #param("string", "registrationType")
+ * #options()
+ * #item ("reactivation")
+ * #item ("deletion")
+ * #item ("none")
+ * #options_end()
+ */
+ public String getRegistrationType(String sessionKey, String kickstartLabel) {
+ User user = getLoggedInUser(sessionKey);
+ ensureConfigAdmin(user);
+ KickstartData data =
+ KickstartFactory.lookupKickstartDataByLabelAndOrgId(kickstartLabel,
+ user.getOrg().getId());
+ return data.getRegistrationType(user).getType();
+ }
}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/test/SystemDetailsHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/test/SystemDetailsHandlerTest.java
index d2b4e3e..c545216 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/test/SystemDetailsHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/test/SystemDetailsHandlerTest.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.common.CommonFactory;
import com.redhat.rhn.domain.common.FileList;
import com.redhat.rhn.domain.kickstart.KickstartData;
import com.redhat.rhn.domain.kickstart.KickstartFactory;
+import com.redhat.rhn.domain.kickstart.RegistrationType;
import com.redhat.rhn.domain.kickstart.SELinuxMode;
import com.redhat.rhn.domain.kickstart.crypto.CryptoKey;
import com.redhat.rhn.domain.kickstart.crypto.test.CryptoTest;
@@ -33,6 +34,7 @@ import com.redhat.rhn.frontend.xmlrpc.test.BaseHandlerTestCase;
import com.redhat.rhn.frontend.xmlrpc.test.XmlRpcTestUtils;
import com.redhat.rhn.manager.kickstart.KickstartCryptoKeyCommand;
import com.redhat.rhn.manager.kickstart.KickstartEditCommand;
+import com.redhat.rhn.testing.TestUtils;
import com.redhat.rhn.testing.UserTestUtils;
import java.util.ArrayList;
@@ -410,4 +412,21 @@ public class SystemDetailsHandlerTest extends BaseHandlerTestCase {
assertEquals(1, result);
return CommonFactory.lookupFileList("list1", admin.getOrg());
}
+
+ public void testRegistrationType() throws Exception {
+ KickstartData profile = createProfile();
+ handler.setRegistrationType(adminKey, profile.getLabel(),
+ RegistrationType.DELETION.getType());
+
+ assertEquals(RegistrationType.DELETION.getType(),
+ handler.getRegistrationType(adminKey, profile.getLabel()));
+ try {
+ handler.setRegistrationType(adminKey, profile.getLabel(),
+ TestUtils.randomString());
+ fail("It let it set random values for registration type");
+ }
+ catch (Exception e) {
+ //success
+ }
+ }
}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index 7b8dd13..9c3ae09 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -24,6 +24,7 @@ import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.common.hibernate.HibernateFactory;
import com.redhat.rhn.common.hibernate.LookupException;
import com.redhat.rhn.common.localization.LocalizationService;
+import com.redhat.rhn.common.messaging.MessageQueue;
import com.redhat.rhn.common.validator.ValidatorError;
import com.redhat.rhn.common.validator.ValidatorResult;
import com.redhat.rhn.domain.action.Action;
@@ -72,6 +73,7 @@ import com.redhat.rhn.frontend.dto.ActivationKeyDto;
import com.redhat.rhn.frontend.dto.ErrataOverview;
import com.redhat.rhn.frontend.dto.ServerPath;
import com.redhat.rhn.frontend.dto.SystemOverview;
+import com.redhat.rhn.frontend.events.SsmDeleteServersEvent;
import com.redhat.rhn.frontend.xmlrpc.BaseHandler;
import com.redhat.rhn.frontend.xmlrpc.InvalidActionTypeException;
import com.redhat.rhn.frontend.xmlrpc.InvalidChannelLabelException;
@@ -211,7 +213,7 @@ public class SystemHandler extends BaseHandler {
* - The server corresponding to the sid cannot be found
* - The server doesn't have the "agent smith" feature
* @throws MethodInvalidParamException thrown if certificate is invalid.
- * @since 10.9
+ * @since 10.10
* @xmlrpc.doc Obtains a reactivation key for this server.
* @xmlrpc.param #param_desc("string", "systemid", "systemid file")
* @xmlrpc.returntype string
@@ -240,7 +242,7 @@ public class SystemHandler extends BaseHandler {
log.error("InvalidCertificateException - Trying to access a " +
"system with an invalid certificate", e);
throw new MethodInvalidParamException();
- }
+ }
return getReactivationKey(server.getOrg().getActiveOrgAdmins().get(0), server);
}
@@ -1151,7 +1153,8 @@ public class SystemHandler extends BaseHandler {
}
/**
- * Delete systems given a list of system ids
+ * Delete systems given a list of system ids.
+ * This call queues the systems for deletion
* @param sessionKey The sessionKey containing the logged in user
* @param systemIds A list of systems ids to delete
* @return Returns the number of systems deleted if successful, fault exception
@@ -1164,43 +1167,96 @@ public class SystemHandler extends BaseHandler {
* @xmlrpc.param #array_single("int", "serverId")
* @xmlrpc.returntype #return_int_success()
*/
- public int deleteSystems(String sessionKey, List systemIds) throws FaultException {
+ public int deleteSystems(String sessionKey, List<Integer> systemIds)
+ throws FaultException {
// Get the logged in user and server
User loggedInUser = getLoggedInUser(sessionKey);
- // Keep track of the number of systems deleted and the number that were skipped.
- int numDeleted = 0;
- List skippedSids = new ArrayList();
-
+ List <Integer> skippedSids = new ArrayList<Integer>();
+ List <Long> deletion = new LinkedList<Long>();
// Loop through the sids and try to delete the server
- for (Iterator sysIter = systemIds.iterator(); sysIter.hasNext();) {
- Integer sidAsInt = (Integer) sysIter.next();
- Long sid = new Long(sidAsInt.longValue());
+ for (Integer sysId : systemIds) {
try {
- SystemManager.deleteServer(loggedInUser, sid);
- numDeleted++;
+ if (SystemManager.isAvailableToUser(loggedInUser, sysId.longValue())) {
+ deletion.add(sysId.longValue());
+ }
+ else {
+ skippedSids.add(sysId);
+ }
}
catch (Exception e) {
System.out.println("Exception: " + e);
e.printStackTrace();
- skippedSids.add(sidAsInt);
+ skippedSids.add(sysId);
}
}
+ // Fire the request off asynchronously
+ SsmDeleteServersEvent event =
+ new SsmDeleteServersEvent(loggedInUser, deletion);
+ MessageQueue.publish(event);
+
// If we skipped any systems, create an error message and throw a FaultException
if (skippedSids.size() > 0) {
- StringBuffer msg = new StringBuffer("The following systems were NOT deleted: ");
- for (Iterator itr = skippedSids.iterator(); itr.hasNext();) {
- Integer sid = (Integer) itr.next();
+ StringBuilder msg = new StringBuilder(
+ "The following systems were NOT deleted: ");
+ for (Integer sid : skippedSids) {
msg.append("\n" + sid);
}
throw new SystemsNotDeletedException(msg.toString());
}
- // Else return the number of systems that were deleted.
- return numDeleted;
+ return 1;
}
+
+ /**
+ * Delete a system given its cilent certificate.
+ *
+ * @param clientCert client certificate of the system.
+ * @return 1 on success
+ * @throws FaultException A FaultException is thrown if:
+ * - The server corresponding to the sid cannot be found
+ * @throws MethodInvalidParamException thrown if certificate is invalid.
+ * @since 10.10
+ * @xmlrpc.doc Delete a system given its cilent certificate.
+ * @xmlrpc.param #param_desc("string", "systemid", "systemid file")
+ * @xmlrpc.returntype #return_int_success()
+ */
+
+ public int deleteSystem(String clientCert) throws FaultException {
+
+ StringReader rdr = new StringReader(clientCert);
+ Server server = null;
+
+ ClientCertificate cert;
+ try {
+ cert = ClientCertificateDigester.buildCertificate(rdr);
+ server = SystemManager.lookupByCert(cert);
+ }
+ catch (IOException ioe) {
+ log.error("IOException - Trying to access a system with an " +
+ "invalid certificate", ioe);
+ throw new MethodInvalidParamException();
+ }
+ catch (SAXException se) {
+ log.error("SAXException - Trying to access a " +
+ "system with an invalid certificate", se);
+ throw new MethodInvalidParamException();
+ }
+ catch (InvalidCertificateException e) {
+ log.error("InvalidCertificateException - Trying to access a " +
+ "system with an invalid certificate", e);
+ throw new MethodInvalidParamException();
+ }
+
+ SystemManager.deleteServer(server.getOrg().getActiveOrgAdmins().get(0),
+ server.getId());
+ return 1;
+ }
+
+
+
/**
* Get the IP and hostname for a given server
* @param sessionKey The sessionKey containing the logged in user
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
index a6cdc33..24bd46f 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
@@ -15,11 +15,11 @@
package com.redhat.rhn.frontend.xmlrpc.system.test;
import com.redhat.rhn.FaultException;
+import com.redhat.rhn.common.client.ClientCertificate;
import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.common.db.datasource.ModeFactory;
import com.redhat.rhn.common.db.datasource.WriteMode;
import com.redhat.rhn.common.hibernate.HibernateFactory;
-import com.redhat.rhn.common.hibernate.LookupException;
import com.redhat.rhn.domain.action.Action;
import com.redhat.rhn.domain.action.ActionFactory;
import com.redhat.rhn.domain.action.script.ScriptActionDetails;
@@ -74,10 +74,12 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.domain.user.UserFactory;
import com.redhat.rhn.frontend.dto.ErrataOverview;
import com.redhat.rhn.frontend.dto.HistoryEvent;
+import com.redhat.rhn.frontend.dto.OperationDetailsDto;
import com.redhat.rhn.frontend.dto.PackageMetadata;
import com.redhat.rhn.frontend.dto.ScheduledAction;
import com.redhat.rhn.frontend.dto.ServerPath;
import com.redhat.rhn.frontend.dto.SystemOverview;
+import com.redhat.rhn.frontend.events.SsmDeleteServersAction;
import com.redhat.rhn.frontend.xmlrpc.ChannelSubscriptionException;
import com.redhat.rhn.frontend.xmlrpc.InvalidActionTypeException;
import com.redhat.rhn.frontend.xmlrpc.InvalidChannelException;
@@ -100,6 +102,7 @@ import com.redhat.rhn.manager.entitlement.EntitlementManager;
import com.redhat.rhn.manager.errata.cache.ErrataCacheManager;
import com.redhat.rhn.manager.profile.ProfileManager;
import com.redhat.rhn.manager.rhnpackage.test.PackageManagerTest;
+import com.redhat.rhn.manager.ssm.SsmOperationManager;
import com.redhat.rhn.manager.system.ServerGroupManager;
import com.redhat.rhn.manager.system.SystemManager;
import com.redhat.rhn.manager.system.test.SystemManagerTest;
@@ -110,6 +113,8 @@ import com.redhat.rhn.testing.ServerTestUtils;
import com.redhat.rhn.testing.TestUtils;
import com.redhat.rhn.testing.UserTestUtils;
+import org.apache.commons.lang.StringUtils;
+
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
@@ -163,6 +168,14 @@ public class SystemHandlerTest extends BaseHandlerTestCase {
}
}
+
+ public void testObtainReactivationKeyWithCert() throws Exception {
+ Server server = ServerFactoryTest.createTestServer(admin, true,
+ ServerConstants.getServerGroupTypeProvisioningEntitled());
+ ClientCertificate cert = SystemManager.createClientCertificate(server);
+ cert.validate(server.getSecret());
+ assertFalse(StringUtils.isBlank(handler.obtainReactivationKey(cert.toString())));
+ }
public void xxxtestUpgradeEntitlement() throws Exception {
Server server = ServerFactoryTest.createTestServer(admin, true,
@@ -698,6 +711,15 @@ public class SystemHandlerTest extends BaseHandlerTestCase {
}
+ public void testDeleteSystemWithCert() throws Exception {
+ Server server = ServerFactoryTest.createTestServer(admin, true);
+ Long sid = server.getId();
+ ClientCertificate cert = SystemManager.createClientCertificate(server);
+ cert.validate(server.getSecret());
+ assertEquals(1, handler.deleteSystem(cert.toString()));
+ assertNull(ServerFactory.lookupById(sid));
+ }
+
public void testDeleteSystems() throws Exception {
Server server = ServerFactoryTest.createTestServer(admin, true);
Long sid = server.getId();
@@ -708,26 +730,18 @@ public class SystemHandlerTest extends BaseHandlerTestCase {
//ok, we have an admin with a server he has access to
List sids = new ArrayList();
sids.add(id);
-
- int result = handler.deleteSystems(adminKey, sids);
- assertEquals(1, result);
-
- //since the server has been deleted, we should get a fault exception this time
try {
- result = handler.deleteSystems(adminKey, sids);
- fail("SystemHandler.deleteSystems allowed deletion of non-existant system");
+ handler.deleteSystems(regularKey, sids);
+ fail("SystemHandler.deleteSystems allowed unauthorized deletion");
}
catch (FaultException e) {
//success
}
+ assertEquals(1, handler.deleteSystems(adminKey, sids));
- //and make sure the server is, in fact, really gone
- try {
- test = SystemManager.lookupByIdAndUser(sid, admin);
- fail("Found deleted server");
- }
- catch (LookupException e) {
- //success
+ List<OperationDetailsDto> ops = SsmOperationManager.allOperations(admin);
+ for (OperationDetailsDto op : ops) {
+ assertEquals(op.getDescription(), SsmDeleteServersAction.OPERATION_NAME);
}
}
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
index 240f5b1..4833727 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
@@ -23,6 +23,7 @@ import com.redhat.rhn.domain.kickstart.KickstartPackage;
import com.redhat.rhn.domain.kickstart.KickstartScript;
import com.redhat.rhn.domain.kickstart.KickstartSession;
import com.redhat.rhn.domain.kickstart.KickstartVirtualizationType;
+import com.redhat.rhn.domain.kickstart.RegistrationType;
import com.redhat.rhn.domain.kickstart.RepoInfo;
import com.redhat.rhn.domain.kickstart.cobbler.CobblerSnippet;
import com.redhat.rhn.domain.kickstart.crypto.CryptoKey;
@@ -59,6 +60,8 @@ public class KickstartFormatter {
private static final String REDHAT_REGISTER_SNIPPET = "spacewalk/redhat_register";
private static final String POST_REACTIVATION_SNIPPET =
"spacewalk/post_reactivation_key";
+ private static final String POST_DELETION_SNIPPET =
+ "spacewalk/post_delete_system";
private static final String KEEP_SYSTEM_ID_SNIPPET = "spacewalk/keep_system_id";
private static final String RAW_START = "#raw";
@@ -208,7 +211,8 @@ public class KickstartFormatter {
* @return String containing kickstart file
*/
public String getFileData() {
- StringBuffer buf = new StringBuffer();
+ RegistrationType regType = ksdata.getRegistrationType(user);
+ StringBuilder buf = new StringBuilder();
buf.append(getHeader());
buf.append(getCommands());
@@ -228,14 +232,22 @@ public class KickstartFormatter {
buf.append(NEWLINE);
addCobblerSnippet(buf, "pre_install_network_config");
buf.append(NEWLINE);
- addCobblerSnippet(buf, KEEP_SYSTEM_ID_SNIPPET);
- buf.append(NEWLINE);
+ if (!RegistrationType.NONE.equals(regType)) {
+ addCobblerSnippet(buf, KEEP_SYSTEM_ID_SNIPPET);
+ buf.append(NEWLINE);
+ }
buf.append(getPrePost(KickstartScript.TYPE_PRE));
buf.append(NEWLINE);
buf.append(getNoChroot());
buf.append(NEWLINE);
- addCobblerSnippet(buf, POST_REACTIVATION_SNIPPET);
- buf.append(NEWLINE);
+
+ if (RegistrationType.REACTIVATION.equals(regType)) {
+ addCobblerSnippet(buf, POST_REACTIVATION_SNIPPET);
+ }
+ else if (RegistrationType.DELETION.equals(regType)) {
+ addCobblerSnippet(buf, POST_DELETION_SNIPPET);
+ }
+
buf.append(getRhnPost());
buf.append(MOTD_FOOTER);
buf.append(NEWLINE);
@@ -251,7 +263,7 @@ public class KickstartFormatter {
return retval;
}
- private void addCobblerSnippet(StringBuffer buf, String contents) {
+ private void addCobblerSnippet(StringBuilder buf, String contents) {
CobblerSnippet.makeFragment(contents);
buf.append(CobblerSnippet.makeFragment(contents));
buf.append(NEWLINE);
@@ -588,7 +600,7 @@ public class KickstartFormatter {
private String getRhnPost() {
log.debug("getRhnPost called.");
- StringBuffer retval = new StringBuffer();
+ StringBuilder retval = new StringBuilder();
retval.append(BEGINRHN);
retval.append(renderKeys() + NEWLINE);
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/SystemDetailsCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/SystemDetailsCommand.java
index 48205d5..5fb2883 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/SystemDetailsCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/SystemDetailsCommand.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.kickstart.KickstartCommand;
import com.redhat.rhn.domain.kickstart.KickstartCommandName;
import com.redhat.rhn.domain.kickstart.KickstartData;
import com.redhat.rhn.domain.kickstart.KickstartDefaults;
+import com.redhat.rhn.domain.kickstart.RegistrationType;
import com.redhat.rhn.domain.kickstart.SELinuxMode;
import com.redhat.rhn.domain.user.User;
@@ -130,5 +131,21 @@ public class SystemDetailsCommand extends BaseKickstartCommand {
defaults.setCreated(new Date());
}
defaults.setRemoteCommandFlag(enable);
- }
+ }
+
+ /**
+ * Sets the registration type of the kickstart data
+ * @param registrationType the registration type
+ */
+ public void setRegistrationType(String registrationType) {
+ RegistrationType tp = RegistrationType.findDefault(registrationType, null);
+ if (tp == null) {
+ String msg = "Invalid registration type must be one of ['%s', '%s', '%s']";
+ throw new ValidatorException(String.format(msg,
+ RegistrationType.REACTIVATION.getType(),
+ RegistrationType.DELETION.getType(),
+ RegistrationType.NONE.getType()));
+ }
+ ksdata.setRegistrationType(tp, user);
+ }
}
diff --git a/java/code/src/com/redhat/rhn/manager/ssm/SsmOperationManager.java b/java/code/src/com/redhat/rhn/manager/ssm/SsmOperationManager.java
index 69791b5..5069fa8 100644
--- a/java/code/src/com/redhat/rhn/manager/ssm/SsmOperationManager.java
+++ b/java/code/src/com/redhat/rhn/manager/ssm/SsmOperationManager.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.common.db.datasource.ModeFactory;
import com.redhat.rhn.common.db.datasource.SelectMode;
import com.redhat.rhn.common.db.datasource.WriteMode;
import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.dto.OperationDetailsDto;
import com.redhat.rhn.manager.BaseManager;
import org.apache.commons.logging.Log;
@@ -50,7 +51,7 @@ public class SsmOperationManager extends BaseManager {
* @param user operations returned only for this user; cannot be <code>null</code>
* @return list of maps containing the data describing each operation
*/
- public static DataResult allOperations(User user) {
+ public static DataResult<OperationDetailsDto> allOperations(User user) {
if (user == null) {
throw new IllegalArgumentException("user cannot be null");
}
@@ -70,7 +71,7 @@ public class SsmOperationManager extends BaseManager {
* @param user operations returned only for this user; cannot be <code>null</code>
* @return list of maps containing the data describing each matching operation
*/
- public static DataResult inProgressOperations(User user) {
+ public static DataResult<OperationDetailsDto> inProgressOperations(User user) {
if (user == null) {
throw new IllegalArgumentException("user cannot be null");
}
@@ -92,7 +93,7 @@ public class SsmOperationManager extends BaseManager {
* @param user operations returned only for this user; cannot be <code>null</code>
* @return list of maps containing the data describing each matching operation
*/
- public static DataResult completedOperations(User user) {
+ public static DataResult<OperationDetailsDto> completedOperations(User user) {
if (user == null) {
throw new IllegalArgumentException("user cannot be null");
}
@@ -114,11 +115,9 @@ public class SsmOperationManager extends BaseManager {
* @param user verifies that the user isn't trying to load someone else's
* operation; cannot be <code>null</code>
* @param operationId database ID of the operation to load
- * @return list of size 1 if the operation was found, containing a map of database
- * column to value for the given operation; list of size 0 if no matches
- * were found in the database
+ * @return OperationsDto given an operation id or null.
*/
- public static DataResult findOperationById(User user, long operationId) {
+ public static OperationDetailsDto findOperationById(User user, long operationId) {
if (user == null) {
throw new IllegalArgumentException("user cannot be null");
}
@@ -129,8 +128,11 @@ public class SsmOperationManager extends BaseManager {
params.put("user_id", user.getId());
params.put("op_id", operationId);
- DataResult result = m.execute(params);
- return result;
+ DataResult<OperationDetailsDto> result = m.execute(params);
+ if (!result.isEmpty()) {
+ return result.get(0);
+ }
+ return null;
}
/**
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp b/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp
index d7ffd92..99db5a4 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp
@@ -70,6 +70,19 @@ boolean staticIfDisabled = Boolean.valueOf(
</tr>
</table>
</c:if>
+
+ <h2><bean:message key="kickstart.systemdetails.jsp.registration-header"/></h2>
+ <table class="details">
+ <tr>
+ <th><bean:message key="kickstart.registration.type.jsp.label" />:</th>
+ <td>
+ <html:radio property="registrationType" value="reactivation" /><bean:message key="kickstart.registration.type.reactivation.jsp.label" /><br />
+ <html:radio property="registrationType" value="deletion" /><bean:message key="kickstart.registration.type.deletion.jsp.label" /><br />
+ <html:radio property="registrationType" value="none" /><bean:message key="kickstart.registration.type.none.jsp.label" />
+ </td>
+ </tr>
+ </table>
+
<h2><bean:message key="kickstart.systemdetails.jsp.header3"/></h2>
<table class="details">
<tr>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index d1576f2..43ba674 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -633,6 +633,7 @@
<form-property name="ksid" type="java.lang.Long" />
<form-property name="kickstart" type="com.redhat.rhn.domain.kickstart.KickstartData" />
<form-property name="selinuxMode" type="java.lang.String" />
+ <form-property name="registrationType" type="java.lang.String" />
<form-property name="configManagement" type="java.lang.String" />
<form-property name="remoteCommands" type="java.lang.String" />
<form-property name="rootPassword" type="java.lang.String" />
diff --git a/java/conf/cobbler/snippets/post_delete_system b/java/conf/cobbler/snippets/post_delete_system
new file mode 100644
index 0000000..f2a79ca
--- /dev/null
+++ b/java/conf/cobbler/snippets/post_delete_system
@@ -0,0 +1,14 @@
+%post --interpreter /usr/bin/python
+import xmlrpclib
+import os.path
+system_id = "/root/systemid.old"
+try:
+ if os.path.exists(system_id):
+ client = xmlrpclib.Server("http://$http_server/rpc/api")
+ client.system.delete_system(open(system_id).read())
+except:
+ # xml rpc due to a old/bad system id
+ # we don't care about those
+ # we'll register those as new.
+ pass
+
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 16ed398..4e0b449 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -247,6 +247,7 @@ install -m 644 conf/log4j.properties.taskomatic $RPM_BUILD_ROOT/%{_datadir}/rhn/
install -m 644 conf/cobbler/snippets/keep_system_id $RPM_BUILD_ROOT/%{cobdirsnippets}/keep_system_id
install -m 644 conf/cobbler/snippets/post_reactivation_key $RPM_BUILD_ROOT/%{cobdirsnippets}/post_reactivation_key
+install -m 644 conf/cobbler/snippets/post_delete_system $RPM_BUILD_ROOT/%{cobdirsnippets}/post_delete_system
install -m 644 conf/cobbler/snippets/redhat_register $RPM_BUILD_ROOT/%{cobdirsnippets}/redhat_register
ln -s -f /usr/sbin/tanukiwrapper $RPM_BUILD_ROOT/%{_bindir}/taskomaticd
@@ -281,6 +282,7 @@ fi
%dir %{cobdirsnippets}
%config %{cobdirsnippets}/keep_system_id
%config %{cobdirsnippets}/post_reactivation_key
+%config %{cobdirsnippets}/post_delete_system
%config %{cobdirsnippets}/redhat_register
%{appdir}/*
%if 0%{?rhel} && 0%{?rhel} < 6
commit 295640039f1a466c6fc388a2e5824ab960811e1c
Author: Partha Aji <paji(a)redhat.com>
Date: Mon May 10 20:37:16 2010 -0400
Made ssm operations use OperationDetailsDto instead of just dealing with plain maps and random attributes
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/ssm_operation_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/ssm_operation_queries.xml
index eeeb633..ec6873b 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/ssm_operation_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/ssm_operation_queries.xml
@@ -7,7 +7,7 @@
<!-- Loads all SSM operation details associated with the user regardless of status. In
addition, this query will return the number of servers involved in each operation. -->
-<mode name="find_all_operations">
+<mode name="find_all_operations" class="com.redhat.rhn.frontend.dto.OperationDetailsDto">
<query params="user_id">
SELECT op.id,
op.description,
@@ -29,7 +29,7 @@
The values for status should be taken from the enumeration SsmOperationStatus.
-->
-<mode name="find_operations_with_status">
+<mode name="find_operations_with_status" class="com.redhat.rhn.frontend.dto.OperationDetailsDto">
<query params="user_id, status">
SELECT op.id,
op.description,
@@ -47,7 +47,7 @@
</mode>
<!-- Loads the SSM operation details identified by the given user and operation ID. -->
-<mode name="find_operation_by_id">
+<mode name="find_operation_by_id" class="com.redhat.rhn.frontend.dto.OperationDetailsDto">
<query params="user_id, op_id">
SELECT op.id,
op.description,
diff --git a/java/code/src/com/redhat/rhn/frontend/action/ssm/ViewLogDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/ssm/ViewLogDetailsAction.java
index 3afebc9..b5a241d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/ssm/ViewLogDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/ssm/ViewLogDetailsAction.java
@@ -16,6 +16,7 @@ package com.redhat.rhn.frontend.action.ssm;
import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.dto.OperationDetailsDto;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
@@ -58,8 +59,8 @@ public class ViewLogDetailsAction extends RhnListAction implements Listable {
RequestContext context = new RequestContext(request);
User user = context.getLoggedInUser();
- DataResult operationList = SsmOperationManager.findOperationById(user, oid);
- Map operationData = (Map) operationList.get(0);
+ OperationDetailsDto operationData = SsmOperationManager.
+ findOperationById(user, oid);
request.setAttribute("operationData", operationData);
// List stuff for the server list
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/OperationDetailsDto.java b/java/code/src/com/redhat/rhn/frontend/dto/OperationDetailsDto.java
new file mode 100644
index 0000000..5f74015
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/dto/OperationDetailsDto.java
@@ -0,0 +1,143 @@
+/**
+ * Copyright (c) 2010 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+package com.redhat.rhn.frontend.dto;
+
+import com.redhat.rhn.common.localization.LocalizationService;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import java.util.Date;
+
+
+/**
+ * OperationsDto
+ * @version $Rev$
+ */
+public class OperationDetailsDto {
+ private Long id;
+ private String description;
+ private String status;
+ private Date started;
+ private Date modified;
+ private long serverCount;
+
+ /**
+ * @return Returns the id.
+ */
+ public Long getId() {
+ return id;
+ }
+
+ /**
+ * @param idIn The id to set.
+ */
+ public void setId(Long idIn) {
+ id = idIn;
+ }
+
+ /**
+ * @return Returns the description.
+ */
+ public String getDescription() {
+ return description;
+ }
+
+ /**
+ * @param descriptionIn The description to set.
+ */
+ public void setDescription(String descriptionIn) {
+ description = descriptionIn;
+ }
+
+ /**
+ * @return Returns the status.
+ */
+ public String getStatus() {
+ return status;
+ }
+
+ /**
+ * @param statusIn The status to set.
+ */
+ public void setStatus(String statusIn) {
+ status = statusIn;
+ }
+
+ /**
+ * @return Returns the started.
+ */
+ public Date getStarted() {
+ return started;
+ }
+
+ /**
+ *
+ * @return the i18n formatted string for started date
+ */
+ public String getStartedDateString() {
+ return LocalizationService.getInstance().formatDate(getStarted());
+ }
+
+ /**
+ * @param startedIn The started to set.
+ */
+ public void setStarted(Date startedIn) {
+ started = startedIn;
+ }
+
+ /**
+ * @return Returns the modified.
+ */
+ public Date getModified() {
+ return modified;
+ }
+
+ /**
+ *
+ * @return the i18n formatted string for modified date
+ */
+ public String getModifiedDateString() {
+ return LocalizationService.getInstance().formatDate(getModified());
+ }
+
+ /**
+ * @param modifiedIn The modified to set.
+ */
+ public void setModified(Date modifiedIn) {
+ modified = modifiedIn;
+ }
+
+ /**
+ * @return Returns the serverCount.
+ */
+ public long getServerCount() {
+ return serverCount;
+ }
+
+ /**
+ * @param serverCountIn The serverCount to set.
+ */
+ public void setServerCount(long serverCountIn) {
+ serverCount = serverCountIn;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString() {
+ return ToStringBuilder.reflectionToString(this);
+ }
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmDeleteServersAction.java b/java/code/src/com/redhat/rhn/frontend/events/SsmDeleteServersAction.java
index 27960da..0c316af 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/SsmDeleteServersAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/SsmDeleteServersAction.java
@@ -29,7 +29,8 @@ import java.util.List;
* @version $Revision$
*/
public class SsmDeleteServersAction extends AbstractDatabaseAction {
-
+ public static final String OPERATION_NAME = "Server Delete";
+
/** {@inheritDoc} */
protected void doExecute(EventMessage msg) {
SsmDeleteServersEvent event = (SsmDeleteServersEvent) msg;
@@ -37,7 +38,7 @@ public class SsmDeleteServersAction extends AbstractDatabaseAction {
List<Long> sids = event.getSids();
long operationId = SsmOperationManager.createOperation(user,
- "Server Delete", null);
+ OPERATION_NAME, null);
SsmOperationManager.associateServersWithOperation(operationId,
user.getId(), sids);
diff --git a/java/code/src/com/redhat/rhn/manager/ssm/test/SsmOperationManagerTest.java b/java/code/src/com/redhat/rhn/manager/ssm/test/SsmOperationManagerTest.java
index 53bcfb2..2dbf9f0 100644
--- a/java/code/src/com/redhat/rhn/manager/ssm/test/SsmOperationManagerTest.java
+++ b/java/code/src/com/redhat/rhn/manager/ssm/test/SsmOperationManagerTest.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.rhnset.SetCleanup;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.server.test.ServerFactoryTest;
import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.dto.OperationDetailsDto;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.rhnset.RhnSetManager;
import com.redhat.rhn.manager.ssm.SsmOperationManager;
@@ -82,19 +83,18 @@ public class SsmOperationManagerTest extends RhnBaseTestCase {
// Verify
// Verify counts for all and in progress operations
- DataResult all = SsmOperationManager.allOperations(ssmUser);
- DataResult inProgress = SsmOperationManager.inProgressOperations(ssmUser);
+ DataResult<OperationDetailsDto> all = SsmOperationManager.allOperations(ssmUser);
+ DataResult<OperationDetailsDto> inProgress = SsmOperationManager.
+ inProgressOperations(ssmUser);
assertEquals(2, all.size());
assertEquals(1, inProgress.size());
// Verify the completed operation has its progress set to 100
- for (int ii = 0; ii < all.size(); ii++) {
- Map<String, Object> operation = (Map<String, Object>) all.get(ii);
-
- if (operation.get("id").equals(completeMeId)) {
+ for (OperationDetailsDto operation : all) {
+ if (operation.getId() == completeMeId) {
assertEquals(SsmOperationStatus.COMPLETED.getText(),
- operation.get("status"));
+ operation.getStatus());
}
}
}
@@ -105,27 +105,25 @@ public class SsmOperationManagerTest extends RhnBaseTestCase {
SsmOperationManager.createOperation(ssmUser,
"Test operation 1", serverSetLabel);
- DataResult operation = SsmOperationManager.findOperationById(ssmUser, operationId);
+ OperationDetailsDto operation = SsmOperationManager.
+ findOperationById(ssmUser, operationId);
// Verify
assertNotNull(operation);
- assertEquals(1, operation.size());
-
- Map<String, Object> operationData = (Map<String, Object>) operation.get(0);
- assertEquals("Test operation 1", operationData.get("description"));
- assertEquals(SsmOperationStatus.IN_PROGRESS.getText(), operationData.get("status"));
- assertNotNull(operationData.get("started"));
- assertNotNull(operationData.get("modified"));
+ assertEquals("Test operation 1", operation.getDescription());
+ assertEquals(SsmOperationStatus.IN_PROGRESS.getText(), operation.getStatus());
+ assertNotNull(operation.getStarted());
+ assertNotNull(operation.getModified());
}
public void testFindNonExistentOperation() {
// Test
- DataResult result = SsmOperationManager.findOperationById(ssmUser, 100000L);
+ OperationDetailsDto result = SsmOperationManager.
+ findOperationById(ssmUser, 100000L);
// Verify
- assertNotNull(result);
- assertEquals(0, result.size());
+ assertNull(result);
}
public void testFindServerDataForOperation() throws Exception {
diff --git a/java/code/webapp/WEB-INF/pages/ssm/view-log-details.jsp b/java/code/webapp/WEB-INF/pages/ssm/view-log-details.jsp
index 49cd722..9257eba 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/view-log-details.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/view-log-details.jsp
@@ -37,11 +37,11 @@
</tr>
<tr>
<td><b><bean:message key="ssm.operations.viewlog.started"/></b></td>
- <td><c:out value="${operationData.started}"/></td>
+ <td><c:out value="${operationData.startedDateString}"/></td>
</tr>
<tr>
<td><b><bean:message key="ssm.operations.viewlog.modified"/></b></td>
- <td><c:out value="${operationData.modified}"/></td>
+ <td><c:out value="${operationData.modifiedDateString}"/></td>
</tr>
</table>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/view-log.jsp b/java/code/webapp/WEB-INF/pages/ssm/view-log.jsp
index eb19833..7a65b47 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/view-log.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/view-log.jsp
@@ -49,7 +49,7 @@
</rl:column>
<rl:column headerkey="ssm.operations.viewlog.modified" bound="false" styleclass="last-column">
- <c:out value="${current.modified}"/>
+ <c:out value="${current.modifiedDateString}"/>
</rl:column>
</rl:list>
13 years, 11 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/manager/kickstart/KickstartCloneCommand.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b142f39761b55653b07eaedf5c7c4d5598771753
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon May 10 18:20:55 2010 -0400
unit tset fix
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartCloneCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartCloneCommand.java
index 42af110..7d69880 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartCloneCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartCloneCommand.java
@@ -62,9 +62,9 @@ public class KickstartCloneCommand extends BaseKickstartCommand {
Profile cloned = clonedKickstart.getCobblerObject(user);
cloned.setKsMeta(original.getKsMeta());
- cloned.setVirtRam(original.getVirtRam());
+ cloned.setVirtRam(((Integer) original.getVirtRam()).longValue());
cloned.setVirtCpus(original.getVirtCpus());
- cloned.setVirtFileSize(original.getVirtFileSize());
+ cloned.setVirtFileSize(((Integer) original.getVirtFileSize()).longValue());
cloned.setVirtBridge(original.getVirtBridge());
cloned.setVirtPath(original.getVirtBridge());
cloned.save();
13 years, 11 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/manager/kickstart/KickstartCloneCommand.java | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit b93e4b78768fa96f80e36bcfbcf11c8c35132182
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon May 10 16:19:06 2010 -0400
528884 - fixing issue where cloning ks profiles wouldnt clone virt info
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartCloneCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartCloneCommand.java
index 64b2445..42af110 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartCloneCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartCloneCommand.java
@@ -61,6 +61,12 @@ public class KickstartCloneCommand extends BaseKickstartCommand {
Profile original = ksdata.getCobblerObject(user);
Profile cloned = clonedKickstart.getCobblerObject(user);
cloned.setKsMeta(original.getKsMeta());
+
+ cloned.setVirtRam(original.getVirtRam());
+ cloned.setVirtCpus(original.getVirtCpus());
+ cloned.setVirtFileSize(original.getVirtFileSize());
+ cloned.setVirtBridge(original.getVirtBridge());
+ cloned.setVirtPath(original.getVirtBridge());
cloned.save();
return null;
13 years, 11 months
java/code
by Partha Aji
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 43 ++++
java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java | 6
java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsCompareAction.java | 99 ++++++++++
java/code/src/com/redhat/rhn/frontend/struts/RequestContext.java | 16 +
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 40 ++++
java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf | 4
java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp | 8
java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp | 71 +++++++
java/code/webapp/WEB-INF/struts-config.xml | 25 ++
9 files changed, 301 insertions(+), 11 deletions(-)
New commits:
commit c4bf69f58c0cf9beabf7d2b3bc9f1c1ca5233e14
Author: Partha Aji <paji(a)redhat.com>
Date: Mon May 10 15:12:38 2010 -0400
Added stubs for the duplicate profiles compare page
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index e5f7c8e..72e80ee 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -1604,6 +1604,19 @@ DELETE FROM rhnSatelliteChannelFamily WHERE server_id = :sid
</query>
</mode>
+<mode name="duplicate_system_ids_ip_key" class="com.redhat.rhn.frontend.dto.SystemOverview">
+ <query params="uid, key">
+ SELECT distinct S.id as id, S.name as name, si.checkin as last_checkin
+ from rhnServer S
+ inner join rhnUserServerPerms USP on S.id = USP.server_id
+ inner join rhnServerNetInterface NI on NI.server_id = S.id
+ inner join rhnServerInfo si on si.server_id = S.id
+ where
+ USP.user_id = :uid
+ and NI.ip_addr = :key
+ </query>
+</mode>
+
<mode name="duplicate_system_ids_mac" class="com.redhat.rhn.frontend.dto.NetworkDto">
<query params="uid, inactive_date">
@@ -1624,6 +1637,22 @@ DELETE FROM rhnSatelliteChannelFamily WHERE server_id = :sid
</query>
</mode>
+
+<mode name="duplicate_system_ids_mac_key" class="com.redhat.rhn.frontend.dto.SystemOverview">
+ <query params="uid, key">
+ SELECT distinct S.id as id, S.name as name, si.checkin as last_checkin
+ from rhnServer S
+ inner join rhnUserServerPerms USP on S.id = USP.server_id
+ inner join rhnServerNetInterface NI on NI.server_id = S.id
+ inner join rhnServerInfo si on si.server_id = S.id
+ where
+ USP.user_id = :uid
+ and NI.hw_addr = :key
+ </query>
+</mode>
+
+
+
<mode name="duplicate_system_ids_hostname" class="com.redhat.rhn.frontend.dto.NetworkDto">
<query params="uid, inactive_date">
SELECT distinct S.id as id, S.name as name, NI.hostname as key, si.checkin as last_checkin,
@@ -1643,6 +1672,20 @@ DELETE FROM rhnSatelliteChannelFamily WHERE server_id = :sid
</mode>
+<mode name="duplicate_system_ids_hostname_key" class="com.redhat.rhn.frontend.dto.SystemOverview">
+ <query params="uid, key">
+ SELECT distinct S.id as id, S.name as name, si.checkin as last_checkin
+ from rhnServer S
+ inner join rhnUserServerPerms USP on S.id = USP.server_id
+ inner join rhnServerNetInterface NI on NI.server_id = S.id
+ inner join rhnServerInfo si on si.server_id = S.id
+ where
+ USP.user_id = :uid
+ and NI.hostname = :key
+ </query>
+</mode>
+
+
</datasource_modes>
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java
index 2afba07..b1abed6 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java
@@ -40,11 +40,11 @@ import javax.servlet.http.HttpServletResponse;
* SystemListAction
* @version $Rev$
*/
-public class DuplicateSystemsAction extends RhnAction implements Listable {
+public class DuplicateSystemsAction extends RhnAction implements Listable {
private static final String INACTIVE_COUNT = "inactive_count";
- private static final String MAC_ADDRESS = "macaddress";
- private static final String HOSTNAME = "hostname";
+ public static final String MAC_ADDRESS = "macaddress";
+ public static final String HOSTNAME = "hostname";
/**
*
* {@inheritDoc}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsCompareAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsCompareAction.java
new file mode 100644
index 0000000..d3e3874
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsCompareAction.java
@@ -0,0 +1,99 @@
+/**
+ * Copyright (c) 2010 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+package com.redhat.rhn.frontend.action.systems.duplicate;
+
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.taglibs.list.helper.ListSessionSetHelper;
+import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
+import com.redhat.rhn.manager.system.SystemManager;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+
+/**
+ * DuplicateSystemsCompareAction
+ * @version $Rev$
+ */
+public class DuplicateSystemsCompareAction extends RhnAction implements Listable {
+ public static final String KEY = "key";
+ public static final String KEY_TYPE = "key_type";
+ public static final String REFRESH_BUTTON = "refresh";
+
+ /**
+ * {@inheritDoc}
+ */
+ public ActionForward execute(ActionMapping mapping,
+ ActionForm formIn,
+ HttpServletRequest request,
+ HttpServletResponse response) {
+ RequestContext context = new RequestContext(request);
+
+ Map params = new HashMap();
+ params.put(KEY, context.getRequiredParamAsString(KEY));
+ params.put(KEY_TYPE, context.getRequiredParamAsString(KEY_TYPE));
+
+ ListSessionSetHelper helper = new ListSessionSetHelper(this, request);
+ helper.execute();
+ if (helper.isDispatched()) {
+ return handleConfirm(context, mapping);
+ }
+
+ if (request.getParameter(REFRESH_BUTTON) != null) {
+ //TODO - Logic to delete profiles
+ }
+
+ List<Long> sids = new LinkedList<Long>();
+ for (String sid : helper.getSet()) {
+ sids.add(Long.valueOf(sid));
+ }
+ request.setAttribute("systems",
+ SystemManager.hydrateServerFromIds(sids, context.getLoggedInUser()));
+ return mapping.findForward("default");
+ }
+
+ private ActionForward handleConfirm(RequestContext context,
+ ActionMapping mapping) {
+ getStrutsDelegate().saveMessage("duplicate.systems.delete.confirm.message",
+ context.getRequest());
+ return mapping.findForward("confirm");
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public List getResult(RequestContext contextIn) {
+ String key = contextIn.getRequiredParamAsString(KEY);
+ String keyType = contextIn.getRequiredParamAsString(KEY_TYPE);
+ if (DuplicateSystemsAction.HOSTNAME.equals(keyType)) {
+ return SystemManager.listDuplicatesByHostname
+ (contextIn.getLoggedInUser(), key);
+ }
+ else if (DuplicateSystemsAction.MAC_ADDRESS.equals(keyType)) {
+ return SystemManager.listDuplicatesByMac(contextIn.getLoggedInUser(), key);
+ }
+ return SystemManager.listDuplicatesByIP(contextIn.getLoggedInUser(), key);
+ }
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/struts/RequestContext.java b/java/code/src/com/redhat/rhn/frontend/struts/RequestContext.java
index fe3488c..c2207d2 100644
--- a/java/code/src/com/redhat/rhn/frontend/struts/RequestContext.java
+++ b/java/code/src/com/redhat/rhn/frontend/struts/RequestContext.java
@@ -455,6 +455,22 @@ public class RequestContext {
}
return result;
}
+
+ /**
+ * Get the parameter <code>paramName</code> from the request
+ * A BadParameterException is thrown if the
+ * parameter is not present in the request or is empty
+ * @param paramName the name of the parameter
+ * @return the parameter value converted to a <code>Long</code>
+ */
+ public String getRequiredParamAsString(String paramName) {
+ String p = request.getParameter(paramName);
+ if (StringUtils.isBlank(p)) {
+ throw new BadParameterException("The parameter " + paramName +
+ " is required.");
+ }
+ return p;
+ }
/**
* If this current Request includes a parameter to indicate the User is attempting
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index b0400a9..d8420e7 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -2664,6 +2664,16 @@ public class SystemManager extends BaseManager {
return retval;
}
+ private static DataResult<SystemOverview> listDuplicates(User user,
+ String query, String key) {
+ SelectMode mode = ModeFactory.getMode("System_queries", query);
+ Map params = new HashMap();
+ params.put("uid", user.getId());
+ params.put("key", key);
+ Map elabParams = new HashMap();
+ return makeDataResult(params, elabParams, null, mode);
+ }
+
private static List listDuplicates(User user, String query,
List ignored, Long inactiveHours) {
@@ -2719,6 +2729,16 @@ public class SystemManager extends BaseManager {
}
/**
+ * List duplicate systems by ip address
+ * @param user the user doing the search
+ * @param ip ip address of the system
+ * @return List of DuplicateSystemGrouping objects
+ */
+ public static List listDuplicatesByIP(User user, String ip) {
+ return listDuplicates(user, "duplicate_system_ids_ip_key", ip);
+ }
+
+ /**
* List duplicate systems by mac address
* @param user the user doing the search
* @param inactiveHours the number of hours a system hasn't checked in
@@ -2733,6 +2753,16 @@ public class SystemManager extends BaseManager {
}
/**
+ * List duplicate systems by mac address
+ * @param user the user doing the search
+ * @param mac the mac address of the system
+ * @return List of DuplicateSystemGrouping objects
+ */
+ public static List listDuplicatesByMac(User user, String mac) {
+ return listDuplicates(user, "duplicate_system_ids_mac_key", mac);
+ }
+
+ /**
* List duplicate systems by hostname
* @param user the user doing the search
* @param inactiveHours the number of hours a system hasn't checked in
@@ -2744,5 +2774,15 @@ public class SystemManager extends BaseManager {
Collections.EMPTY_LIST, inactiveHours);
}
+ /**
+ * List duplicate systems by hostName
+ * @param user the user doing the search
+ * @param hostName host name of the system
+ * @return List of DuplicateSystemGrouping objects
+ */
+ public static List listDuplicatesByHostname(User user, String hostName) {
+ return listDuplicates(user, "duplicate_system_ids_hostname_key",
+ hostName);
+ }
}
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf
index a9de78e..af04e72 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf
@@ -1,9 +1,9 @@
<c:out value="<a href=\"/rhn/systems/details/Overview.do?sid=${current.id}\">" escapeXml="false" />
<c:choose>
- <c:when test="${current.virtualGuest}">
+ <c:when test="${current.virtualGuest && empty nosystemicons}">
<img src="/img/rhn-listicon-virtguest.gif" alt="<bean:message key="systemlist.jsp.virtguest"/>" />
</c:when>
- <c:when test="${current.virtualHost}">
+ <c:when test="${current.virtualHost && empty nosystemicons}">
<img src="/img/rhn-listicon-virthost.gif" alt="<bean:message key="systemlist.jsp.virthost"/>" />
</c:when>
<c:otherwise>
diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
index 018c108..b791500 100644
--- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
@@ -18,12 +18,15 @@
<c:choose>
<c:when test="${not empty requestScope.hostname}">
<c:set var="filtermessage" value="row.hostname"/>
+ <c:set var="key_type" value="hostname"/>
</c:when>
<c:when test="${not empty requestScope.ip}">
<c:set var="filtermessage" value="row.ip"/>
+ <c:set var="key_type" value="ip"/>
</c:when>
<c:otherwise>
<c:set var="filtermessage" value="row.macaddress"/>
+ <c:set var="key_type" value="macaddress"/>
</c:otherwise>
</c:choose>
@@ -97,9 +100,8 @@
</rl:column>
<rl:column headerkey="systemlist.jsp.last_checked_in"
styleclass="last-column">
- <rl:non-expandable>
- ${current.lastCheckinString}
- </rl:non-expandable>
+ <rl:expandable><a href="/rhn/systems/DuplicateSystemsCompare.do?key=${current.key}&key_type=${key_type}"><bean:message key="Compare Systems"/></a></rl:expandable>
+ <rl:non-expandable>${current.lastCheckinString}</rl:non-expandable>
</rl:column>
</rl:list>
diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp
new file mode 100644
index 0000000..8f64a80
--- /dev/null
+++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp
@@ -0,0 +1,71 @@
+<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
+
+<html:xhtml/>
+<html>
+<head>
+ <meta name="page-decorator" content="none" />
+ <script src="/javascript/tree.js" type="text/javascript"></script>
+</head>
+<body>
+<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt"
+ helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-ood">
+ <bean:message key="duplicates.jsp.header"/>
+</rhn:toolbar>
+
+<c:set var="nosystemicons" value="true"/>
+
+<rl:listset name="DupesCompareSet" legend="system">
+ <p><bean:message key="duplicate.compares.jsp.message"/></p>
+<br/>
+<rl:list
+ emptykey="nosystems.message"
+ alphabarcolumn="name"
+ filter="com.redhat.rhn.frontend.taglibs.list.filters.SystemOverviewFilter"
+ >
+ <rl:decorator name="SelectableDecorator"/>
+ <rl:decorator name="PageSizeDecorator"/>
+ <rl:selectablecolumn value="${current.id}"
+ styleclass="first-column"/>
+
+ <!-- Name Column -->
+ <rl:column headerkey="systemlist.jsp.system" sortable="true" bound="false" sortattr="name"
+ defaultsort="asc">
+ <%@ include file="/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf" %>
+ </rl:column>
+ <rl:column sortattr="lastCheckinDate"
+ attr="lastCheckin"
+ bound="true"
+ headerkey="systemlist.jsp.last_checked_in"/>
+
+</rl:list>
+ <input type="hidden" name="key" value="${param.key}"/>
+ <input type="hidden" name="key_type" value="${param.key_type}"/>
+
+ <div align="right">
+
+ <hr />
+ <input type="submit" name="refresh" value="<bean:message key='Refresh Comparison'/>" />
+ </div>
+<rhn:submitted/>
+<br/>
+<h2><bean:message key='System Comparison'/></h2>
+<c:choose> <c:when test="${not empty requestScope.systems}">
+<table cellpadding="0" cellspacing="0" class="list">
+<thead><tr> <th> Property</th>
+<c:forEach items="${requestScope.systems}" var="current">
+ <th><%@ include file="/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf" %></th>
+</c:forEach>
+</tr></thead>
+</table>
+</c:when>
+<c:otherwise><p><bean:message key = "nosystems.message"/></p></c:otherwise>
+</c:choose>
+</rl:listset>
+
+
+</body>
+</html>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index 66e9886..d1576f2 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -2414,7 +2414,7 @@
path="/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp"/>
<forward name="confirm"
path="/systems/ssm/DeleteConfirm.do"
- redirect="true"/>
+ redirect="true"/>
</action>
<action path="/systems/DuplicateHostName"
@@ -2427,7 +2427,7 @@
path="/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp"/>
<forward name="confirm"
path="/systems/ssm/DeleteConfirm.do"
- redirect="true"/>
+ redirect="true"/>
</action>
<action path="/systems/DuplicateMacAddress"
@@ -2440,9 +2440,28 @@
path="/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp"/>
<forward name="confirm"
path="/systems/ssm/DeleteConfirm.do"
- redirect="true"/>
+ redirect="true"/>
</action>
+
+ <action path="/systems/DuplicateSystemsCompare"
+ scope="request"
+ input="/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp"
+ type="com.redhat.rhn.frontend.action.systems.duplicate.DuplicateSystemsCompareAction"
+ className="com.redhat.rhn.frontend.struts.RhnActionMapping"
+ parameter="macaddress">
+ <forward name="default"
+ path="/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp"/>
+ <forward name="hostname"
+ path="/systems/DuplicateHostName"
+ redirect="true"/>
+ <forward name="ip"
+ path="/systems/DuplicateIPList"
+ redirect="true"/>
+ <forward name="macaddress"
+ path="/systems/DuplicateMacAddress"
+ redirect="true"/>
+ </action>
<action path="/systems/OutOfDate"
13 years, 11 months
java/code
by Partha Aji
java/code/src/com/redhat/rhn/domain/server/Capability.hbm.xml | 4 -
java/code/src/com/redhat/rhn/domain/server/Capability.java | 4 -
java/code/src/com/redhat/rhn/domain/server/test/ServerTest.java | 22 ++++++++++
3 files changed, 23 insertions(+), 7 deletions(-)
New commits:
commit 7ed1f613b370a626620e9533a84db592dac84145
Author: Partha Aji <paji(a)redhat.com>
Date: Mon May 10 14:02:40 2010 -0400
Fixed a hibernate bug on capabilities object. Removed created and modified from mapping
diff --git a/java/code/src/com/redhat/rhn/domain/server/Capability.hbm.xml b/java/code/src/com/redhat/rhn/domain/server/Capability.hbm.xml
index 072bded..cb646c5 100644
--- a/java/code/src/com/redhat/rhn/domain/server/Capability.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/server/Capability.hbm.xml
@@ -11,9 +11,5 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<generator class="native" />
</id>
<property name="name" type="string" column="name"/>
- <property name="created" column="created" type="timestamp"
- insert="false" update="false"/>
- <property name="modified" column="modified" type="timestamp"
- insert="false" update="false"/>
</class>
</hibernate-mapping>
diff --git a/java/code/src/com/redhat/rhn/domain/server/Capability.java b/java/code/src/com/redhat/rhn/domain/server/Capability.java
index c726915..6f9b120 100644
--- a/java/code/src/com/redhat/rhn/domain/server/Capability.java
+++ b/java/code/src/com/redhat/rhn/domain/server/Capability.java
@@ -14,8 +14,6 @@
*/
package com.redhat.rhn.domain.server;
-import com.redhat.rhn.domain.BaseDomainHelper;
-
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
@@ -24,7 +22,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
* Capability
* @version $Rev$
*/
-public class Capability extends BaseDomainHelper {
+public class Capability {
private Long id;
private String name;
diff --git a/java/code/src/com/redhat/rhn/domain/server/test/ServerTest.java b/java/code/src/com/redhat/rhn/domain/server/test/ServerTest.java
index 601b019..96f5a1c 100644
--- a/java/code/src/com/redhat/rhn/domain/server/test/ServerTest.java
+++ b/java/code/src/com/redhat/rhn/domain/server/test/ServerTest.java
@@ -15,9 +15,11 @@
package com.redhat.rhn.domain.server.test;
import com.redhat.rhn.domain.role.RoleFactory;
+import com.redhat.rhn.domain.server.Capability;
import com.redhat.rhn.domain.server.EntitlementServerGroup;
import com.redhat.rhn.domain.server.NetworkInterface;
import com.redhat.rhn.domain.server.Server;
+import com.redhat.rhn.domain.server.ServerConstants;
import com.redhat.rhn.domain.server.ServerFactory;
import com.redhat.rhn.domain.server.ServerInfo;
import com.redhat.rhn.domain.server.VirtualInstance;
@@ -25,6 +27,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.manager.entitlement.EntitlementManager;
import com.redhat.rhn.manager.system.ServerGroupManager;
import com.redhat.rhn.manager.system.SystemManager;
+import com.redhat.rhn.manager.system.test.SystemManagerTest;
import com.redhat.rhn.testing.BaseTestCaseWithUser;
import com.redhat.rhn.testing.ServerTestUtils;
import com.redhat.rhn.testing.TestUtils;
@@ -84,6 +87,25 @@ public class ServerTest extends BaseTestCaseWithUser {
}
+
+ public void testCapabilities() throws Exception {
+ UserTestUtils.addProvisioning(user.getOrg());
+ Server s = ServerFactoryTest.createTestServer(user, true,
+ ServerConstants.getServerGroupTypeProvisioningEntitled());
+ SystemManagerTest.giveCapability(s.getId(),
+ SystemManager.CAP_CONFIGFILES_DEPLOY, 1L);
+ assertFalse(s.getCapabilities().isEmpty());
+ boolean containsDeploy = false;
+ for (Capability c : s.getCapabilities()) {
+ if (SystemManager.CAP_CONFIGFILES_DEPLOY.equals(c.getName())) {
+ containsDeploy = true;
+ break;
+ }
+ }
+ assertTrue(containsDeploy);
+ }
+
+
public void testNetworkInterfaces() throws Exception {
Server s = ServerTestUtils.createTestSystem(user);
NetworkInterface device = NetworkInterfaceTest.createTestNetworkInterface(s);
13 years, 11 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 37 +++++-----
1 file changed, 22 insertions(+), 15 deletions(-)
New commits:
commit 78d901926272372b63c24e38636b690aba131c35
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon May 10 17:33:45 2010 +0200
568962 - get correct set of errata to merge
replacing default Set.contains() by continuous compare
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
index 7fa4287..b17d64e 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
@@ -1769,16 +1769,10 @@ public class ChannelSoftwareHandler extends BaseHandler {
mergeTo.getLabel()));
}
- List<Errata> differentErrata = new ArrayList<Errata>();
-
Set<Errata> toErrata = mergeTo.getErratas();
Set<Errata> fromErrata = mergeFrom.getErratas();
-
- for (Errata errata : fromErrata) {
- if (!toErrata.contains(errata)) {
- differentErrata.add(errata);
- }
- }
+ Set<Errata> differentErrata = errataDiff(fromErrata, toErrata);
+
mergeTo.getErratas().addAll(differentErrata);
ChannelFactory.save(mergeTo);
return differentErrata.toArray();
@@ -1826,22 +1820,35 @@ public class ChannelSoftwareHandler extends BaseHandler {
mergeTo.getLabel()));
}
- List<Errata> differentErrata = new ArrayList<Errata>();
-
Set<Errata> toErrata = mergeTo.getErratas();
List<Errata> fromErrata = ErrataFactory.lookupByChannelBetweenDates(
loggedInUser.getOrg(), mergeFrom, startDate, endDate);
+ Set<Errata> differentErrata = errataDiff(new HashSet(fromErrata), toErrata);
- for (Errata errata : fromErrata) {
- if (!toErrata.contains(errata)) {
- differentErrata.add(errata);
- }
- }
mergeTo.getErratas().addAll(differentErrata);
ChannelFactory.save(mergeTo);
return differentErrata.toArray();
}
+ private Set<Errata> errataDiff(Set<Errata> from, Set<Errata> to) {
+ Set<Errata> diff = new HashSet<Errata>();
+ for (Errata errata : from) {
+ if (!errataInSet(to, errata)) {
+ diff.add(errata);
+ }
+ }
+ return diff;
+ }
+
+ private boolean errataInSet(Set<Errata> where, Errata what) {
+ for (Errata errata : where) {
+ if (errata.equals(what)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
/*
public Object[] listErrata(String sessionKey, String channelLabel,
String startDate, String endDate) throws NoSuchChannelException {
13 years, 11 months
2 commits - client/tools
by Jan Pazdziora
client/tools/osad/osad.spec | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 258fb0e2017f98d1c1bf154c1b1653cc396d85e2
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 10 13:49:49 2010 +0200
Some spell checking in %descriptions.
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 222eeee..fac9a6e 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -33,11 +33,11 @@ Requires(preun): chkconfig
Requires(preun): initscripts
%description
-OSAD agent receive commands over jabber protocol from Spacewalk Server and
+OSAD agent receives commands over jabber protocol from Spacewalk Server and
commands are instantly executed.
-This package effectively replace rhn_check command which check in Spacewalk
-Server only in some period.
+This package effectively replaces the behaviour of rhnsd/rhn_check that
+only poll the Spacewalk Server from time to time.
%package -n osa-dispatcher
Summary: OSA dispatcher
@@ -52,9 +52,9 @@ Requires(preun): chkconfig
Requires(preun): initscripts
%description -n osa-dispatcher
-OSA dispatcher get message from Spacewalk server that some command is need
-to execute on client. The message is transported via jabber protocol to OSAD
-agent.
+OSA dispatcher is supposed to run on the Spacewalk server. It gets information
+from the Spacewalk server that some command needs to be execute on the client;
+that message is transported via jabber protocol to OSAD agent on the clients.
%if 0%{?rhel} && 0%{?rhel} <= 4
%define include_selinux_package 0
commit 3ab66f4e763d0030d898bcf391aacc0c174a965e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 10 13:48:37 2010 +0200
OSAD stands for Open Source Architecture Daemon.
Addressing rpmlint's
osad.src: W: name-repeated-in-summary C OSAD
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index dc4901d..222eeee 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -4,7 +4,7 @@
%{!?pythongen:%define pythongen %(%{__python} -c "import sys ; print sys.version[:3]")}
Name: osad
-Summary: OSAD agent
+Summary: Open Source Architecture Daemon
Group: System Environment/Daemons
License: GPLv2
URL: https://fedorahosted.org/spacewalk
13 years, 11 months
client/rhel
by Transifex System User
client/rhel/rhn-client-tools/po/de.po | 1584 ++--------------------------------
1 file changed, 137 insertions(+), 1447 deletions(-)
New commits:
commit 7d7de19fe11ee8fee78736088417ed822aab48f3
Author: ttrinks <ttrinks(a)fedoraproject.org>
Date: Mon May 10 02:28:39 2010 +0000
l10n: Updates to German (de) translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/client/rhel/rhn-client-tools/po/de.po b/client/rhel/rhn-client-tools/po/de.po
index ac261df..aa84973 100644
--- a/client/rhel/rhn-client-tools/po/de.po
+++ b/client/rhel/rhn-client-tools/po/de.po
@@ -1,31 +1,22 @@
-# translation of de.po to
+# translation of spacewalk.rhn-client-tools.po to
# translation of de.po to
-# translation of de.po to
-# translation of de.po to
-# translation of de.po to
-# translation of de.po to
-# translation of de.po to
-# translation of de.po to
-# translation of de.po to
-# translation of de.po to
-# translation of de.po to Deutsch
# Copyright (C) 2001 Red Hat, Inc.
+#
# Bernd Groh <bgroh(a)redhat.com>, 2003.
# Verena <vfuehrer(a)redhat.com>, 2004, 2005.
-# Timo Trinks <ttrinks(a)redhat.com>, 2006, 2007.
-#
+# sknirT omiT <moc.tahder@sknirtt>, 2010.
msgid ""
msgstr ""
-"Project-Id-Version: de\n"
+"Project-Id-Version: spacewalk.rhn-client-tools\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-05-07 13:34+0200\n"
-"PO-Revision-Date: 2007-02-01 10:55+1000\n"
-"Last-Translator: Timo Trinks <ttrinks(a)redhat.com>\n"
-"Language-Team: <en(a)li.org>\n"
+"PO-Revision-Date: 2010-05-10 12:22+1000\n"
+"Last-Translator: sknirT omiT <moc.tahder@sknirtt>\n"
+"Language-Team: <de(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../src/up2date_client/capabilities.py:88
@@ -44,22 +35,21 @@ msgstr "%s wurde nicht gefunden"
#: ../src/up2date_client/gui.py:298
msgid "_Finish"
-msgstr "_Beenden"
+msgstr "_Abschließen"
#. Finish Window
#: ../src/up2date_client/gui.py:299
#: ../src/up2date_client/rhnreg_constants.py:97
msgid "Finish setting up software updates"
-msgstr "Einrichten von Software-Updates abschliessen"
+msgstr "Einrichten von Software-Updates abschließen"
#: ../src/up2date_client/gui.py:301
msgid "_Exit"
-msgstr ""
+msgstr "_Beenden"
#: ../src/up2date_client/gui.py:302
-#, fuzzy
msgid "Software updates setup unsuccessful"
-msgstr "Einrichtung des Software-Updates nicht erfolgreich"
+msgstr "Einrichten des Software-Updates nicht erfolgreich"
#: ../src/up2date_client/gui.py:312
msgid "You must run rhn_register as root."
@@ -112,7 +102,7 @@ msgstr "Frage-Dialog:"
#: ../src/up2date_client/rhnChannel.py:97
msgid "Unable to Locate SystemId"
-msgstr ""
+msgstr "SystemId kann nicht lokalisiert werden"
#: ../src/up2date_client/rhnChannel.py:114
msgid "This system may not be updated until it is associated with a channel."
@@ -154,16 +144,13 @@ msgid "An unexpected OS error occurred: %s\n"
msgstr "Ein unerwarteter Betriebssystemfehler ist aufgetreten: %s\n"
#: ../src/up2date_client/rhncli.py:83
-#, fuzzy
msgid "A connection was attempted with a malformed URI.\n"
-msgstr ""
-"Es wurde versucht, eine Verbindung mit einer falschen URI herzustellen.\n"
+msgstr "Es wurde versucht, eine Verbindung mit einer fehlerhaften URI herzustellen.\n"
#: ../src/up2date_client/rhncli.py:85
-#, fuzzy, python-format
+#, python-format
msgid "A connection was attempted with a malformed URI: %s.\n"
-msgstr ""
-"Es wurde versucht, eine Verbindung mit einer falschen URI %s herzustellen.\n"
+msgstr "Es wurde versucht, eine Verbindung mit einer fehlerhaften URI herzustellen: %s.\n"
#: ../src/up2date_client/rhncli.py:87
#, python-format
@@ -204,15 +191,15 @@ msgid "Unable to open gui. Try `up2date --nox`"
msgstr "Das GUI kann nicht geöffnet werden. Versuchen Sie 'up2date --nox'"
#: ../src/up2date_client/rhncli.py:184
-#, fuzzy, python-format
+#, python-format
msgid ""
"%%prog (Red Hat Network Client Tools) %s\n"
"Copyright (C) 1999--2010 Red Hat, Inc.\n"
"Licensed under the terms of the GPLv2."
msgstr ""
"%%prog (Red Hat Network Client Tools) %s\n"
-"Copyright (C) 1999-2006 Red Hat, Inc.\n"
-"Licensed under the terms of the GPL."
+"Copyright (C) 1999--2010 Red Hat, Inc.\n"
+"Licensed under the terms of the GPLv2."
#: ../src/up2date_client/rhncli.py:204
msgid "An error has occurred:"
@@ -223,9 +210,8 @@ msgid "See /var/log/up2date for more information"
msgstr "Siehe /var/log/up2date für weitere Informationen"
#: ../src/up2date_client/rhnreg_constants.py:13
-#, fuzzy
msgid "Copyright © 2006--2010 Red Hat, Inc. All rights reserved."
-msgstr "Copyright © 2006 Red Hat, Inc. All rights reserved."
+msgstr "Copyright © 2006--2010 Red Hat, Inc. All rights reserved."
#. Connect Window
#: ../src/up2date_client/rhnreg_constants.py:16
@@ -342,7 +328,7 @@ msgid ""
"Tip: Red Hat values your privacy: http://www.redhat.com/legal/"
"privacy_statement.html"
msgstr ""
-"Tipp: Red Hat respektiert Ihren Datenschutz: http://www.redhat.com/legal/"
+"Hinweis: Red Hat respektiert Ihren Datenschutz: http://www.redhat.com/legal/"
"privacy_statement.html"
#: ../src/up2date_client/rhnreg_constants.py:56
@@ -356,23 +342,20 @@ msgid "Software update setup unsuccessful"
msgstr "Einrichtung des Software-Updates nicht erfolgreich"
#: ../src/up2date_client/rhnreg_constants.py:60
-#, fuzzy
msgid ""
"Are you sure you don't want to connect your system to Red Hat Network? "
"You'll miss out on the benefits of a Red Hat Enterprise Linux subscription:\n"
msgstr ""
-"Sind Sie sicher, Ihr System nicht mit dem Red Hat Network zu verbinden? Sie "
-"werden nicht in den Genuss der Vorteile eines Red Hat Enterprise Linux "
-"Abonnements kommen:"
+"Möchten Sie Ihr System wirklich nicht mit dem Red Hat Network zu verbinden? Sie werden nicht in den Genuss der Vorteile eines Red Hat Enterprise Linux "
+"Abonnements kommen:\n"
#: ../src/up2date_client/rhnreg_constants.py:62
-#, fuzzy
msgid ""
"You will not be able to take advantage of these subscription privileges "
"without connecting your system to Red Hat Network.\n"
msgstr ""
"Ohne die Verbindung Ihres Systems mit Red Hat Network können Sie die "
-"Vorteile dieser Abonnement-Privilegien <b>nicht</b> nutzen."
+"Vorteile dieser Abonnement-Privilegien nicht nutzen.\n"
#: ../src/up2date_client/rhnreg_constants.py:65
msgid "I'll register later."
@@ -411,7 +394,7 @@ msgid ""
"Tip: Forgot your login or password? Contact your Satellite's Organization "
"Administrator."
msgstr ""
-"Tipp: Haben Sie Ihr Passwort vergessen? Kontaktieren Sie Ihren Satellite-"
+"Hinweis: Haben Sie Ihr Passwort vergessen? Kontaktieren Sie Ihren Satellite-"
"Organisations-Administrator"
#: ../src/up2date_client/rhnreg_constants.py:76
@@ -434,13 +417,10 @@ msgstr ""
"\n"
#: ../src/up2date_client/rhnreg_constants.py:82
-#, fuzzy
msgid ""
"Tip: Forgot your login or password? Visit: https://rhn.redhat.com/rhn/sales/"
"LoginInfo.do"
-msgstr ""
-"<small>Tipp: Haben Sie Ihr Login oder Passwort vergessen? Schlagen Sie es\n"
-"unter https://www.redhat.com/wapps/sso/rhn/lostPassword.html nach.</small>"
+msgstr "Hinweis: Haben Sie Ihr Login oder Passwort vergessen? Rufen Sie folgende Seite auf: https://rhn.redhat.com/rhn/sales/LoginInfo.do"
#: ../src/up2date_client/rhnreg_constants.py:84
msgid "*Email Address:"
@@ -448,8 +428,7 @@ msgstr "*E-Mail Adresse:"
#: ../src/up2date_client/rhnreg_constants.py:86 ../data/rh_register.glade.h:61
msgid "It appears this system has already been set up for software updates:"
-msgstr ""
-"Dieses System ist offensichtlich bereits für Software-Updates eingerichtet:"
+msgstr "Dieses System ist offensichtlich bereits für Software-Updates eingerichtet:"
#: ../src/up2date_client/rhnreg_constants.py:87 ../data/rh_register.glade.h:38
msgid "Are you sure you would like to continue?"
@@ -513,8 +492,7 @@ msgstr ""
msgid ""
"Subscriptions have been activated for the following Red Hat products/"
"services:"
-msgstr ""
-"Es wurden Abonnements für die folgenden Red Hat Produkte/Dienste aktiviert:"
+msgstr "Es wurden Abonnements für die folgenden Red Hat Produkte/Dienste aktiviert:"
#: ../src/up2date_client/rhnreg_constants.py:115
msgid "Software channel subscriptions:"
@@ -786,7 +764,7 @@ msgstr ""
"erneut mit einem neueren Server."
#: ../src/up2date_client/rhnreg_constants.py:229
-#, fuzzy, python-format
+#, python-format
msgid ""
"<b><span size=\"16000\">Incompatible Certificate File</span></b>\n"
"\n"
@@ -814,11 +792,13 @@ msgid ""
" The certificate is expired. Please ensure you have the correct certificate "
"and your system time is correct."
msgstr ""
+"<b><span size=\"12000\">Nicht kompatible Zertifikatdatei</span></b>\n"
+"\n"
+" Das Zertifikat ist abgelaufen. Bitte stellen Sie sicher, dass Sie das korrekte Zertifikat verwenden und Ihre Systemzeit korrekt ist."
#: ../src/up2date_client/rhnreg_constants.py:241
msgid "Please verify the value of sslCACert in /etc/sysconfig/rhn/up2date"
-msgstr ""
-"Bitte überprüfen Sie den Wert von sslCACert in /etc/sysconfig/rhn/up2date"
+msgstr "Bitte überprüfen Sie den Wert von sslCACert in /etc/sysconfig/rhn/up2date"
#: ../src/up2date_client/rhnreg_constants.py:244
msgid ""
@@ -848,12 +828,15 @@ msgid ""
" Tip: Minor releases with a '*' are currently supported by Red Hat.\n"
"\n"
msgstr ""
+"\n"
+" Hinweis: Zwischen-Releases mit einem '*' werden derzeit von Red Hat unterstützt.\n"
+"\n"
#: ../src/up2date_client/rhnreg_constants.py:260
msgid ""
"Warning:You will not be able to limit this system to minor release that is "
"older than the recent minor release if you select this option.\n"
-msgstr ""
+msgstr "Warnung: Wenn Sie diese Option wählen, können Sie dieses System nicht auf Zwischen-Releases beschränken, die älter sind, als das aktuelle Zwischen-Release.\n"
#: ../src/up2date_client/rhnreg_constants.py:265
#, python-format
@@ -864,6 +847,11 @@ msgid ""
"(you will be able to move to a newer release.)\n"
"Are you sure you Would like to Continue?"
msgstr ""
+"Ihr System hat nun %s Basis-Software-Channel \n"
+"abonniert. Sie können dieses System nicht in\n"
+"ein älteres Release umwandeln (Sie können\n"
+"jedoch auf ein neueres Release wechseln).\n"
+"Möchten Sie wirklich fortfahren?"
#. Navigation
#: ../src/up2date_client/rhnreg_constants.py:274
@@ -913,9 +901,8 @@ msgid "Notice"
msgstr "Hinweis"
#: ../src/up2date_client/rhnregGui.py:261
-#, fuzzy
msgid "There was an error while applying your choice."
-msgstr "Beim Ausfüllen des Profils trat ein Fehler auf."
+msgstr "Beim Anwenden Ihrer Auswahl trat ein Fehler auf."
#: ../src/up2date_client/rhnregGui.py:287
msgid "You specified an invalid protocol. Only https and http are allowed."
@@ -924,13 +911,12 @@ msgstr ""
"erlaubt."
#: ../src/up2date_client/rhnregGui.py:300
-#, fuzzy
msgid ""
"You will not be able to successfully register this system without contacting "
"a Red Hat Network server."
msgstr ""
"Ohne die Verbindung Ihres Systems mit Red Hat Network können Sie die "
-"Vorteile dieser Abonnement-Privilegien <b>nicht</b> nutzen."
+"Vorteile dieser Abonnement-Privilegien nicht nutzen."
#: ../src/up2date_client/rhnregGui.py:325
#, python-format
@@ -940,8 +926,7 @@ msgstr "Red Hat Network (%s) konnte nicht kontaktiert werden."
#: ../src/up2date_client/rhnregGui.py:327
#: ../src/up2date_client/rhnregGui.py:340
msgid "Make sure the network connection on this system is operational."
-msgstr ""
-"Stellen Sie sicher, dass die Netzwerkverbindung dieses Systems funktioniert."
+msgstr "Stellen Sie sicher, dass die Netzwerkverbindung dieses Systems funktioniert."
#: ../src/up2date_client/rhnregGui.py:329
msgid ""
@@ -983,14 +968,13 @@ msgstr ""
"ist."
#: ../src/up2date_client/rhnregGui.py:396
-#, fuzzy, python-format
+#, python-format
msgid ""
"Please enter your account information for the <b>%s</b> Red Hat Network "
"Satellite:"
msgstr ""
-"Bitte geben Sie Ihre Login-Informationen für den %s Red Hat Network "
-"Satellite:\n"
-"\n"
+"Bitte geben Sie Ihre Login-Informationen für den <b>%s</b> Red Hat Network "
+"Satellite:"
#: ../src/up2date_client/rhnregGui.py:445
msgid "You must enter a login."
@@ -1001,7 +985,6 @@ msgid "You must enter a password."
msgstr "Sie müssen ein Passwort eingeben."
#: ../src/up2date_client/rhnregGui.py:465
-#, fuzzy
msgid "There was an error while logging in."
msgstr "Beim Einloggen trat ein Problem auf."
@@ -1014,9 +997,8 @@ msgstr ""
"Die Meldung war:\n"
#: ../src/up2date_client/rhnregGui.py:631
-#, fuzzy
msgid "There was an error while assembling information for the profile."
-msgstr "Beim Ausfüllen des Profils trat ein Fehler auf."
+msgstr "Bei der Informationssammlung für das Profil trat ein Fehler auf."
#: ../src/up2date_client/rhnregGui.py:652
msgid "Error running hardware profile"
@@ -1031,9 +1013,8 @@ msgid "You must choose a name for this profile."
msgstr "Wählen sie einen Namen für dieses Profil."
#: ../src/up2date_client/rhnregGui.py:714
-#, fuzzy
msgid "There was an error while creating the profile."
-msgstr "Beim Ausfüllen des Profils trat ein Fehler auf."
+msgstr "Beim Erstellen des Profils trat ein Fehler auf."
#: ../src/up2date_client/rhnregGui.py:725
msgid "Sending your profile information to Red Hat Network. Please wait."
@@ -1067,8 +1048,7 @@ msgstr "Problem beim Registrieren des Systems."
#: ../src/up2date_client/rhnregGui.py:789 ../src/up2date_client/tui.py:852
msgid "Problem writing out system id to disk."
-msgstr ""
-"Beim Schreiben der System-ID auf die Diskette ist ein Problem aufgetreten."
+msgstr "Beim Schreiben der System-ID auf die Diskette ist ein Problem aufgetreten."
#: ../src/up2date_client/rhnregGui.py:795
msgid "There was a problem registering this system."
@@ -1103,20 +1083,17 @@ msgstr "Beim Senden der Paketinformationen traten Probleme auf."
#: ../src/up2date_client/rhnregGui.py:893 ../src/up2date_client/tui.py:866
#: ../src/up2date_client/tui.py:880
msgid "Problem registering personal information:\n"
-msgstr ""
-"Beim Registrieren der persönlichen Informationen sind Probleme aufgetreten:\n"
+msgstr "Beim Registrieren der persönlichen Informationen sind Probleme aufgetreten:\n"
#: ../src/up2date_client/rhnregGui.py:881
#: ../src/up2date_client/rhnregGui.py:898 ../src/up2date_client/tui.py:872
#: ../src/up2date_client/tui.py:884
msgid "Problem registering personal information"
-msgstr ""
-"Beim Registrieren der persönlichen Informationen sind Probleme aufgetreten."
+msgstr "Beim Registrieren der persönlichen Informationen sind Probleme aufgetreten."
#: ../src/up2date_client/rhnregGui.py:940
-#, fuzzy
msgid "There was an error while installing the certificate."
-msgstr "Beim Ausfüllen des Profils trat ein Fehler auf."
+msgstr "Beim Installieren des Zertifikats trat ein Fehler auf."
#: ../src/up2date_client/rhnregGui.py:966
msgid "You must select a certificate."
@@ -1144,9 +1121,8 @@ msgid "unknown"
msgstr "unbekannt"
#: ../src/up2date_client/rhnregGui.py:1138
-#, fuzzy
msgid "There was an error getting the list of hardware."
-msgstr "Beim Ausfüllen des Profils trat ein Fehler auf."
+msgstr "Beim Abrufen der Hardware-Liste trat ein Fehler auf."
#: ../src/up2date_client/rhnregGui.py:1150 ../src/up2date_client/tui.py:631
#, python-format
@@ -1159,9 +1135,8 @@ msgid "%s MB"
msgstr "%s MB"
#: ../src/up2date_client/rhnregGui.py:1198
-#, fuzzy
msgid "There was an error building the list of packages."
-msgstr "Schwerwiegender Fehler beim Installieren des Pakets:\n"
+msgstr "Beim Erstellen der Paketliste trat ein Fehler auf."
#: ../src/up2date_client/rhnregGui.py:1213
msgid "Package"
@@ -1211,13 +1186,12 @@ msgid "Warning: unable to enable rhnsd with chkconfig"
msgstr "Achtung: rhnsd konnte nicht mit chkconfig freigeschaltet werden"
#: ../src/up2date_client/rhnreg.py:65
-#, fuzzy
msgid "Warning: unable to run rhn_check"
-msgstr "Achtung: rhnsd konnte nicht mit chkconfig freigeschaltet werden"
+msgstr "Warnung: rhn_check konnte nicht ausgeführt werden"
#: ../src/up2date_client/rpcServer.py:47
msgid "Error: Server Unavailable. Please try later."
-msgstr ""
+msgstr "Fehler: Server nicht verfügbar. Bitte versuchen Sie es später erneut."
#: ../src/up2date_client/rpcServer.py:171
msgid "ERROR: can not find RHNS CA file"
@@ -1240,61 +1214,56 @@ msgid "System software updates already set up"
msgstr "Software-Updates für das System bereits eingerichtet"
#: ../src/up2date_client/tui.py:115
-#, fuzzy
msgid "Red Hat Network Location:"
-msgstr "Red Hat Network _Position:"
+msgstr "Red Hat Network Position:"
#: ../src/up2date_client/tui.py:117
-#, fuzzy
msgid "System ID:"
-msgstr ""
-"\n"
-"System-ID: "
+msgstr "System-ID: "
#: ../src/up2date_client/tui.py:371
msgid "The server indicated an error:\n"
msgstr "Der Server meldete einen Fehler:\n"
#: ../src/up2date_client/tui.py:375
-#, fuzzy
msgid "There was an error communicating with the registration server:\n"
-msgstr ""
-"Beim Kommunizieren mit dem Registrierungsserver ist ein Fehler aufgetreten. "
-"Die Meldung war:\n"
+msgstr "Beim Kommunizieren mit dem Registrierungsserver trat ein Fehler auf:\n"
#: ../src/up2date_client/tui.py:434
msgid "Select Operating System Release"
-msgstr ""
+msgstr "Release des Betriebssystems wählen"
#: ../src/up2date_client/tui.py:438
msgid "Operating System version:"
-msgstr ""
+msgstr "Betriebssystemversion:"
#: ../src/up2date_client/tui.py:440
msgid "Limited Updates Only"
-msgstr ""
+msgstr "Nur eingeschränkte Updates"
#: ../src/up2date_client/tui.py:452
msgid " Minor Release: "
-msgstr ""
+msgstr " Zwischen-Release: "
#: ../src/up2date_client/tui.py:467
msgid "All available updates"
-msgstr ""
+msgstr "Alle verfügbaren Updates"
#: ../src/up2date_client/tui.py:520
msgid "Confirm operating system release selection"
-msgstr ""
+msgstr "Auswahl des Releases des Betriebssystems bestätigen"
#: ../src/up2date_client/tui.py:528
msgid ""
"Your system will be subscribed to the base software channel to receive all "
"available updates."
msgstr ""
+"Ihr System wird den Basis-Software-Channel abonnieren, um alle verfügbaren "
+"Updates zu erhalten."
#: ../src/up2date_client/tui.py:572
msgid "Register a System Profile - Hardware"
-msgstr "Registrieren Sie ein Systemprofil - Hardware"
+msgstr "Ein Systemprofil registrieren - Hardware"
#: ../src/up2date_client/tui.py:575
msgid ""
@@ -1321,7 +1290,7 @@ msgstr "Version: "
#: ../src/up2date_client/tui.py:610
msgid "CPU model: "
-msgstr "CPU Modell: "
+msgstr "CPU-Modell: "
#: ../src/up2date_client/tui.py:616
msgid "Hostname: "
@@ -1329,7 +1298,7 @@ msgstr "Rechnername: "
#: ../src/up2date_client/tui.py:627
msgid "CPU speed: "
-msgstr "CPU Geschwindigkeit: "
+msgstr "CPU-Geschwindigkeit: "
#: ../src/up2date_client/tui.py:633
msgid "IP Address: "
@@ -1349,12 +1318,12 @@ msgid ""
"Additional hardware information including PCI devices, disk sizes and mount "
"points will be included in the profile."
msgstr ""
-"Zusätzliche Hardware-Information einschließlich PCI-Geräte, Diskettengröße "
-"und Mountpunkte werden in das Profil integriert."
+"Zusätzliche Hardware-Information einschließlich PCI-Geräte, Plattengrößen "
+"und Einhängepunkte werden in das Profil integriert."
#: ../src/up2date_client/tui.py:685
msgid "Register a System Profile - Packages"
-msgstr "Registrieren Sie ein Systemprofil - Pakete"
+msgstr "Ein Systemprofil registrieren - Pakete"
#: ../src/up2date_client/tui.py:690
msgid ""
@@ -1366,8 +1335,7 @@ msgstr ""
#: ../src/up2date_client/tui.py:694
msgid "Include RPM packages installed on this system in my System Profile"
-msgstr ""
-"In diesem System installierte RPM-Pakete in mein Systemprofil einschließen"
+msgstr "In diesem System installierte RPM-Pakete in mein Systemprofil einschließen"
#: ../src/up2date_client/tui.py:698
msgid "You may deselect individual packages by unchecking them below."
@@ -1412,8 +1380,7 @@ msgid "You specified an invalid protocol."
msgstr "Sie haben ein ungültiges Protokoll angegeben."
#: ../src/up2date_client/tui.py:1106
-msgid ""
-" <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
+msgid " <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr ""
" <Tab>/<Alt-Tab> zwischen Elementen | <Space> wählt | <F12> nächster "
"Bildschirm"
@@ -1428,7 +1395,7 @@ msgstr "Plattenfehler. Die Meldung war:\n"
#: ../src/up2date_client/up2dateErrors.py:39
msgid "RPM error. The message was:\n"
-msgstr "RPM Fehler. Die Meldung war:\n"
+msgstr "RPM-Fehler. Die Meldung war:\n"
#: ../src/up2date_client/up2dateErrors.py:50
msgid "There was a fatal error installing the package:\n"
@@ -1436,7 +1403,7 @@ msgstr "Schwerwiegender Fehler beim Installieren des Pakets:\n"
#: ../src/up2date_client/up2dateErrors.py:63
msgid "Password error. The message was:\n"
-msgstr "Passwort Fehler. Die Meldung war:\n"
+msgstr "Passwort-Fehler. Die Meldung war:\n"
#: ../src/up2date_client/up2dateErrors.py:74
msgid "RPM package conflict error. The message was:\n"
@@ -1452,7 +1419,7 @@ msgstr "Fehler aufgrund einer RPM-Abhängigkeit . Die Meldung war:\n"
#: ../src/up2date_client/up2dateErrors.py:114
msgid "RPM error. The message was:\n"
-msgstr "RPM Fehler. Die Meldung war:\n"
+msgstr "RPM-Fehler. Die Meldung war:\n"
#: ../src/up2date_client/up2dateErrors.py:127
#: ../src/up2date_client/up2dateErrors.py:140
@@ -1461,7 +1428,7 @@ msgstr "Fehler aufgrund einer RPM-Abhängigkeit . Die Meldung war:\n"
#: ../src/up2date_client/up2dateErrors.py:151
msgid "Package Skip List error. The message was:\n"
-msgstr "Fehler in der Paket-Auslassliste. Die Meldung war:\n"
+msgstr "Fehler in der Paket-Auslass-Liste. Die Meldung war:\n"
#: ../src/up2date_client/up2dateErrors.py:164
msgid "File Skip List or config file overwrite error. The message was:\n"
@@ -1493,10 +1460,9 @@ msgid "GPG is not installed properly."
msgstr "GPG ist nicht korrekt installiert."
#: ../src/up2date_client/up2dateErrors.py:237
-msgid ""
-"GPG keyring does not include the Red Hat, Inc. public package-signing key"
+msgid "GPG keyring does not include the Red Hat, Inc. public package-signing key"
msgstr ""
-"Der GPG Schlüsselring enthält nicht den \n"
+"Der GPG-Schlüsselring enthält nicht den \n"
"öffentlichen Red Hat, Inc. Schlüssel, \n"
"mit dem die Pakete signiert werden."
@@ -1506,7 +1472,7 @@ msgid ""
"The package %s failed its gpg signature verification. This means the package "
"is corrupt."
msgstr ""
-"Die gpg Signatur des Paketes %s ist falsch. Das bedeutet, dass das Paket "
+"Die GPG-Signatur des Paketes %s ist falsch. Das bedeutet, dass das Paket "
"beschädigt ist."
#: ../src/up2date_client/up2dateErrors.py:263
@@ -1557,6 +1523,23 @@ msgid ""
"retry to avoid\n"
" requiring a Management entitlement."
msgstr ""
+"\n"
+" Ihre Organisation besitzt nicht genügend Management-Berechtigungen, "
+"um dieses System\n"
+" beim Red Hat Network zu registrieren. Bitte informieren Sie Ihren Organisationsadministrator über diesen Fehler. \n"
+" Sie sollten in der Lage sein, dieses System zu registrieren, nachdem Ihre Organisation bestehende Berechtigungen freigibt, \n"
+" oder zusätzliche Berechtigungen erwirbt. Zusätzliche Berechtigungen können "
+"von Ihrem Organisationsadministrator\n"
+" erworben werden. Dazu kann dieser sich bei Red Hat Network einloggen und\n"
+" auf die Seite 'Abonnement-Management' im Abschnitt 'Ihr RHN' von RHN zugreifen.\n"
+" \n"
+" Eine gängige Ursache dieses Fehler-Codes ist ein fehlerhaftes Einrichten eines\n"
+" Aktivierungsschlüssels, der als allgemeine Vorgabe gesetzt wird. Falls ein "
+"Aktivierungsschlüssel\n"
+" im Zusammenhang mit diesem Benutzerkonto als allgemeine Vorgabe gesetzt ist,\n"
+" können Sie diesen Schlüssel deaktivieren und es erneut versuchen, um das "
+"Benötigen\n"
+" einer Management-Berechtigung zu umgehen."
#: ../src/firstboot/rhn_choose_server_gui.py:40 ../data/rh_register.glade.h:43
msgid "Choose Server"
@@ -1593,8 +1576,7 @@ msgid "There was a communication error with the server: %s"
msgstr "Beim Kommunizieren mit dem Server ist ein Fehler aufgetreten: %s"
#: ../src/firstboot/rhn_login_gui.py:106
-msgid ""
-"Would you like to try changing the network configuration and trying again?"
+msgid "Would you like to try changing the network configuration and trying again?"
msgstr "Möchten Sie die Netzwerkkonfiguration ändern und es nochmal probieren?"
#: ../src/firstboot/rhn_provide_certificate_gui.py:40
@@ -1666,14 +1648,12 @@ msgid "Specify an activation key"
msgstr "Geben Sie einen Aktivierungsschlüssel an"
#: ../src/bin/rhnreg_ks.py:58
-msgid ""
-"Subscribe this system to the EUS channel tied to the system's redhat-release"
-msgstr ""
+msgid "Subscribe this system to the EUS channel tied to the system's redhat-release"
+msgstr "Den EUS-Channel, der mit dem Redhat-Release des Systems verbunden ist, für dieses System abonnieren"
#: ../src/bin/rhnreg_ks.py:60
-#, fuzzy
msgid "[Deprecated] Read contact info from stdin"
-msgstr "Kontaktinformationen von stdin lesen"
+msgstr "[Veraltet] Kontaktinformationen von stdin lesen"
#: ../src/bin/rhnreg_ks.py:62
msgid "Do not probe or upload any hardware info"
@@ -1697,8 +1677,7 @@ msgstr "Das System registrieren, auch wenn es bereits registriert ist"
#: ../src/bin/rhnreg_ks.py:80
msgid "A username and password are required to register a system."
-msgstr ""
-"Für das Registrieren eines Systems sind ein Benutzername und Passwort nötig."
+msgstr "Für das Registrieren eines Systems sind ein Benutzername und Passwort nötig."
#: ../src/bin/rhnreg_ks.py:85
msgid "This system is already registered. Use --force to override"
@@ -1710,20 +1689,19 @@ msgstr ""
msgid ""
"Usage of --use-eus-channel option with --activationkey is not supported. "
"Please use username and password instead."
-msgstr ""
+msgstr "Die Verwendung der Option --use-eus-channel mit --activationkey wird nicht unterstützt. Bitte verwenden Sie stattdessen Benutzername und Passwort."
#: ../src/bin/rhnreg_ks.py:122
-#, fuzzy
msgid "The server you are registering against does not support EUS."
-msgstr ""
-"Der Server, bei dem Sie versuchen, sich zu registrieren, unterstützt diese "
-"Client-Version nicht."
+msgstr "Der Server, bei dem Sie versuchen, sich zu registrieren, unterstützt EUS nicht."
#: ../src/bin/rhnreg_ks.py:152
msgid ""
"Warning: --contactinfo option has been deprecated. Please login to the "
"server web user Interface and update your contactinfo. "
msgstr ""
+"Warnung: Die Option --contactinfo ist veraltet. Bitte loggen Sie sich im "
+"Web-Benutzer-Interface des Servers ein und aktualisieren Sie Ihre Kontakt-Informationen (contactinfo)."
#: ../src/bin/rhnreg_ks.py:192
msgid ""
@@ -1756,22 +1734,23 @@ msgstr "Für Software-Updates registrieren"
#: ../data/gui.glade.h:7
msgid "Select operating system release"
-msgstr ""
+msgstr "Release des Betriebssystems auswählen"
#: ../data/progress.glade.h:1
msgid "Progress Dialog"
msgstr "Fortschritts-Dialog"
#: ../data/rh_register.glade.h:1
-#, fuzzy
msgid ""
"\n"
"Are you sure you would like to continue?"
-msgstr "Möchten Sie wirklich fortfahren?"
+msgstr ""
+"\n"
+"Möchten Sie wirklich fortfahren?"
#: ../data/rh_register.glade.h:3
msgid " "
-msgstr ""
+msgstr " "
#: ../data/rh_register.glade.h:4
msgid "<b>Compliance:</b>"
@@ -1783,7 +1762,7 @@ msgstr "<b>Downloads & Upgrades:</b>"
#: ../data/rh_register.glade.h:6
msgid "<b>HTTP Proxy</b>"
-msgstr "<b>HTTP Proxy</b>"
+msgstr "<b>HTTP-Proxy</b>"
#: ../data/rh_register.glade.h:7
msgid "<b>Login:</b>"
@@ -1818,14 +1797,14 @@ msgstr ""
msgid ""
"<b>Tip:</b> Minor releases with a '*' are currently fully supported by Red "
"Hat."
-msgstr ""
+msgstr "<b>Hinweis:</b> Hinweis: Zwischen-Releases mit einem '*' werden derzeit von Red Hat unterstützt."
#: ../data/rh_register.glade.h:14
msgid ""
"<b>Warning:</b> You will <b>not</b> be able to limit this system to a minor "
"release that is older than the most recent minor release if you select this "
"option."
-msgstr ""
+msgstr "<b>Warnung:</b> Wenn Sie diese Option wählen, können Sie dieses System <b>nicht</b> auf Zwischen-Releases beschränken, die älter sind, als das aktuelle Zwischen-Release."
#: ../data/rh_register.glade.h:15
msgid ""
@@ -1839,7 +1818,7 @@ msgstr ""
#: ../data/rh_register.glade.h:16
msgid "<b>Your system was registered for updates during installation.</b>"
-msgstr ""
+msgstr "<b>Ihr System wurde für Updates während der Installation registriert.</b>"
#: ../data/rh_register.glade.h:17
msgid ""
@@ -1847,18 +1826,18 @@ msgid ""
"if kept updated, will always be equivalent to the latest available minor "
"release of Red Hat Enterprise Linux 5. It will be registered to the main "
"'Red Hat Enterprise Linux 5' software channel."
-msgstr ""
+msgstr "<b>_Alle verfügbaren Updates</b> werden diesem System zur Verfügung gestellt. Dieses System - wenn es auf dem aktuellsten Stand gehalten wird - wird immer dem aktuell verfügbaren Zwischen-Release von Red Hat Enterprise Linux 5 entsprechen. Es wird beim Haupt-Software-Channel für 'Red Hat Enterprise Linux 5' registriert."
#: ../data/rh_register.glade.h:18
msgid ""
"<b>_Limited updates</b> will be provided to this system to maintain "
"compatibility with the following eligible Red Hat Enterprise Linux minor "
"release software channel:"
-msgstr ""
+msgstr "<b>_Eingeschränkte Updates</b> werden für dieses System zur Verfügung gestellt, um die Kompatibilität mit den folgenden, berechtigten Red Hat Enterprise Linux Zwischen-Release Software-Channeln zu erhalten:"
#: ../data/rh_register.glade.h:19
msgid "<big><b>Moving to earlier releases won't be possible</b></big>"
-msgstr ""
+msgstr "<big><b>Das Wechseln zu früheren Releases ist nicht möglich!</b></big>"
#: ../data/rh_register.glade.h:20
msgid "<big><b>Profile Data</b></big>"
@@ -1881,20 +1860,19 @@ msgid "<small><b>Example</b>: XXXX-XXXX-XXXX-XXXX</small>"
msgstr "<small><b>Beispiel</b>: XXXX-XXXX-XXXX-XXXX</small>"
#: ../data/rh_register.glade.h:25
-#, fuzzy
msgid ""
"<small><b>Tip:</b> Red Hat values your privacy: http://www.redhat.com/legal/"
"privacy_statement.html.</small>"
msgstr ""
-"Tipp: Red Hat respektiert Ihren Datenschutz: http://www.redhat.com/legal/"
-"privacy_statement.html"
+"<small><b>Hinweis:</b> Red Hat respektiert Ihre Privatsphäre: http://www.redhat.com/legal/"
+"privacy_statement.html</small>"
#: ../data/rh_register.glade.h:26
msgid ""
"<small>Tip: Forgot your login or password? Contact your Satellite's "
"<i>Organization Administrator</i>.</small>"
msgstr ""
-"<small>Tipp: Haben Sie Ihr Login oder Passwort vergessen? Kontaktieren Sie "
+"<small>Hinweis: Haben Sie Ihr Login oder Passwort vergessen? Kontaktieren Sie "
"Ihren Satellite-<i>Organisations-Administrator</i>.</small>"
#: ../data/rh_register.glade.h:27
@@ -1902,7 +1880,7 @@ msgid ""
"<small>Tip: Forgot your login or password? Look it up at \n"
"https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small>"
msgstr ""
-"<small>Tipp: Haben Sie Ihr Login oder Passwort vergessen? Schlagen Sie es\n"
+"<small>Hinweis: Haben Sie Ihr Login oder Passwort vergessen? Schlagen Sie es\n"
"unter https://www.redhat.com/wapps/sso/rhn/lostPassword.html nach.</small>"
#: ../data/rh_register.glade.h:30
@@ -1923,8 +1901,7 @@ msgstr ""
"Network (inklusive Ihres Logins und Passworts) zu gewährleisten."
#: ../data/rh_register.glade.h:34
-msgid ""
-"Activate a previously purchased subscription you have not yet activated."
+msgid "Activate a previously purchased subscription you have not yet activated."
msgstr ""
"Aktivieren Sie ein zuvor erworbenes Abonnement, das sie noch nicht aktiviert "
"haben."
@@ -1959,13 +1936,12 @@ msgid "Certificate _Location:"
msgstr "_Position des Zertifikats:"
#: ../data/rh_register.glade.h:42
-#, fuzzy
msgid "Choose Channel"
-msgstr "Organisation wählen"
+msgstr "Channel auswählen"
#: ../data/rh_register.glade.h:44
msgid "Confirm operation system release selection"
-msgstr ""
+msgstr "Auswahl des Releases des Betriebssystems bestätigen"
#: ../data/rh_register.glade.h:46
msgid "Create profile"
@@ -2124,8 +2100,7 @@ msgstr "_Paketprofil senden"
#: ../data/rh_register.glade.h:79
msgid "Software update setup has been completed for this system."
-msgstr ""
-"Die Einrichtung des Software-Updates wurde für dieses System abgeschlossen."
+msgstr "Die Einrichtung des Software-Updates wurde für dieses System abgeschlossen."
#: ../data/rh_register.glade.h:80
msgid "Start Window"
@@ -2179,8 +2154,7 @@ msgstr "Weshalb registrieren"
msgid ""
"Would you like to register your system at this time? <b>(Strongly "
"recommended.)</b>"
-msgstr ""
-"Möchten Sie Ihr System jetzt registrieren? <b>(Dringend empfohlen.)</b>"
+msgstr "Möchten Sie Ihr System jetzt registrieren? <b>(Dringend empfohlen.)</b>"
#: ../data/rh_register.glade.h:93
msgid ""
@@ -2259,7 +2233,6 @@ msgstr ""
"verfügbarer Updates:"
#: ../data/rh_register.glade.h:104
-#, fuzzy
msgid ""
"Your system is ready to receive the software updates that will keep it "
"secure and supported.\n"
@@ -2283,7 +2256,7 @@ msgid ""
"Your system will be subscribed to the base software channel. You will not "
"be able to move this system to an earlier minor release channel if you "
"continue (you will be able to move to a later release.)"
-msgstr ""
+msgstr "Ihr System hat nun den Basis-Software-Channel abonniert. Sie können dieses System nicht in ein älteres Zwischen-Release umwandeln (Sie können jedoch auf ein neueres Release wechseln)."
#: ../data/rh_register.glade.h:108
msgid ""
@@ -2307,7 +2280,7 @@ msgstr "_Login:"
#: ../data/rh_register.glade.h:112
msgid "_Minor release:"
-msgstr ""
+msgstr "_Zwischen-Release:"
#: ../data/rh_register.glade.h:113
msgid "_No thanks, I'll connect later."
@@ -2323,7 +2296,7 @@ msgstr "_Nein, Ich möchte lieber zu einem späteren Zeitpunkt registrieren."
#: ../data/rh_register.glade.h:116
msgid "_Operating system version:"
-msgstr ""
+msgstr "_Betriebssystem-Version:"
#: ../data/rh_register.glade.h:117
msgid "_Password:"
@@ -2378,1297 +2351,14 @@ msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr "• Ihr Red Hat Network oder Red Hat Network Satellite Login "
#: ../rhn_register.desktop.in.h:1
-#, fuzzy
msgid "RHN Registration"
-msgstr "Registrierungs_nummer"
+msgstr "RHN-Registrierung"
#: ../rhn_register.desktop.in.h:2
msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
-msgstr ""
+msgstr "Für Software-Updates via Spacewalk/Satellite/Red Hat Network registrieren"
#: ../rhn_register.desktop.in.h:3
-#, fuzzy
msgid "Register to Spacewalk/Satellite/Red Hat Network."
-msgstr "Registrieren Sie sich bei Red Hat Network"
-
-#~ msgid "_Exit software update setup"
-#~ msgstr "Software-Updates-Setup be_enden"
-
-#~ msgid "software updates setup unsuccessful"
-#~ msgstr "Software-Updates-Setup nicht erfolgreich"
-
-#~ msgid ""
-#~ "If you do not have a Red Hat Login, this assistant will allow you to "
-#~ "create one."
-#~ msgstr ""
-#~ "Falls Sie kein Red Hat-Login besitzen, ist dieser Assistent bei der "
-#~ "Erstellung eines solchen behilflich."
-
-#~ msgid "Step 1: Review the Red Hat Privacy Statement"
-#~ msgstr "Schritt 1: Prüfen Sie die Datenschutzerklärung von Red Hat"
-
-#~ msgid "Review the Red Hat Network Terms And Conditions"
-#~ msgstr "Überprüfen Sie die Bedingungen des Red Hat Network"
-
-#~ msgid ""
-#~ "Are you sure you don't want to connect your system to Red Hat Network? "
-#~ "You'll miss out on the benefits of a Red Hat Enterprise Linux "
-#~ "subscription:\n"
-#~ "\n"
-#~ "Security & Updates:\n"
-#~ "Receive the latest software updates, including security updates, keeping "
-#~ "this Red Hat Enterprise Linux system updated and secure.\n"
-#~ "\n"
-#~ "Downloads & Upgrades:\n"
-#~ "Download installation images for Red Hat Enterprise Linux releases, "
-#~ "including new releases.\n"
-#~ "\n"
-#~ "Support:\n"
-#~ "Access to the technical support experts at Red Hat or Red Hat's partners "
-#~ "for help with any issues you might encounter with this system.\n"
-#~ "\n"
-#~ "Compliance:\n"
-#~ "Stay in compliance with your subscription agreement and manage "
-#~ "subscriptions for systems connected to your account at http://rhn.redhat."
-#~ "com/.\n"
-#~ "\n"
-#~ "You will not be able to take advantage of these subscription privileges "
-#~ "without connecting your system to Red Hat Network.\n"
-#~ "\n"
-#~ "Tip: Red Hat values your privacy: http://www.redhat.com/legal/"
-#~ "privacy_statement.html"
-#~ msgstr ""
-#~ "Möchten Sie Ihr System wirklich nicht mit dem Red Hat Network verbinden? "
-#~ "Sie werden nicht von den Vorteilen eines Red Hat Enterprise Linux "
-#~ "Abonnements\n"
-#~ "profitieren:\n"
-#~ "\n"
-#~ "Sicherheit & Updates:\n"
-#~ "Erhalten Sie die aktuellsten Software-Updates, inklusive Sicherheits-"
-#~ "Updates, die dieses Red Hat Enterprise Linux-System aktuell und sicher "
-#~ "halten.\n"
-#~ "\n"
-#~ "Downloads & Upgrades:\n"
-#~ "Laden Sie Installationsimages für Red Hat Enterprise Linux-Releases "
-#~ "inklusive neuer Releases herunter.\n"
-#~ "\n"
-#~ "Support:\n"
-#~ "Zugang zu Experten des technischen Supports von Red Hat oder Red Hat "
-#~ "Partnern für Hilfe zu jeglichen Problemen, auf die Sie mit diesem System "
-#~ "stoßen.\n"
-#~ "\n"
-#~ "Konformität:\n"
-#~ "Entsprechen Sie Ihrer Abonnement-Zustimmung und verwalten Sie Abonnements "
-#~ "für Systeme, die mit Ihrem Account unter http://www.rhn.redhat.com "
-#~ "verbunden sind.\n"
-#~ "\n"
-#~ "Sie können die Vorteile dieser Abonnement-Privilegien nicht nutzen, ohne "
-#~ "Ihr System mit dem Red Hat Network zu verbinden.\n"
-#~ "\n"
-#~ "Tipp: Red Hat respektiert Ihren Datenschutz: http://www.redhat.com/legal/"
-#~ "privacy_statement.html"
-
-#~ msgid "No thanks. I'll connect later."
-#~ msgstr "Nein danke. Später verbinden."
-
-#~ msgid "Create a New Login ..."
-#~ msgstr "Neues Login erstellen ..."
-
-#~ msgid ""
-#~ "The two passwords you entered don't match. Please re-type your passwords."
-#~ msgstr ""
-#~ "Die beiden von Ihnen eingegebenen Passwörter stimmen nicht überein. "
-#~ "Geben Sie sie erneut ein."
-
-#~ msgid "Create a new Red Hat login"
-#~ msgstr "Erstellen Sie ein neues Red Hat Login"
-
-#~ msgid ""
-#~ "Fill in the form below to create a new Red Hat login for use with Red Hat "
-#~ "Network (http://rhn.redhat.com/). Required information is marked with a "
-#~ "'*':"
-#~ msgstr ""
-#~ "Füllen Sie nachfolgendes Formular aus, um ein neues Red Hat Login für das "
-#~ "Red Hat Network (http://rhn.redhat.com/) zu kreieren. Erforderliche "
-#~ "Informationen sind mit einem '*' gekennzeichnet:"
-
-#~ msgid "*Desired Login:"
-#~ msgstr "*Gewünschtes Login:"
-
-#~ msgid "Examples: user(a)domain.com"
-#~ msgstr "Beispiele: user(a)domain.com"
-
-#~ msgid "*Desired Password:"
-#~ msgstr "*Gewünschtes Passwort:"
-
-#~ msgid "*Confirm Password:"
-#~ msgstr "*Passwort bestätigen:"
-
-#~ msgid "Tip: Leave blank if not with a company."
-#~ msgstr "Tipp: Bitte frei lassen, wenn Sie keiner Firma angehören."
-
-#~ msgid ""
-#~ "Tip: Red Hat values your privacy. View our privacy policy at: http://"
-#~ msgstr ""
-#~ "Tipp: Red Hat respektiert Ihren Datenschutz. Siehe unsere "
-#~ "Datenschutzbestimmungen unter: http://"
-
-#~ msgid "Please enter your first name."
-#~ msgstr "Bitte Ihren Vornamen eingeben."
-
-#~ msgid "Please enter your last name."
-#~ msgstr "Bitte Ihren Nachnamen eingeben."
-
-#~ msgid "Please enter your email address."
-#~ msgstr "Bitte Ihre E-Mail-Adresse eingeben."
-
-#~ msgid "Please enter a valid email address."
-#~ msgstr "Bitte eine gültige E-Mail Adresse eingeben."
-
-#~ msgid "Please enter your country."
-#~ msgstr "Bitte Ihr Land eingeben."
-
-#~ msgid "Please enter a longer login."
-#~ msgstr "Bitte ein längeres Login eingeben."
-
-#~ msgid "Please enter a longer password."
-#~ msgstr "Bitte ein längeres Passwort eingeben."
-
-#~ msgid "Please enter a shorter password."
-#~ msgstr "Bitte ein kürzeres Passwort eingeben."
-
-#~ msgid ""
-#~ "It appears this system has attempted to register to the Red Hat Network.\n"
-#~ "The system may already be set up for software updates.\n"
-#~ "\n"
-#~ "Are you sure you would like to continue?"
-#~ msgstr ""
-#~ "Dieses System hat offensichtlich bereits versucht, sich bei Red Hat "
-#~ "Network\n"
-#~ "zu registrieren. Es ist möglicherweise bereits für Software-Updates "
-#~ "eingerichtet.\n"
-#~ "\n"
-#~ "Möchten Sie wirklich fortfahren?"
-
-#~ msgid "Select Organization"
-#~ msgstr "Organisation wählen"
-
-#~ msgid ""
-#~ "Your login, %s, is associated with multiple organizations. You will need "
-#~ "to select an organization to connect this system to."
-#~ msgstr ""
-#~ "Ihr Account %s ist mit mehreren Organisationen verknüpft. Sie müssen eine "
-#~ "Organisation, im Namen derer Sie dieses System registrieren, auswählen."
-
-#~ msgid "Organization:"
-#~ msgstr "Organisation:"
-
-#~ msgid "You must select an organization."
-#~ msgstr "Sie müssen eine Organisation auswählen."
-
-#~ msgid "Access a subscription"
-#~ msgstr "Auf ein Abonnement zugreifen"
-
-#~ msgid ""
-#~ "You have no active subscriptions available in your account. You will "
-#~ "need to do one of the following to create an active subscription in your "
-#~ "account before this system can connect to Red Hat Network:"
-#~ msgstr ""
-#~ "Es existieren keine aktiven Abonnements für Ihren Account. Sie müssen "
-#~ "einen der folgenden Schritte durchführen, um ein aktives Abonnement in "
-#~ "Ihrem Account zu erstellen, bevor Sie sich mit dem Red Hat Network "
-#~ "verbinden können:"
-
-#~ msgid "Activate a new subscription with an installation number:"
-#~ msgstr "Aktivieren Sie ein neues Abonnement mit einer Installationsnummer:"
-
-#~ msgid ""
-#~ "You have already activated this installation number during this "
-#~ "registration."
-#~ msgstr ""
-#~ "Sie haben diese Installationsnummer bereits während der Registrierung "
-#~ "aktiviert."
-
-#~ msgid "Installation Number:"
-#~ msgstr "Installationsnummer:"
-
-#, fuzzy
-#~ msgid "Example: XXXX-XXXX-XXXX-XXXX"
-#~ msgstr "Beispiel: XXXX-XXXX-XXXX-XXXX-XXXX"
-
-#~ msgid ""
-#~ "Congratulations, you have successfully completed software updates set up "
-#~ "for this system.\n"
-#~ "\n"
-#~ "Your system is now ready to receive the software updates that will keep "
-#~ "it secure and supported.\n"
-#~ "\n"
-#~ "You'll know when software updates are available when a package icon "
-#~ "appears in the notification area of you desktop (usually in the upper-"
-#~ "right corner.) Clicking on this icon, when available, will guide you "
-#~ "through applying any updates that are available."
-#~ msgstr ""
-#~ "Herzlichen Glückwunsch, das Einrichten der Software-Updates für dieses "
-#~ "System wurde erfolgreich abgeschlossen.\n"
-#~ "\n"
-#~ "Ihr System ist nun bereit, Software-Updates, die es sicher und "
-#~ "unterstützt halten, zu empfangen.\n"
-#~ "\n"
-#~ "Sie werden darüber informiert, wenn Updates verfügbar sind, wenn ein "
-#~ "Paket-Symbol im Mitteilungsbereich auf Ihrem Desktop (gewöhnlich in der "
-#~ "rechten, oberen Ecke, nachfolgend eingekreist.) erscheint. Ein Klick auf "
-#~ "dieses Symbol, sofern verfügbar, führt Sie durch die Anwendung jeglicher "
-#~ "verfügbarer Updates:"
-
-#~ msgid "Subscriptions Activated:"
-#~ msgstr "Aktivierte Abonnements:"
-
-#~ msgid ""
-#~ "A subscription-activating installation number was found on disk, but we "
-#~ "were not able to activate it (An unknown error occurred.) We used "
-#~ "existing active subscription slots available in the rhn account instead. "
-#~ "You may wish to contact Red Hat customer service regarding this issue: "
-#~ "http://www.redhat.com/apps/support/"
-#~ msgstr ""
-#~ "Eine Installationsnummer zur Aktivierung von Abonnements wurde auf der "
-#~ "Platte gefunden, konnte jedoch nicht aktiviert werden (ein unbekannter "
-#~ "Fehler trat auf). Stattdessen wurden aktive, im RHN-Account verfügbare "
-#~ "Plätze des Abonnements verwendet. Kontaktieren Sie den Red Hat "
-#~ "Kundendienst bezüglich dieses Problems: http://www.redhat.com/apps/"
-#~ "support/"
-
-#~ msgid "A installation number was found on disk, but we "
-#~ msgstr "Eine Installationsnummer wurde auf Platte gefunden, jedoch "
-
-#~ msgid ""
-#~ "The installation number you have provided (%s) is invalid.\n"
-#~ "\n"
-#~ "Please check the number and try again or try another option listed on the "
-#~ "'Access a Subscription' screen."
-#~ msgstr ""
-#~ "Die von Ihnen angegebene Installationsnummer (%s) ist ungültig.\n"
-#~ "\n"
-#~ "Bitte überprüfen Sie die Nummer und versuchen es erneut oder einer "
-#~ "anderen Option auf dem Bildschirm 'Auf ein Abonnement zugreifen'."
-
-#~ msgid ""
-#~ "The installation number you provided is valid but was already activated "
-#~ "and the subscriptions have already been used by systems in your "
-#~ "organization or is not usable for this system.\n"
-#~ "\n"
-#~ "Please try a different number or try another option listed on the 'Access "
-#~ "a Subscription' screen."
-#~ msgstr ""
-#~ "Die von Ihnen angegebene Installationsnummer ist gültig, wurde aber "
-#~ "bereits aktiviert und die Abonnements bereits von Systemen innerhalb "
-#~ "Ihres Unternehmens verwendet, oder können nicht für dieses System "
-#~ "verwendet werden.\n"
-#~ "\n"
-#~ "Bitte versuchen Sie es mit einer anderen Nummer oder einer anderen Option "
-#~ "auf dem Bildschirm 'Auf ein Abonnement zugreifen'."
-
-#~ msgid ""
-#~ "The installation number you provided does not have subscriptions "
-#~ "associated with it.\n"
-#~ "\n"
-#~ "Please try a different number or try another option listed in the 'Access "
-#~ "a Subscription' screen."
-#~ msgstr ""
-#~ "Die von Ihnen angegebene Installationsnummer kann keinem Abonnements "
-#~ "zugeordnet werden.\n"
-#~ "\n"
-#~ "Bitte versuchen Sie es mit einer anderen Nummer oder einer anderen Option "
-#~ "auf dem Bildschirm 'Auf ein Abonnement zugreifen'."
-
-#~ msgid ""
-#~ "There was a problem logging in:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Beim Einloggen trat ein Problem auf:\n"
-#~ "%s"
-
-#~ msgid "There was problem logging in."
-#~ msgstr "Beim Einloggen trat ein Problem auf."
-
-#, fuzzy
-#~ msgid "There was an error while getting the list of organizations."
-#~ msgstr "Beim Ausfüllen des Profils trat ein Fehler auf."
-
-#, fuzzy
-#~ msgid "You must enter an installation number."
-#~ msgstr "Sie müssen eine Installationsnummer eingeben."
-
-#, fuzzy
-#~ msgid "There was an error activating your number."
-#~ msgstr "Bei der Kommunikation mit Red Hat Network trat ein Fehler auf."
-
-#~ msgid "This installation number has already been activated."
-#~ msgstr "Diese Installationsnummer wurde bereits aktiviert."
-
-#, fuzzy
-#~ msgid "There was an error retrieving the privacy statement."
-#~ msgstr "Beim Ausfüllen des Profils trat ein Fehler auf."
-
-#~ msgid "Unable to access the server. Please check your network settings."
-#~ msgstr ""
-#~ "Kein Zugriff auf den Server möglich. Bitte überprüfen Sie Ihre "
-#~ "Netzwerkeinstellungen."
-
-#~ msgid ""
-#~ "The server you are attempting to register against does not support this "
-#~ "version of the client."
-#~ msgstr ""
-#~ "Der Server, bei dem Sie versuchen, sich zu registrieren, unterstützt "
-#~ "diese Client-Version nicht."
-
-#~ msgid "You must enter an Installation Number that "
-#~ msgstr "Sie müssen eine Installationsnummer eingeben, die"
-
-#~ msgid "Problem registering login name:\n"
-#~ msgstr "Probleme beim Registrieren des Login-Namens:\n"
-
-#~ msgid "Problem registering login name."
-#~ msgstr "Probleme beim Registrieren des Login-Namens."
-
-#~ msgid ", quantity:"
-#~ msgstr ", Menge:"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Red Hat Network Location: "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Red Hat Network Position: "
-
-#~ msgid ""
-#~ "\n"
-#~ "RHN Login: "
-#~ msgstr ""
-#~ "\n"
-#~ "RHN-Login: "
-
-#~ msgid "Access Subscription"
-#~ msgstr "Abonnement-Zugriff"
-
-#~ msgid "Choose Organization"
-#~ msgstr "Organisation wählen"
-
-#~ msgid "Choose an organization to use with this username"
-#~ msgstr ""
-#~ "Wählen Sie eine Organisation, die Sie mit diesem Benutzernamen verwenden "
-#~ "möchten"
-
-#~ msgid "Specify an email address"
-#~ msgstr "Geben Sie eine E-Mail-Adresse an"
-
-#, fuzzy
-#~ msgid "Specify a installation number to use"
-#~ msgstr "Geben Sie eine zu verwendende Abonnement-Nummer an"
-
-#~ msgid "Important Registration Info"
-#~ msgstr "Wichtige Registrierungsinformationen"
-
-#~ msgid "Registration information"
-#~ msgstr "Registrierungs-Informationen"
-
-#~ msgid "Select organization"
-#~ msgstr "Organisation wählen"
-
-#~ msgid "<small><b>Tip:</b> Red Hat values your privacy.</small>"
-#~ msgstr "<small><b>Tipp:</b> Red Hat respektiert Ihren Datenschutz.</small>"
-
-#~ msgid "Privacy Statement"
-#~ msgstr "Datenschutzerklärung"
-
-#~ msgid "Red Hat Privacy Statement"
-#~ msgstr "Red Hat Datenschutzerklärung"
-
-#, fuzzy
-#~ msgid ""
-#~ "Your account is associated with multiple <b>organizations</b>. You will "
-#~ "need to select an organization to register this system to."
-#~ msgstr ""
-#~ "Ihr Account ist mit mehreren <b>Organisationen</b> verknüpft. Sie müssen "
-#~ "eine Organisation, im Namen derer Sie dieses System registrieren, "
-#~ "auswählen."
-
-#~ msgid "_Organization:"
-#~ msgstr "_Organisation:"
-
-#~ msgid ""
-#~ "were not able to activate it (An unknown error occurred.) We used "
-#~ "existing "
-#~ msgstr ""
-#~ "konnte diese nicht aktiviert werden (ein unbekannter Fehler trat auf). "
-#~ "Stattdessen "
-
-#~ msgid ""
-#~ "active subscription slots available in the rhn account instead. You may "
-#~ "wish "
-#~ msgstr ""
-#~ "wurden freie Plätze des aktiven Abonnements im RHN-Account verwendet. Sie "
-#~ "können "
-
-#~ msgid "to contact Red Hat customer service regarding this issue: "
-#~ msgstr "den Red Hat Kundendienst bezüglich dieses Fehlers kontaktieren: "
-
-#~ msgid "http://www.redhat.com/apps/support/"
-#~ msgstr "http://www.redhat.com/apps/support/"
-
-#~ msgid "activates subscriptions in your account."
-#~ msgstr "Ihre Abonnements in Ihrem Account aktiviert."
-
-#~ msgid "Only https and http are allowed."
-#~ msgstr "Lediglich https und http sind erlaubt."
-
-#~ msgid "Error reading hardware information:"
-#~ msgstr "Fehler beim Lesen der Hardware-Informationen:"
-
-#~ msgid "Error reading DMI information:"
-#~ msgstr "Fehler beim Lesen der DMI-Informationen:"
-
-#~ msgid "That user account and password is not valid\n"
-#~ msgstr "Dieser Benutzer-Account und Passwort sind ungültig\n"
-
-#~ msgid "You must enter a user name."
-#~ msgstr "Geben Sie einen Benutzernamen ein."
-
-#~ msgid "You must enter and verify a password."
-#~ msgstr "Geben Sie ein Passwort ein und prüfen Sie es."
-
-#~ msgid ""
-#~ "Problem registering login:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Problem beim Registrieren des Logins:\n"
-#~ "%s"
-
-#~ msgid "Problem registering login."
-#~ msgstr "Problem beim Registrieren des Logins."
-
-#~ msgid "United States"
-#~ msgstr "Vereinigte Staaten von Amerika"
-
-#~ msgid "Canada"
-#~ msgstr "Kanada"
-
-#~ msgid "Login Information:"
-#~ msgstr "Login-Informationen:"
-
-#~ msgid "Account Information:"
-#~ msgstr "Account-Informationen:"
-
-#~ msgid "*First Name:"
-#~ msgstr "*Vorname:"
-
-#~ msgid "*Last Name:"
-#~ msgstr "*Nachname:"
-
-#~ msgid "*Company Name:"
-#~ msgstr "*Firmenname:"
-
-#~ msgid "Street Address:"
-#~ msgstr "Straßenadresse:"
-
-#~ msgid "City:"
-#~ msgstr "Ort:"
-
-#~ msgid "State/Province:"
-#~ msgstr "Bundesland/Bezirk:"
-
-#~ msgid "Zip/Post Code:"
-#~ msgstr "PLZ:"
-
-#~ msgid "*Country:"
-#~ msgstr "*Land:"
-
-#~ msgid " Address 2:"
-#~ msgstr " Adresse 2:"
-
-#~ msgid " Address:"
-#~ msgstr " Adresse:"
-
-#~ msgid " C_ity:"
-#~ msgstr " O_rt:"
-
-#~ msgid " Co_mpany Name:"
-#~ msgstr " Fir_menname:"
-
-#~ msgid " _State/Province:"
-#~ msgstr " _Land/Bezirk:"
-
-#~ msgid " _Zip/Postal code:"
-#~ msgstr " PL_Z:"
-
-#~ msgid "* C_onfirm password: "
-#~ msgstr "* Passwort _bestätigen: "
-
-#~ msgid "* Co_untry:"
-#~ msgstr "* L_and:"
-
-#~ msgid "* Desired _Login:"
-#~ msgstr "* Gewünschtes _Login:"
-
-#~ msgid "* Desired _Password:"
-#~ msgstr "* Gewünschtes _Passwort:"
-
-#~ msgid "* Last _Name:"
-#~ msgstr "* Nach_name:"
-
-#~ msgid "* _Email Address: "
-#~ msgstr "* _E-Mail Adresse: "
-
-#~ msgid "* _First Name:"
-#~ msgstr "* _Vorname:"
-
-#~ msgid "<b>Account Information:</b>"
-#~ msgstr "<b>Account-Informationen:</b>"
-
-#~ msgid "<b>Login Information:</b>"
-#~ msgstr "<b>Login-Informationen:</b>"
-
-#~ msgid "<small><b>Examples:</b> user(a)domain.com</small>"
-#~ msgstr "<small><b>Beispiele:</b> user(a)domain.com</small>"
-
-#~ msgid "<small><b>Tip:</b> Leave blank if not with a company.</small>"
-#~ msgstr ""
-#~ "<small><b>Tipp:</b> Frei lassen, falls Sie keinem Unternehmen angehören.</"
-#~ "small>"
-
-#~ msgid "Afghanistan"
-#~ msgstr "Afghanistan"
-
-#~ msgid "Albania"
-#~ msgstr "Albanien"
-
-#~ msgid "Algeria"
-#~ msgstr "Algerien"
-
-#~ msgid "American Samoa"
-#~ msgstr "Amerikanisch Samoa"
-
-#~ msgid "Andorra"
-#~ msgstr "Andorra"
-
-#~ msgid "Angola"
-#~ msgstr "Angola"
-
-#~ msgid "Anguilla"
-#~ msgstr "Anguilla"
-
-#~ msgid "Antarctica"
-#~ msgstr "Antarktis"
-
-#~ msgid "Antigua and Barbuda"
-#~ msgstr "Antigua und Barbuda"
-
-#~ msgid "Argentina"
-#~ msgstr "Argentinien"
-
-#~ msgid "Armenia"
-#~ msgstr "Armenien"
-
-#~ msgid "Aruba"
-#~ msgstr "Aruba"
-
-#~ msgid "Australia"
-#~ msgstr "Australien"
-
-#~ msgid "Austria"
-#~ msgstr "Österreich"
-
-#~ msgid "Azerbaijan"
-#~ msgstr "Aserbaidschan"
-
-#~ msgid "Bahamas"
-#~ msgstr "Bahamas"
-
-#~ msgid "Bahrain"
-#~ msgstr "Bahrain"
-
-#~ msgid "Bangladesh"
-#~ msgstr "Bangladesch"
-
-#~ msgid "Barbados"
-#~ msgstr "Barbados"
-
-#~ msgid "Belarus"
-#~ msgstr "Weißrussland"
-
-#~ msgid "Belgium"
-#~ msgstr "Belgien"
-
-#~ msgid "Belize"
-#~ msgstr "Belize"
-
-#~ msgid "Benin"
-#~ msgstr "Benin"
-
-#~ msgid "Bermuda"
-#~ msgstr "Bermuda Inseln"
-
-#~ msgid "Bhutan"
-#~ msgstr "Bhutan"
-
-#~ msgid "Bolivia"
-#~ msgstr "Bolivien"
-
-#~ msgid "Bosnia and Herzegovina"
-#~ msgstr "Bosnien und Herzegowina"
-
-#~ msgid "Botswana"
-#~ msgstr "Botswana"
-
-#~ msgid "Bouvet Island"
-#~ msgstr "Bouvet Insel"
-
-#~ msgid "Brazil"
-#~ msgstr "Brasilien"
-
-#~ msgid "British Indian Ocean Territory"
-#~ msgstr "Britisch-Indischer Ozean"
-
-#~ msgid "Brunei Darussalam"
-#~ msgstr "Brunei"
-
-#~ msgid "Bulgaria"
-#~ msgstr "Bulgarien"
-
-#~ msgid "Burkina Faso"
-#~ msgstr "Burkina Faso"
-
-#~ msgid "Burundi"
-#~ msgstr "Burundi"
-
-#~ msgid "C_reate new login"
-#~ msgstr "Neues Login e_rstellen"
-
-#~ msgid "Cambodia"
-#~ msgstr "Kambodscha"
-
-#~ msgid "Cameroon"
-#~ msgstr "Kamerun"
-
-#~ msgid "Cape Verde"
-#~ msgstr "Kap Verde"
-
-#~ msgid "Cayman Islands"
-#~ msgstr "Kayman Inseln"
-
-#~ msgid "Central African Republic"
-#~ msgstr "Zentralafrikanische Republik"
-
-#~ msgid "Chad"
-#~ msgstr "Tschad"
-
-#~ msgid "Chile"
-#~ msgstr "Chile"
-
-#~ msgid "China"
-#~ msgstr "China"
-
-#~ msgid "Christmas Island"
-#~ msgstr "Weihnachtsinsel"
-
-#~ msgid "Cocos (Keeling) Islands"
-#~ msgstr "Cocos (Keeling) Inseln"
-
-#~ msgid "Colombia"
-#~ msgstr "Kolumbien"
-
-#~ msgid "Comoros"
-#~ msgstr "Komoren"
-
-#~ msgid "Congo"
-#~ msgstr "Kongo"
-
-#~ msgid "Cook Islands"
-#~ msgstr "Cook Inseln"
-
-#~ msgid "Costa Rica"
-#~ msgstr "Costa Rica"
-
-#~ msgid "Cote d'Ivoire"
-#~ msgstr "Elfenbeinküste"
-
-#~ msgid "Create a _New Login"
-#~ msgstr "_Neues Login erstellen"
-
-#~ msgid "Create a new Red Hat Network login"
-#~ msgstr "Erstellen Sie ein neues Red Hat Network Login"
-
-#~ msgid "Croatia"
-#~ msgstr "Kroatien"
-
-#~ msgid "Cuba"
-#~ msgstr "Kuba"
-
-#~ msgid "Cyprus"
-#~ msgstr "Zypern"
-
-#~ msgid "Czech Republic"
-#~ msgstr "Tschechische Republik"
-
-#~ msgid "Denmark"
-#~ msgstr "Dänemark"
-
-#~ msgid "Djibouti"
-#~ msgstr "Dschibuti"
-
-#~ msgid "Dominica"
-#~ msgstr "Dominica"
-
-#~ msgid "Dominican Republic"
-#~ msgstr "Dominikanische Republik"
-
-#~ msgid "East Timor"
-#~ msgstr "Ost Timor"
-
-#~ msgid "Ecuador"
-#~ msgstr "Äquador"
-
-#~ msgid "Egypt"
-#~ msgstr "Ägypten"
-
-#~ msgid "El Salvador"
-#~ msgstr "El Salvador"
-
-#~ msgid "Equatorial Guinea"
-#~ msgstr "Äquatorial Guinea"
-
-#~ msgid "Eritrea"
-#~ msgstr "Eritrea"
-
-#~ msgid "Estonia"
-#~ msgstr "Estland"
-
-#~ msgid "Ethiopia"
-#~ msgstr "Äthiopien"
-
-#~ msgid "Falkland Islands (Malvinas)"
-#~ msgstr "Falkland Inseln (Malvinas)"
-
-#~ msgid "Faroe Islands"
-#~ msgstr "Färöer Inseln"
-
-#~ msgid "Fiji"
-#~ msgstr "Fidschi"
-
-#~ msgid ""
-#~ "Fill in the form below to create a new Red Hat login. Required "
-#~ "information is marked with a '*':"
-#~ msgstr ""
-#~ "Füllen Sie nachfolgendes Formular aus, um ein neues Red Hat Login zu "
-#~ "kreieren. Erforderliche Informationen sind mit einem '*' gekennzeichnet:"
-
-#~ msgid "Finland"
-#~ msgstr "Finnland"
-
-#~ msgid "France"
-#~ msgstr "Frankreich"
-
-#~ msgid "France, Metropolitan"
-#~ msgstr "France, Metropolitan"
-
-#~ msgid "French Guiana"
-#~ msgstr "Französisch Guyana"
-
-#~ msgid "French Polynesia"
-#~ msgstr "Französisch Polynesien"
-
-#~ msgid "French Southern Territories"
-#~ msgstr "Französisch Südliche Territorien"
-
-#~ msgid "Gabon"
-#~ msgstr "Gabun"
-
-#~ msgid "Gambia"
-#~ msgstr "Gambia"
-
-#~ msgid "Georgia"
-#~ msgstr "Georgia"
-
-#~ msgid "Germany"
-#~ msgstr "Deutschland"
-
-#~ msgid "Ghana"
-#~ msgstr "Ghana"
-
-#~ msgid "Gibraltar"
-#~ msgstr "Gibraltar"
-
-#~ msgid "Greece"
-#~ msgstr "Griechenland"
-
-#~ msgid "Greenland"
-#~ msgstr "Grönland"
-
-#~ msgid "Grenada"
-#~ msgstr "Grenada"
-
-#~ msgid "Guadeloupe"
-#~ msgstr "Guadeloupe"
-
-#~ msgid "Guam"
-#~ msgstr "Guam"
-
-#~ msgid "Guatemala"
-#~ msgstr "Guatemala"
-
-#~ msgid "Guinea"
-#~ msgstr "Guinea"
-
-#~ msgid "Guinea-Bissau"
-#~ msgstr "Guinea-Bissau"
-
-#~ msgid "Guyana"
-#~ msgstr "Guyana"
-
-#~ msgid "Haiti"
-#~ msgstr "Haiti"
-
-#~ msgid "Heard Island and McDonald Islands"
-#~ msgstr "Heard Insel und McDonald Insel"
-
-#~ msgid "Honduras"
-#~ msgstr "Honduras"
-
-#~ msgid "Hong Kong"
-#~ msgstr "Hong Kong"
-
-#~ msgid "Hungary"
-#~ msgstr "Ungarn"
-
-#~ msgid "Iceland"
-#~ msgstr "Island"
-
-#~ msgid "India"
-#~ msgstr "Indien"
-
-#~ msgid "Indonesia"
-#~ msgstr "Indonesien"
-
-#~ msgid "Iran (Islamic Republic of)"
-#~ msgstr "Iran"
-
-#~ msgid "Iraq"
-#~ msgstr "Irak"
-
-#~ msgid "Ireland"
-#~ msgstr "Irland"
-
-#~ msgid "Israel"
-#~ msgstr "Israel"
-
-#~ msgid "Italy"
-#~ msgstr "Italien"
-
-#~ msgid "Jamaica"
-#~ msgstr "Jamaica"
-
-#~ msgid "Japan"
-#~ msgstr "Japan"
-
-#~ msgid "Jordan"
-#~ msgstr "Jordanien"
-
-#~ msgid "Kazakhstan"
-#~ msgstr "Kasachstan"
-
-#~ msgid "Kenya"
-#~ msgstr "Kenia"
-
-#~ msgid "Kiribati"
-#~ msgstr "Kiribati"
-
-#~ msgid "Korea, Democratic People's Republic of"
-#~ msgstr "Nord Korea"
-
-#~ msgid "Korea, Republic of"
-#~ msgstr "Süd Korea"
-
-#~ msgid "Kuwait"
-#~ msgstr "Kuwait"
-
-#~ msgid "Kyrgyzstan"
-#~ msgstr "Kirgisien"
-
-#~ msgid "Lao People's Democratic Republic"
-#~ msgstr "Volksrepublic Laos"
-
-#~ msgid "Latin America"
-#~ msgstr "Lateinamerica"
-
-#~ msgid "Latvia"
-#~ msgstr "Lettland"
-
-#~ msgid "Lebanon"
-#~ msgstr "Libanon"
-
-#~ msgid "Lesotho"
-#~ msgstr "Lesotho"
-
-#~ msgid "Liberia"
-#~ msgstr "Liberia"
-
-#~ msgid "Libyan Arab Jamahiriya"
-#~ msgstr "Libyen"
-
-#~ msgid "Liechtenstein"
-#~ msgstr "Fürstentum Liechtenstein"
-
-#~ msgid "Lithuania"
-#~ msgstr "Litauen"
-
-#~ msgid "Luxembourg"
-#~ msgstr "Luxemburg"
-
-#~ msgid "Macau"
-#~ msgstr "Macau"
-
-#~ msgid "Macedonia"
-#~ msgstr "Mazedonien"
-
-#~ msgid "Madagascar"
-#~ msgstr "Madagaskar"
-
-#~ msgid "Malawi"
-#~ msgstr "Malawi"
-
-#~ msgid "Malaysia"
-#~ msgstr "Malaysia"
-
-#~ msgid "Maldives"
-#~ msgstr "Malediven"
-
-#~ msgid "Mali"
-#~ msgstr "Mali"
-
-#~ msgid "Malta"
-#~ msgstr "Malta"
-
-#~ msgid "Marshall Islands"
-#~ msgstr "Marschall Inseln"
-
-#~ msgid "Martinique"
-#~ msgstr "Martinique"
-
-#~ msgid "Mauritania"
-#~ msgstr "Mauretanien"
-
-#~ msgid "Mauritius"
-#~ msgstr "Mauritius"
-
-#~ msgid "Mayotte"
-#~ msgstr "Mayotte"
-
-#~ msgid "Mexico"
-#~ msgstr "Mexiko"
-
-#~ msgid "Micronesia (Federated States of)"
-#~ msgstr "Mikronesien"
-
-#~ msgid "Moldova"
-#~ msgstr "Moldawien"
-
-#~ msgid "Monaco"
-#~ msgstr "Monaco"
-
-#~ msgid "Mongolia"
-#~ msgstr "Mongolei"
-
-#~ msgid "Montserrat"
-#~ msgstr "Montserrat"
-
-#~ msgid "Morocco"
-#~ msgstr "Marokko"
-
-#~ msgid "Mozambique"
-#~ msgstr "Mosambik"
-
-#~ msgid "Myanmar"
-#~ msgstr "Myanmar"
-
-#~ msgid "Namibia"
-#~ msgstr "Namibien"
-
-#~ msgid "Nauru"
-#~ msgstr "Nauru"
-
-#~ msgid "Nepal"
-#~ msgstr "Nepal"
-
-#~ msgid "Netherlands"
-#~ msgstr "Niederlande"
-
-#~ msgid "Netherlands Antilles"
-#~ msgstr "Niederländische Antillen"
-
-#~ msgid "New Caledonia"
-#~ msgstr "Neu Kaledonien"
-
-#~ msgid "New Zealand"
-#~ msgstr "Neuseeland"
-
-#~ msgid "Nicaragua"
-#~ msgstr "Nicaragua"
-
-#~ msgid "Niger"
-#~ msgstr "Niger"
-
-#~ msgid "Nigeria"
-#~ msgstr "Nigeria"
-
-#~ msgid "Niue"
-#~ msgstr "Niue"
-
-#~ msgid "Norfolk Island"
-#~ msgstr "Norfolk Insel"
-
-#~ msgid "Northern Mariana Islands"
-#~ msgstr "Nördliche Marianen"
-
-#~ msgid "Norway"
-#~ msgstr "Norwegen"
-
-#~ msgid "Oman"
-#~ msgstr "Oman"
-
-#~ msgid "Pakistan"
-#~ msgstr "Pakistan"
-
-#~ msgid "Palau"
-#~ msgstr "Palau"
-
-#~ msgid "Panama"
-#~ msgstr "Panama"
-
-#~ msgid "Papua New Guinea"
-#~ msgstr "Papua Neu Guinea"
-
-#~ msgid "Paraguay"
-#~ msgstr "Paraguay"
-
-#~ msgid "Peru"
-#~ msgstr "Peru"
-
-#~ msgid "Philippines"
-#~ msgstr "Philippinen"
-
-#~ msgid "Pitcairn"
-#~ msgstr "Pitcairn"
-
-#~ msgid "Poland"
-#~ msgstr "Polen"
-
-#~ msgid "Portugal"
-#~ msgstr "Portugal"
-
-#~ msgid "Puerto Rico"
-#~ msgstr "Puerto Rico"
-
-#~ msgid "Qatar"
-#~ msgstr "Katar"
-
-#~ msgid ""
-#~ "Red Hat Logins and Passwords must be at least 5 alphanumeric characters"
-#~ msgstr ""
-#~ "Red Hat Logins und Passwörter müssen aus mindestens 5 alphanumerischen "
-#~ "Zeichen bestehen"
-
-#~ msgid "Reunion"
-#~ msgstr "Reunion"
-
-#~ msgid "Romania"
-#~ msgstr "Rumänien"
-
-#~ msgid "Russian Federation"
-#~ msgstr "Russische Förderation"
-
-#~ msgid "Rwanda"
-#~ msgstr "Ruanda"
-
-#~ msgid "Saint Helena"
-#~ msgstr "Sankt Helena"
-
-#~ msgid "Saint Kitts and Nevis"
-#~ msgstr "St. Kitts und Nevis"
-
-#~ msgid "Saint Lucia"
-#~ msgstr "Santa Lucia"
-
-#~ msgid "Saint Pierre and Miquelon "
-#~ msgstr "St. Pierre und Miquelon"
-
-#~ msgid "Saint Vincent and the Grenadines"
-#~ msgstr "St. Vincent und Grenadinen"
-
-#~ msgid "Samoa"
-#~ msgstr "Samoa"
-
-#~ msgid "San Marino"
-#~ msgstr "San Marino"
-
-#~ msgid "Sao Tome and Principe"
-#~ msgstr "Sao Tome und Principe"
-
-#~ msgid "Saudi Arabia"
-#~ msgstr "Saudi Arabien"
-
-#~ msgid "Senegal"
-#~ msgstr "Senegal"
-
-#~ msgid "Seychelles"
-#~ msgstr "Seychellen"
-
-#~ msgid "Sierra Leone"
-#~ msgstr "Sierra Leone"
-
-#~ msgid "Singapore"
-#~ msgstr "Singapur"
-
-#~ msgid "Slovakia"
-#~ msgstr "Slowakei"
-
-#~ msgid "Slovenia"
-#~ msgstr "Slowenien"
-
-#~ msgid "Solomon Islands"
-#~ msgstr "Solomon Inseln"
-
-#~ msgid "Somalia"
-#~ msgstr "Somalia"
-
-#~ msgid "South Africa"
-#~ msgstr "Südafrika"
-
-#~ msgid "South Georgia and the South Sandwich Island"
-#~ msgstr "Süd Georgia und die Südlichen Sandwich Inseln"
-
-#~ msgid "Spain"
-#~ msgstr "Spanien"
-
-#~ msgid "Sri Lanka"
-#~ msgstr "Sri Lanka"
-
-#~ msgid "Sudan"
-#~ msgstr "Sudan"
-
-#~ msgid "Suriname"
-#~ msgstr "Surinam"
-
-#~ msgid "Svalbard and Jan Mayen Islands"
-#~ msgstr "Svalbard und Jan Mayen Inseln"
-
-#~ msgid "Swaziland"
-#~ msgstr "Swasiland"
-
-#~ msgid "Sweden"
-#~ msgstr "Schweden"
-
-#~ msgid "Switzerland"
-#~ msgstr "Schweiz"
-
-#~ msgid "Syrian Arab Republic"
-#~ msgstr "Syrien"
-
-#~ msgid "Taiwan"
-#~ msgstr "Taiwan"
-
-#~ msgid "Tajikistan"
-#~ msgstr "Tadschikistan"
-
-#~ msgid "Tanzania, United Republic of"
-#~ msgstr "Tansania"
-
-#~ msgid "Thailand"
-#~ msgstr "Thailand"
-
-#~ msgid "Togo"
-#~ msgstr "Togo"
-
-#~ msgid "Tokelau"
-#~ msgstr "Tokelau"
-
-#~ msgid "Tonga"
-#~ msgstr "Tonga"
-
-#~ msgid "Trinidad and Tobago"
-#~ msgstr "Trinidad und Tobago"
-
-#~ msgid "Tunisia"
-#~ msgstr "Tunesien"
-
-#~ msgid "Turkey"
-#~ msgstr "Türkei"
-
-#~ msgid "Turkmenistan"
-#~ msgstr "Turkmenistan"
-
-#~ msgid "Turks and Caicos Islands"
-#~ msgstr "Turks und Caicos Inseln"
-
-#~ msgid "Tuvalu"
-#~ msgstr "Tuvalu"
-
-#~ msgid "Uganda"
-#~ msgstr "Uganda"
-
-#~ msgid "Ukraine"
-#~ msgstr "Ukraine"
-
-#~ msgid "United Arab Emirates"
-#~ msgstr "Vereinigte Arabische Emirate"
-
-#~ msgid "United Kingdom"
-#~ msgstr "Großbritannien"
-
-#~ msgid "United States Minor Outlying Islands"
-#~ msgstr "USA Minor Outlying Islands"
-
-#~ msgid "Uruguay"
-#~ msgstr "Uruguay"
-
-#~ msgid "Uzbekistan"
-#~ msgstr "Usbekistan"
-
-#~ msgid "Vanuatu"
-#~ msgstr "Vanuatu"
-
-#~ msgid "Vatican City State (Holy See)"
-#~ msgstr "Vatikan Stadt"
-
-#~ msgid "Venezuela"
-#~ msgstr "Venezuela"
-
-#~ msgid "Viet Nam"
-#~ msgstr "Vietnam"
-
-#~ msgid "Virgin Islands (British)"
-#~ msgstr "Jungferninseln (Großbritannien)"
-
-#~ msgid "Virgin Islands (U.S.)"
-#~ msgstr "Jungferninseln (USA)"
-
-#~ msgid "Wallis and Futuna Islands"
-#~ msgstr "Wallis und Futuna Inseln"
-
-#~ msgid "Western Sahara"
-#~ msgstr "Westsahara"
-
-#~ msgid "Yemen"
-#~ msgstr "Yemen"
-
-#~ msgid "Yugoslavia"
-#~ msgstr "Jugoslawien"
-
-#~ msgid "Zaire"
-#~ msgstr "Zaire"
-
-#~ msgid "Zambia"
-#~ msgstr "Sambia"
+msgstr "Registrieren Sie sich bei Spacewalk/Satellite/Red Hat Network."
-#~ msgid "Zimbabwe"
-#~ msgstr "Simbabwe"
13 years, 11 months
Branch 'yum-repo-sync' - 14 commits - client/rhel client/tools java/code utils/spacewalk-hostname-rename
by Shannon Hughes
client/rhel/rhn-client-tools/po/Makefile | 5
client/rhel/rhn-client-tools/po/ar.po | 20
client/rhel/rhn-client-tools/po/as.po | 19
client/rhel/rhn-client-tools/po/bg.po | 20
client/rhel/rhn-client-tools/po/bn.po | 23
client/rhel/rhn-client-tools/po/bn_IN.po | 22
client/rhel/rhn-client-tools/po/ca.po | 20
client/rhel/rhn-client-tools/po/cs.po | 20
client/rhel/rhn-client-tools/po/cy.po | 20
client/rhel/rhn-client-tools/po/da.po | 20
client/rhel/rhn-client-tools/po/de.po | 19
client/rhel/rhn-client-tools/po/ds.po | 1992 ----------
client/rhel/rhn-client-tools/po/el.po | 20
client/rhel/rhn-client-tools/po/en_GB.po | 20
client/rhel/rhn-client-tools/po/es.po | 19
client/rhel/rhn-client-tools/po/et.po | 20
client/rhel/rhn-client-tools/po/fa.po | 14
client/rhel/rhn-client-tools/po/fi.po | 20
client/rhel/rhn-client-tools/po/fr.po | 19
client/rhel/rhn-client-tools/po/gu.po | 19
client/rhel/rhn-client-tools/po/he.po | 14
client/rhel/rhn-client-tools/po/hi.po | 19
client/rhel/rhn-client-tools/po/hr.po | 19
client/rhel/rhn-client-tools/po/hu.po | 20
client/rhel/rhn-client-tools/po/hy.po | 14
client/rhel/rhn-client-tools/po/id.po | 19
client/rhel/rhn-client-tools/po/is.po | 20
client/rhel/rhn-client-tools/po/it.po | 19
client/rhel/rhn-client-tools/po/ja.po | 19
client/rhel/rhn-client-tools/po/ka.po | 14
client/rhel/rhn-client-tools/po/kn.po | 19
client/rhel/rhn-client-tools/po/ko.po | 19
client/rhel/rhn-client-tools/po/ku.po | 14
client/rhel/rhn-client-tools/po/lo.po | 14
client/rhel/rhn-client-tools/po/lv.po | 14
client/rhel/rhn-client-tools/po/mk.po | 20
client/rhel/rhn-client-tools/po/ml.po | 19
client/rhel/rhn-client-tools/po/mr.po | 19
client/rhel/rhn-client-tools/po/ms.po | 20
client/rhel/rhn-client-tools/po/my.po | 14
client/rhel/rhn-client-tools/po/nb.po | 20
client/rhel/rhn-client-tools/po/nl.po | 19
client/rhel/rhn-client-tools/po/no.po | 20
client/rhel/rhn-client-tools/po/or.po | 19
client/rhel/rhn-client-tools/po/pa.po | 19
client/rhel/rhn-client-tools/po/pl.po | 20
client/rhel/rhn-client-tools/po/pt.po | 19
client/rhel/rhn-client-tools/po/pt_BR.po | 19
client/rhel/rhn-client-tools/po/rhn-client-tools.pot | 14
client/rhel/rhn-client-tools/po/ro.po | 20
client/rhel/rhn-client-tools/po/ru.po | 19
client/rhel/rhn-client-tools/po/si.po | 19
client/rhel/rhn-client-tools/po/sk.po | 20
client/rhel/rhn-client-tools/po/sl.po | 20
client/rhel/rhn-client-tools/po/sq.po | 14
client/rhel/rhn-client-tools/po/sr.po | 20
client/rhel/rhn-client-tools/po/sr(a)Latn.po | 14
client/rhel/rhn-client-tools/po/sv.po | 19
client/rhel/rhn-client-tools/po/ta.po | 19
client/rhel/rhn-client-tools/po/te.po | 19
client/rhel/rhn-client-tools/po/tr.po | 20
client/rhel/rhn-client-tools/po/uk.po | 19
client/rhel/rhn-client-tools/po/ur.po | 14
client/rhel/rhn-client-tools/po/vi.po | 14
client/rhel/rhn-client-tools/po/zh_CN.GB2312.po | 20
client/rhel/rhn-client-tools/po/zh_CN.po | 19
client/rhel/rhn-client-tools/po/zh_TW.Big5.po | 19
client/rhel/rhn-client-tools/po/zh_TW.po | 19
client/rhel/rhn-client-tools/rhn_register.desktop.in | 10
client/rhel/rhnsd/po/ds.po | 40
client/rhel/yum-rhn-plugin/po/ds.po | 81
client/tools/rhnpush/solaris2mpm.py | 2
java/code/src/com/redhat/rhn/domain/channel/test/ChannelTest.java | 2
java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java | 28
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 6
java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ExpansionDecorator.java | 4
java/code/src/com/redhat/rhn/manager/audit/AuditManager.java | 4
java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp | 10
java/code/webapp/WEB-INF/struts-config.xml | 12
utils/spacewalk-hostname-rename | 29
80 files changed, 1043 insertions(+), 2401 deletions(-)
New commits:
commit 767bba15c37b24da49e39f7f0e35fb9019dd1153
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Fri May 7 16:33:07 2010 -0400
minor changes to tests
diff --git a/java/code/src/com/redhat/rhn/domain/channel/test/ChannelTest.java b/java/code/src/com/redhat/rhn/domain/channel/test/ChannelTest.java
index ad3d12f..ac763ca 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/test/ChannelTest.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/test/ChannelTest.java
@@ -184,7 +184,7 @@ public class ChannelTest extends BaseTestCaseWithUser {
cs.setSourceUrl("fake url");
cs.getChannels().add(c);
cs.setType(ChannelFactory.CONTENT_SOURCE_TYPE_YUM);
- c.getSources().add(cs);
+ //c.getSources().add(cs);
c = (Channel) TestUtils.saveAndReload(c);
assertNotEmpty(c.getSources());
}
commit 7b16461ea26832637bb50a130dd476dc0bcba119
Merge: 85ff5e6... 345917f...
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Fri May 7 14:40:44 2010 -0400
Merge branch 'master' into repo
commit 345917f10987a1454045d98de232636e85cb1eb0
Author: Joshua Roys <joshua.roys(a)gtri.gatech.edu>
Date: Thu May 6 13:50:37 2010 -0400
Fix a NPE in the Audit code
diff --git a/java/code/src/com/redhat/rhn/manager/audit/AuditManager.java b/java/code/src/com/redhat/rhn/manager/audit/AuditManager.java
index f109f3f..6acb651 100644
--- a/java/code/src/com/redhat/rhn/manager/audit/AuditManager.java
+++ b/java/code/src/com/redhat/rhn/manager/audit/AuditManager.java
@@ -263,6 +263,10 @@ public class AuditManager /* extends BaseManager */ {
Date lastReview, firstUnreviewed;
LinkedList<AuditMachineDto> hosts = new LinkedList<AuditMachineDto>();
+ if (logDir == null || !logDir.canRead()) {
+ return new DataResult<AuditMachineDto>(hosts);
+ }
+
for (File host : logDir.listFiles()) {
if (host.isDirectory()) {
aurev = getLastReview(host.getName());
commit d33a3bdd5272c6a54773670285be15e973900a41
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri May 7 14:42:31 2010 +0200
470154 - arch can be optional, do not freak out if it is not present
diff --git a/client/tools/rhnpush/solaris2mpm.py b/client/tools/rhnpush/solaris2mpm.py
index 31e0167..ef4da0c 100644
--- a/client/tools/rhnpush/solaris2mpm.py
+++ b/client/tools/rhnpush/solaris2mpm.py
@@ -53,7 +53,7 @@ _temp_files = []
# package dependency parsing regular expressions -------------------------
_dep_regex = re.compile("(?P<code>[PIR]) +(?P<name>[^ \t]+)")
-_arch_ver_regex = re.compile("^ *\((?P<arch>[a-zA-Z0-9]+)\)"
+_arch_ver_regex = re.compile("^ *(?:\((?P<arch>[a-zA-Z0-9]+)\))?"
" *(?P<ver>[^,]+)(,[ \t\S]*REV=(?P<rev>[^,\s]+))?")
_ver_regex = re.compile("(?P<ver>[^,]+)(,[ \t\S]*REV=(?P<rev>[^,\s]+))?")
_illegal_ver_regex = re.compile("[/\\\?\*:\|\"'<>\~\$\(\)[\]{}&=\s,]")
commit eb214289c2a3140aabc9d944886a20f4b6bf8830
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri May 7 13:35:19 2010 +0200
l10n update .pot and .po files for rhn-client-tools
diff --git a/client/rhel/rhn-client-tools/po/ar.po b/client/rhel/rhn-client-tools/po/ar.po
index 437a6e0..6a8ccc1 100644
--- a/client/rhel/rhn-client-tools/po/ar.po
+++ b/client/rhel/rhn-client-tools/po/ar.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ar\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2005-05-19 13:45+0300\n"
"Last-Translator: Munzir Taha <munzirtaha(a)newhorizons.com.sa>\n"
"Language-Team: Arabic <fedora-trans-ar(a)redhat.com>\n"
@@ -2131,6 +2131,20 @@ msgstr ""
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "رقم الاشتراك"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "سجّل نفسك في شبكة ردهات"
+
#, fuzzy
#~ msgid "_Exit software update setup"
#~ msgstr "إعادة تشغيل up2date"
@@ -2308,10 +2322,6 @@ msgstr ""
#~ msgstr "https://rhn.redhat.com"
#, fuzzy
-#~ msgid "registration_number"
-#~ msgstr "رقم الاشتراك"
-
-#, fuzzy
#~ msgid "activates subscriptions in your account."
#~ msgstr "فعل اشتراكك"
diff --git a/client/rhel/rhn-client-tools/po/as.po b/client/rhel/rhn-client-tools/po/as.po
index e235704..83eb444 100644
--- a/client/rhel/rhn-client-tools/po/as.po
+++ b/client/rhel/rhn-client-tools/po/as.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: as\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-02-01 13:41+0530\n"
"Last-Translator: Amitakhya Phukan <aphukan(a)redhat.com>\n"
"Language-Team: Assamese <assam(a)mm.assam-glug.org>\n"
@@ -2284,6 +2284,20 @@ msgstr "• আপোনাৰ Red Hat Network Satellite (বিকল্পি
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr "• আপোনাৰ Red Hat Network or Red Hat Network Satellite ৰ প্ৰৱেশ"
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "পঞ্জিকৰণ সংখ্যা (_n)"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Red Hat Network ৰ সৈতে পঞ্জিকৰণ কৰক"
+
#~ msgid "_Exit software update setup"
#~ msgstr "চালনাজ্ঞান উন্নয়নৰ প্ৰতিষ্ঠাৰ পৰা বাহিৰ হওক (_E)"
@@ -2681,9 +2695,6 @@ msgstr "• আপোনাৰ Red Hat Network or Red Hat Network Satellite ৰ
#~ msgid "http://www.redhat.com/apps/support/"
#~ msgstr "http://www.redhat.com/apps/support/"
-#~ msgid "registration_number"
-#~ msgstr "পঞ্জিকৰণ সংখ্যা (_n)"
-
#~ msgid "activates subscriptions in your account."
#~ msgstr "আপোনাৰ হিচাপৰ বৰঙনি সক্ৰিয় কৰিব ।"
diff --git a/client/rhel/rhn-client-tools/po/bg.po b/client/rhel/rhn-client-tools/po/bg.po
index 50667a8..aed72a9 100644
--- a/client/rhel/rhn-client-tools/po/bg.po
+++ b/client/rhel/rhn-client-tools/po/bg.po
@@ -23,7 +23,7 @@ msgid ""
msgstr ""
"Project-Id-Version: bg\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2005-05-04 18:14-0700\n"
"Last-Translator: Николай Сърмаджиев <nikolay(a)sarmadzhiev.com>\n"
"Language-Team: Български <en(a)li.org>\n"
@@ -2164,6 +2164,20 @@ msgstr ""
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "Rегистрационен номер"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Регистриране в Red Hat Network"
+
#, fuzzy
#~ msgid "_Exit software update setup"
#~ msgstr "Рестартиране на агента за обновление"
@@ -2344,10 +2358,6 @@ msgstr ""
#~ msgstr "https://rhn.redhat.com"
#, fuzzy
-#~ msgid "registration_number"
-#~ msgstr "Rегистрационен номер"
-
-#, fuzzy
#~ msgid "activates subscriptions in your account."
#~ msgstr "Активиране на Вашия абонамент"
diff --git a/client/rhel/rhn-client-tools/po/bn.po b/client/rhel/rhn-client-tools/po/bn.po
index 1927b79..ae7d091 100644
--- a/client/rhel/rhn-client-tools/po/bn.po
+++ b/client/rhel/rhn-client-tools/po/bn.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: up2date\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2005-04-25 15:34+0600\n"
"Last-Translator: Samia Niamatullah <mailsamia2001(a)yahoo.com>\n"
"Language-Team: Bengali <redhat-translation(a)bengalinux.org>\n"
@@ -2323,6 +2323,22 @@ msgstr ""
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+# modified for RHEL
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "registrationNumber"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+# modified for RHEL
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Red Hat নেটওয়ার্কে নিবন্ধিত করুন"
+
# msgstr " <Tab>/<Alt-Tab> বস্তুর মধ্যে | <Space> বাছাই করে | <F12> পরবর্তী পর্দা"-->tranlsated in this format in a few recent files (suggestion)
# modfied for RHEL
#, fuzzy
@@ -2537,11 +2553,6 @@ msgstr ""
# modified for RHEL
#, fuzzy
-#~ msgid "registration_number"
-#~ msgstr "registrationNumber"
-
-# modified for RHEL
-#, fuzzy
#~ msgid "activates subscriptions in your account."
#~ msgstr "আপনার সাবস্ক্রিপশনটি সক্রিয় করুন"
diff --git a/client/rhel/rhn-client-tools/po/bn_IN.po b/client/rhel/rhn-client-tools/po/bn_IN.po
index 90bc566..4963930 100644
--- a/client/rhel/rhn-client-tools/po/bn_IN.po
+++ b/client/rhel/rhn-client-tools/po/bn_IN.po
@@ -27,7 +27,7 @@ msgid ""
msgstr ""
"Project-Id-Version: bn_IN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-02-01 09:48+0530\n"
"Last-Translator: Runa Bhattacharjee <runab(a)redhat.com>\n"
"Language-Team: Bengali India\n"
@@ -2473,6 +2473,22 @@ msgstr "• Red Hat Network Satellite'র অবস্থান (ঐচ্ছি
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr "• Red Hat Network অথবা Red Hat Network Satellite'র লগ-ইন নাম "
+# modified for RHEL
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "registration_number"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+# modified for RHEL
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Red Hat Network-এ নিবন্ধিত করুন"
+
#~ msgid "_Exit software update setup"
#~ msgstr "সফ্টওয়্যার আপডেট স্থাপনা থেকে প্রস্থান (_E)"
@@ -2906,10 +2922,6 @@ msgstr "• Red Hat Network অথবা Red Hat Network Satellite'র লগ-
#~ msgstr "http://www.redhat.com/apps/support/"
# modified for RHEL
-#~ msgid "registration_number"
-#~ msgstr "registration_number"
-
-# modified for RHEL
#~ msgid "activates subscriptions in your account."
#~ msgstr "ইনস্টলেশন সংখ্যা উল্লেখ করা আবশ্যক।"
diff --git a/client/rhel/rhn-client-tools/po/ca.po b/client/rhel/rhn-client-tools/po/ca.po
index 00352ec..0ec6d8b 100644
--- a/client/rhel/rhn-client-tools/po/ca.po
+++ b/client/rhel/rhn-client-tools/po/ca.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: up2date\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2005-10-25 23:24+0200\n"
"Last-Translator: Xavier Conde Rueda <xaviconde(a)eresmas.com>\n"
"Language-Team: Catalan <fedora(a)softcatala.net>\n"
@@ -2177,6 +2177,20 @@ msgstr ""
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "registrationNumber"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Registreu amb Red Hat Network"
+
#, fuzzy
#~ msgid "_Exit software update setup"
#~ msgstr "S'està reiniciant up2date"
@@ -2354,10 +2368,6 @@ msgstr ""
#~ msgstr "https://rhn.redhat.com"
#, fuzzy
-#~ msgid "registration_number"
-#~ msgstr "registrationNumber"
-
-#, fuzzy
#~ msgid "activates subscriptions in your account."
#~ msgstr "Activeu la vostra subscripció"
diff --git a/client/rhel/rhn-client-tools/po/cs.po b/client/rhel/rhn-client-tools/po/cs.po
index 365948d..d747772 100644
--- a/client/rhel/rhn-client-tools/po/cs.po
+++ b/client/rhel/rhn-client-tools/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: up2date VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-01-28 10:50+0100\n"
"Last-Translator: Milan Kerslager <kerslage(a)linux.cz>\n"
"Language-Team: Czech <cs(a)li.org>\n"
@@ -2162,6 +2162,20 @@ msgstr ""
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "registrationNumber"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Zaregistrovat se u Red Hat Network"
+
#~ msgid "_Exit software update setup"
#~ msgstr "_Přerušit nastavení aktualizace programů"
@@ -2347,10 +2361,6 @@ msgstr ""
#~ msgstr "https://rhn.redhat.com"
#, fuzzy
-#~ msgid "registration_number"
-#~ msgstr "registrationNumber"
-
-#, fuzzy
#~ msgid "activates subscriptions in your account."
#~ msgstr "Aktivovat vaše přihlášení"
diff --git a/client/rhel/rhn-client-tools/po/cy.po b/client/rhel/rhn-client-tools/po/cy.po
index f20f1ea..13ea79c 100644
--- a/client/rhel/rhn-client-tools/po/cy.po
+++ b/client/rhel/rhn-client-tools/po/cy.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2005-04-26 22:40+0100\n"
"Last-Translator: Rhys Jones <rhys(a)sgwarnog.com>\n"
"Language-Team: Cymraeg <cy(a)li.org>\n"
@@ -2153,6 +2153,20 @@ msgstr ""
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "rhifCofrestru"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Cofrestru â Rhwydwaith Red Hat"
+
#, fuzzy
#~ msgid "_Exit software update setup"
#~ msgstr "Yn ailddechrau up2date"
@@ -2330,10 +2344,6 @@ msgstr ""
#~ msgstr "https://rhn.redhat.com"
#, fuzzy
-#~ msgid "registration_number"
-#~ msgstr "rhifCofrestru"
-
-#, fuzzy
#~ msgid "activates subscriptions in your account."
#~ msgstr "Gwneud eich tanysgrifiad yn weithredol"
diff --git a/client/rhel/rhn-client-tools/po/da.po b/client/rhel/rhn-client-tools/po/da.po
index dc509ee..24d9057 100644
--- a/client/rhel/rhn-client-tools/po/da.po
+++ b/client/rhel/rhn-client-tools/po/da.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: da\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2005-10-21 21:47+0200\n"
"Last-Translator: Keld Simonsen <keld(a)rap.dk>\n"
"Language-Team: <da(a)li.org>\n"
@@ -2160,6 +2160,20 @@ msgstr ""
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "registeringsnummer"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Registrér i Red Hat Network"
+
#, fuzzy
#~ msgid "_Exit software update setup"
#~ msgstr "Genstarter up2date"
@@ -2337,10 +2351,6 @@ msgstr ""
#~ msgstr "https://rhn.redhat.com"
#, fuzzy
-#~ msgid "registration_number"
-#~ msgstr "registeringsnummer"
-
-#, fuzzy
#~ msgid "activates subscriptions in your account."
#~ msgstr "Aktivér dit abonnement"
diff --git a/client/rhel/rhn-client-tools/po/de.po b/client/rhel/rhn-client-tools/po/de.po
index 4ed7ace..ac261df 100644
--- a/client/rhel/rhn-client-tools/po/de.po
+++ b/client/rhel/rhn-client-tools/po/de.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-02-01 10:55+1000\n"
"Last-Translator: Timo Trinks <ttrinks(a)redhat.com>\n"
"Language-Team: <en(a)li.org>\n"
@@ -2377,6 +2377,20 @@ msgstr "• Die Adresse Ihres Red Hat Network Satellite (optional)"
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr "• Ihr Red Hat Network oder Red Hat Network Satellite Login "
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "Registrierungs_nummer"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Registrieren Sie sich bei Red Hat Network"
+
#~ msgid "_Exit software update setup"
#~ msgstr "Software-Updates-Setup be_enden"
@@ -2803,9 +2817,6 @@ msgstr "• Ihr Red Hat Network oder Red Hat Network Satellite Login "
#~ msgid "http://www.redhat.com/apps/support/"
#~ msgstr "http://www.redhat.com/apps/support/"
-#~ msgid "registration_number"
-#~ msgstr "Registrierungs_nummer"
-
#~ msgid "activates subscriptions in your account."
#~ msgstr "Ihre Abonnements in Ihrem Account aktiviert."
diff --git a/client/rhel/rhn-client-tools/po/el.po b/client/rhel/rhn-client-tools/po/el.po
index b67cb9c..dda6dd1 100644
--- a/client/rhel/rhn-client-tools/po/el.po
+++ b/client/rhel/rhn-client-tools/po/el.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: el\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2004-02-03 00:36+0200\n"
"Last-Translator: Nikos Charonitakis <charosn(a)her.forthnet.gr>\n"
"Language-Team: Greek <nls(a)hellug.gr>\n"
@@ -2146,6 +2146,20 @@ msgstr ""
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "Πρέπει να εισάγετε ένα όνομα χρήστη."
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Εγγραφή στο Δίκτυο Red Hat"
+
#, fuzzy
#~ msgid "_Exit software update setup"
#~ msgstr "Γίνεται επαννεκίνηση του up2date"
@@ -2303,10 +2317,6 @@ msgstr ""
#~ msgstr "https://rhn.redhat.com"
#, fuzzy
-#~ msgid "registration_number"
-#~ msgstr "Πρέπει να εισάγετε ένα όνομα χρήστη."
-
-#, fuzzy
#~ msgid "Error reading hardware information:"
#~ msgstr "Παρουσιάστηκε πρόβλημα στην αποστολή του προφίλ υλικού:\n"
diff --git a/client/rhel/rhn-client-tools/po/en_GB.po b/client/rhel/rhn-client-tools/po/en_GB.po
index ab1533c..455c1b8 100644
--- a/client/rhel/rhn-client-tools/po/en_GB.po
+++ b/client/rhel/rhn-client-tools/po/en_GB.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: up 2date\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2004-10-22 12:53-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -2103,6 +2103,20 @@ msgstr ""
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "Registration information for: "
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Register with Red Hat Network"
+
#, fuzzy
#~ msgid "Step 1: Review the Red Hat Privacy Statement"
#~ msgstr "Step 1: Review the Red Hat Privacy Statement"
@@ -2213,10 +2227,6 @@ msgstr ""
#~ msgstr "https://rhn.redhat.com"
#, fuzzy
-#~ msgid "registration_number"
-#~ msgstr "Registration information for: "
-
-#, fuzzy
#~ msgid ""
#~ "Problem registering login:\n"
#~ "%s"
diff --git a/client/rhel/rhn-client-tools/po/es.po b/client/rhel/rhn-client-tools/po/es.po
index b79d2ba..0115309 100644
--- a/client/rhel/rhn-client-tools/po/es.po
+++ b/client/rhel/rhn-client-tools/po/es.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-02-01 11:27+1000\n"
"Last-Translator: Manuel Ospina <mospina(a)redhat.com>\n"
"Language-Team: Spanish <en(a)li.org>\n"
@@ -2339,6 +2339,20 @@ msgstr "• La dirección de si Red Hat Network Satellite (opcional)"
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr "• Su login de Red Hat Network o Red Hat Network Satellite"
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "registration_number"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Registrarse con Red Hat Network"
+
#~ msgid "_Exit software update setup"
#~ msgstr "Salir d_el configurador del actualizador de software"
@@ -2753,9 +2767,6 @@ msgstr "• Su login de Red Hat Network o Red Hat Network Satellite"
#~ msgid "http://www.redhat.com/apps/support/"
#~ msgstr "http://www.redhat.com/apps/support/"
-#~ msgid "registration_number"
-#~ msgstr "registration_number"
-
#~ msgid "activates subscriptions in your account."
#~ msgstr "active las suscripciones en su cuenta."
diff --git a/client/rhel/rhn-client-tools/po/et.po b/client/rhel/rhn-client-tools/po/et.po
index 53d3028..dc1d60d 100644
--- a/client/rhel/rhn-client-tools/po/et.po
+++ b/client/rhel/rhn-client-tools/po/et.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Up2date\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2005-11-04 09:27+0200\n"
"Last-Translator: Allan Sims <allan.sims(a)eau.ee>\n"
"Language-Team: Estonian <et(a)li.org>\n"
@@ -2144,6 +2144,20 @@ msgstr ""
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "registrationNumber"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Red Hat Network-i registreerimine"
+
#, fuzzy
#~ msgid "_Exit software update setup"
#~ msgstr "Up2date taaskäivitamine"
@@ -2321,10 +2335,6 @@ msgstr ""
#~ msgstr "https://rhn.redhat.com"
#, fuzzy
-#~ msgid "registration_number"
-#~ msgstr "registrationNumber"
-
-#, fuzzy
#~ msgid "activates subscriptions in your account."
#~ msgstr "Oma tellimus aktiveerimine"
diff --git a/client/rhel/rhn-client-tools/po/fa.po b/client/rhel/rhn-client-tools/po/fa.po
index c9f3101..eef2267 100644
--- a/client/rhel/rhn-client-tools/po/fa.po
+++ b/client/rhel/rhn-client-tools/po/fa.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -1990,3 +1990,15 @@ msgstr ""
#: ../data/rh_register.glade.h:129
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+
+#: ../rhn_register.desktop.in.h:1
+msgid "RHN Registration"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/fi.po b/client/rhel/rhn-client-tools/po/fi.po
index 3b6cebe..f48505e 100644
--- a/client/rhel/rhn-client-tools/po/fi.po
+++ b/client/rhel/rhn-client-tools/po/fi.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: up2date\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2005-11-28 13:53+0200\n"
"Last-Translator: Pekka Harjamäki <pekka(a)mcfish.org>\n"
"Language-Team: Finnish <kde-i18n-fi-discussion(a)lists.sourceforge.net>\n"
@@ -2143,6 +2143,20 @@ msgstr ""
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "rekisteröintiNumero"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Rekisteröidy Red Hat Networkiin"
+
#, fuzzy
#~ msgid "_Exit software update setup"
#~ msgstr "Käynnistetään up2date päivitysohjelma uudelleen"
@@ -2314,10 +2328,6 @@ msgstr ""
#~ msgstr "https://rhn.redhat.com/"
#, fuzzy
-#~ msgid "registration_number"
-#~ msgstr "rekisteröintiNumero"
-
-#, fuzzy
#~ msgid "activates subscriptions in your account."
#~ msgstr "Aktivoi kirjautuminen"
diff --git a/client/rhel/rhn-client-tools/po/fr.po b/client/rhel/rhn-client-tools/po/fr.po
index 9f261ed..d65f47c 100644
--- a/client/rhel/rhn-client-tools/po/fr.po
+++ b/client/rhel/rhn-client-tools/po/fr.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-02-01 16:07+1000\n"
"Last-Translator: Myriam Malga <mmalga(a)redhat.com>\n"
"Language-Team: <fr(a)li.org>\n"
@@ -2376,6 +2376,20 @@ msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
"• Votre idedntifiant pour Red Hat Network ou votre Satellite Red Hat Network"
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "registration_number"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Enregistrement avec Red Hat Network"
+
#~ msgid "_Exit software update setup"
#~ msgstr "Quitt_er l'installation de mise à jour logicielle"
@@ -2793,9 +2807,6 @@ msgstr ""
#~ msgid "http://www.redhat.com/apps/support/"
#~ msgstr "http://www.redhat.com/apps/support/"
-#~ msgid "registration_number"
-#~ msgstr "registration_number"
-
#~ msgid "activates subscriptions in your account."
#~ msgstr "active les abonnements dans votre compte."
diff --git a/client/rhel/rhn-client-tools/po/gu.po b/client/rhel/rhn-client-tools/po/gu.po
index 5e488e0..6b6a481 100644
--- a/client/rhel/rhn-client-tools/po/gu.po
+++ b/client/rhel/rhn-client-tools/po/gu.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-02-01 11:01+0530\n"
"Last-Translator: Ankit Patel <ankit(a)redhat.com>\n"
"Language-Team: Gujarati <fedora-trans-gu(a)redhat.com>\n"
@@ -2266,6 +2266,20 @@ msgstr "• તમારા Red Hat Network સેટેલાઈટનું
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr "• તમારું Red Hat Network અથવા Red Hat Network સેટેલાઈટ પ્રવેશ "
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "નોંધણી નંબર (_n)"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Red Hat નેટવર્ક સાથે નોંધણી કરાવો"
+
#~ msgid "_Exit software update setup"
#~ msgstr "સોફ્ટવેર સુધારા સુયોજનમાંથી બહાર નીકળો (_E)"
@@ -2663,9 +2677,6 @@ msgstr "• તમારું Red Hat Network અથવા Red Hat Network સ
#~ msgid "http://www.redhat.com/apps/support/"
#~ msgstr "http://www.redhat.com/apps/support/"
-#~ msgid "registration_number"
-#~ msgstr "નોંધણી નંબર (_n)"
-
#~ msgid "activates subscriptions in your account."
#~ msgstr "તમારા ખાતામાં ઉમેદવારીઓ સક્રિયકૃત કરે."
diff --git a/client/rhel/rhn-client-tools/po/he.po b/client/rhel/rhn-client-tools/po/he.po
index b898d2a..f57c03c 100644
--- a/client/rhel/rhn-client-tools/po/he.po
+++ b/client/rhel/rhn-client-tools/po/he.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: up 2date\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2003-09-20 18:57-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -1990,3 +1990,15 @@ msgstr ""
#: ../data/rh_register.glade.h:129
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+
+#: ../rhn_register.desktop.in.h:1
+msgid "RHN Registration"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/hi.po b/client/rhel/rhn-client-tools/po/hi.po
index 27fa0ad..20c3f52 100644
--- a/client/rhel/rhn-client-tools/po/hi.po
+++ b/client/rhel/rhn-client-tools/po/hi.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: hi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-02-05 15:11+0530\n"
"Last-Translator: Rajesh Ranjan <rranjan(a)redhat.com>\n"
"Language-Team: Hindi <fedora-trans-hi(a)redhat.com>\n"
@@ -2252,6 +2252,20 @@ msgstr "• आपके Red Hat Network सैटेलाइट (वैकल
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr "• आपका Red Hat Network या Red Hat Network सैटेलाइट लॉगिन"
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "registration_number"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Red Hat नेटवर्क के साथ पंजीयन"
+
#~ msgid "_Exit software update setup"
#~ msgstr "सॉफ्टवेयर अद्यतन सेटअप से बाहर निकलें (_E)"
@@ -2646,9 +2660,6 @@ msgstr "• आपका Red Hat Network या Red Hat Network सैटेल
#~ msgid "http://www.redhat.com/apps/support/"
#~ msgstr "http://www.redhat.com/apps/support/"
-#~ msgid "registration_number"
-#~ msgstr "registration_number"
-
#~ msgid "activates subscriptions in your account."
#~ msgstr "सदस्यता आपके खाता में सक्रिय करता है"
diff --git a/client/rhel/rhn-client-tools/po/hr.po b/client/rhel/rhn-client-tools/po/hr.po
index 342de98..69bcf22 100644
--- a/client/rhel/rhn-client-tools/po/hr.po
+++ b/client/rhel/rhn-client-tools/po/hr.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rhn-client-tools\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-02-03 11:45+0100\n"
"Last-Translator: Renato Pavicic <renato(a)translator-shop.org>\n"
"Language-Team: Croatian <http://translator-shop.org>\n"
@@ -2316,6 +2316,20 @@ msgstr "• Adresa vašeg Red Hat Mrežnog Satelita (neobavezno)"
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr "• Vaše korisničko ime pri Red Hat Mreži ili Red Hat Mrežnom Satelitu"
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "registracijski_broj"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Registriraj pri Red Hat Mreži"
+
#~ msgid "_Exit software update setup"
#~ msgstr "_Izlazak iz postavljanja ažuriranja softvera"
@@ -2728,9 +2742,6 @@ msgstr "• Vaše korisničko ime pri Red Hat Mreži ili Red Hat Mrežnom Sateli
#~ msgid "http://www.redhat.com/apps/support/"
#~ msgstr "http://www.redhat.com/apps/support/"
-#~ msgid "registration_number"
-#~ msgstr "registracijski_broj"
-
#~ msgid "activates subscriptions in your account."
#~ msgstr "koji aktivira pretplatu vašeg naloga."
diff --git a/client/rhel/rhn-client-tools/po/hu.po b/client/rhel/rhn-client-tools/po/hu.po
index 16c3671..cc5eb5d 100644
--- a/client/rhel/rhn-client-tools/po/hu.po
+++ b/client/rhel/rhn-client-tools/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: up2date-hu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2005-04-15 14:56+0200\n"
"Last-Translator: Arpad Biro <biro_arpad(a)yahoo.com>\n"
"Language-Team: Hungarian\n"
@@ -2170,6 +2170,20 @@ msgstr ""
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "regisztrációsSzám"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Regisztrálás a Red Hat Networkön"
+
#, fuzzy
#~ msgid "_Exit software update setup"
#~ msgstr "Az Up2date újraindítása"
@@ -2348,10 +2362,6 @@ msgstr ""
#~ msgstr "https://rhn.redhat.com"
#, fuzzy
-#~ msgid "registration_number"
-#~ msgstr "regisztrációsSzám"
-
-#, fuzzy
#~ msgid "activates subscriptions in your account."
#~ msgstr "Az előfizetés aktiválása"
diff --git a/client/rhel/rhn-client-tools/po/hy.po b/client/rhel/rhn-client-tools/po/hy.po
index 78f1017..66c29eb 100644
--- a/client/rhel/rhn-client-tools/po/hy.po
+++ b/client/rhel/rhn-client-tools/po/hy.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: up 2date\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2005-09-14 16:22-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -1989,3 +1989,15 @@ msgstr ""
#: ../data/rh_register.glade.h:129
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+
+#: ../rhn_register.desktop.in.h:1
+msgid "RHN Registration"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/id.po b/client/rhel/rhn-client-tools/po/id.po
index 705351c..97dddde 100644
--- a/client/rhel/rhn-client-tools/po/id.po
+++ b/client/rhel/rhn-client-tools/po/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: up2date-4.3.47-5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2004-12-16 09:56+0700\n"
"Last-Translator: Erwien Samantha Y <erwiensamantha(a)sederhana.or.id>\n"
"Language-Team: BlankOn <http://www.blankonlinux.or.id>\n"
@@ -2005,6 +2005,19 @@ msgstr ""
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "Up2date - Informasi Pendaftaran"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr ""
+
#, fuzzy
#~ msgid "Create a New Login ..."
#~ msgstr "Buat Login"
@@ -2024,10 +2037,6 @@ msgstr ""
#~ msgstr "Diskripsi"
#, fuzzy
-#~ msgid "Registration information"
-#~ msgstr "Up2date - Informasi Pendaftaran"
-
-#, fuzzy
#~ msgid "C_reate new login"
#~ msgstr "Buat Login"
diff --git a/client/rhel/rhn-client-tools/po/is.po b/client/rhel/rhn-client-tools/po/is.po
index 6024e4c..1b18b4b 100644
--- a/client/rhel/rhn-client-tools/po/is.po
+++ b/client/rhel/rhn-client-tools/po/is.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: up2date2-is\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2005-10-01 20:33+0000\n"
"Last-Translator: Richard Allen <ra(a)ra.is>\n"
"Language-Team: Icelandic <kde-isl(a)molar.is>\n"
@@ -2135,6 +2135,20 @@ msgstr ""
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "áskriftarNúmer"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Skrá vélina hjá Red Hat Network"
+
#, fuzzy
#~ msgid "_Exit software update setup"
#~ msgstr "Endurræsi up2date"
@@ -2312,10 +2326,6 @@ msgstr ""
#~ msgstr "https://rhn.redhat.com"
#, fuzzy
-#~ msgid "registration_number"
-#~ msgstr "áskriftarNúmer"
-
-#, fuzzy
#~ msgid "activates subscriptions in your account."
#~ msgstr "Virkja áskriftina"
diff --git a/client/rhel/rhn-client-tools/po/it.po b/client/rhel/rhn-client-tools/po/it.po
index 38befdc..9063408 100644
--- a/client/rhel/rhn-client-tools/po/it.po
+++ b/client/rhel/rhn-client-tools/po/it.po
@@ -34,7 +34,7 @@ msgid ""
msgstr ""
"Project-Id-Version: it\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-02-01 02:01+0100\n"
"Last-Translator: \n"
"Language-Team: <it(a)li.org>\n"
@@ -2395,6 +2395,20 @@ msgstr "• L'indirizzo per il vostro Red Hat Network Satellite (facoltativo)"
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr "• Il vostro Red Hat Network o login di Red Hat Network Satellite"
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "numero_registrazione"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Registrazione a Red Hat Network"
+
#~ msgid "_Exit software update setup"
#~ msgstr "(_E)Abbandona impostazione aggiornamenti software"
@@ -2821,9 +2835,6 @@ msgstr "• Il vostro Red Hat Network o login di Red Hat Network Satellite"
#~ msgid "http://www.redhat.com/apps/support/"
#~ msgstr "http://www.redhat.com/apps/support/"
-#~ msgid "registration_number"
-#~ msgstr "numero_registrazione"
-
#~ msgid "activates subscriptions in your account."
#~ msgstr "attivare le sottoscrizioni nel vostro account."
diff --git a/client/rhel/rhn-client-tools/po/ja.po b/client/rhel/rhn-client-tools/po/ja.po
index 90cfcac..2b6b5ee 100644
--- a/client/rhel/rhn-client-tools/po/ja.po
+++ b/client/rhel/rhn-client-tools/po/ja.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ja\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-02-01 11:02+1000\n"
"Last-Translator: Noriko Mizumoto <noriko(a)redhat.com>\n"
"Language-Team: Japanese <fedora-trans-ja(a)redhat.com>\n"
@@ -2409,6 +2409,20 @@ msgstr "• ご使用の Red Hat Network Satellite へのアドレス(オプシ
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr "• Red Hat Network または Red Hat Network Satellite のログイン"
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "登録番号(_N)"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Red Hat Network に登録します"
+
#~ msgid "_Exit software update setup"
#~ msgstr "ソフトウェア更新の設定を終了する(_E)"
@@ -2829,9 +2843,6 @@ msgstr "• Red Hat Network または Red Hat Network Satellite のログイン"
#~ msgid "http://www.redhat.com/apps/support/"
#~ msgstr "http://www.redhat.com/apps/support/"
-#~ msgid "registration_number"
-#~ msgstr "登録番号(_N)"
-
#~ msgid "activates subscriptions in your account."
#~ msgstr "インストール番号を入力する必要があります。"
diff --git a/client/rhel/rhn-client-tools/po/ka.po b/client/rhel/rhn-client-tools/po/ka.po
index 9d9f1a8..32dcec0 100644
--- a/client/rhel/rhn-client-tools/po/ka.po
+++ b/client/rhel/rhn-client-tools/po/ka.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: up 2date\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2003-09-20 18:57-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -1989,3 +1989,15 @@ msgstr ""
#: ../data/rh_register.glade.h:129
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+
+#: ../rhn_register.desktop.in.h:1
+msgid "RHN Registration"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/kn.po b/client/rhel/rhn-client-tools/po/kn.po
index 1439aa5..f78f6f8 100644
--- a/client/rhel/rhn-client-tools/po/kn.po
+++ b/client/rhel/rhn-client-tools/po/kn.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-05-28 11:44+0530\n"
"Last-Translator: Shankar Prasad <svenkate(a)redhat.com>\n"
"Language-Team: Kannada <en(a)li.org>\n"
@@ -2287,6 +2287,20 @@ msgstr "• ನಿಮ್ಮ Red Hat Network Satellite ನ ವಿಳಾಸ (ಐ
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr "• ನಿಮ್ಮ Red Hat Network ಅಥವ Red Hat Network Satellite ನ ಲಾಗಿನ್"
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "ನೋಂದಣಿ ಸಂಖ್ಯೆ (_n)"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Red Hat Networkನೊಂದಿಗೆ ನೋಂದಾಯಿಸಿ"
+
#~ msgid "_Exit software update setup"
#~ msgstr "ತಂತ್ರಾಂಶ ಅಪ್ಡೇಟ್ ಸಂಯೋಜನೆಯಿಂದ ನಿರ್ಗಮಿಸು(_E)"
@@ -2692,9 +2706,6 @@ msgstr "• ನಿಮ್ಮ Red Hat Network ಅಥವ Red Hat Network Satellite
#~ msgid "http://www.redhat.com/apps/support/"
#~ msgstr "http://www.redhat.com/apps/support/"
-#~ msgid "registration_number"
-#~ msgstr "ನೋಂದಣಿ ಸಂಖ್ಯೆ (_n)"
-
#~ msgid "activates subscriptions in your account."
#~ msgstr "ಅನುಸ್ಥಾಪನಾ ಸಂಖ್ಯೆಯನ್ನು ನೀವು ದಾಖಲಿಸಬೇಕು."
diff --git a/client/rhel/rhn-client-tools/po/ko.po b/client/rhel/rhn-client-tools/po/ko.po
index 8b4b7ab..7c84628 100644
--- a/client/rhel/rhn-client-tools/po/ko.po
+++ b/client/rhel/rhn-client-tools/po/ko.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ko\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-02-01 11:21+1000\n"
"Last-Translator: Eunju Kim <eukim(a)redhat.com>\n"
"Language-Team: Korean <ko(a)li.org>\n"
@@ -2278,6 +2278,20 @@ msgstr "Red Hat Network Satellite (선택 사항)에 있는 주소"
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr "Red Hat Network 또는 Red Hat Network Satellite 로그인"
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "등록 번호(_n)"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Red Hat Network에 등록"
+
#~ msgid "_Exit software update setup"
#~ msgstr "소프트웨어 업데이트가 설정 종료(_E)"
@@ -2677,9 +2691,6 @@ msgstr "Red Hat Network 또는 Red Hat Network Satellite 로그인"
#~ msgid "http://www.redhat.com/apps/support/"
#~ msgstr "http://www.redhat.com/apps/support/"
-#~ msgid "registration_number"
-#~ msgstr "등록 번호(_n)"
-
#~ msgid "activates subscriptions in your account."
#~ msgstr "설치 번호를 입력해 주십시오."
diff --git a/client/rhel/rhn-client-tools/po/ku.po b/client/rhel/rhn-client-tools/po/ku.po
index 7182d38..189ba4d 100644
--- a/client/rhel/rhn-client-tools/po/ku.po
+++ b/client/rhel/rhn-client-tools/po/ku.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: up 2date\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2003-09-20 18:57-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -1989,3 +1989,15 @@ msgstr ""
#: ../data/rh_register.glade.h:129
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+
+#: ../rhn_register.desktop.in.h:1
+msgid "RHN Registration"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/lo.po b/client/rhel/rhn-client-tools/po/lo.po
index 0e7284a..cea198d 100644
--- a/client/rhel/rhn-client-tools/po/lo.po
+++ b/client/rhel/rhn-client-tools/po/lo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: up 2date\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2003-09-20 18:57-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -1989,3 +1989,15 @@ msgstr ""
#: ../data/rh_register.glade.h:129
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+
+#: ../rhn_register.desktop.in.h:1
+msgid "RHN Registration"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/lv.po b/client/rhel/rhn-client-tools/po/lv.po
index c9f3101..eef2267 100644
--- a/client/rhel/rhn-client-tools/po/lv.po
+++ b/client/rhel/rhn-client-tools/po/lv.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -1990,3 +1990,15 @@ msgstr ""
#: ../data/rh_register.glade.h:129
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+
+#: ../rhn_register.desktop.in.h:1
+msgid "RHN Registration"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/mk.po b/client/rhel/rhn-client-tools/po/mk.po
index 6ebed8b..a530e19 100644
--- a/client/rhel/rhn-client-tools/po/mk.po
+++ b/client/rhel/rhn-client-tools/po/mk.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: up2date.mk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2005-04-27 21:45+0200\n"
"Last-Translator: Arangel Angov <ufo(a)linux.net.mk>\n"
"Language-Team: Macedonian <ossm-members(a)hedona.on.net.mk>\n"
@@ -2153,6 +2153,20 @@ msgstr ""
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "Број за регистрација"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Регистритајте се на мрежата на Red Hat"
+
#, fuzzy
#~ msgid "_Exit software update setup"
#~ msgstr "Го рестартирам up2date"
@@ -2324,10 +2338,6 @@ msgstr ""
#~ msgstr "https://rhn.redhat.com"
#, fuzzy
-#~ msgid "registration_number"
-#~ msgstr "Број за регистрација"
-
-#, fuzzy
#~ msgid "activates subscriptions in your account."
#~ msgstr "Активирајте ја вашата претплата"
diff --git a/client/rhel/rhn-client-tools/po/ml.po b/client/rhel/rhn-client-tools/po/ml.po
index 908c736..19df03d 100644
--- a/client/rhel/rhn-client-tools/po/ml.po
+++ b/client/rhel/rhn-client-tools/po/ml.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ml\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-02-01 12:05+0530\n"
"Last-Translator: Ani Peter <apeter(a)redhat.com>\n"
"Language-Team: Malayalam <en(a)li.org>\n"
@@ -2284,6 +2284,20 @@ msgstr ""
"• നിങ്ങളുടെ Red Hat നെറ്റ്വറ്ക്ക് അല്ലെങ്കില് Red Hat നെറ്റ്വറ്ക്ക് സാറ്റിലൈറ്റ് ഉപയോഗിക്കുന്ന "
"പേര് "
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "registration_number"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Red Hat നെറ്റ്വറ്ക്കുമായി രജിസ്ടര് ചെയ്യുക"
+
#~ msgid "_Exit software update setup"
#~ msgstr "സോഫ്റ്റ്വെയറ് അപ്ഡേറ്റ് സെറ്റപ്പില് നിന്നും പുറത്ത് കടക്കുക (_E)"
@@ -2688,9 +2702,6 @@ msgstr ""
#~ msgid "http://www.redhat.com/apps/support/"
#~ msgstr "http://www.redhat.com/apps/support/"
-#~ msgid "registration_number"
-#~ msgstr "registration_number"
-
#~ msgid "activates subscriptions in your account."
#~ msgstr "നിങ്ങളുടെ അക്കൌണ്ടിന് അംഗത്വം സജ്ജമാക്കുന്നു."
diff --git a/client/rhel/rhn-client-tools/po/mr.po b/client/rhel/rhn-client-tools/po/mr.po
index e5491cf..eb41017 100644
--- a/client/rhel/rhn-client-tools/po/mr.po
+++ b/client/rhel/rhn-client-tools/po/mr.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-02-01 11:46+0530\n"
"Last-Translator: Rahul Bhalerao <rahul.bhalerao(a)redhat.com>\n"
"Language-Team: Marathi\n"
@@ -2253,6 +2253,20 @@ msgstr "• तुमच्या Red Hat Network Satellite साठी पत
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr "• तुमचे Red Hat Network किंवा Red Hat Network Satellite लॉगीन "
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "registration_number"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Red Hat Network सह नोंदणी करा"
+
#~ msgid "_Exit software update setup"
#~ msgstr "सॉफ्टवेयर अद्यतने व्यवस्थेतून बाहेर(_E)"
@@ -2650,9 +2664,6 @@ msgstr "• तुमचे Red Hat Network किंवा Red Hat Network Sate
#~ msgid "http://www.redhat.com/apps/support/"
#~ msgstr "http://www.redhat.com/apps/support/"
-#~ msgid "registration_number"
-#~ msgstr "registration_number"
-
#~ msgid "activates subscriptions in your account."
#~ msgstr "तुमच्या खात्यामध्ये सभासदत्व कार्यान्वित करतो."
diff --git a/client/rhel/rhn-client-tools/po/ms.po b/client/rhel/rhn-client-tools/po/ms.po
index 6aa9969..23b2a8c 100644
--- a/client/rhel/rhn-client-tools/po/ms.po
+++ b/client/rhel/rhn-client-tools/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: up2date\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2005-11-26 13:39+0800\n"
"Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman(a)myrealbox.com>\n"
"Language-Team: Malay <translation-team-ms(a)lists.sourceforge.net>\n"
@@ -2194,6 +2194,20 @@ msgstr ""
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "registrationNumber"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Memulakan Daemon Red Hat Network: "
+
#, fuzzy
#~ msgid "_Exit software update setup"
#~ msgstr "_Laksana up2date..."
@@ -2364,10 +2378,6 @@ msgstr ""
#~ msgstr "https://rhn.redhat.com"
#, fuzzy
-#~ msgid "registration_number"
-#~ msgstr "registrationNumber"
-
-#, fuzzy
#~ msgid "activates subscriptions in your account."
#~ msgstr "Mempartisyen Sistem Anda"
diff --git a/client/rhel/rhn-client-tools/po/my.po b/client/rhel/rhn-client-tools/po/my.po
index c9f3101..eef2267 100644
--- a/client/rhel/rhn-client-tools/po/my.po
+++ b/client/rhel/rhn-client-tools/po/my.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -1990,3 +1990,15 @@ msgstr ""
#: ../data/rh_register.glade.h:129
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+
+#: ../rhn_register.desktop.in.h:1
+msgid "RHN Registration"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/nb.po b/client/rhel/rhn-client-tools/po/nb.po
index 2375baa..833f630 100644
--- a/client/rhel/rhn-client-tools/po/nb.po
+++ b/client/rhel/rhn-client-tools/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: up2date 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2005-09-21 15:40+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas(a)gnome.org>\n"
"Language-Team: Norwegian <i18n-nb(a)lister.ping.uio.no>\n"
@@ -2138,6 +2138,20 @@ msgstr ""
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "registreringsnummer"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Registrer deg hos Red Hat Network"
+
#, fuzzy
#~ msgid "_Exit software update setup"
#~ msgstr "Starter up2date på nytt"
@@ -2310,10 +2324,6 @@ msgstr ""
#~ msgstr "https://rhn.redhat.com"
#, fuzzy
-#~ msgid "registration_number"
-#~ msgstr "registreringsnummer"
-
-#, fuzzy
#~ msgid "activates subscriptions in your account."
#~ msgstr "Aktiver ditt abonnement"
diff --git a/client/rhel/rhn-client-tools/po/nl.po b/client/rhel/rhn-client-tools/po/nl.po
index 62c5039..3d6fa2a 100644
--- a/client/rhel/rhn-client-tools/po/nl.po
+++ b/client/rhel/rhn-client-tools/po/nl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rhn-client-tools\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-01-16 23:33+0100\n"
"Last-Translator: Peter van Egdom <p.van.egdom(a)gmail.com>\n"
"Language-Team: Dutch <vertaling(a)nl.linux.org>\n"
@@ -2074,6 +2074,20 @@ msgstr "• Het adres naar uw Red Hat Network Satellite (optioneel)"
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr "• Uw Red Hat Network of Red Hat Network Satellite login "
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "registratie_nummer"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Registreer via Red Hat Network"
+
#~ msgid "_Exit software update setup"
#~ msgstr "Software update setup _beëindigen"
@@ -2190,9 +2204,6 @@ msgstr "• Uw Red Hat Network of Red Hat Network Satellite login "
#~ msgid "http://www.redhat.com/apps/support/"
#~ msgstr "http://www.redhat.com/apps/support/"
-#~ msgid "registration_number"
-#~ msgstr "registratie_nummer"
-
#~ msgid "Error reading hardware information:"
#~ msgstr "Fout bij het inlezen van de hardware-informatie:"
diff --git a/client/rhel/rhn-client-tools/po/no.po b/client/rhel/rhn-client-tools/po/no.po
index 3f9501c..e6f3e87 100644
--- a/client/rhel/rhn-client-tools/po/no.po
+++ b/client/rhel/rhn-client-tools/po/no.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: up2date 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2004-03-13 13:45+0100\n"
"Last-Translator: Kjartan Maraas <kmaraas(a)online.no\n"
"Language-Team: Norwegian <nb(a)lister.ping.uio.no>\n"
@@ -2159,6 +2159,20 @@ msgstr ""
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "Du må skrive inn et brukernavn."
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Registrer deg hos Red Hat Network"
+
#, fuzzy
#~ msgid "_Exit software update setup"
#~ msgstr "Starter up2date på nytt"
@@ -2324,10 +2338,6 @@ msgstr ""
#~ msgstr "https://rhn.redhat.com"
#, fuzzy
-#~ msgid "registration_number"
-#~ msgstr "Du må skrive inn et brukernavn."
-
-#, fuzzy
#~ msgid "Error reading hardware information:"
#~ msgstr "Feil ved lesing av hode"
diff --git a/client/rhel/rhn-client-tools/po/or.po b/client/rhel/rhn-client-tools/po/or.po
index ee865c0..fe265e1 100644
--- a/client/rhel/rhn-client-tools/po/or.po
+++ b/client/rhel/rhn-client-tools/po/or.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: or\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-02-01 11:40+0530\n"
"Last-Translator: Subhransu Behera <sbehera(a)redhat.com>\n"
"Language-Team: Oriya <oriya-group(a)lists.sarovar.org>\n"
@@ -2279,6 +2279,20 @@ msgstr "• ଆପଣଙ୍କ Red Hat Network ସେଟେଲାଇଟର ଠ
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr "• ଆପଣଙ୍କ Red Hat Network କିମ୍ବା Red Hat Netwok ସେଟେଲାଇଟ ଲଗଇନ ନାମ "
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "ପଞ୍ଜୀକରଣ ସଂଖ୍ଯା (_n)"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Red Hat Network ରେ ପଞ୍ଜୀକୃତ କରନ୍ତୁ"
+
#~ msgid "_Exit software update setup"
#~ msgstr "ସଫ୍ଟୱେର ଅଦ୍ଯତନ ବ୍ଯବସ୍ଥାପନ ବନ୍ଦ କରନ୍ତୁ (_E)"
@@ -2677,9 +2691,6 @@ msgstr "• ଆପଣଙ୍କ Red Hat Network କିମ୍ବା Red Hat Netwok
#~ msgid "http://www.redhat.com/apps/support/"
#~ msgstr "http://www.redhat.com/apps/support/"
-#~ msgid "registration_number"
-#~ msgstr "ପଞ୍ଜୀକରଣ ସଂଖ୍ଯା (_n)"
-
#~ msgid "activates subscriptions in your account."
#~ msgstr "ଆପଣଙ୍କ ଖାତାରେ ସଦସ୍ଯତାକୁ ସକ୍ରିୟ କରିବ।"
diff --git a/client/rhel/rhn-client-tools/po/pa.po b/client/rhel/rhn-client-tools/po/pa.po
index daf31ee..036da08 100644
--- a/client/rhel/rhn-client-tools/po/pa.po
+++ b/client/rhel/rhn-client-tools/po/pa.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pa\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-02-01 13:47+0530\n"
"Last-Translator: Jaswinder Singh <jsingh(a)redhat.com>\n"
"Language-Team: Punjabi <fedora-trans-pa(a)redhat.com>\n"
@@ -2251,6 +2251,20 @@ msgstr "• ਤੁਹਾਡੇ Red Hat ਨੈੱਟਵਰਕ ਸੈਟੇਲਾ
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr "• ਤੁਹਾਡਾ Red Hat ਨੈੱਟਵਰਕ ਜਾਂ Red Hat ਨੈੱਟਵਰਕ ਸੈਟੇਲਾਈਟ ਲਾਗਇਨ "
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "ਰਜਿਸਟਰੇਸ਼ਨ-ਨੰਬਰ"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Red Hat ਨੈੱਟਵਰਕ ਨਾਲ ਰਜਿਸਟਰ ਕਰੋ"
+
#~ msgid "_Exit software update setup"
#~ msgstr "ਸਾਫਟਵੇਅਰ ਅੱਪਡੇਟ ਸੈੱਟਅੱਪ ਬੰਦ(_E)"
@@ -2644,9 +2658,6 @@ msgstr "• ਤੁਹਾਡਾ Red Hat ਨੈੱਟਵਰਕ ਜਾਂ Red Hat
#~ msgid "http://www.redhat.com/apps/support/"
#~ msgstr "http://www.redhat.com/apps/support/"
-#~ msgid "registration_number"
-#~ msgstr "ਰਜਿਸਟਰੇਸ਼ਨ-ਨੰਬਰ"
-
#~ msgid "activates subscriptions in your account."
#~ msgstr "ਤੁਹਾਡੇ ਖਾਤੇ ਵਿੱਚ ਮੈਂਬਰੀ ਸਰਗਰਮ ਕਰਦਾ ਹੈ।"
diff --git a/client/rhel/rhn-client-tools/po/pl.po b/client/rhel/rhn-client-tools/po/pl.po
index 925532d..4294742 100644
--- a/client/rhel/rhn-client-tools/po/pl.po
+++ b/client/rhel/rhn-client-tools/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2005-12-03 18:33+0200\n"
"Last-Translator: Tom Berner <tom(a)lodz.pl>\n"
"Language-Team: Polish <pl(a)li.org>\n"
@@ -2145,6 +2145,20 @@ msgstr ""
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "registrationNumber"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Rejestracja w Red Hat Network"
+
#, fuzzy
#~ msgid "_Exit software update setup"
#~ msgstr "Rejestrowanie w celu uzyskania aktualizacji oprogramowania"
@@ -2329,10 +2343,6 @@ msgstr ""
#~ msgstr "https://rhn.redhat.com"
#, fuzzy
-#~ msgid "registration_number"
-#~ msgstr "registrationNumber"
-
-#, fuzzy
#~ msgid "activates subscriptions in your account."
#~ msgstr "Aktywuj subskrypcję"
diff --git a/client/rhel/rhn-client-tools/po/pt.po b/client/rhel/rhn-client-tools/po/pt.po
index c0bf344..091e540 100644
--- a/client/rhel/rhn-client-tools/po/pt.po
+++ b/client/rhel/rhn-client-tools/po/pt.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: up2date\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-02-06 14:32+0000\n"
"Last-Translator: José Nuno Pires <jncp(a)netcabo.pt>\n"
"Language-Team: pt <kde(a)poli.org>\n"
@@ -2348,6 +2348,20 @@ msgstr "• O endereço do seu Satélite da Red Hat Network (opcional)"
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr "• O seu utilizador da Red Hat Network ou do seu Satélite "
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "registration_number"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Registar na Red Hat Network"
+
#~ msgid "_Exit software update setup"
#~ msgstr "_Sair da configuração de actualizações do 'software'"
@@ -2764,9 +2778,6 @@ msgstr "• O seu utilizador da Red Hat Network ou do seu Satélite "
#~ msgid "http://www.redhat.com/apps/support/"
#~ msgstr "http://www.redhat.com/apps/support/"
-#~ msgid "registration_number"
-#~ msgstr "registration_number"
-
#~ msgid "activates subscriptions in your account."
#~ msgstr "active as inscrições da sua conta."
diff --git a/client/rhel/rhn-client-tools/po/pt_BR.po b/client/rhel/rhn-client-tools/po/pt_BR.po
index 5787850..f0c9ced 100644
--- a/client/rhel/rhn-client-tools/po/pt_BR.po
+++ b/client/rhel/rhn-client-tools/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-02-01 11:17+1000\n"
"Last-Translator: Valnir Ferreira Jr.\n"
"Language-Team: Brazilian Portuguese\n"
@@ -2343,6 +2343,20 @@ msgstr "• O endereço do seu Red Hat Network Satellite (opcional)"
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr "• Seu login do Red Hat Network ou Red Hat Network Satellite"
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "registration_number"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Registrar no Red Hat Network"
+
#~ msgid "_Exit software update setup"
#~ msgstr "_Sair da configuração de atualização de software"
@@ -2757,9 +2771,6 @@ msgstr "• Seu login do Red Hat Network ou Red Hat Network Satellite"
#~ msgstr ""
#~ "da Red Hat para discutir esta questão: http://www.redhat.com/apps/support/"
-#~ msgid "registration_number"
-#~ msgstr "registration_number"
-
#~ msgid "activates subscriptions in your account."
#~ msgstr "ative subscrições em sua conta."
diff --git a/client/rhel/rhn-client-tools/po/rhn-client-tools.pot b/client/rhel/rhn-client-tools/po/rhn-client-tools.pot
index c9f3101..eef2267 100644
--- a/client/rhel/rhn-client-tools/po/rhn-client-tools.pot
+++ b/client/rhel/rhn-client-tools/po/rhn-client-tools.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -1990,3 +1990,15 @@ msgstr ""
#: ../data/rh_register.glade.h:129
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+
+#: ../rhn_register.desktop.in.h:1
+msgid "RHN Registration"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/ro.po b/client/rhel/rhn-client-tools/po/ro.po
index 99b8180..9a48259 100644
--- a/client/rhel/rhn-client-tools/po/ro.po
+++ b/client/rhel/rhn-client-tools/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Up2date 2.8\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2002-04-15 18:35-04:00\n"
"Last-Translator: Cristian Gafton\n"
"Language-Team: Romanian <gafton+po(a)redhat.com>\n"
@@ -2121,6 +2121,20 @@ msgstr ""
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "Trebuie să rulaţi Update Agent ca root."
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Configurare Red Hat Network"
+
#, fuzzy
#~ msgid "Review the Red Hat Network Terms And Conditions"
#~ msgstr "Configurare Red Hat Network"
@@ -2265,10 +2279,6 @@ msgstr ""
#~ msgstr "https://rhn.redhat.com"
#, fuzzy
-#~ msgid "registration_number"
-#~ msgstr "Trebuie să rulaţi Update Agent ca root."
-
-#, fuzzy
#~ msgid "Error reading hardware information:"
#~ msgstr "Eroare la citire informaţii"
diff --git a/client/rhel/rhn-client-tools/po/ru.po b/client/rhel/rhn-client-tools/po/ru.po
index 2a76ae2..694f07e 100644
--- a/client/rhel/rhn-client-tools/po/ru.po
+++ b/client/rhel/rhn-client-tools/po/ru.po
@@ -25,7 +25,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-02-01 12:03+1000\n"
"Last-Translator: Yulia Poyarkova <ypoyarko(a)redhat.com>\n"
"Language-Team: \n"
@@ -2318,6 +2318,20 @@ msgstr "• Адрес Red Hat Network Satellite (не обязателен)"
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr "• Ваше имя входа Red Hat Network или Red Hat Network Satellite"
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "registration_number"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Регистрация в Red Hat Network"
+
#~ msgid "_Exit software update setup"
#~ msgstr "В_ыход из настройки обновлений ПО"
@@ -2718,9 +2732,6 @@ msgstr "• Ваше имя входа Red Hat Network или Red Hat Network Sa
#~ msgid "http://www.redhat.com/apps/support/"
#~ msgstr "http://www.redhat.com/apps/support/"
-#~ msgid "registration_number"
-#~ msgstr "registration_number"
-
#~ msgid "activates subscriptions in your account."
#~ msgstr "активации подписок вашей учетной записи."
diff --git a/client/rhel/rhn-client-tools/po/si.po b/client/rhel/rhn-client-tools/po/si.po
index 7949f9e..a4661b7 100644
--- a/client/rhel/rhn-client-tools/po/si.po
+++ b/client/rhel/rhn-client-tools/po/si.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: si\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-02-01 15:28+0530\n"
"Last-Translator: Tyronne Wickramarathne <tywickra(a)redhat.com>\n"
"Language-Team: Sinhala <en(a)li.org>\n"
@@ -2263,6 +2263,20 @@ msgstr "• ඔබේ Red Hat Network Satellite සඳහා වන ලිපි
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr "• ඔබේ Red Hat Network හෝ Red Hat Network Satellite සඳහා වන පිවිසුම"
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "ලියාපදිංචි අංකය(_n)"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Red Hat Network සමඟ ලියාපදිංචි වන්න"
+
#~ msgid "_Exit software update setup"
#~ msgstr "මෘදුකාංග ප්රගමන සැකසුමෙන් ඉවත් වන්න(_E)"
@@ -2659,9 +2673,6 @@ msgstr "• ඔබේ Red Hat Network හෝ Red Hat Network Satellite සඳහ
#~ msgid "http://www.redhat.com/apps/support/"
#~ msgstr "http://www.redhat.com/apps/support/"
-#~ msgid "registration_number"
-#~ msgstr "ලියාපදිංචි අංකය(_n)"
-
#~ msgid "activates subscriptions in your account."
#~ msgstr "ඔබේ ගිණුම තුල ග්රාහකත්වයන් සක්රීය කරයි"
diff --git a/client/rhel/rhn-client-tools/po/sk.po b/client/rhel/rhn-client-tools/po/sk.po
index f76bafb..f1d6438 100644
--- a/client/rhel/rhn-client-tools/po/sk.po
+++ b/client/rhel/rhn-client-tools/po/sk.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: up2date\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2005-10-20 11:30+0200\n"
"Last-Translator: Mike Karas <zoliqe(a)gmail.com>\n"
"Language-Team: Slovak <sk-i18n(a)lists.linux.sk>\n"
@@ -2151,6 +2151,20 @@ msgstr ""
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "registračnéČíslo"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Registrovať cez Red Hat Network"
+
#, fuzzy
#~ msgid "_Exit software update setup"
#~ msgstr "Reštartujem up2date"
@@ -2328,10 +2342,6 @@ msgstr ""
#~ msgstr "https://rhn.redhat.com"
#, fuzzy
-#~ msgid "registration_number"
-#~ msgstr "registračnéČíslo"
-
-#, fuzzy
#~ msgid "activates subscriptions in your account."
#~ msgstr "Aktivovať vaše prihlásenie"
diff --git a/client/rhel/rhn-client-tools/po/sl.po b/client/rhel/rhn-client-tools/po/sl.po
index 4df5aca..b5f321b 100644
--- a/client/rhel/rhn-client-tools/po/sl.po
+++ b/client/rhel/rhn-client-tools/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2004-04-06 22:55+0200\n"
"Last-Translator: Rok Papez <rok.papez(a)lugos.si>\n"
"Language-Team: slovenščina <translation-team-sl(a)lists.sourceforge.net>\n"
@@ -2150,6 +2150,20 @@ msgstr ""
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "Vnesti morate uporabniško ime."
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Registriraj z Red Hat Network"
+
#, fuzzy
#~ msgid "_Exit software update setup"
#~ msgstr "Restavriram up2date"
@@ -2314,10 +2328,6 @@ msgstr ""
#~ msgstr "https://rhn.redhat.com"
#, fuzzy
-#~ msgid "registration_number"
-#~ msgstr "Vnesti morate uporabniško ime."
-
-#, fuzzy
#~ msgid "Error reading hardware information:"
#~ msgstr "Napak pri branju glave"
diff --git a/client/rhel/rhn-client-tools/po/sq.po b/client/rhel/rhn-client-tools/po/sq.po
index 7c84242..44b071a 100644
--- a/client/rhel/rhn-client-tools/po/sq.po
+++ b/client/rhel/rhn-client-tools/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: up 2date\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2003-09-20 18:57-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -1989,3 +1989,15 @@ msgstr ""
#: ../data/rh_register.glade.h:129
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+
+#: ../rhn_register.desktop.in.h:1
+msgid "RHN Registration"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/sr.po b/client/rhel/rhn-client-tools/po/sr.po
index 3382ff5..300daf4 100644
--- a/client/rhel/rhn-client-tools/po/sr.po
+++ b/client/rhel/rhn-client-tools/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: up2date\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2005-08-31 13:56+0200\n"
"Last-Translator: Игор Несторовић <igor(a)prevod.org>\n"
"Language-Team: Serbian (sr) <fedora(a)prevod.org>\n"
@@ -2135,6 +2135,20 @@ msgstr ""
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "регистарскиБрој"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Региструјте се на Red Hat Network"
+
#, fuzzy
#~ msgid "_Exit software update setup"
#~ msgstr "Поновно покретање up2date"
@@ -2312,10 +2326,6 @@ msgstr ""
#~ msgstr "https://rhn.redhat.com"
#, fuzzy
-#~ msgid "registration_number"
-#~ msgstr "регистарскиБрој"
-
-#, fuzzy
#~ msgid "activates subscriptions in your account."
#~ msgstr "Активирајте пријаву"
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 c9f3101..eef2267 100644
--- a/client/rhel/rhn-client-tools/po/sr(a)Latn.po
+++ b/client/rhel/rhn-client-tools/po/sr(a)Latn.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -1990,3 +1990,15 @@ msgstr ""
#: ../data/rh_register.glade.h:129
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+
+#: ../rhn_register.desktop.in.h:1
+msgid "RHN Registration"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/sv.po b/client/rhel/rhn-client-tools/po/sv.po
index f5ba2d4..c89d924 100644
--- a/client/rhel/rhn-client-tools/po/sv.po
+++ b/client/rhel/rhn-client-tools/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: up2date\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-01-18 20:17-0500\n"
"Last-Translator: Christian Rose <menthos(a)menthos.com>\n"
"Language-Team: Swedish <sv(a)li.org>\n"
@@ -2115,6 +2115,20 @@ msgstr ""
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "Registreringen slutförd"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Registrera i Red Hat Network"
+
#, fuzzy
#~ msgid "_Exit software update setup"
#~ msgstr "Startar om up2date"
@@ -4294,9 +4308,6 @@ msgstr ""
#~ msgid "Step 3 : Register a System Profile - Packages"
#~ msgstr "Steg 3: Registrera en systemprofil - Paket"
-#~ msgid "Registration Finished"
-#~ msgstr "Registreringen slutförd"
-
#~ msgid ""
#~ "You have successfully registered this System Profile on Red Hat Network.\n"
#~ "\n"
diff --git a/client/rhel/rhn-client-tools/po/ta.po b/client/rhel/rhn-client-tools/po/ta.po
index 55cecb1..d250576 100644
--- a/client/rhel/rhn-client-tools/po/ta.po
+++ b/client/rhel/rhn-client-tools/po/ta.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ta\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-02-01 10:51+0530\n"
"Last-Translator: Felix <ifelix(a)redhat.com>\n"
"Language-Team: Tamil <ta(a)li.org>\n"
@@ -2294,6 +2294,20 @@ msgstr "• உங்கள் Red Hat Network சேட்டிலைட்
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr "• உங்கள் Red Hat Network அல்லது Red Hat Network சேட்டிலைட் புகுபதிவு "
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "registration_number"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Red Hat Network யுடன் பதிவு செய்யவும்"
+
#~ msgid "_Exit software update setup"
#~ msgstr "மென்பொருள் மேம்படுத்தல் அமைவு வெளியேறுகிறது (_E)"
@@ -2695,9 +2709,6 @@ msgstr "• உங்கள் Red Hat Network அல்லது Red Hat Networ
#~ msgid "http://www.redhat.com/apps/support/"
#~ msgstr "http://www.redhat.com/apps/support/"
-#~ msgid "registration_number"
-#~ msgstr "registration_number"
-
#~ msgid "activates subscriptions in your account."
#~ msgstr "நிறுவல் எண்ணை உள்ளிட வேண்டும்."
diff --git a/client/rhel/rhn-client-tools/po/te.po b/client/rhel/rhn-client-tools/po/te.po
index fa4a430..9235a09 100644
--- a/client/rhel/rhn-client-tools/po/te.po
+++ b/client/rhel/rhn-client-tools/po/te.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: te\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-02-01 11:05+0530\n"
"Last-Translator: Sree Ganesh <sthottem(a)redhat.com>\n"
"Language-Team: Telugu <en(a)li.org>\n"
@@ -2249,6 +2249,20 @@ msgstr "• మీ Red Hat Network సాటిలైటుకి (ఐచ్ఛ
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr "• మీ Red Hat Network లేదా Red Hat Network శాటిలైటు ప్రవేశం "
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "నమోదు_సంఖ్య (_n)"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Red Hat నెట్వర్కుతో నమోదు చేయి"
+
#~ msgid "_Exit software update setup"
#~ msgstr "సాఫ్టువేరు నవీకరణలను బయటకు తీసుకురా"
@@ -2615,9 +2629,6 @@ msgstr "• మీ Red Hat Network లేదా Red Hat Network శాటిల
#~ msgid "http://www.redhat.com/apps/support/"
#~ msgstr "http://www.redhat.com/apps/support/"
-#~ msgid "registration_number"
-#~ msgstr "నమోదు_సంఖ్య (_n)"
-
#~ msgid "activates subscriptions in your account."
#~ msgstr "మీ ఖాతాలో సబ్ స్క్రిప్షన్లను క్రియాశీలం చేస్తాయి."
diff --git a/client/rhel/rhn-client-tools/po/tr.po b/client/rhel/rhn-client-tools/po/tr.po
index 028bf3a..ce0ae5f 100644
--- a/client/rhel/rhn-client-tools/po/tr.po
+++ b/client/rhel/rhn-client-tools/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2004-01-23 13:45+0200\n"
"Last-Translator: YILDIZ KARDEŞLER <turkishprogram(a)xposta.com>\n"
"Language-Team: Turkish <C(a)li.org>\n"
@@ -2157,6 +2157,20 @@ msgstr ""
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "Bir kullanıcı adı girmelisiniz."
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Red Hat Ağıan Kaydet"
+
#, fuzzy
#~ msgid "_Exit software update setup"
#~ msgstr "Up2date yeniden başlatılıyor"
@@ -2321,10 +2335,6 @@ msgstr ""
#~ msgstr "https://rhn.redhat.com"
#, fuzzy
-#~ msgid "registration_number"
-#~ msgstr "Bir kullanıcı adı girmelisiniz."
-
-#, fuzzy
#~ msgid "Error reading hardware information:"
#~ msgstr "Başlık okunurken hata"
diff --git a/client/rhel/rhn-client-tools/po/uk.po b/client/rhel/rhn-client-tools/po/uk.po
index de12dea..497bc95 100644
--- a/client/rhel/rhn-client-tools/po/uk.po
+++ b/client/rhel/rhn-client-tools/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: up2rhn-client-tools\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-01-24 17:37+0200\n"
"Last-Translator: Maxim Dziumanenko <dziumanenko(a)gmail.com>\n"
"Language-Team: Ukrainian <uk(a)li.org>\n"
@@ -2280,6 +2280,20 @@ msgstr "• Адреса Red Hat Network Satellite (не обов'язково)"
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr "• Ваше реєстраційне ім'я Red Hat Network чи Red Hat Network Satellite"
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "registration_number"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Реєстрація у Red Hat Network"
+
#~ msgid "_Exit software update setup"
#~ msgstr "Ви_йти з налаштовування оновлення ПЗ"
@@ -2680,9 +2694,6 @@ msgstr "• Ваше реєстраційне ім'я Red Hat Network чи Red H
#~ msgid "http://www.redhat.com/apps/support/"
#~ msgstr "http://www.redhat.com/apps/support/"
-#~ msgid "registration_number"
-#~ msgstr "registration_number"
-
#~ msgid "activates subscriptions in your account."
#~ msgstr "активації передплат вашого облікового запису."
diff --git a/client/rhel/rhn-client-tools/po/ur.po b/client/rhel/rhn-client-tools/po/ur.po
index 80bf7b3..21a66b6 100644
--- a/client/rhel/rhn-client-tools/po/ur.po
+++ b/client/rhel/rhn-client-tools/po/ur.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: up 2date\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2003-09-20 18:57-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -1989,3 +1989,15 @@ msgstr ""
#: ../data/rh_register.glade.h:129
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+
+#: ../rhn_register.desktop.in.h:1
+msgid "RHN Registration"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/vi.po b/client/rhel/rhn-client-tools/po/vi.po
index c9f3101..eef2267 100644
--- a/client/rhel/rhn-client-tools/po/vi.po
+++ b/client/rhel/rhn-client-tools/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -1990,3 +1990,15 @@ msgstr ""
#: ../data/rh_register.glade.h:129
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+
+#: ../rhn_register.desktop.in.h:1
+msgid "RHN Registration"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr ""
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 a688d9d..cb379de 100644
--- a/client/rhel/rhn-client-tools/po/zh_CN.GB2312.po
+++ b/client/rhel/rhn-client-tools/po/zh_CN.GB2312.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: up2date\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2002-04-14 13:17GMT+10:00\n"
"Last-Translator: Sarah Smith <sarahs(a)redhat.com>\n"
"Language-Team: Simplified Chinese <zh(a)li.org>\n"
@@ -2115,6 +2115,20 @@ msgstr ""
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr ""
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "你必须作为根用户运行更新代理。"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "Red Hat 网络配置"
+
#, fuzzy
#~ msgid "Review the Red Hat Network Terms And Conditions"
#~ msgstr "Red Hat 网络配置"
@@ -2259,10 +2273,6 @@ msgstr ""
#~ msgstr "https://rhn.redhat.com"
#, fuzzy
-#~ msgid "registration_number"
-#~ msgstr "你必须作为根用户运行更新代理。"
-
-#, fuzzy
#~ msgid "Error reading hardware information:"
#~ msgstr "读取头出错"
diff --git a/client/rhel/rhn-client-tools/po/zh_CN.po b/client/rhel/rhn-client-tools/po/zh_CN.po
index d201214..d0e8541 100644
--- a/client/rhel/rhn-client-tools/po/zh_CN.po
+++ b/client/rhel/rhn-client-tools/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: zh_CN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-02-01 11:42+1000\n"
"Last-Translator: Xi HUANG <xhuang(a)redhat.com>\n"
"Language-Team: <en(a)li.org>\n"
@@ -2166,6 +2166,20 @@ msgstr "您的红帽网络 Satellite 的位置(可选)"
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr "• 您的红帽网络或红帽网络 Satellite 登录"
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "注册码(_n)"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "在 Red Hat 网络上注册"
+
#~ msgid "_Exit software update setup"
#~ msgstr "退出软件更新设置(_E)"
@@ -2541,9 +2555,6 @@ msgstr "• 您的红帽网络或红帽网络 Satellite 登录"
#~ msgid "http://www.redhat.com/apps/support/"
#~ msgstr "http://www.redhat.com/apps/support/"
-#~ msgid "registration_number"
-#~ msgstr "注册码(_n)"
-
#~ msgid "activates subscriptions in your account."
#~ msgstr "来在您的帐号中激活订阅。"
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 b11a1a6..fb3039e 100644
--- a/client/rhel/rhn-client-tools/po/zh_TW.Big5.po
+++ b/client/rhel/rhn-client-tools/po/zh_TW.Big5.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: zh_TW.Big5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-01-30 09:38+1000\n"
"Last-Translator: Chester Cheng <ccheng(a)redhat.com>\n"
"Language-Team: Chinese, Traditional <zh_TW(a)li.org>\n"
@@ -2178,6 +2178,20 @@ msgstr "• 您 Red Hat Network 衛星伺服器的位址(選用)"
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr "• 您 Red Hat Network 或 Red Hat Network 衛星伺服器的登入名稱"
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "註冊號碼(registration_number)"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "向 Red Hat Network 註冊"
+
#~ msgid "_Exit software update setup"
#~ msgstr "離開軟體更新設定(_E)"
@@ -2556,9 +2570,6 @@ msgstr "• 您 Red Hat Network 或 Red Hat Network 衛星伺服器的登入名
#~ msgid "http://www.redhat.com/apps/support/"
#~ msgstr "http://www.redhat.com/apps/support/"
-#~ msgid "registration_number"
-#~ msgstr "註冊號碼(registration_number)"
-
#~ msgid "activates subscriptions in your account."
#~ msgstr "以啟動您的帳號。"
diff --git a/client/rhel/rhn-client-tools/po/zh_TW.po b/client/rhel/rhn-client-tools/po/zh_TW.po
index 67e7581..2ad0163 100644
--- a/client/rhel/rhn-client-tools/po/zh_TW.po
+++ b/client/rhel/rhn-client-tools/po/zh_TW.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: zh_TW\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
+"POT-Creation-Date: 2010-05-07 13:34+0200\n"
"PO-Revision-Date: 2007-02-01 10:53+1000\n"
"Last-Translator: Chester Cheng <ccheng(a)redhat.com>\n"
"Language-Team: Chinese, Traditional <zh_TW(a)li.org>\n"
@@ -2189,6 +2189,20 @@ msgstr "• 您 Red Hat Network 衛星伺服器的位址(選用)"
msgid "• Your Red Hat Network or Red Hat Network Satellite login "
msgstr "• 您 Red Hat Network 或 Red Hat Network 衛星伺服器的登入名稱"
+#: ../rhn_register.desktop.in.h:1
+#, fuzzy
+msgid "RHN Registration"
+msgstr "註冊號碼(registration_number)"
+
+#: ../rhn_register.desktop.in.h:2
+msgid "Register for software updates from Spacewalk/Satellite/Red Hat Network"
+msgstr ""
+
+#: ../rhn_register.desktop.in.h:3
+#, fuzzy
+msgid "Register to Spacewalk/Satellite/Red Hat Network."
+msgstr "向 Red Hat Network 註冊"
+
#~ msgid "_Exit software update setup"
#~ msgstr "離開軟體更新設定(_E)"
@@ -2567,9 +2581,6 @@ msgstr "• 您 Red Hat Network 或 Red Hat Network 衛星伺服器的登入名
#~ msgid "http://www.redhat.com/apps/support/"
#~ msgstr "http://www.redhat.com/apps/support/"
-#~ msgid "registration_number"
-#~ msgstr "註冊號碼(registration_number)"
-
#~ msgid "activates subscriptions in your account."
#~ msgstr "以啟動您的帳號。"
commit 863ca169e2f1666cd51e3535c8bebe57f1d2616e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri May 7 13:32:03 2010 +0200
l10n - translate desktop file too
diff --git a/client/rhel/rhn-client-tools/po/Makefile b/client/rhel/rhn-client-tools/po/Makefile
index 0498c28..398a8c1 100644
--- a/client/rhel/rhn-client-tools/po/Makefile
+++ b/client/rhel/rhn-client-tools/po/Makefile
@@ -48,7 +48,8 @@ POTFILES = \
$(wildcard ../src/firstboot/*.py) \
$(wildcard ../src/bin/*.py) \
$(wildcard ../src/actions/*.py) \
- $(wildcard ../data/*.glade)
+ $(wildcard ../data/*.glade) \
+ ../rhn_register.desktop.in
CATALOGS = $(GMOFILES)
@@ -167,6 +168,8 @@ update-po: Makefile POTFILES.in $(PACKAGE).pot
fi; \
done
$(MAKE) update-gmo
+ cd $(top_srcdir) \
+ intltool-merge -d po rhn_register.desktop.in rhn_register.desktop
update-gmo: Makefile $(GMOFILES)
@:
diff --git a/client/rhel/rhn-client-tools/rhn_register.desktop.in b/client/rhel/rhn-client-tools/rhn_register.desktop.in
new file mode 100644
index 0000000..6039e4e
--- /dev/null
+++ b/client/rhel/rhn-client-tools/rhn_register.desktop.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=RHN Registration
+_GenericName=Register for software updates from Spacewalk/Satellite/Red Hat Network
+_Comment=Register to Spacewalk/Satellite/Red Hat Network.
+Exec=rhn_register
+Icon=up2date
+Terminal=false
+Type=Application
+Categories=System;Settings;X-Red-Hat-Base;
commit 4623a070058c9b6469b4b1995ac8741d9cd8748c
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 7 10:55:26 2010 +0200
do not check /etc/hosts file for actual hostname
diff --git a/utils/spacewalk-hostname-rename b/utils/spacewalk-hostname-rename
index cb10ae9..032c5df 100755
--- a/utils/spacewalk-hostname-rename
+++ b/utils/spacewalk-hostname-rename
@@ -22,7 +22,6 @@ fi
LOG=/var/log/rhn/rhn_hostname_rename.log
RHN_CONF_FILE=/etc/rhn/rhn.conf
SSL_BUILD_DIR=/root/ssl-build
-HOSTS_FILE=/etc/hosts
ETC_JABBERD_DIR=/etc/jabberd
NOCPULSE_INI=/etc/NOCpulse.ini
BOOTSTRAP_SH=/var/www/html/pub/bootstrap/bootstrap.sh
@@ -127,12 +126,6 @@ function initial_system_hostname_check {
return 1
fi
- if [ -z "$(awk "/$HOSTNAME/ && ! /127.0./ && ! /^::1/ && ! /^[[:space:]]*#/" $HOSTS_FILE)" ]
- then
- echo_err "Missing line \"IP $HOSTNAME\" in your $HOSTS_FILE"
- return 1
- fi
-
return 0
}
commit a24a6b1042c2c103d7f47b59f242a9dc799cd176
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 7 10:53:43 2010 +0200
check for presence of bootstrap files before modifying them
diff --git a/utils/spacewalk-hostname-rename b/utils/spacewalk-hostname-rename
index 3ac161c..cb10ae9 100755
--- a/utils/spacewalk-hostname-rename
+++ b/utils/spacewalk-hostname-rename
@@ -422,14 +422,20 @@ print_status 0 # just simulate end
re-generate_server_ssl_certificate
echo -n "Regenerating new bootstrap client-config-overrides.txt ... " | tee -a $LOG
-backup_file ${BOOTSTRAP_SH}
-backup_file ${BOOTSTRAP_CCO}
# it's easier to subst HOSTNAME with sed
# than to re-generate and keep current configuration
# rhn-bootstrap >> /dev/null 2>&1
-sed -i "s/\(HOSTNAME=\).*/\1$HOSTNAME/" ${BOOTSTRAP_SH}
-sed -i "s/\(noSSLServerURL=https\?:\/\/\).*\(\/XMLRPC\)/\1$HOSTNAME\2/" ${BOOTSTRAP_CCO}
-sed -i "s/\(serverURL=https\?:\/\/\).*\(\/XMLRPC\)/\1$HOSTNAME\2/" ${BOOTSTRAP_CCO}
+if [ -e "$BOOTSTRAP_SH" ]
+then
+ backup_file ${BOOTSTRAP_SH}
+ sed -i "s/\(HOSTNAME=\).*/\1$HOSTNAME/" ${BOOTSTRAP_SH}
+fi
+if [ -e "$BOOTSTRAP_CCO" ]
+then
+ backup_file ${BOOTSTRAP_CCO}
+ sed -i "s/\(noSSLServerURL=https\?:\/\/\).*\(\/XMLRPC\)/\1$HOSTNAME\2/" ${BOOTSTRAP_CCO}
+ sed -i "s/\(serverURL=https\?:\/\/\).*\(\/XMLRPC\)/\1$HOSTNAME\2/" ${BOOTSTRAP_CCO}
+fi
print_status 0 # just simulate end
if [ -e "${NOCPULSE_INI}" ]
commit ad3ad6d34dee3eeacf1f6f7c74e39666047d1c24
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 7 10:49:36 2010 +0200
fixed typo
diff --git a/utils/spacewalk-hostname-rename b/utils/spacewalk-hostname-rename
index f65edf2..3ac161c 100755
--- a/utils/spacewalk-hostname-rename
+++ b/utils/spacewalk-hostname-rename
@@ -459,7 +459,7 @@ if [ "$MONITORING_ENABLED" != "0" ]
then
if [ "$MONITORING_SCOUT_ENABLED" != "0" ]
then
- echo -n "Pushing monitoring scounts ... " | tee -a $LOG
+ echo -n "Pushing monitoring scouts ... " | tee -a $LOG
push_monitoring_scounts
print_status 0 # just simulate end
fi
commit c0044528c019bb77ec43e8fcd20df8487a238caa
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 7 10:47:35 2010 +0200
set localhost instead of hostname to tnsnames.ora and listener.ora
diff --git a/utils/spacewalk-hostname-rename b/utils/spacewalk-hostname-rename
index c396266..f65edf2 100755
--- a/utils/spacewalk-hostname-rename
+++ b/utils/spacewalk-hostname-rename
@@ -398,11 +398,11 @@ echo -n "Testing DB connection ... " | tee -a $LOG
# for spacewalk only:
if [ -e "$ORACLE_XE_LISTENER_ORA_FILE" ]
then
- sed -i$BACKUP_EXT "s/\(.*(HOST[[:space:]]*=[[:space:]]*\)[^)]*\().*$\)/\1$HOSTNAME\2/" $ORACLE_XE_LISTENER_ORA_FILE
+ sed -i$BACKUP_EXT 's/\(.*(HOST[[:space:]]*=[[:space:]]*\)[^)]*\().*$\)/\1localhost\2/' $ORACLE_XE_LISTENER_ORA_FILE
fi
if [ -e $ORACLE_XE_TNSNAMES_ORA_FILE ]
then
- sed -i$BACKUP_EXT "s/\(.*(HOST[[:space:]]*=[[:space:]]*\)[^)]*\().*$\)/\1$HOSTNAME\2/" $ORACLE_XE_TNSNAMES_ORA_FILE
+ sed -i$BACKUP_EXT 's/\(.*(HOST[[:space:]]*=[[:space:]]*\)[^)]*\().*$\)/\1localhost\2/' $ORACLE_XE_TNSNAMES_ORA_FILE
fi
SQL_RET=$(
commit 7a023cf5c91a74170d23a950b753032a67f411f7
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri May 7 09:41:10 2010 +0200
cleanup - removing translation file, which does not match any language code
diff --git a/client/rhel/rhn-client-tools/po/ds.po b/client/rhel/rhn-client-tools/po/ds.po
deleted file mode 100644
index c9f3101..0000000
--- a/client/rhel/rhn-client-tools/po/ds.po
+++ /dev/null
@@ -1,1992 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:22+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../src/up2date_client/capabilities.py:88
-#, python-format
-msgid ""
-"This client requires the server to support %s, which the current server does "
-"not support"
-msgstr ""
-
-#: ../src/up2date_client/config.py:139
-#, python-format
-msgid "%s was not found"
-msgstr ""
-
-#: ../src/up2date_client/gui.py:298
-msgid "_Finish"
-msgstr ""
-
-#. Finish Window
-#: ../src/up2date_client/gui.py:299
-#: ../src/up2date_client/rhnreg_constants.py:97
-msgid "Finish setting up software updates"
-msgstr ""
-
-#: ../src/up2date_client/gui.py:301
-msgid "_Exit"
-msgstr ""
-
-#: ../src/up2date_client/gui.py:302
-msgid "Software updates setup unsuccessful"
-msgstr ""
-
-#: ../src/up2date_client/gui.py:312
-msgid "You must run rhn_register as root."
-msgstr ""
-
-#: ../src/up2date_client/gui.py:336
-#, python-format
-msgid "There was some sort of I/O error: %s"
-msgstr ""
-
-#: ../src/up2date_client/hardware.py:655
-msgid "Error reading cpu information:"
-msgstr ""
-
-#: ../src/up2date_client/hardware.py:662
-msgid "Error reading system memory information:"
-msgstr ""
-
-#: ../src/up2date_client/hardware.py:672
-msgid "Error reading networking information:"
-msgstr ""
-
-#: ../src/up2date_client/hardware.py:693
-msgid "Error reading install method information:"
-msgstr ""
-
-#: ../src/up2date_client/hardware.py:701
-msgid "Error reading network interface information:"
-msgstr ""
-
-#: ../src/up2date_client/messageWindow.py:94
-msgid "Error:"
-msgstr ""
-
-#: ../src/up2date_client/messageWindow.py:101
-msgid "Warning:"
-msgstr ""
-
-#: ../src/up2date_client/messageWindow.py:108
-msgid "OK dialog:"
-msgstr ""
-
-#: ../src/up2date_client/messageWindow.py:116
-msgid "Yes/No dialog:"
-msgstr ""
-
-#: ../src/up2date_client/messageWindow.py:123
-msgid "Question dialog:"
-msgstr ""
-
-#: ../src/up2date_client/rhnChannel.py:97
-msgid "Unable to Locate SystemId"
-msgstr ""
-
-#: ../src/up2date_client/rhnChannel.py:114
-msgid "This system may not be updated until it is associated with a channel."
-msgstr ""
-
-#: ../src/up2date_client/rhncli.py:47
-msgid "Show additional output"
-msgstr ""
-
-#: ../src/up2date_client/rhncli.py:49
-msgid "Specify an http proxy to use"
-msgstr ""
-
-#: ../src/up2date_client/rhncli.py:51
-msgid "Specify a username to use with an authenticated http proxy"
-msgstr ""
-
-#: ../src/up2date_client/rhncli.py:53
-msgid "Specify a password to use with an authenticated http proxy"
-msgstr ""
-
-#: ../src/up2date_client/rhncli.py:76
-msgid ""
-"\n"
-"Aborted.\n"
-msgstr ""
-
-#: ../src/up2date_client/rhncli.py:79
-#, python-format
-msgid "An unexpected OS error occurred: %s\n"
-msgstr ""
-
-#: ../src/up2date_client/rhncli.py:83
-msgid "A connection was attempted with a malformed URI.\n"
-msgstr ""
-
-#: ../src/up2date_client/rhncli.py:85
-#, python-format
-msgid "A connection was attempted with a malformed URI: %s.\n"
-msgstr ""
-
-#: ../src/up2date_client/rhncli.py:87
-#, python-format
-msgid "There was some sort of I/O error: %s\n"
-msgstr ""
-
-#: ../src/up2date_client/rhncli.py:90
-#, python-format
-msgid "There was an SSL error: %s\n"
-msgstr ""
-
-#: ../src/up2date_client/rhncli.py:91
-msgid ""
-"A common cause of this error is the system time being incorrect. Verify that "
-"the time on this system is correct.\n"
-msgstr ""
-
-#: ../src/up2date_client/rhncli.py:95
-#, python-format
-msgid "There was a SSL crypto error: %s\n"
-msgstr ""
-
-#: ../src/up2date_client/rhncli.py:99
-#, python-format
-msgid "There was an authentication error: %s\n"
-msgstr ""
-
-#: ../src/up2date_client/rhncli.py:112
-#, python-format
-msgid "You must be root to run %s"
-msgstr ""
-
-#: ../src/up2date_client/rhncli.py:142 ../src/up2date_client/rhncli.py:177
-msgid "Unable to open gui. Try `up2date --nox`"
-msgstr ""
-
-#: ../src/up2date_client/rhncli.py:184
-#, python-format
-msgid ""
-"%%prog (Red Hat Network Client Tools) %s\n"
-"Copyright (C) 1999--2010 Red Hat, Inc.\n"
-"Licensed under the terms of the GPLv2."
-msgstr ""
-
-#: ../src/up2date_client/rhncli.py:204
-msgid "An error has occurred:"
-msgstr ""
-
-#: ../src/up2date_client/rhncli.py:212
-msgid "See /var/log/up2date for more information"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:13
-msgid "Copyright © 2006--2010 Red Hat, Inc. All rights reserved."
-msgstr ""
-
-#. Connect Window
-#: ../src/up2date_client/rhnreg_constants.py:16
-msgid "Attempting to contact the Red Hat Network server."
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:17
-#, python-format
-msgid "We are attempting to contact the Red Hat Network server at %s."
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:19
-#, python-format
-msgid "A proxy was specified at %s."
-msgstr ""
-
-#. Start Window
-#: ../src/up2date_client/rhnreg_constants.py:22
-msgid "Setting up Software updates"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:23
-msgid ""
-"This assistant will guide you through connecting your system to Red Hat "
-"Network (RHN) to receive software updates, including security updates, to "
-"keep your system supported and compliant. You will need the following at "
-"this time:\n"
-"\n"
-" * A network connection\n"
-" * Your Red Hat Login & password\n"
-" * The location of a Red Hat Network Satellite or Proxy (optional)\n"
-"\n"
-msgstr ""
-
-#. Why Register Window
-#: ../src/up2date_client/rhnreg_constants.py:36 ../data/rh_register.glade.h:91
-msgid "Why Should I Connect to RHN? ..."
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:37
-msgid "Why connect to Red Hat Network?"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:38 ../data/rh_register.glade.h:45
-msgid ""
-"Connecting your system to Red Hat Network allows you to take full advantage "
-"of the benefits of a paid subscription, including:"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:40
-msgid "Security & Updates:"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:41
-msgid "Downloads & Upgrades:"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:42
-msgid "Support:"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:43
-msgid "Compliance:"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:44
-msgid ""
-"Receive the latest software updates, including security updates, keeping "
-"this Red Hat Enterprise Linux system updated and secure."
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:46 ../data/rh_register.glade.h:47
-msgid ""
-"Download installation images for Red Hat Enterprise Linux releases, "
-"including new releases."
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:48 ../data/rh_register.glade.h:33
-msgid ""
-"Access to the technical support experts at Red Hat or Red Hat's partners for "
-"help with any issues you might encounter with this system."
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:50 ../data/rh_register.glade.h:81
-msgid ""
-"Stay in compliance with your subscription agreement and manage subscriptions "
-"for systems connected to your account at http://rhn.redhat.com/."
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:54
-msgid ""
-"Tip: Red Hat values your privacy: http://www.redhat.com/legal/"
-"privacy_statement.html"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:56
-#: ../src/up2date_client/rhnreg_constants.py:64
-msgid "Take me back to the setup process."
-msgstr ""
-
-#. Confirm Quit Window
-#: ../src/up2date_client/rhnreg_constants.py:59
-msgid "Software update setup unsuccessful"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:60
-msgid ""
-"Are you sure you don't want to connect your system to Red Hat Network? "
-"You'll miss out on the benefits of a Red Hat Enterprise Linux subscription:\n"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:62
-msgid ""
-"You will not be able to take advantage of these subscription privileges "
-"without connecting your system to Red Hat Network.\n"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:65
-msgid "I'll register later."
-msgstr ""
-
-#. Info Window
-#: ../src/up2date_client/rhnreg_constants.py:68
-msgid "Setting up software updates"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:69
-#, python-format
-msgid ""
-"Please enter your login information for the %s Red Hat Network Satellite:\n"
-"\n"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:71
-msgid "Red Hat Login:"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:72
-#: ../src/up2date_client/tui.py:116
-msgid "Login:"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:73
-msgid "Password:"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:74
-msgid ""
-"Tip: Forgot your login or password? Contact your Satellite's Organization "
-"Administrator."
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:76
-msgid "Please enter a desired login."
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:77
-msgid "Please enter and verify a password."
-msgstr ""
-
-#. Product Window
-#: ../src/up2date_client/rhnreg_constants.py:80
-msgid ""
-"Please enter your login information for Red Hat Network (http://rhn.redhat."
-"com/):\n"
-"\n"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:82
-msgid ""
-"Tip: Forgot your login or password? Visit: https://rhn.redhat.com/rhn/sales/"
-"LoginInfo.do"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:84
-msgid "*Email Address:"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:86 ../data/rh_register.glade.h:61
-msgid "It appears this system has already been set up for software updates:"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:87 ../data/rh_register.glade.h:38
-msgid "Are you sure you would like to continue?"
-msgstr ""
-
-#. Send Window
-#: ../src/up2date_client/rhnreg_constants.py:90
-msgid ""
-"We are finished collecting information for the System Profile.\n"
-"\n"
-"Press \"Next\" to send this System Profile to Red Hat Network. Click "
-"\"Cancel\" and no information will be sent. You can run the registration "
-"program later by typing `rhn_register` at the command line."
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:98
-msgid ""
-"You may now run 'yum update' from this system's command line to get the "
-"latest software updates from Red Hat Network. You will need to run this "
-"periodically to get the latest updates. Alternatively, you may configure "
-"this system for automatic software updates (also known as 'auto errata "
-"update') via the Red Hat Network web interface. (Instructions for this are "
-"in chapter 6 of the RHN Reference Guide, available from the 'Help' button in "
-"the main Red Hat Network web interface.)"
-msgstr ""
-
-#. Review Window
-#: ../src/up2date_client/rhnreg_constants.py:109 ../data/gui.glade.h:6
-msgid "Review system subscription details"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:110
-#: ../data/rh_register.glade.h:67
-msgid "Please review the subscription details below:"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:111
-#, python-format
-msgid ""
-"The installation number %s was activated during this system's initial "
-"connection to Red Hat Network."
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:113
-msgid ""
-"Subscriptions have been activated for the following Red Hat products/"
-"services:"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:115
-msgid "Software channel subscriptions:"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:116
-msgid ""
-"This system will receive updates from the following Red Hat Network software "
-"channels:"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:118
-msgid ""
-"Warning: If an installed product on this system is not listed above, you "
-"will not receive updates or support for that product. If you would like to "
-"receive updates for that product, please login to your satellite web "
-"interface and subscribe this system to the appropriate software channels to "
-"get updates for that product. See Kbase article 6227 for more details. "
-"(http://kbase.redhat.com/faq/FAQ_58_6227.shtm)"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:129
-msgid ""
-"Warning: If an installed product on this system is not listed above, you "
-"will not receive updates or support for that product. If you would like to "
-"receive updates for that product, please visit http://rhn.redhat.com/ and "
-"subscribe this system to the appropriate software channels to get updates "
-"for that product. See Kbase article 6227 for more details. (http://kbase."
-"redhat.com/faq/FAQ_58_6227.shtm)"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:140
-msgid ""
-"You were unable to be subscribed to the following software channels because "
-"there were insufficient subscriptions available in your account:"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:144
-msgid ""
-"This system was unable to subscribe to any software channels. Your system "
-"will not receive any software updates to keep it secure and supported. There "
-"are a few things you can try to resolve this situation:\n"
-"(1) Log in to http://rhn.redhat.com/ and unentitle an inactive system at "
-"Your RHN > Subscription Management > System Entitlements.\n"
-"(2) Purchase an additional Red Hat Enterprise Linux subscription at http://"
-"www.redhat.com/store/.\n"
-"(3) Activate a new installation number at http://www.redhat.com/now/. Once "
-"you make the appropriate active subscriptions available in your account, you "
-"may browse to this system's profile in the RHN web interface and subscribe "
-"this system to software channels via the software > software channels tab."
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:155
-msgid "RHN service level:"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:156
-msgid ""
-"Depending on what RHN modules are associated with a system, you'll enjoy "
-"different benefits of Red Hat Network. The following are the RHN modules "
-"associated with this system:"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:160
-msgid ""
-"This system was unable to be associated with the following RHN module(s) "
-"because there were insufficient subscriptions available in your account:"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:163
-msgid ""
-"Update module: per-system updates, email errata notifications, errata "
-"information"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:165
-msgid ""
-"Management module: automatic updates, systems grouping, systems permissions, "
-"system package profiling"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:167
-msgid ""
-"Provisioning module: bare-metal provisioning, existing state provisioning, "
-"rollbacks, configuration management"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:169
-msgid ""
-"Monitoring module: pre-defined and custom system performance probes, system "
-"performance email notifications, graphs of system performance"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:173
-msgid ""
-"Virtualization module: software updates for a limited number of virtual "
-"guests on this system."
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:176
-msgid ""
-"Virtualization Platform module: software updates for an unlimited number "
-"virtual guests of this system, access to additional software channels for "
-"guests of this system."
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:180
-msgid ""
-"<b>Warning:</b> Any guest systems you create on this system and register to "
-"RHN will consume Red Hat Enterprise Linux subscriptions beyond this host "
-"system's subscription. You will need to: (1) make a virtualization or "
-"virtualization platform system entitlement available and (2) apply that "
-"system entitlement to this system in RHN's web interface if you do not want "
-"virtual guests of this system to consume additional subscriptions."
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:188
-msgid ""
-"This system was unable to be associated with any RHN service level modules. "
-"This system will not receive any software updates to keep it secure and "
-"supported. There are a few things you can try to resolve this situation:\n"
-"(1) Log in to http://rhn.redhat.com/ and unentitle an inactive system at "
-"Your RHN > Subscription Management > System Entitlements.\n"
-"(2) Purchase an additional Red Hat Enterprise Linux subscription at http://"
-"www.redhat.com/store/.\n"
-"(3) Activate a new installation number at http://www.redhat.com/now/. Once "
-"you make the appropriate active subscriptions available in your account, you "
-"may browse to this system's profile in the RHN web interface, delete the "
-"profile, and re-connect this system to Red Hat Network."
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:200
-#, python-format
-msgid ""
-"Universal default activation key detected\n"
-"A universal default activation key was detected in your RHN organization. "
-"What this means is that a set of properties (software channel subscriptions, "
-"Red Hat Network service, package installations, system group memberships, "
-"etc.) for your system's connection to Red Hat Network have been determined "
-"by the activation key rather than your installation number. You may also "
-"refer to the RHN Reference Guide, section 6.4.6 for more details about "
-"activation keys (http://rhn.redhat.com/rhn/help/reference/)\n"
-"Universal Default activation key: %s"
-msgstr ""
-
-#. Error Messages.
-#: ../src/up2date_client/rhnreg_constants.py:212
-msgid "Fatal Error"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:213
-msgid "Warning"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:214
-#, python-format
-msgid ""
-"We can't contact the Red Hat Network Server.\n"
-"\n"
-"Double check the location provided - is '%s' correct?\n"
-"If not, you can correct it and try again.\n"
-"\n"
-"Make sure that the network connection on this system is operational.\n"
-"\n"
-"This system will not be able to successfully receive software updates from "
-"Red Hat without connecting to a Red Hat Network server"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:221
-#, python-format
-msgid "Architecture: %s, OS Release: %s, OS Version: %s"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:223
-msgid ""
-"This server doesn't support functionality needed by this version of the "
-"software update setup client. Please try again with a newer server."
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:229
-#, python-format
-msgid ""
-"<b><span size=\"16000\">Incompatible Certificate File</span></b>\n"
-"\n"
-"The certificate you provided, <b>%s</b>, is not compatible with the Red Hat "
-"Network server at <b>%s</b>. You may want to double-check that you have "
-"provided a valid certificate file. Are you sure you have provided the "
-"correct certificate, and that the certificate file has not been corrupted?\n"
-"\n"
-"Please try again with a different certificate file."
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:237
-msgid ""
-"<b><span size=\"12000\">Incompatible Certificate File</span></b>\n"
-"\n"
-" The certificate is expired. Please ensure you have the correct certificate "
-"and your system time is correct."
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:241
-msgid "Please verify the value of sslCACert in /etc/sysconfig/rhn/up2date"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:244
-msgid ""
-"Problem registering system.\n"
-"\n"
-"A universal default activation key limits the number of systems which can "
-"connect to the RHN organization associated with your login. To allow this "
-"system to connect, please contact your RHN organization administrator to "
-"increase the number of systems allowed to connect or to disable this "
-"universal default activation key. More details can be found in Red Hat "
-"Knowledgebase Article #7924 at http://kbase.redhat.com/faq/FAQ_61_7924.shtm "
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:257
-msgid ""
-"\n"
-" Tip: Minor releases with a '*' are currently supported by Red Hat.\n"
-"\n"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:260
-msgid ""
-"Warning:You will not be able to limit this system to minor release that is "
-"older than the recent minor release if you select this option.\n"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:265
-#, python-format
-msgid ""
-"Your system will be subscribed to %s \n"
-"base software channel. You will not be\n"
-"able to move this system to an earlier\n"
-"(you will be able to move to a newer release.)\n"
-"Are you sure you Would like to Continue?"
-msgstr ""
-
-#. Navigation
-#: ../src/up2date_client/rhnreg_constants.py:274
-#: ../src/up2date_client/tui.py:371
-msgid "OK"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:275
-#: ../src/up2date_client/tui.py:371
-msgid "Error"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:276
-msgid "Next"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:277
-msgid "Back"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:278
-msgid "Cancel"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:279
-msgid "No, Cancel"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:280
-msgid "Yes, Continue"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg_constants.py:281
-msgid "Press <space> to deselect the option."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:113
-msgid "Automatic Subscription Activation"
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:125
-msgid "Subscription Activation"
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:136
-msgid "Notice"
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:261
-msgid "There was an error while applying your choice."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:287
-msgid "You specified an invalid protocol. Only https and http are allowed."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:300
-msgid ""
-"You will not be able to successfully register this system without contacting "
-"a Red Hat Network server."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:325
-#, python-format
-msgid "We could not contact Red Hat Network (%s)."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:327
-#: ../src/up2date_client/rhnregGui.py:340
-msgid "Make sure the network connection on this system is operational."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:329
-msgid ""
-"Did you mean to register to a Red Hat Network Satellite or Proxy? If so, you "
-"can enter a Satellite or Proxy location instead."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:335
-#, python-format
-msgid "We could not contact the Satellite or Proxy at '%s.'"
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:337
-#, python-format
-msgid ""
-"Double-check the location - is '%s' correct? If not, you can correct it and "
-"try again."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:350
-msgid "There was an error communicating with Red Hat Network."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:351
-msgid "The server may be in outage mode. You may have to try connecting later."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:353
-msgid "You may be running a client that is incompatible with the server."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:396
-#, python-format
-msgid ""
-"Please enter your account information for the <b>%s</b> Red Hat Network "
-"Satellite:"
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:445
-msgid "You must enter a login."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:451
-msgid "You must enter a password."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:465
-msgid "There was an error while logging in."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:489
-msgid ""
-"There was an error communicating with the registration server. The message "
-"was:\n"
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:631
-msgid "There was an error while assembling information for the profile."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:652
-msgid "Error running hardware profile"
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:679
-msgid "There was an error while populating the profile."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:699
-msgid "You must choose a name for this profile."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:714
-msgid "There was an error while creating the profile."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:725
-msgid "Sending your profile information to Red Hat Network. Please wait."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:744
-msgid "Registering System"
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:758
-#: ../src/up2date_client/rhnregGui.py:762
-#: ../src/up2date_client/rhnregGui.py:766 ../src/up2date_client/tui.py:835
-#: ../src/up2date_client/tui.py:838 ../src/up2date_client/tui.py:841
-msgid "Problem registering system:\n"
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:769
-#, python-format
-msgid ""
-"The installation number [ %s ] provided is not a valid installation number. "
-"Please go back to the previous screen and fix it."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:779 ../src/up2date_client/tui.py:847
-msgid "Problem registering system."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:789 ../src/up2date_client/tui.py:852
-msgid "Problem writing out system id to disk."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:795
-msgid "There was a problem registering this system."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:808
-msgid "Sending hardware information"
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:813
-msgid "Problem sending hardware information."
-msgstr ""
-
-#. # for row in range(self.regPackageArea.n_rows):
-#. # rowData = self.regPackageArea.get_row_data(row)
-#. # if rowData[0] == 1:
-#. # selection.append(rowData[1])
-#. # print "gh270"
-#. # selectedPackages = []
-#. # for pkg in packageList:
-#. # if pkg[0] in selection:
-#. # selectedPackages.append(pkg)
-#: ../src/up2date_client/rhnregGui.py:837
-msgid "Sending package information"
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:842
-msgid "Problem sending package information."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:876
-#: ../src/up2date_client/rhnregGui.py:893 ../src/up2date_client/tui.py:866
-#: ../src/up2date_client/tui.py:880
-msgid "Problem registering personal information:\n"
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:881
-#: ../src/up2date_client/rhnregGui.py:898 ../src/up2date_client/tui.py:872
-#: ../src/up2date_client/tui.py:884
-msgid "Problem registering personal information"
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:940
-msgid "There was an error while installing the certificate."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:966
-msgid "You must select a certificate."
-msgstr ""
-
-#. TODO Modify rhnlib to raise a unique exception for the not a
-#. cert file case.
-#: ../src/up2date_client/rhnregGui.py:999
-msgid ""
-"There was an SSL error. This could be because the file you picked was not a "
-"certificate file."
-msgstr ""
-
-#. TODO Provide better messages
-#: ../src/up2date_client/rhnregGui.py:1006
-msgid "Something went wrong while installing the new certificate:\n"
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:1058
-#: ../src/up2date_client/rhnregGui.py:1059
-#: ../src/up2date_client/rhnregGui.py:1060
-msgid "unknown"
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:1138
-msgid "There was an error getting the list of hardware."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:1150 ../src/up2date_client/tui.py:631
-#, python-format
-msgid "%d MHz"
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:1154
-#, python-format
-msgid "%s MB"
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:1198
-msgid "There was an error building the list of packages."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:1213
-msgid "Package"
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:1218
-msgid "Arch"
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:1225
-msgid "Building a list of RPM packages installed on your system. Please wait."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:1256
-msgid ""
-"There was an error loading your configuration. Make sure that\n"
-"you have read access to /etc/sysconfig/rhn."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:1298
-#, python-format
-msgid ""
-"There was an error saving your configuration. Make sure that\n"
-"you own %s."
-msgstr ""
-
-#: ../src/up2date_client/rhnregGui.py:1327
-#, python-format
-msgid ""
-"This error shouldn't have happened. If you'd like to help us improve this "
-"program, please file a bug at bugzilla.redhat.com. Including the relevant "
-"parts of '%s' would be very helpful. Thanks!"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg.py:55
-msgid "Warning: unable to enable rhnsd with chkconfig"
-msgstr ""
-
-#: ../src/up2date_client/rhnreg.py:65
-msgid "Warning: unable to run rhn_check"
-msgstr ""
-
-#: ../src/up2date_client/rpcServer.py:47
-msgid "Error: Server Unavailable. Please try later."
-msgstr ""
-
-#: ../src/up2date_client/rpcServer.py:171
-msgid "ERROR: can not find RHNS CA file"
-msgstr ""
-
-#: ../src/up2date_client/rpcServer.py:207
-msgid "Connection aborted by the user"
-msgstr ""
-
-#: ../src/up2date_client/rpcServer.py:252
-msgid "Server has refused connection due to high load"
-msgstr ""
-
-#: ../src/up2date_client/rpmUtils.py:123
-msgid "Getting list of packages installed on the system"
-msgstr ""
-
-#: ../src/up2date_client/tui.py:112 ../data/rh_register.glade.h:83
-msgid "System software updates already set up"
-msgstr ""
-
-#: ../src/up2date_client/tui.py:115
-msgid "Red Hat Network Location:"
-msgstr ""
-
-#: ../src/up2date_client/tui.py:117
-msgid "System ID:"
-msgstr ""
-
-#: ../src/up2date_client/tui.py:371
-msgid "The server indicated an error:\n"
-msgstr ""
-
-#: ../src/up2date_client/tui.py:375
-msgid "There was an error communicating with the registration server:\n"
-msgstr ""
-
-#: ../src/up2date_client/tui.py:434
-msgid "Select Operating System Release"
-msgstr ""
-
-#: ../src/up2date_client/tui.py:438
-msgid "Operating System version:"
-msgstr ""
-
-#: ../src/up2date_client/tui.py:440
-msgid "Limited Updates Only"
-msgstr ""
-
-#: ../src/up2date_client/tui.py:452
-msgid " Minor Release: "
-msgstr ""
-
-#: ../src/up2date_client/tui.py:467
-msgid "All available updates"
-msgstr ""
-
-#: ../src/up2date_client/tui.py:520
-msgid "Confirm operating system release selection"
-msgstr ""
-
-#: ../src/up2date_client/tui.py:528
-msgid ""
-"Your system will be subscribed to the base software channel to receive all "
-"available updates."
-msgstr ""
-
-#: ../src/up2date_client/tui.py:572
-msgid "Register a System Profile - Hardware"
-msgstr ""
-
-#: ../src/up2date_client/tui.py:575
-msgid ""
-"A Profile Name is a descriptive name that you choose to identify this System "
-"Profile on the Red Hat Network web pages. Optionally, include a computer "
-"serial or identification number."
-msgstr ""
-
-#: ../src/up2date_client/tui.py:581
-msgid "Profile name:"
-msgstr ""
-
-#: ../src/up2date_client/tui.py:590 ../src/up2date_client/tui.py:592
-msgid "Include the following information about hardware and network:"
-msgstr ""
-
-#: ../src/up2date_client/tui.py:603 ../src/up2date_client/tui.py:604
-msgid "Version: "
-msgstr ""
-
-#: ../src/up2date_client/tui.py:610
-msgid "CPU model: "
-msgstr ""
-
-#: ../src/up2date_client/tui.py:616
-msgid "Hostname: "
-msgstr ""
-
-#: ../src/up2date_client/tui.py:627
-msgid "CPU speed: "
-msgstr ""
-
-#: ../src/up2date_client/tui.py:633
-msgid "IP Address: "
-msgstr ""
-
-#: ../src/up2date_client/tui.py:639
-msgid "Memory: "
-msgstr ""
-
-#: ../src/up2date_client/tui.py:643
-#, python-format
-msgid "%s megabytes"
-msgstr ""
-
-#: ../src/up2date_client/tui.py:648
-msgid ""
-"Additional hardware information including PCI devices, disk sizes and mount "
-"points will be included in the profile."
-msgstr ""
-
-#: ../src/up2date_client/tui.py:685
-msgid "Register a System Profile - Packages"
-msgstr ""
-
-#: ../src/up2date_client/tui.py:690
-msgid ""
-"RPM information is important to determine what updated software packages are "
-"relevant to this system."
-msgstr ""
-
-#: ../src/up2date_client/tui.py:694
-msgid "Include RPM packages installed on this system in my System Profile"
-msgstr ""
-
-#: ../src/up2date_client/tui.py:698
-msgid "You may deselect individual packages by unchecking them below."
-msgstr ""
-
-#: ../src/up2date_client/tui.py:707
-msgid "Building Package List"
-msgstr ""
-
-#: ../src/up2date_client/tui.py:768
-msgid "Send Profile Information to Red Hat Network"
-msgstr ""
-
-#: ../src/up2date_client/tui.py:805
-msgid "Sending Profile to Red Hat Network"
-msgstr ""
-
-#: ../src/up2date_client/tui.py:894
-msgid "Problem sending hardware profile:\n"
-msgstr ""
-
-#: ../src/up2date_client/tui.py:898
-msgid "Problem sending hardware profile."
-msgstr ""
-
-#: ../src/up2date_client/tui.py:907
-msgid "Problem sending package list:\n"
-msgstr ""
-
-#: ../src/up2date_client/tui.py:910
-msgid "Problem sending package list."
-msgstr ""
-
-#: ../src/up2date_client/tui.py:953
-msgid "Finish"
-msgstr ""
-
-#: ../src/up2date_client/tui.py:1067
-msgid "You specified an invalid protocol."
-msgstr ""
-
-#: ../src/up2date_client/tui.py:1106
-msgid ""
-" <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
-msgstr ""
-
-#: ../src/up2date_client/tui.py:1200
-msgid "You must run the RHN registration program as root."
-msgstr ""
-
-#: ../src/up2date_client/up2dateErrors.py:31
-msgid "Disk error. The message was:\n"
-msgstr ""
-
-#: ../src/up2date_client/up2dateErrors.py:39
-msgid "RPM error. The message was:\n"
-msgstr ""
-
-#: ../src/up2date_client/up2dateErrors.py:50
-msgid "There was a fatal error installing the package:\n"
-msgstr ""
-
-#: ../src/up2date_client/up2dateErrors.py:63
-msgid "Password error. The message was:\n"
-msgstr ""
-
-#: ../src/up2date_client/up2dateErrors.py:74
-msgid "RPM package conflict error. The message was:\n"
-msgstr ""
-
-#: ../src/up2date_client/up2dateErrors.py:86
-msgid "RPM file conflict error. The message was:\n"
-msgstr ""
-
-#: ../src/up2date_client/up2dateErrors.py:100
-msgid "RPM dependency error. The message was:\n"
-msgstr ""
-
-#: ../src/up2date_client/up2dateErrors.py:114
-msgid "RPM error. The message was:\n"
-msgstr ""
-
-#: ../src/up2date_client/up2dateErrors.py:127
-#: ../src/up2date_client/up2dateErrors.py:140
-msgid "RPM dependency error. The message was:\n"
-msgstr ""
-
-#: ../src/up2date_client/up2dateErrors.py:151
-msgid "Package Skip List error. The message was:\n"
-msgstr ""
-
-#: ../src/up2date_client/up2dateErrors.py:164
-msgid "File Skip List or config file overwrite error. The message was:\n"
-msgstr ""
-
-#: ../src/up2date_client/up2dateErrors.py:174
-msgid "Error communicating with server. The message was:\n"
-msgstr ""
-
-#: ../src/up2date_client/up2dateErrors.py:185
-msgid "File Not Found: \n"
-msgstr ""
-
-#: ../src/up2date_client/up2dateErrors.py:196
-msgid "Delay error from server. The message was:\n"
-msgstr ""
-
-#: ../src/up2date_client/up2dateErrors.py:204
-#, python-format
-msgid "Could not remove package \"%s\". It was on the RemoveSkipList"
-msgstr ""
-
-#: ../src/up2date_client/up2dateErrors.py:227
-msgid "GPG is not installed properly."
-msgstr ""
-
-#: ../src/up2date_client/up2dateErrors.py:237
-msgid ""
-"GPG keyring does not include the Red Hat, Inc. public package-signing key"
-msgstr ""
-
-#: ../src/up2date_client/up2dateErrors.py:249
-#, python-format
-msgid ""
-"The package %s failed its gpg signature verification. This means the package "
-"is corrupt."
-msgstr ""
-
-#: ../src/up2date_client/up2dateErrors.py:263
-#, python-format
-msgid "Package %s does not have a GPG signature.\n"
-msgstr ""
-
-#: ../src/up2date_client/up2dateErrors.py:276
-#, python-format
-msgid "Package %s has a untrusted GPG signature.\n"
-msgstr ""
-
-#: ../src/up2date_client/up2dateErrors.py:289
-#, python-format
-msgid "Package %s has a unknown GPG signature.\n"
-msgstr ""
-
-#: ../src/up2date_client/up2dateErrors.py:339
-msgid "Error validating data at server:\n"
-msgstr ""
-
-#: ../src/up2date_client/up2dateErrors.py:350
-msgid "The installation number is invalid"
-msgstr ""
-
-#: ../src/up2date_client/up2dateErrors.py:357
-msgid "Error parsing the oemInfo file at field:\n"
-msgstr ""
-
-#: ../src/up2date_client/up2dateErrors.py:546
-msgid ""
-"\n"
-" Your organization does not have enough Management entitlements to "
-"register this\n"
-" system to Red Hat Network. Please notify your organization administrator "
-"of this error. \n"
-" You should be able to register this system after your organization frees "
-"existing \n"
-" or purchases additional entitlements. Additional entitlements may be "
-"purchased by your\n"
-" organization administrator by logging into Red Hat Network and visiting\n"
-" the 'Subscription Management' page in the 'Your RHN' section of RHN.\n"
-" \n"
-" A common cause of this error code is due to having mistakenly setup an\n"
-" Activation Key which is set as the universal default. If an activation "
-"key is set\n"
-" on the account as a universal default, you can disable this key and "
-"retry to avoid\n"
-" requiring a Management entitlement."
-msgstr ""
-
-#: ../src/firstboot/rhn_choose_server_gui.py:40 ../data/rh_register.glade.h:43
-msgid "Choose Server"
-msgstr ""
-
-#: ../src/firstboot/rhn_choose_server_gui.py:42
-msgid "Choose a Red Hat Network server"
-msgstr ""
-
-#: ../src/firstboot/rhn_create_profile_gui.py:48
-msgid "Create Profile"
-msgstr ""
-
-#: ../src/firstboot/rhn_create_profile_gui.py:50
-#: ../src/firstboot/rhn_finish_gui.py:41 ../src/firstboot/rhn_review_gui.py:40
-msgid "Connect to Red Hat Network"
-msgstr ""
-
-#: ../src/firstboot/rhn_finish_gui.py:39
-msgid "Finish Updates Setup"
-msgstr ""
-
-#: ../src/firstboot/rhn_login_gui.py:54
-msgid "Red Hat Login"
-msgstr ""
-
-#: ../src/firstboot/rhn_login_gui.py:56 ../src/firstboot/rhn_start_gui.py:41
-msgid "Register with Red Hat Network"
-msgstr ""
-
-#: ../src/firstboot/rhn_login_gui.py:105
-#, python-format
-msgid "There was a communication error with the server: %s"
-msgstr ""
-
-#: ../src/firstboot/rhn_login_gui.py:106
-msgid ""
-"Would you like to try changing the network configuration and trying again?"
-msgstr ""
-
-#: ../src/firstboot/rhn_provide_certificate_gui.py:40
-msgid "Provide Certificate"
-msgstr ""
-
-#: ../src/firstboot/rhn_provide_certificate_gui.py:42
-msgid "Provide a certificate for this Red Hat Network server"
-msgstr ""
-
-#: ../src/firstboot/rhn_review_gui.py:38
-msgid "Review Subscription"
-msgstr ""
-
-#: ../src/firstboot/rhn_start_gui.py:39
-msgid "Set Up Software Updates"
-msgstr ""
-
-#: ../src/bin/rhn-profile-sync.py:34
-msgid ""
-"You need to register this system by running `rhn_register` before using this "
-"option"
-msgstr ""
-
-#: ../src/bin/rhn-profile-sync.py:42
-msgid "Updating package profile..."
-msgstr ""
-
-#: ../src/bin/rhn-profile-sync.py:45
-msgid "Updating hardware profile..."
-msgstr ""
-
-#: ../src/bin/rhn-profile-sync.py:49
-msgid "Updating virtualization profile..."
-msgstr ""
-
-#: ../src/bin/rhn_register.py:36
-msgid "Do not attempt to use X"
-msgstr ""
-
-#: ../src/bin/rhnreg_ks.py:44
-msgid "Specify a profilename"
-msgstr ""
-
-#: ../src/bin/rhnreg_ks.py:46
-msgid "Specify a username"
-msgstr ""
-
-#: ../src/bin/rhnreg_ks.py:48
-msgid "Specify a password"
-msgstr ""
-
-#: ../src/bin/rhnreg_ks.py:50
-msgid "Specify an organizational id for this system"
-msgstr ""
-
-#: ../src/bin/rhnreg_ks.py:52
-msgid "Specify a url to use as a server"
-msgstr ""
-
-#: ../src/bin/rhnreg_ks.py:54
-msgid "Specify a file to use as the ssl CA cert"
-msgstr ""
-
-#: ../src/bin/rhnreg_ks.py:56
-msgid "Specify an activation key"
-msgstr ""
-
-#: ../src/bin/rhnreg_ks.py:58
-msgid ""
-"Subscribe this system to the EUS channel tied to the system's redhat-release"
-msgstr ""
-
-#: ../src/bin/rhnreg_ks.py:60
-msgid "[Deprecated] Read contact info from stdin"
-msgstr ""
-
-#: ../src/bin/rhnreg_ks.py:62
-msgid "Do not probe or upload any hardware info"
-msgstr ""
-
-#: ../src/bin/rhnreg_ks.py:64
-msgid "Do not profile or upload any package info"
-msgstr ""
-
-#: ../src/bin/rhnreg_ks.py:66
-msgid "Do not upload any virtualization info"
-msgstr ""
-
-#: ../src/bin/rhnreg_ks.py:68
-msgid "Do not start rhnsd after completion"
-msgstr ""
-
-#: ../src/bin/rhnreg_ks.py:70
-msgid "Register the system even if it is already registered"
-msgstr ""
-
-#: ../src/bin/rhnreg_ks.py:80
-msgid "A username and password are required to register a system."
-msgstr ""
-
-#: ../src/bin/rhnreg_ks.py:85
-msgid "This system is already registered. Use --force to override"
-msgstr ""
-
-#: ../src/bin/rhnreg_ks.py:119
-msgid ""
-"Usage of --use-eus-channel option with --activationkey is not supported. "
-"Please use username and password instead."
-msgstr ""
-
-#: ../src/bin/rhnreg_ks.py:122
-msgid "The server you are registering against does not support EUS."
-msgstr ""
-
-#: ../src/bin/rhnreg_ks.py:152
-msgid ""
-"Warning: --contactinfo option has been deprecated. Please login to the "
-"server web user Interface and update your contactinfo. "
-msgstr ""
-
-#: ../src/bin/rhnreg_ks.py:192
-msgid ""
-"A profilename was not specified, and hostname and IP address could not be "
-"determined to use as a profilename, please specify one."
-msgstr ""
-
-#: ../data/gui.glade.h:1
-msgid "Choose an update location"
-msgstr ""
-
-#: ../data/gui.glade.h:2
-msgid "Create your system profile"
-msgstr ""
-
-#: ../data/gui.glade.h:3
-msgid "Enter your account information"
-msgstr ""
-
-#: ../data/gui.glade.h:4
-msgid "Provide a security certificate"
-msgstr ""
-
-#: ../data/gui.glade.h:5
-msgid "Registering for software updates"
-msgstr ""
-
-#: ../data/gui.glade.h:7
-msgid "Select operating system release"
-msgstr ""
-
-#: ../data/progress.glade.h:1
-msgid "Progress Dialog"
-msgstr ""
-
-#: ../data/rh_register.glade.h:1
-msgid ""
-"\n"
-"Are you sure you would like to continue?"
-msgstr ""
-
-#: ../data/rh_register.glade.h:3
-msgid " "
-msgstr ""
-
-#: ../data/rh_register.glade.h:4
-msgid "<b>Compliance:</b>"
-msgstr ""
-
-#: ../data/rh_register.glade.h:5
-msgid "<b>Downloads & Upgrades:</b>"
-msgstr ""
-
-#: ../data/rh_register.glade.h:6
-msgid "<b>HTTP Proxy</b>"
-msgstr ""
-
-#: ../data/rh_register.glade.h:7
-msgid "<b>Login:</b>"
-msgstr ""
-
-#: ../data/rh_register.glade.h:8
-msgid "<b>Red Hat Network Location:</b>"
-msgstr ""
-
-#: ../data/rh_register.glade.h:9
-msgid "<b>Security & Updates:</b>"
-msgstr ""
-
-#: ../data/rh_register.glade.h:10
-msgid "<b>Support:</b>"
-msgstr ""
-
-#: ../data/rh_register.glade.h:11
-msgid "<b>System ID:</b>"
-msgstr ""
-
-#: ../data/rh_register.glade.h:12
-msgid ""
-"<b>The network connection on your system is not active. Your system cannot "
-"be set up for software updates at this time.</b>"
-msgstr ""
-
-#: ../data/rh_register.glade.h:13
-msgid ""
-"<b>Tip:</b> Minor releases with a '*' are currently fully supported by Red "
-"Hat."
-msgstr ""
-
-#: ../data/rh_register.glade.h:14
-msgid ""
-"<b>Warning:</b> You will <b>not</b> be able to limit this system to a minor "
-"release that is older than the most recent minor release if you select this "
-"option."
-msgstr ""
-
-#: ../data/rh_register.glade.h:15
-msgid ""
-"<b>You have no active subscriptions available in your account.</b> You will "
-"need to do one of the following to create an active subscription in your "
-"account before this system can be registered:"
-msgstr ""
-
-#: ../data/rh_register.glade.h:16
-msgid "<b>Your system was registered for updates during installation.</b>"
-msgstr ""
-
-#: ../data/rh_register.glade.h:17
-msgid ""
-"<b>_All available updates</b> will be provided to this system. This system, "
-"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
-msgstr ""
-
-#: ../data/rh_register.glade.h:18
-msgid ""
-"<b>_Limited updates</b> will be provided to this system to maintain "
-"compatibility with the following eligible Red Hat Enterprise Linux minor "
-"release software channel:"
-msgstr ""
-
-#: ../data/rh_register.glade.h:19
-msgid "<big><b>Moving to earlier releases won't be possible</b></big>"
-msgstr ""
-
-#: ../data/rh_register.glade.h:20
-msgid "<big><b>Profile Data</b></big>"
-msgstr ""
-
-#: ../data/rh_register.glade.h:21
-msgid "<big><b>System Name</b></big>"
-msgstr ""
-
-#: ../data/rh_register.glade.h:22
-msgid "<small><b>Example:</b> https://satellite.example.com</small>"
-msgstr ""
-
-#: ../data/rh_register.glade.h:23
-msgid "<small><b>Example:</b> squid.example.com:3128</small>"
-msgstr ""
-
-#: ../data/rh_register.glade.h:24
-msgid "<small><b>Example</b>: XXXX-XXXX-XXXX-XXXX</small>"
-msgstr ""
-
-#: ../data/rh_register.glade.h:25
-msgid ""
-"<small><b>Tip:</b> Red Hat values your privacy: http://www.redhat.com/legal/"
-"privacy_statement.html.</small>"
-msgstr ""
-
-#: ../data/rh_register.glade.h:26
-msgid ""
-"<small>Tip: Forgot your login or password? Contact your Satellite's "
-"<i>Organization Administrator</i>.</small>"
-msgstr ""
-
-#: ../data/rh_register.glade.h:27
-msgid ""
-"<small>Tip: Forgot your login or password? Look it up at \n"
-"https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small>"
-msgstr ""
-
-#: ../data/rh_register.glade.h:30
-#, no-c-format
-msgid ""
-"A security certificate compatible with <b>%s</b> was not found on this "
-"system.\n"
-"\n"
-"A security certificate, using SSL technology, is necessary to ensure that "
-"data communicated between this system and Red Hat Network (including your "
-"login and password) is secure."
-msgstr ""
-
-#: ../data/rh_register.glade.h:34
-msgid ""
-"Activate a previously purchased subscription you have not yet activated."
-msgstr ""
-
-#: ../data/rh_register.glade.h:35
-msgid "Advanced Network Configuration"
-msgstr ""
-
-#: ../data/rh_register.glade.h:36
-msgid "Advanced _Network Configuration ..."
-msgstr ""
-
-#: ../data/rh_register.glade.h:37
-msgid ""
-"Are you sure you don't want to connect your system to Red Hat Network? "
-"You'll miss out on the benefits of a Red Hat Enterprise Linux subscription:"
-msgstr ""
-
-#: ../data/rh_register.glade.h:39
-msgid "CPU Model:"
-msgstr ""
-
-#: ../data/rh_register.glade.h:40
-msgid "CPU Speed:"
-msgstr ""
-
-#: ../data/rh_register.glade.h:41
-msgid "Certificate _Location:"
-msgstr ""
-
-#: ../data/rh_register.glade.h:42
-msgid "Choose Channel"
-msgstr ""
-
-#: ../data/rh_register.glade.h:44
-msgid "Confirm operation system release selection"
-msgstr ""
-
-#: ../data/rh_register.glade.h:46
-msgid "Create profile"
-msgstr ""
-
-#: ../data/rh_register.glade.h:48
-msgid "ERROR"
-msgstr ""
-
-#: ../data/rh_register.glade.h:49
-msgid "Enter Your Account Information"
-msgstr ""
-
-#: ../data/rh_register.glade.h:50
-msgid "Enter in the format hostname(:port)"
-msgstr ""
-
-#: ../data/rh_register.glade.h:51
-msgid "Hardware Info"
-msgstr ""
-
-#: ../data/rh_register.glade.h:52
-msgid "Hardware Profile"
-msgstr ""
-
-#: ../data/rh_register.glade.h:53
-msgid "Hostname:"
-msgstr ""
-
-#: ../data/rh_register.glade.h:54
-msgid ""
-"I <b>_don't</b> have an SSL certificate. I will contact my system "
-"administrator for assistance and will register at a later time."
-msgstr ""
-
-#: ../data/rh_register.glade.h:55
-msgid ""
-"I have access to a <b>Red Hat Network Satellite</b> or <b>Red Hat Network "
-"Proxy</b>. I'd like to receive software updates from the Satellite or Proxy "
-"below:"
-msgstr ""
-
-#: ../data/rh_register.glade.h:56
-msgid "I have an <b>_SSL certificate</b> to communicate with Red Hat Network:"
-msgstr ""
-
-#: ../data/rh_register.glade.h:57
-msgid "I would like to connect to Red Hat Network via an _HTTP proxy."
-msgstr ""
-
-#: ../data/rh_register.glade.h:58
-msgid ""
-"I'd like to receive updates from <b>Red Hat Network</b>. (I don't have "
-"access to a Red Hat Network Satellite or Proxy.)"
-msgstr ""
-
-#: ../data/rh_register.glade.h:59
-msgid "IP Address:"
-msgstr ""
-
-#: ../data/rh_register.glade.h:60
-msgid "Installation _Number:"
-msgstr ""
-
-#: ../data/rh_register.glade.h:62
-msgid "Link To Subscription"
-msgstr ""
-
-#: ../data/rh_register.glade.h:63
-msgid ""
-"Log in to http://rhn.redhat.com/ and unentitle an inactive system at Your "
-"RHN > Subscription Management > System Entitlements."
-msgstr ""
-
-#: ../data/rh_register.glade.h:64
-msgid "Memory:"
-msgstr ""
-
-#: ../data/rh_register.glade.h:65
-msgid "Package Information"
-msgstr ""
-
-#: ../data/rh_register.glade.h:66
-msgid ""
-"Please enter your account information for <b>Red Hat Network</b> (http://rhn."
-"redhat.com/)"
-msgstr ""
-
-#: ../data/rh_register.glade.h:68
-msgid "Provide a Security Certificate"
-msgstr ""
-
-#: ../data/rh_register.glade.h:69
-msgid "Proxy P_assword:"
-msgstr ""
-
-#: ../data/rh_register.glade.h:70
-msgid "Proxy _Username:"
-msgstr ""
-
-#: ../data/rh_register.glade.h:71
-msgid ""
-"Purchase an additional Red Hat Enterprise Linux subscription at http://www."
-"redhat.com/store/."
-msgstr ""
-
-#: ../data/rh_register.glade.h:72
-msgid ""
-"Receive the latest software updates, including security updates, keeping "
-"this Red Hat Enterprise Linux system <b>updated</b> and <b>secure</b>."
-msgstr ""
-
-#: ../data/rh_register.glade.h:73
-msgid "Red Hat Linux Version:"
-msgstr ""
-
-#: ../data/rh_register.glade.h:74
-msgid "Red Hat Network _Location:"
-msgstr ""
-
-#: ../data/rh_register.glade.h:75
-msgid "Review system..."
-msgstr ""
-
-#: ../data/rh_register.glade.h:76
-msgid "Select A File"
-msgstr ""
-
-#: ../data/rh_register.glade.h:77
-msgid "Send _hardware profile"
-msgstr ""
-
-#: ../data/rh_register.glade.h:78
-msgid "Send _package profile"
-msgstr ""
-
-#: ../data/rh_register.glade.h:79
-msgid "Software update setup has been completed for this system."
-msgstr ""
-
-#: ../data/rh_register.glade.h:80
-msgid "Start Window"
-msgstr ""
-
-#: ../data/rh_register.glade.h:82
-msgid "System _Name:"
-msgstr ""
-
-#: ../data/rh_register.glade.h:84
-msgid ""
-"This assistant will guide you through connecting your system to Red Hat "
-"Network (RHN) for software updates, such as:"
-msgstr ""
-
-#: ../data/rh_register.glade.h:85
-msgid ""
-"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 Network server.\n"
-"\n"
-"To keep your system updated, secure, and supported, please register this "
-"system at your earliest convenience. You may access this registration tool "
-"by running <b>Software Updater</b> in the <b>Applications > System Tools</b> "
-"menu."
-msgstr ""
-
-#: ../data/rh_register.glade.h:88
-msgid "Use Au_thentication with HTTP Proxy:"
-msgstr ""
-
-#: ../data/rh_register.glade.h:89
-msgid "V_iew Package Profile ..."
-msgstr ""
-
-#: ../data/rh_register.glade.h:90
-msgid "Why Register"
-msgstr ""
-
-#: ../data/rh_register.glade.h:92
-msgid ""
-"Would you like to register your system at this time? <b>(Strongly "
-"recommended.)</b>"
-msgstr ""
-
-#: ../data/rh_register.glade.h:93
-msgid ""
-"You may connect your system to <b>Red Hat Network</b> (https://rhn.redhat."
-"com/) or to a <b>Red Hat Network Satellite</b> or <b>Red Hat Network Proxy</"
-"b> in order to receive software updates."
-msgstr ""
-
-#: ../data/rh_register.glade.h:94
-msgid ""
-"You will <b>not</b> be able to take advantage of these subscriptions "
-"privileges without connecting your system to Red Hat Network."
-msgstr ""
-
-#: ../data/rh_register.glade.h:95
-msgid ""
-"You won't be able to receive software updates, including security updates, "
-"for this system.\n"
-"\n"
-"To keep your system updated, secure, and supported, please connect this "
-"system to RHN at your earliest convenience. You may access this software "
-"updates setup tool at any time by running Software Updater in the "
-"Applications > System Tools menu."
-msgstr ""
-
-#: ../data/rh_register.glade.h:98
-msgid ""
-"You'll need to send us a profile of what packages and hardware are installed "
-"on your system so we can determine what updates are available."
-msgstr ""
-
-#: ../data/rh_register.glade.h:99
-msgid ""
-"You'll want to choose a name for this system so you'll be able to identify "
-"it in the Red Hat Network interface."
-msgstr ""
-
-#: ../data/rh_register.glade.h:100
-msgid "Your system is not setup for software updates."
-msgstr ""
-
-#: ../data/rh_register.glade.h:101
-msgid ""
-"Your system is now ready to receive the software updates that will keep it "
-"secure and supported.\n"
-"\n"
-"You'll know when software updates are available when a package icon appears "
-"in the notification area of your desktop (usually in the upper-right corner, "
-"circled below.) Clicking on this icon, when available, will guide you "
-"through applying any updates that are available:"
-msgstr ""
-
-#: ../data/rh_register.glade.h:104
-msgid ""
-"Your system is ready to receive the software updates that will keep it "
-"secure and supported.\n"
-"\n"
-"You'll know when software updates are available when a package icon appears "
-"in the notification area of your desktop (usually in the upper-right corner, "
-"circled below.) Clicking on this icon, when available, will guide you "
-"through applying any updates that are available:"
-msgstr ""
-
-#: ../data/rh_register.glade.h:107
-msgid ""
-"Your system will be subscribed to the base software channel. You will not "
-"be able to move this system to an earlier minor release channel if you "
-"continue (you will be able to move to a later release.)"
-msgstr ""
-
-#: ../data/rh_register.glade.h:108
-msgid ""
-"Your system will need to access a subscription. This will allow you to keep "
-"your system updated, secure, and supported."
-msgstr ""
-
-#: ../data/rh_register.glade.h:109
-msgid "_Activate a subscription now..."
-msgstr ""
-
-#: ../data/rh_register.glade.h:110
-msgid "_Close"
-msgstr ""
-
-#: ../data/rh_register.glade.h:111
-msgid "_Login:"
-msgstr ""
-
-#: ../data/rh_register.glade.h:112
-msgid "_Minor release:"
-msgstr ""
-
-#: ../data/rh_register.glade.h:113
-msgid "_No thanks, I'll connect later."
-msgstr ""
-
-#: ../data/rh_register.glade.h:114
-msgid "_No, Cancel"
-msgstr ""
-
-#: ../data/rh_register.glade.h:115
-msgid "_No, I prefer to register at a later time."
-msgstr ""
-
-#: ../data/rh_register.glade.h:116
-msgid "_Operating system version:"
-msgstr ""
-
-#: ../data/rh_register.glade.h:117
-msgid "_Password:"
-msgstr ""
-
-#: ../data/rh_register.glade.h:118
-msgid "_Proxy Location:"
-msgstr ""
-
-#: ../data/rh_register.glade.h:119
-msgid "_Take me back to the registration"
-msgstr ""
-
-#: ../data/rh_register.glade.h:120
-msgid "_Take me back to the setup process."
-msgstr ""
-
-#: ../data/rh_register.glade.h:121
-msgid "_View Hardware Profile ..."
-msgstr ""
-
-#: ../data/rh_register.glade.h:122
-msgid "_Why Should I Connect to RHN? ..."
-msgstr ""
-
-#: ../data/rh_register.glade.h:123
-msgid "_Yes, Continue"
-msgstr ""
-
-#: ../data/rh_register.glade.h:124
-msgid "_Yes, I'd like to register now."
-msgstr ""
-
-#: ../data/rh_register.glade.h:125
-msgid "label"
-msgstr ""
-
-#: ../data/rh_register.glade.h:126
-msgid "•"
-msgstr ""
-
-#: ../data/rh_register.glade.h:127
-msgid "• A name for your system's Red Hat Network profile"
-msgstr ""
-
-#: ../data/rh_register.glade.h:128
-msgid "• The address to your Red Hat Network Satellite (optional)"
-msgstr ""
-
-#: ../data/rh_register.glade.h:129
-msgid "• Your Red Hat Network or Red Hat Network Satellite login "
-msgstr ""
diff --git a/client/rhel/rhnsd/po/ds.po b/client/rhel/rhnsd/po/ds.po
deleted file mode 100644
index 95d6e40..0000000
--- a/client/rhel/rhnsd/po/ds.po
+++ /dev/null
@@ -1,40 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:17+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: rhnsd.c:116
-#, c-format
-msgid "Only root can run this program\n"
-msgstr ""
-
-#: rhnsd.c:136
-msgid "wrong number of arguments"
-msgstr ""
-
-#: rhnsd.c:143
-msgid "already running"
-msgstr ""
-
-#: rhnsd.c:243
-#, c-format
-msgid "Copyright (C) %s Red Hat, Inc.\n"
-msgstr ""
-
-#: rhnsd.c:246
-#, c-format
-msgid "Written by %s.\n"
-msgstr ""
diff --git a/client/rhel/yum-rhn-plugin/po/ds.po b/client/rhel/yum-rhn-plugin/po/ds.po
deleted file mode 100644
index e188bfb..0000000
--- a/client/rhel/yum-rhn-plugin/po/ds.po
+++ /dev/null
@@ -1,81 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 16:28+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../rhnplugin.py:47
-msgid "There was an error communicating with RHN."
-msgstr ""
-
-#: ../rhnplugin.py:69
-msgid "RHN support will be disabled."
-msgstr ""
-
-#. If non-root notify user RHN repo not accessible
-#: ../rhnplugin.py:81
-msgid ""
-"*Note* Red Hat Network repositories are not listed below. You must run this "
-"command as root to access RHN repositories."
-msgstr ""
-
-#: ../rhnplugin.py:95
-msgid "There was an error parsing the RHN proxy settings."
-msgstr ""
-
-#: ../rhnplugin.py:106
-msgid "Cleaning"
-msgstr ""
-
-#: ../rhnplugin.py:112
-msgid "Either --version, or no commands entered"
-msgstr ""
-
-#: ../rhnplugin.py:126
-msgid "This system is not registered with RHN."
-msgstr ""
-
-#: ../rhnplugin.py:131
-msgid "RHN channel support will be disabled."
-msgstr ""
-
-#: ../rhnplugin.py:135
-msgid "This system is not subscribed to any channels."
-msgstr ""
-
-#: ../rhnplugin.py:139
-msgid ""
-"This system may not be a registered to RHN. SystemId could not be acquired.\n"
-msgstr ""
-
-#: ../rhnplugin.py:213
-msgid "Package profile information could not be sent."
-msgstr ""
-
-#. This is compensating for hosted/satellite returning back an error
-#. message instructing RHEL5 clients to run "up2date --register"
-#. bz: 438175
-#: ../rhnplugin.py:220
-msgid "Error Message:"
-msgstr ""
-
-#: ../rhnplugin.py:221
-msgid "Please run rhn_register as root on this client"
-msgstr ""
-
-#: ../rhnplugin.py:298
-#, python-format
-msgid "Missing required login information for RHN: %s"
-msgstr ""
commit 02f1022bfb742d4c3b9637713e198845603442c2
Author: Partha Aji <paji(a)redhat.com>
Date: Thu May 6 17:04:13 2010 -0400
Added the import tree.js part to the expansion decorator so its used on a need to use bases
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ExpansionDecorator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ExpansionDecorator.java
index 2db011d..c776efd 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ExpansionDecorator.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ExpansionDecorator.java
@@ -40,11 +40,15 @@ public class ExpansionDecorator extends BaseListDecorator {
"onLoadStuff(%s, '%s', rowHash%s);" +
"showAllRows(rowHash%s);</script>";
+ private static final String IMPORT_TREE_JS =
+ "<script src=\"/javascript/tree.js\" type=\"text/javascript\"></script>";
/**
* {@inheritDoc}
*/
@Override
public void beforeList() throws JspException {
+ //<script src="/javascript/tree.js" type="text/javascript"></script>
+ ListTagUtil.write(pageContext, IMPORT_TREE_JS);
ListTagUtil.write(pageContext, String.format(NEW_VAR_SCRIPT, listName));
LocalizationService ls = LocalizationService.getInstance();
ListTagUtil.write(pageContext, String.format(SHOW_ALL_SCRIPT, listName,
diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
index 58f63e4..018c108 100644
--- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
@@ -8,7 +8,6 @@
<html>
<head>
<meta name="page-decorator" content="none" />
- <script src="/javascript/tree.js" type="text/javascript"></script>
</head>
<body>
<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt"
commit 96b9b72fb87923464e84dda3db878960ae6afafa
Author: Partha Aji <paji(a)redhat.com>
Date: Thu May 6 16:18:57 2010 -0400
Added the logic to handle Delete from the Dup Systems page
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java
index c8a3d6d..2afba07 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java
@@ -100,8 +100,9 @@ public class DuplicateSystemsAction extends RhnAction implements Listable {
private ActionForward handleConfirm(RequestContext context,
ActionMapping mapping) {
-
- return mapping.findForward("success");
+ getStrutsDelegate().saveMessage("duplicate.systems.delete.confirm.message",
+ context.getRequest());
+ return mapping.findForward("confirm");
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index a02205b..7869d96 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -5761,6 +5761,12 @@ value for this entitlement, excluding the default organization's consumption.</s
<trans-unit id="duplicate.jsp.message">
<source>Inactive system profiles are highlighted below.</source>
</trans-unit>
+ <trans-unit id="Delete Selected">
+ <source>Delete Selected</source>
+ </trans-unit>
+ <trans-unit id="duplicate.systems.delete.confirm.message">
+ <source> There may be system profiles selected for deletion below that were not selected on the Duplicate System Profiles page. Please check the list below carefully to prevent accidental deletion of profiles that may have been in the System Set Manager.</source>
+ </trans-unit>
</group>
diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
index 5d3374f..58f63e4 100644
--- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
@@ -104,6 +104,15 @@
</rl:column>
</rl:list>
+
+ <div align="right">
+
+ <hr />
+ <html:submit property="dispatch">
+ <bean:message key="Delete Selected"/>
+ </html:submit>
+
+ </div>
<rhn:submitted/>
</rl:listset>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index acf0120..66e9886 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -2412,8 +2412,8 @@
parameter="ip">
<forward name="default"
path="/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp"/>
- <forward name="success"
- path="/systems/Overview.do"
+ <forward name="confirm"
+ path="/systems/ssm/DeleteConfirm.do"
redirect="true"/>
</action>
@@ -2425,8 +2425,8 @@
parameter="hostname">
<forward name="default"
path="/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp"/>
- <forward name="success"
- path="/systems/Overview.do"
+ <forward name="confirm"
+ path="/systems/ssm/DeleteConfirm.do"
redirect="true"/>
</action>
@@ -2438,8 +2438,8 @@
parameter="macaddress">
<forward name="default"
path="/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp"/>
- <forward name="success"
- path="/systems/Overview.do"
+ <forward name="confirm"
+ path="/systems/ssm/DeleteConfirm.do"
redirect="true"/>
</action>
commit 2600180777c5e67565413db1cbcd515a16dbe690
Author: Partha Aji <paji(a)redhat.com>
Date: Thu May 6 15:06:38 2010 -0400
Made the dup systems page use ssm
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java
index 85f0dfa..c8a3d6d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java
@@ -14,12 +14,15 @@
*/
package com.redhat.rhn.frontend.action.systems.duplicate;
+import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.frontend.dto.NetworkDto;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.frontend.taglibs.list.ListTagUtil;
-import com.redhat.rhn.frontend.taglibs.list.helper.ListSessionSetHelper;
+import com.redhat.rhn.frontend.taglibs.list.helper.ListRhnSetHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
+import com.redhat.rhn.manager.rhnset.RhnSetDecl;
+import com.redhat.rhn.manager.rhnset.RhnSetManager;
import com.redhat.rhn.manager.system.DuplicateSystemGrouping;
import com.redhat.rhn.manager.system.SystemManager;
@@ -28,10 +31,7 @@ import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import java.util.Collections;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -64,8 +64,7 @@ public class DuplicateSystemsAction extends RhnAction implements Listable {
request.setAttribute(INACTIVE_COUNT, inactiveHours);
- ListSessionSetHelper helper = new ListSessionSetHelper(this, request,
- Collections.EMPTY_MAP, mapping.getParameter());
+ ListRhnSetHelper helper = new ListRhnSetHelper(this, request, getSetDecl());
helper.setWillClearSet(false);
helper.execute();
if (helper.isDispatched()) {
@@ -77,7 +76,8 @@ public class DuplicateSystemsAction extends RhnAction implements Listable {
String inactiveButton = ListTagUtil.makeExtraButtonName(helper.getUniqueName());
if (!StringUtils.isBlank(request.getParameter(inactiveButton))) {
List<DuplicateSystemGrouping> list = getResult(ctx);
- Set set = new HashSet();
+
+ RhnSet set = helper.getSet();
for (DuplicateSystemGrouping grp : list) {
for (NetworkDto dto : grp.getSystems()) {
if (dto.getInactive() > 0) {
@@ -85,8 +85,10 @@ public class DuplicateSystemsAction extends RhnAction implements Listable {
}
}
}
- helper.getSet().addAll(set);
+
+ RhnSetManager.store(set);
helper.resync(request);
+
}
@@ -117,5 +119,8 @@ public class DuplicateSystemsAction extends RhnAction implements Listable {
return SystemManager.listDuplicatesByIP(contextIn.getLoggedInUser(), count);
}
-
+ private RhnSetDecl getSetDecl() {
+ return RhnSetDecl.SYSTEMS;
+ }
+
}
13 years, 11 months
Branch 'yum-repo-sync' - java/code
by Shannon Hughes
java/code/src/com/redhat/rhn/domain/channel/ContentSource.java | 22 ----------
java/code/src/com/redhat/rhn/domain/channel/test/ChannelTest.java | 2
java/code/src/com/redhat/rhn/domain/task/Task.hbm.xml | 1
java/code/src/com/redhat/rhn/domain/task/Task.java | 17 +++++++
java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java | 4 +
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java | 12 ++---
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 4 -
java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java | 10 ++--
9 files changed, 39 insertions(+), 35 deletions(-)
New commits:
commit 85ff5e6f8b55d6726c9cac0f48f267b09e08dd19
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Fri May 7 14:37:45 2010 -0400
more compiliation fixes to support many2many
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ContentSource.java b/java/code/src/com/redhat/rhn/domain/channel/ContentSource.java
index 44e0e92..74c6161 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ContentSource.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/ContentSource.java
@@ -26,8 +26,7 @@ import com.redhat.rhn.domain.BaseDomainHelper;
*/
public class ContentSource extends BaseDomainHelper {
- private Long id;
- private Channel channel;
+ private Long id;
private ContentSourceType type;
private String sourceUrl;
private Date lastSynced;
@@ -60,24 +59,7 @@ public class ContentSource extends BaseDomainHelper {
*/
public void setId(Long idIn) {
this.id = idIn;
- }
-
-
-
- /**
- * @return Returns the chan.
- */
- public Channel getChannel() {
- return channel;
- }
-
-
- /**
- * @param chanIn The chan to set.
- */
- public void setChannel(Channel chanIn) {
- this.channel = chanIn;
- }
+ }
/**
diff --git a/java/code/src/com/redhat/rhn/domain/channel/test/ChannelTest.java b/java/code/src/com/redhat/rhn/domain/channel/test/ChannelTest.java
index 5a132de..ad3d12f 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/test/ChannelTest.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/test/ChannelTest.java
@@ -182,7 +182,7 @@ public class ChannelTest extends BaseTestCaseWithUser {
ContentSource cs = new ContentSource();
cs.setLabel("repo_label-" + c.getLabel());
cs.setSourceUrl("fake url");
- cs.setChannel(c);
+ cs.getChannels().add(c);
cs.setType(ChannelFactory.CONTENT_SOURCE_TYPE_YUM);
c.getSources().add(cs);
c = (Channel) TestUtils.saveAndReload(c);
diff --git a/java/code/src/com/redhat/rhn/domain/task/Task.hbm.xml b/java/code/src/com/redhat/rhn/domain/task/Task.hbm.xml
index 70b8f1a..08d3b56 100644
--- a/java/code/src/com/redhat/rhn/domain/task/Task.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/task/Task.hbm.xml
@@ -11,6 +11,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
column="org_id" />
<key-property name="name" type="string" column="task_name" length="64"/>
<key-property name="data" column="task_data" type="long"/>
+ <key-property name="data2" column="task_data_two" type="long"/>
<key-property name="earliest" column="earliest" type="timestamp"/>
</composite-id>
diff --git a/java/code/src/com/redhat/rhn/domain/task/Task.java b/java/code/src/com/redhat/rhn/domain/task/Task.java
index 604c90c..f891773 100644
--- a/java/code/src/com/redhat/rhn/domain/task/Task.java
+++ b/java/code/src/com/redhat/rhn/domain/task/Task.java
@@ -30,6 +30,7 @@ public class Task implements Serializable {
private String name;
private Long data;
+ private Long data2;
private int priority;
private Date earliest;
private Org org;
@@ -50,6 +51,22 @@ public class Task implements Serializable {
}
/**
+ *
+ * @return the data
+ */
+ public Long getData2() {
+ return data2;
+ }
+
+ /**
+ *
+ * @param dataIn data to set
+ */
+ public void setData2(Long dataIn) {
+ this.data2 = dataIn;
+ }
+
+ /**
* @return Returns the earliest.
*/
public Date getEarliest() {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
index b9994a7..4c928e4 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
@@ -609,7 +609,7 @@ public class EditChannelAction extends RhnAction implements Listable {
cs.getLastSynced());
}
request.setAttribute("last_sync", lastSync);
- if (ChannelManager.getLatestSyncLogFile(cs) != null) {
+ if (ChannelManager.getLatestSyncLogFile(cs,c) != null) {
request.setAttribute("log_url",
DownloadManager.getChannelSyncLogDownloadPath(cs,
ctx.getLoggedInUser()));
diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
index 592297f..ad75549 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
@@ -89,6 +89,7 @@ public class DownloadFile extends DownloadAction {
private static final String PATH = "path";
private static final String SESSION = "session";
private static final String URL = "url";
+ private static final String CHANNEL = "cid";
/** {@inheritDoc} */
public ActionForward execute(ActionMapping mapping,
@@ -368,9 +369,10 @@ public class DownloadFile extends DownloadAction {
(int) patch.getReadme().length()));
}
else if (type.equals(DownloadManager.DOWNLOAD_TYPE_REPO_LOG)) {
+ Channel c = ChannelFactory.lookupById((Long)params.get(CHANNEL));
ContentSource cs = ChannelFactory.lookupContentSource(fileId);
ChannelManager.verifyChannelAdmin(user, fileId);
- File file = new File(ChannelManager.getLatestSyncLogFile(cs));
+ File file = new File(ChannelManager.getLatestSyncLogFile(cs, c));
StringBuilder output = new StringBuilder();
BufferedReader input = new BufferedReader(new FileReader(file));
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java
index dd6c1a7..36bab29 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java
@@ -14,19 +14,19 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.channel.Channel;
-import com.redhat.rhn.domain.channel.ContentSource;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
-import org.apache.commons.lang.StringUtils;
-
import java.io.IOException;
import java.io.Writer;
+import org.apache.commons.lang.StringUtils;
+
import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.channel.Channel;
+import com.redhat.rhn.domain.channel.ContentSource;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
*
* ChannelSerializer
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
index 3544c67..d39f3f7 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
@@ -2812,7 +2812,7 @@ public class ChannelManager extends BaseManager {
* @param cs the channel content source you want the latest log file for
* @return the string of the filename (fully qualified)
*/
- public static String getLatestSyncLogFile(ContentSource cs) {
+ public static String getLatestSyncLogFile(ContentSource cs, Channel c) {
String logPath = Config.get().getString(ConfigDefaults.SPACEWALK_REPOSYNC_LOG_PATH,
"/var/log/rhn/reposync/");
@@ -2821,7 +2821,7 @@ public class ChannelManager extends BaseManager {
File dir = new File(logPath);
List<String> possibleList = new ArrayList<String>();
for (String file : dir.list()) {
- if (file.contains(cs.getChannel().getLabel() + '-' + repoLabel)) {
+ if (file.contains(c.getLabel() + '-' + repoLabel)) {
possibleList.add(file);
}
}
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java b/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
index 0836dcf..ce11bff 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
@@ -16,6 +16,7 @@ package com.redhat.rhn.taskomatic.task;
import com.redhat.rhn.common.conf.Config;
import com.redhat.rhn.common.conf.ConfigDefaults;
+import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.channel.ChannelFactory;
import com.redhat.rhn.domain.channel.ContentSource;
import com.redhat.rhn.domain.task.Task;
@@ -70,9 +71,10 @@ public class RepoSyncTask implements Job {
continue;
}
ContentSource src = ChannelFactory.lookupContentSource(task.getData());
+ Channel c = ChannelFactory.lookupById(task.getData2());
if (log.isInfoEnabled()) {
log.info("Syncing repo " + src.getSourceUrl() + " to channel " +
- src.getChannel().getLabel());
+ c.getLabel());
}
if (src == null) {
log.error("Content Source could not be found: " + task.getData());
@@ -83,7 +85,7 @@ public class RepoSyncTask implements Job {
try {
Process p = Runtime.getRuntime().exec(
- getSyncCommand(src).toArray(new String[0]));
+ getSyncCommand(src,c).toArray(new String[0]));
src.setLastSynced(new Date());
int chr = p.getInputStream().read();
while (chr != -1) {
@@ -99,12 +101,12 @@ public class RepoSyncTask implements Job {
}
}
- private static List<String> getSyncCommand(ContentSource src) {
+ private static List<String> getSyncCommand(ContentSource src, Channel c) {
List<String> cmd = new ArrayList<String>();
cmd.add(Config.get().getString(ConfigDefaults.SPACEWALK_REPOSYNC_PATH,
"/usr/bin/spacewalk-repo-sync"));
cmd.add("--channel");
- cmd.add(src.getChannel().getLabel());
+ cmd.add(c.getLabel());
cmd.add("--url");
cmd.add(src.getSourceUrl());
cmd.add("--type");
13 years, 11 months