java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 8
++++----
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml | 3
+--
java/spacewalk-java.spec | 7
++++++-
rel-eng/packages/spacewalk-java | 2
+-
4 files changed, 12 insertions(+), 8 deletions(-)
New commits:
commit a0c430c07dad92b618a013e68da1cc49b035262f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Feb 4 11:48:58 2013 +0100
Automatic commit of package [spacewalk-java] release [1.9.56-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 6d71dde..27b38e2 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.9.55
+Version: 1.9.56
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -659,6 +659,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Feb 04 2013 Tomas Lestach <tlestach(a)redhat.com> 1.9.56-1
+- 903718 - give the user url to request or generate a new certificate
+- 903557 - fix queries for extra packages
+- 906345 - reuse the ssm.server.delete.operationname message
+
* Thu Jan 31 2013 Tomas Lestach <tlestach(a)redhat.com> 1.9.55-1
- 906345 - undo delete 'Server Delete' string
- 906345 - localize operation descriptions
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index d410be9..349303c 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.55-1 java/
+1.9.56-1 java/
commit 2233682fc8da64ff5f427fcd52b297fe5860b318
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Feb 1 14:45:39 2013 +0100
903718 - give the user url to request or generate a new certificate
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index 9e4dc46..5178885 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -5154,26 +5154,26 @@ user before attempting to deactivate their
account.</source>
</context-group>
</trans-unit>
<trans-unit id="satellite.expired">
- <source>Your satellite certificate has expired. Please contact Red Hat for
a new certificate.</source>
+ <source>Your satellite certificate has expired. Please visit the following
link for steps on how to request or generate a new certificate: <a
href="https://access.redhat.com/knowledge/tools/satcert">...
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/Login.do</context>
</context-group>
</trans-unit>
<trans-unit id="satellite.expired.restricted">
- <source>Your Satellite Certificate has expired. Your Satellite is on day
{0} of {1} day restricted period and will soon stop functioning. Please contact Red Hat
for a new certificate.</source>
+ <source>Your Satellite Certificate has expired. Your Satellite is on day
{0} of {1} day restricted period and will soon stop functioning. Please visit the
following url for steps on how to request or generate a new certificate:
https://access.redhat.com/knowledge/tools/satcert</source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/Login.do</context>
</context-group>
</trans-unit>
<trans-unit id="satellite.graceperiod">
- <source>Your satellite certificate has expired. Please contact Red Hat for
a new certificate. Your satellite enters restricted period in {0} day(s).</source>
+ <source>Your satellite certificate has expired. Please visit the following
link for steps on how to request or generate a new certificate: <a
href="https://access.redhat.com/knowledge/tools/satcert">...
Your satellite enters restricted period in {0} day(s).</source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/Login.do</context>
<context
context-type="sourcefile">/rhn/YourRhn.do</context>
</context-group>
</trans-unit>
<trans-unit id="restricted.forbidden">
- <source>You are not allowed to perform this action until your Satellite
Certificate is renewed. Your Satellite is on day {0} of the {1} restricted period and will
soon stop functioning. Please contact Red Hat for a new certificate.</source>
+ <source>You are not allowed to perform this action until your Satellite
Certificate is renewed. Your Satellite is on day {0} of the {1} restricted period and will
soon stop functioning. Please visit the following url for steps on how to request or
generate a new certificate:
https://access.redhat.com/knowledge/tools/satcert</source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/Login.do</context>
</context-group>
diff --git
a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml
index b47e494..63f6544a 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml
@@ -328,8 +328,7 @@ Thank you for using @@PRODUCT_NAME@@.
</trans-unit>
<trans-unit id="email.satellitecert.satbodyend">
<source>
-Please contact your regional Red Hat Customer Service Representative for information
-on how to renew your @@PRODUCT_NAME@@ Certificate.
+Please visit the following url for steps on how to request or generate a new
@@PRODUCT_NAME@@ certificate:
https://access.redhat.com/knowledge/tools/satcert
Thank you for using @@PRODUCT_NAME@@.