Branch 'ipv6' - backend/server
by Miroslav Suchý
backend/server/rhnServer/server_hardware.py | 54 ++++++++++++++++++----------
1 file changed, 35 insertions(+), 19 deletions(-)
New commits:
commit 7c643f238a431c8e86098d89cdb86c25c537d3c5
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 22 14:46:37 2011 +0100
IPv6: fix ipv6 for rhn-profile-sync
errr - for rhnRAM, rhnCPU, rhnDevice ... we pass dev_id to reload.
For NetIfaceInformation we pass server_id
this is strongly related to 70694d0bccdccfc3f00ba4cfc0b3dd6b52e9cc3d
and revert significant part of that commit
diff --git a/backend/server/rhnServer/server_hardware.py b/backend/server/rhnServer/server_hardware.py
index 19beaa7..8a9b30e 100644
--- a/backend/server/rhnServer/server_hardware.py
+++ b/backend/server/rhnServer/server_hardware.py
@@ -173,6 +173,7 @@ def cleanse_ip_addr(ip_addr):
class GenericDevice:
""" A generic device class """
+ __table = "override-GenericDevice"
def __init__(self, table):
self.id = 0
self.status = 1 # just added
@@ -251,8 +252,8 @@ class Device(GenericDevice):
table. The mapping allows transformation from whatever comes in to
valid fields in the table Looks complicated but it isn't -- gafton
"""
- def __init__(self, table, fields, dict = None, mapping = None):
- GenericDevice.__init__(self, table)
+ def __init__(self, fields, dict = None, mapping = None):
+ GenericDevice.__init__(self)
x = {}
for k in fields:
x[k] = None
@@ -305,6 +306,7 @@ class Device(GenericDevice):
class HardwareDevice(Device):
""" A more specific device based on the Device class """
+ __table = "rhnDevice"
def __init__(self, dict = None):
fields = ['class', 'bus', 'device', 'driver', 'detached',
'description', 'pcitype', 'prop1', 'prop2',
@@ -312,12 +314,13 @@ class HardwareDevice(Device):
# get a processed mapping
mapping = kudzu_mapping(dict)
# ... and do little to no work
- Device.__init__(self, "rhnDevice", fields, dict, mapping)
+ Device.__init__(self, fields, dict, mapping)
# use the hardware id sequencer
self.sequence = "rhn_hw_dev_id_seq"
class CPUDevice(Device):
""" A class for handling CPU - mirrors the rhnCPU structure """
+ __table = "rhnCPU"
def __init__(self, dict = None):
fields = ['cpu_arch_id', 'architecture', 'bogomips', 'cache',
'family', 'mhz', 'stepping', 'flags', 'model',
@@ -340,7 +343,7 @@ class CPUDevice(Device):
'class' : None,
}
# now instantiate this class
- Device.__init__(self, "rhnCPU", fields, dict, mapping)
+ Device.__init__(self, fields, dict, mapping)
self.sequence = "rhn_cpu_id_seq"
if not dict:
return
@@ -368,10 +371,11 @@ class CPUDevice(Device):
class NetworkInformation(Device):
""" This is a wrapper class for the Network Information (rhnServerNetwork) """
+ __table = "rhnServerNetwork"
def __init__(self, dict = None):
fields = ["hostname", "ipaddr", "ip6addr"]
mapping = { 'class' : None }
- Device.__init__(self, "rhnServerNetwork", fields, dict, mapping)
+ Device.__init__(self, fields, dict, mapping)
self._autonull = ('ipaddr', 'ip6addr')
# use our own sequence
self.sequence = "rhn_server_net_id_seq"
@@ -554,7 +558,7 @@ class NetIfaceAddress(Device):
'address' : 'address',
}
unique = ['address'] # to be overriden by child
- table = 'rhnServerNetAddress' # to be overriden by child
+ __table = 'rhnServerNetAddress' # to be overriden by child
def __init__(self, list_ifaces=None):
log_debug(4, list_ifaces)
self.ifaces = {}
@@ -637,7 +641,7 @@ class NetIfaceAddress(Device):
columns = self.key_mapping.values() + ['interface_id']
columns.sort()
bind_params = string.join(map(lambda x: ':' + x, columns), ", ")
- h = rhnSQL.prepare(q % (self.table, string.join(columns, ", "), bind_params))
+ h = rhnSQL.prepare(q % (self.__table, string.join(columns, ", "), bind_params))
return _dml(h, params)
def _delete(self, params):
@@ -646,7 +650,7 @@ class NetIfaceAddress(Device):
columns = self.unique
wheres = map(lambda x: '%s = :%s' % (x, x), columns)
- h = rhnSQL.prepare(q % (self.table, string.join(wheres, " and ")))
+ h = rhnSQL.prepare(q % (self.__table, string.join(wheres, " and ")))
return _dml(h, params)
def _update(self, params):
@@ -664,7 +668,7 @@ class NetIfaceAddress(Device):
updates = map(lambda x: '%s = :%s' % (x, x), updates)
updates = string.join(updates, ", ")
- h = rhnSQL.prepare(q % (self.table, updates, wheres))
+ h = rhnSQL.prepare(q % (self.__table, updates, wheres))
return _dml(h, params)
def reload(self, interface_id):
@@ -672,7 +676,7 @@ class NetIfaceAddress(Device):
select *
from %s
where interface_id = :interface_id
- """ % self.table)
+ """ % self.__table)
h.execute(interface_id=interface_id)
self.db_ifaces = []
while 1:
@@ -694,7 +698,7 @@ class NetIfaceAddress6(NetIfaceAddress):
'addr' : 'address',
'scope' : 'scope',
}
- table = 'rhnServerNetAddress6'
+ __table = 'rhnServerNetAddress6'
unique = ['interface_id', 'address', 'scope']
def __init__(self, addr_dict=None):
NetIfaceAddress.__init__(self, addr_dict)
@@ -707,7 +711,7 @@ class NetIfaceAddress4(NetIfaceAddress):
'ipaddr' : 'address',
'broadcast' : 'broadcast',
}
- table = 'rhnServerNetAddress4'
+ __table = 'rhnServerNetAddress4'
unique = ['interface_id']
def __init__(self, addr_dict=None):
NetIfaceAddress.__init__(self, addr_dict)
@@ -756,10 +760,11 @@ def _transpose(hasharr):
class MemoryInformation(Device):
""" Memory information """
+ __table = "rhnRAM"
def __init__(self, dict = None):
fields = ["ram", "swap"]
mapping = { "class" : None }
- Device.__init__(self, "rhnRAM", fields, dict, mapping)
+ Device.__init__(self, fields, dict, mapping)
# use our own sequence
self.sequence = "rhn_ram_id_seq"
if not dict:
@@ -776,11 +781,12 @@ class MemoryInformation(Device):
class DMIInformation(Device):
""" DMI information """
+ __table = "rhnServerDMI"
def __init__(self, dict = None):
fields = ["vendor", "system", "product", "asset", "board",
"bios_vendor", "bios_version", "bios_release"]
mapping = { "class" : None }
- Device.__init__(self, "rhnServerDMI", fields, dict, mapping)
+ Device.__init__(self, fields, dict, mapping)
# use our own sequence
self.sequence = "rhn_server_dmi_id_seq"
if not dict:
@@ -794,6 +800,7 @@ class DMIInformation(Device):
class InstallInformation(Device):
""" Install information """
+ __table = "rhnServerInstallInfo"
def __init__(self, dict = None):
fields = ['install_method', 'iso_status', 'mediasum']
mapping = {
@@ -802,7 +809,7 @@ class InstallInformation(Device):
'isostatus' : 'iso_status',
'mediasum' : 'mediasum',
}
- Device.__init__(self, "rhnServerInstallInfo", fields, dict, mapping)
+ Device.__init__(self, fields, dict, mapping)
self.sequence = 'rhn_server_install_info_id_seq'
class Hardware:
@@ -912,9 +919,16 @@ class Hardware:
""" Load a certain hardware class from the database """
if not self.__hardware.has_key(DevClass):
self.__hardware[DevClass] = []
- dev = DevClass()
- dev.reload(sysid)
- self.__hardware[DevClass].append(dev)
+
+ h = rhnSQL.prepare("select id from %s where server_id = :sysid" % DevClass.__table)
+ h.execute(sysid = sysid)
+ rows = h.fetchall_dict() or []
+
+ for device in rows:
+ dev_id = device['id']
+ dev = DevClass()
+ dev.reload(dev_id)
+ self.__hardware[DevClass].append(dev)
def reload_hardware_byid(self, sysid):
""" load all hardware devices for a server """
@@ -929,7 +943,9 @@ class Hardware:
self.__load_from_db(NetworkInformation, sysid)
self.__load_from_db(MemoryInformation, sysid)
self.__load_from_db(InstallInformation, sysid)
- self.__load_from_db(NetIfaceInformation, sysid)
+
+ net_iface_info = NetIfaceInformation()
+ net_iface_info.reload(sysid)
# now set the flag
self.__changed = 0
12 years, 5 months
Branch 'ipv6' - schema/spacewalk
by Miroslav Suchý
schema/spacewalk/common/tables/rhnCpu.sql | 2 +-
schema/spacewalk/common/tables/rhnRam.sql | 2 +-
schema/spacewalk/common/tables/rhnServerDMI.sql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/125-alter-index-rhnRam.sql.oracle | 6 ++++++
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/125-alter-index-rhnRam.sql.postgresql | 6 ++++++
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/126-alter-index-rhnCpu.sql.oracle | 6 ++++++
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/126-alter-index-rhnCpu.sql.postgresql | 6 ++++++
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/127-alter-index-rhnServerDmi.sql.oracle | 6 ++++++
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/127-alter-index-rhnServerDmi.sql.postgresql | 6 ++++++
9 files changed, 39 insertions(+), 3 deletions(-)
New commits:
commit 9e8384cf38eb31aa5b7c8420f34e19f8da6335be
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 22 10:53:29 2011 +0100
in tables rhnRam, rhnCpu and rhnServerDMI allow only one record per server
Java part of Spacewalk assume only one record per server there.
If there are more records per server tomcat will fail with traceback of
apocalyptic size.
diff --git a/schema/spacewalk/common/tables/rhnCpu.sql b/schema/spacewalk/common/tables/rhnCpu.sql
index 849068e..dcdb923 100644
--- a/schema/spacewalk/common/tables/rhnCpu.sql
+++ b/schema/spacewalk/common/tables/rhnCpu.sql
@@ -48,7 +48,7 @@ CREATE TABLE rhnCpu
ENABLE ROW MOVEMENT
;
-CREATE INDEX rhn_cpu_server_id_idx
+CREATE UNIQUE INDEX rhn_cpu_server_id_uq
ON rhnCpu (server_id)
TABLESPACE [[4m_tbs]]
NOLOGGING;
diff --git a/schema/spacewalk/common/tables/rhnRam.sql b/schema/spacewalk/common/tables/rhnRam.sql
index 84dfb71..67a02c1 100644
--- a/schema/spacewalk/common/tables/rhnRam.sql
+++ b/schema/spacewalk/common/tables/rhnRam.sql
@@ -32,7 +32,7 @@ CREATE TABLE rhnRam
ENABLE ROW MOVEMENT
;
-CREATE INDEX rhn_ram_sid_idx
+CREATE UNIQUE INDEX rhn_ram_sid_uq
ON rhnRam (server_id)
TABLESPACE [[4m_tbs]]
NOLOGGING;
diff --git a/schema/spacewalk/common/tables/rhnServerDMI.sql b/schema/spacewalk/common/tables/rhnServerDMI.sql
index 2e5e786..23caafb 100644
--- a/schema/spacewalk/common/tables/rhnServerDMI.sql
+++ b/schema/spacewalk/common/tables/rhnServerDMI.sql
@@ -38,7 +38,7 @@ CREATE TABLE rhnServerDMI
ENABLE ROW MOVEMENT
;
-CREATE INDEX rhn_server_dmi_sid_idx
+CREATE UNIQUE INDEX rhn_server_dmi_sid_uq
ON rhnServerDMI (server_id)
TABLESPACE [[2m_tbs]]
NOLOGGING;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/125-alter-index-rhnRam.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/125-alter-index-rhnRam.sql.oracle
new file mode 100644
index 0000000..8c6e6ee
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/125-alter-index-rhnRam.sql.oracle
@@ -0,0 +1,6 @@
+DROP INDEX rhn_ram_sid_idx;
+
+CREATE UNIQUE INDEX rhn_ram_sid_uq
+ ON rhnRam (server_id)
+ TABLESPACE [[4m_tbs]]
+ NOLOGGING;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/125-alter-index-rhnRam.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/125-alter-index-rhnRam.sql.postgresql
new file mode 100644
index 0000000..2c01a8f
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/125-alter-index-rhnRam.sql.postgresql
@@ -0,0 +1,6 @@
+-- oracle equivalent source sha1 586724a3a2befe543cd5352b7e1d3d88f82d82f3
+
+DROP INDEX rhn_ram_sid_idx;
+
+CREATE UNIQUE INDEX rhn_ram_sid_uq
+ ON rhnRam (server_id);
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/126-alter-index-rhnCpu.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/126-alter-index-rhnCpu.sql.oracle
new file mode 100644
index 0000000..b327501
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/126-alter-index-rhnCpu.sql.oracle
@@ -0,0 +1,6 @@
+DROP INDEX rhn_cpu_server_id_idx;
+
+CREATE UNIQUE INDEX rhn_cpu_server_id_uq
+ ON rhnCpu (server_id)
+ TABLESPACE [[4m_tbs]]
+ NOLOGGING;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/126-alter-index-rhnCpu.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/126-alter-index-rhnCpu.sql.postgresql
new file mode 100644
index 0000000..eaca4a9
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/126-alter-index-rhnCpu.sql.postgresql
@@ -0,0 +1,6 @@
+-- oracle equivalent source sha1 9cf5504d7dabce531f966048916bf85ce13e43ed
+
+DROP INDEX rhn_cpu_server_id_idx;
+
+CREATE UNIQUE INDEX rhn_cpu_server_id_uq
+ ON rhnCpu (server_id);
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/127-alter-index-rhnServerDmi.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/127-alter-index-rhnServerDmi.sql.oracle
new file mode 100644
index 0000000..e5ff9f8
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/127-alter-index-rhnServerDmi.sql.oracle
@@ -0,0 +1,6 @@
+DROP INDEX rhn_server_dmi_sid_idx;
+
+CREATE UNIQUE INDEX rhn_server_dmi_sid_uq
+ ON rhnServerDMI (server_id)
+ TABLESPACE [[2m_tbs]]
+ NOLOGGING;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/127-alter-index-rhnServerDmi.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/127-alter-index-rhnServerDmi.sql.postgresql
new file mode 100644
index 0000000..096f010
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/127-alter-index-rhnServerDmi.sql.postgresql
@@ -0,0 +1,6 @@
+-- oracle equivalent source sha1 37531557b1d0368256273ea973cbdbc6eac3dd19
+
+DROP INDEX rhn_server_dmi_sid_idx;
+
+CREATE UNIQUE INDEX rhn_server_dmi_sid_uq
+ ON rhnServerDMI (server_id);
12 years, 5 months
Changes to 'refs/tags/rhn-client-tools-1.6.36-1'
by Miroslav Suchý
Tag 'rhn-client-tools-1.6.36-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-11-21 20:51 +0000
Tagging package [rhn-client-tools] version [1.6.36-1] in directory [client/rhel/rhn-client-tools/].
Changes since rhn-client-tools-1.6.35-1:
Miroslav Suchý (2):
751760 - make errmsg as an alias to value (for setter too)
Automatic commit of package [rhn-client-tools] release [1.6.36-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py | 6 ++++++
rel-eng/packages/rhn-client-tools | 2 +-
3 files changed, 11 insertions(+), 2 deletions(-)
---
12 years, 5 months
2 commits - client/rhel rel-eng/packages
by Miroslav Suchý
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py | 6 ++++++
rel-eng/packages/rhn-client-tools | 2 +-
3 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit e1724ca83dcb9eab6260a3425f57641f6adf934a
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Nov 21 21:51:49 2011 +0100
Automatic commit of package [rhn-client-tools] release [1.6.36-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 144499c..84a455d 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.6.35
+Version: 1.6.36
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -334,6 +334,9 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Mon Nov 21 2011 Miroslav Suchý 1.6.36-1
+- 751760 - make errmsg as an alias to value (for setter too)
+
* Mon Nov 21 2011 Miroslav Suchý 1.6.35-1
- 751760 - make errmsg as an alias to value
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index ba492e4..9849c30 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.6.35-1 client/rhel/rhn-client-tools/
+1.6.36-1 client/rhel/rhn-client-tools/
commit 369c6fb728bf69c742d1f526244c753b401e0c7a
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Nov 21 20:54:50 2011 +0100
751760 - make errmsg as an alias to value (for setter too)
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
index 85f8db6..97d9ac3 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
@@ -43,6 +43,12 @@ class Error(YumBaseError):
else:
return YumBaseError.__getattribute__(self, name)
+ def __setattr__(self, name, value):
+ """ Spacewalk backend still use errmsg, let have errmsg as alias to value """
+ if name == 'errmsg':
+ self.__dict__['value'] = value
+ else:
+ YumBaseError.__setattr__(self, name, value)
class RpmError(Error):
"""rpm itself raised an error condition"""
12 years, 5 months
Changes to 'refs/tags/rhn-client-tools-1.6.35-1'
by Miroslav Suchý
Tag 'rhn-client-tools-1.6.35-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-11-21 19:36 +0000
Tagging package [rhn-client-tools] version [1.6.35-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-java-1.6.78-1:
Miroslav Suchý (2):
751760 - make errmsg as an alias to value
Automatic commit of package [rhn-client-tools] release [1.6.35-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py | 8 ++++++++
rel-eng/packages/rhn-client-tools | 2 +-
3 files changed, 13 insertions(+), 2 deletions(-)
---
12 years, 5 months
2 commits - client/rhel rel-eng/packages
by Miroslav Suchý
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py | 8 ++++++++
rel-eng/packages/rhn-client-tools | 2 +-
3 files changed, 13 insertions(+), 2 deletions(-)
New commits:
commit e16a61a4ab5b3ce48e7ff11e924a6552f8a70207
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Nov 21 20:36:02 2011 +0100
Automatic commit of package [rhn-client-tools] release [1.6.35-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index f25299c..144499c 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.6.34
+Version: 1.6.35
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -334,6 +334,9 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Mon Nov 21 2011 Miroslav Suchý 1.6.35-1
+- 751760 - make errmsg as an alias to value
+
* Mon Nov 07 2011 Miroslav Suchý 1.6.34-1
- call parent's constructor
- 751760 - use attribute value, which our ancestor use
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 2bbe3bc..ba492e4 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.6.34-1 client/rhel/rhn-client-tools/
+1.6.35-1 client/rhel/rhn-client-tools/
commit 61d62a5a31cdfb5094987c2575a5b0a56e9c194d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Nov 21 20:35:12 2011 +0100
751760 - make errmsg as an alias to value
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
index e1c5198..85f8db6 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
@@ -35,6 +35,14 @@ class Error(YumBaseError):
def __repr__(self):
self.log.log_me(self.value)
return self.value
+
+ def __getattribute__(self, name):
+ """ Spacewalk backend still use errmsg, let have errmsg as alias to value """
+ if name == 'errmsg':
+ return self.value
+ else:
+ return YumBaseError.__getattribute__(self, name)
+
class RpmError(Error):
"""rpm itself raised an error condition"""
12 years, 5 months
Branch 'ipv6' - 2 commits - backend/server java/code
by Miroslav Suchý
backend/server/rhnServer/server_hardware.py | 22 +++++-----
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java | 14 +++---
2 files changed, 20 insertions(+), 16 deletions(-)
New commits:
commit 5823ba4825f09b29cfd9357155428213d52042c9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Nov 21 18:18:42 2011 +0100
IPv6: delete address which no longer exists for this interface
diff --git a/backend/server/rhnServer/server_hardware.py b/backend/server/rhnServer/server_hardware.py
index 972aeed..19beaa7 100644
--- a/backend/server/rhnServer/server_hardware.py
+++ b/backend/server/rhnServer/server_hardware.py
@@ -457,19 +457,23 @@ class NetIfaceInformation(Device):
log_debug(4, "Updates", updates)
log_debug(4, "Inserts", inserts)
- self._delete(deletes)
self._update(updates)
self._insert(inserts)
ifaces = self.ifaces.copy()
for name, info in ifaces.items():
- if 'ipv6' in info:
- info['ipv6'].save(self.get_server_id(server_id, name))
- else:
- pass # wipe old records if any
- if 'ipv4' in info:
- info['ipv4'].save(self.get_server_id(server_id, name))
- else:
- pass # wipe old records if any
+ if not 'ipv6' in info:
+ info['ipv6'] = NetIfaceAddress6()
+ info['ipv6'].save(self.get_server_id(server_id, name))
+ if not 'ipv4' in info:
+ info['ipv4'] = NetIfaceAddress4()
+ info['ipv4'].save(self.get_server_id(server_id, name))
+ # delete address (if any) of deleted interaces
+ for d in deletes:
+ interface = NetIfaceAddress6()
+ interface.save(self.get_server_id(server_id, d['name']))
+ interface = NetIfaceAddress4()
+ interface.save(self.get_server_id(server_id, d['name']))
+ self._delete(deletes)
return 0
def get_server_id(self, server_id, name):
commit 491ea371e2379a5dfdb91f295fbdff618aac2565
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Nov 21 17:13:58 2011 +0100
make lines shorter
addressing;
./code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java:49: Line is longer than 92 characters.
./code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java:50: Line is longer than 92 characters.
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java
index cad29eb..fb420d9 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java
@@ -44,13 +44,13 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop_desc("string", "module", "Network driver used for this device.")
* #prop_desc("string", "broadcast", " Broadcast address for device.")
* #prop_desc("array", "ipv6", "List of IPv6 addresses")
- * #array()
- * #struct("ipv6 address")
- * #prop_desc("string", "address", "IPv6 address of this network device")
- * #prop_desc("string", "netmask", "IPv6 netmask of this network device")
- * #prop_desc("string", "scope", "IPv6 address scope")
- * #struct_end()
- * #array_end()
+ * #array()
+ * #struct("ipv6 address")
+ * #prop_desc("string", "address", "IPv6 address of this network device")
+ * #prop_desc("string", "netmask", "IPv6 netmask of this network device")
+ * #prop_desc("string", "scope", "IPv6 address scope")
+ * #struct_end()
+ * #array_end()
* #struct_end()
*
*/
12 years, 5 months
Changes to 'refs/tags/spacewalk-java-1.6.78-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.6.78-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-11-21 15:57 +0000
Tagging package [spacewalk-java] version [1.6.78-1] in directory [java/].
Changes since rhncfg-5.10.20-1:
Jan Pazdziora (2):
Catch a java.lang.NullPointerException when web_contact got deleted and rhnServerCustomDataValue.created_by became null.
Automatic commit of package [spacewalk-java] release [1.6.78-1].
Johannes Renner (2):
Remove markup from error message in all translation files
Remove markup from another error message
---
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/UpdateCustomDataAction.java | 4 +++-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 8 ++++----
java/spacewalk-java.spec | 9 ++++++++-
rel-eng/packages/spacewalk-java | 2 +-
19 files changed, 74 insertions(+), 65 deletions(-)
---
12 years, 5 months
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 9 ++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit a6065e15ca6634414e32e630614cfb5bf7ce2d8d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Nov 21 16:57:01 2011 +0100
Automatic commit of package [spacewalk-java] release [1.6.78-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index fb89dc7..48420fd 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.6.77
+Version: 1.6.78
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -557,6 +557,13 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Nov 21 2011 Jan Pazdziora 1.6.78-1
+- Remove markup from another error message (jrenner(a)suse.de)
+- Remove markup from error message in all translation files (jrenner(a)suse.de)
+- Catch a java.lang.NullPointerException when web_contact got deleted and
+ rhnServerCustomDataValue.created_by became null.
+- Fix the *callerIp* in API logfile (jrenner(a)suse.de)
+
* Tue Nov 15 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.77-1
- 738999 - VirtualInstance.confirmed is number not boolean
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 7168611..0ea0d7e 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.77-1 java/
+1.6.78-1 java/
12 years, 5 months
2 commits - java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 8 ++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 8 ++++----
16 files changed, 62 insertions(+), 62 deletions(-)
New commits:
commit d88cf8598a85d4224d2f3eb039dd70eeb335a64c
Author: Johannes Renner <jrenner(a)suse.de>
Date: Fri Nov 11 10:42:35 2011 +0100
Remove markup from another error message
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml
index 0939242..eb6026c 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml
@@ -1119,11 +1119,11 @@
<target>{0}-এ Satellite অ্যাডমিনিস্ট্রেটরের ভূমিকা যোগ করা হয়েছে</target></trans-unit>
<trans-unit id="user.deleteadmin">
-<source>You cannot delete <strong>another</strong> organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
+<source>You cannot delete another organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/CreateUser</context>
</context-group>
- <target>আপনি <strong>অন্যান্য</strong> প্রাতিষ্ঠানিক অ্যাডমিনিস্ট্রেটরের অ্যাকাউন্ট মুছে ফেলতে সক্ষম হবেন না। ব্যবহারকারীর অ্যাকাউন্ট নিষ্ক্রিয় করার পূর্বে অ্যাকাউন্ট থেকে 'প্রাতিষ্ঠানিক অ্যাডমিনিস্ট্রেটরের' ভূমিকা সরিয়ে নিন।</target></trans-unit>
+ <target>আপনি অন্যান্য প্রাতিষ্ঠানিক অ্যাডমিনিস্ট্রেটরের অ্যাকাউন্ট মুছে ফেলতে সক্ষম হবেন না। ব্যবহারকারীর অ্যাকাউন্ট নিষ্ক্রিয় করার পূর্বে অ্যাকাউন্ট থেকে 'প্রাতিষ্ঠানিক অ্যাডমিনিস্ট্রেটরের' ভূমিকা সরিয়ে নিন।</target></trans-unit>
<trans-unit id="user.cannot.delete.last.sat.admin">
<source>Cannot delete the last remaining satellite administrator.</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
index 6e78db8..ef49315 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
@@ -1119,11 +1119,11 @@
<target>Satellite-Administrator Rolle zu {0} hinzugefügt</target></trans-unit>
<trans-unit id="user.deleteadmin">
-<source>You cannot delete <strong>another</strong> organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
+<source>You cannot delete another organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/CreateUser</context>
</context-group>
- <target>Sie k&ouml;nnen keinen <strong>anderen</strong> Organisations-Administrator l&ouml;schen. Bitte entfernen Sie die 'Organisations-Administrator'-Funktion dieses Benutzers vor dem Versuch, seinen Account zu l&ouml;schen.</target></trans-unit>
+ <target>Sie k&ouml;nnen keinen anderen Organisations-Administrator l&ouml;schen. Bitte entfernen Sie die 'Organisations-Administrator'-Funktion dieses Benutzers vor dem Versuch, seinen Account zu l&ouml;schen.</target></trans-unit>
<trans-unit id="user.cannot.delete.last.sat.admin">
<source>Cannot delete the last remaining satellite administrator.</source>
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 4750b1c..bece319 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
@@ -1131,7 +1131,7 @@ http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd"
</trans-unit>
<trans-unit id="user.deleteadmin">
-<source>You cannot delete <strong>another</strong> organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
+<source>You cannot delete another organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/CreateUser</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
index afc968b..e184240 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
@@ -1113,11 +1113,11 @@
<target>Rol de administrador del satélite añadido a {0} </target></trans-unit>
<trans-unit id="user.deleteadmin">
-<source>You cannot delete <strong>another</strong> organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
+<source>You cannot delete another organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/CreateUser</context>
</context-group>
- <target>No puede borrar <strong>otro</strong> administrador de la organización. Por favor borre el rol de 'Administrador de la organización' de este usuario antes de intentar desactivar esta cuenta.</target></trans-unit>
+ <target>No puede borrar otro administrador de la organización. Por favor borre el rol de 'Administrador de la organización' de este usuario antes de intentar desactivar esta cuenta.</target></trans-unit>
<trans-unit id="user.cannot.delete.last.sat.admin">
<source>Cannot delete the last remaining satellite administrator.</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
index 3dcb299..d21643b 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
@@ -1113,11 +1113,11 @@
<target>Rôle d'administrateur du Satellite ajouté à {0}</target></trans-unit>
<trans-unit id="user.deleteadmin">
-<source>You cannot delete <strong>another</strong> organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
+<source>You cannot delete another organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/CreateUser</context>
</context-group>
- <target>Vous ne pouvez pas supprimer <strong>un autre</strong> administrateur
+ <target>Vous ne pouvez pas supprimer un autre administrateur
d'organisation. Supprimez le rôle "Administrateur d'organisation" de cet
utilisateur avant de supprimer son compte.</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml
index 7d8dbe5..521c40c 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml
@@ -1113,11 +1113,11 @@
<target>{0} માં સેટેલાઈટ સંચાલક ભૂમિકા ઉમેરાયેલ છે</target></trans-unit>
<trans-unit id="user.deleteadmin">
-<source>You cannot delete <strong>another</strong> organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
+<source>You cannot delete another organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/CreateUser</context>
</context-group>
- <target>તમે <strong>અન્ય</strong> સંસ્થા સંચાલકને કાઢી શકશો નહિં. મહેરબાની કરીને 'સંસ્થા સંચાલક' ભૂમિકાને આ વપરાશકર્તામાંથી તેમનું ખાતું કાઢી નાંખવા પહેલાં દૂર કરો</target></trans-unit>
+ <target>તમે અન્ય સંસ્થા સંચાલકને કાઢી શકશો નહિં. મહેરબાની કરીને 'સંસ્થા સંચાલક' ભૂમિકાને આ વપરાશકર્તામાંથી તેમનું ખાતું કાઢી નાંખવા પહેલાં દૂર કરો</target></trans-unit>
<trans-unit id="user.cannot.delete.last.sat.admin">
<source>Cannot delete the last remaining satellite administrator.</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml
index 15f89d9..652ebf9 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml
@@ -1113,11 +1113,11 @@
<target>{0} में सैटेलाइट प्रशासक जोड़ा</target></trans-unit>
<trans-unit id="user.deleteadmin">
-<source>You cannot delete <strong>another</strong> organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
+<source>You cannot delete another organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/CreateUser</context>
</context-group>
- <target>आप <strong>दूसरे</strong> संगठन प्रशासक को मिटा नहीं सकते हैं. कृपया 'संगठन प्रशासक' भूमिका को इस उपयोक्ता से उनके खाता के मिटाने के प्रयास पहले हटायें.</target></trans-unit>
+ <target>आप दूसरे संगठन प्रशासक को मिटा नहीं सकते हैं. कृपया 'संगठन प्रशासक' भूमिका को इस उपयोक्ता से उनके खाता के मिटाने के प्रयास पहले हटायें.</target></trans-unit>
<trans-unit id="user.cannot.delete.last.sat.admin">
<source>Cannot delete the last remaining satellite administrator.</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
index 53d434c..fe5fd8d 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
@@ -1113,11 +1113,11 @@
<target>Ruolo di Amministratore di Satellite aggiunto a {0}</target></trans-unit>
<trans-unit id="user.deleteadmin">
-<source>You cannot delete <strong>another</strong> organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
+<source>You cannot delete another organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/CreateUser</context>
</context-group>
- <target>Non è possibile rimuovere un <strong>altro</strong> organization administrator. Si prega di rimuovere il ruolo di 'Organization Administrator' da questo utente prima di rimuovere l'account in questione.</target></trans-unit>
+ <target>Non è possibile rimuovere un altro organization administrator. Si prega di rimuovere il ruolo di 'Organization Administrator' da questo utente prima di rimuovere l'account in questione.</target></trans-unit>
<trans-unit id="user.cannot.delete.last.sat.admin">
<source>Cannot delete the last remaining satellite administrator.</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
index b99877a..d1a149a 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
@@ -1113,11 +1113,11 @@
<target>Satellite 管理者ロールを {0} に追加しました </target></trans-unit>
<trans-unit id="user.deleteadmin">
-<source>You cannot delete <strong>another</strong> organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
+<source>You cannot delete another organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/CreateUser</context>
</context-group>
- <target><strong>別の</strong> Organization Administrator (組織管理者) を削除することはできません。 このユーザーの「Organization Administrator」ロールを削除してからアカウントの削除を行なってください。</target></trans-unit>
+ <target>別の Organization Administrator (組織管理者) を削除することはできません。 このユーザーの「Organization Administrator」ロールを削除してからアカウントの削除を行なってください。</target></trans-unit>
<trans-unit id="user.cannot.delete.last.sat.admin">
<source>Cannot delete the last remaining satellite administrator.</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
index b77180b..4778d71 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
@@ -1113,11 +1113,11 @@
<target>{0}로 추가된 Satellite 관리자 역할 </target></trans-unit>
<trans-unit id="user.deleteadmin">
-<source>You cannot delete <strong>another</strong> organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
+<source>You cannot delete another organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/CreateUser</context>
</context-group>
- <target><strong>또 다른</strong> 조직 관리자를 삭제하실 수 없습니다. 사용자 계정을 삭제하기 전에 해당 사용자의 '조직 관리자' 역할을 먼저 삭제하셔야 합니다. </target></trans-unit>
+ <target>또 다른 조직 관리자를 삭제하실 수 없습니다. 사용자 계정을 삭제하기 전에 해당 사용자의 '조직 관리자' 역할을 먼저 삭제하셔야 합니다. </target></trans-unit>
<trans-unit id="user.cannot.delete.last.sat.admin">
<source>Cannot delete the last remaining satellite administrator.</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml
index 94b1276..fe3910d 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml
@@ -1113,11 +1113,11 @@
<target>{0} ਵਿੱਚ ਸੈਟੇਲਾਈਟ ਪਰਬੰਧਕ ਰੋਲ ਸ਼ਾਮਿਲ ਕੀਤਾ ਗਿਆ ਹੈ</target></trans-unit>
<trans-unit id="user.deleteadmin">
-<source>You cannot delete <strong>another</strong> organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
+<source>You cannot delete another organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/CreateUser</context>
</context-group>
- <target>ਤੁਸੀਂ <strong>ਹੋਰ</strong> ਸੰਸਥਾ ਪਰਬੰਧਕ ਨੂੰ ਹਟਾ ਨਹੀਂ
+ <target>ਤੁਸੀਂ ਹੋਰ ਸੰਸਥਾ ਪਰਬੰਧਕ ਨੂੰ ਹਟਾ ਨਹੀਂ
ਸਕਦੇ। ਇਹਨਾਂ ਦੇ ਖਾਤੇ ਹਟਾਉਣ ਤੋਂ ਪਹਿਲਾਂ ਕਿਰਪਾ ਕਰਕੇ
ਇਸ ਉਪਭੋਗੀ ਤੋਂ 'ਸੰਸਥਾ ਪਰਬੰਧਕ' ਰੋਲ ਹਟਾਓ।</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
index 8d7f1e5..41548da 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
@@ -1113,11 +1113,11 @@
<target>Função do Administrador do Satellite adicionada em {0}</target></trans-unit>
<trans-unit id="user.deleteadmin">
-<source>You cannot delete <strong>another</strong> organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
+<source>You cannot delete another organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/CreateUser</context>
</context-group>
- <target>Você não pode desativar <strong>outro</strong> administrador da organização. Por favor remova a função 'Administrador da Organização' (Organization Administrator) deste usuário antes de tentar desativar sua conta</target></trans-unit>
+ <target>Você não pode desativar outro administrador da organização. Por favor remova a função 'Administrador da Organização' (Organization Administrator) deste usuário antes de tentar desativar sua conta</target></trans-unit>
<trans-unit id="user.cannot.delete.last.sat.admin">
<source>Cannot delete the last remaining satellite administrator.</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
index dd3bec6..c8b7f72 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
@@ -1113,11 +1113,11 @@
<target>Роль администратора Satellite добавлена к {0}</target></trans-unit>
<trans-unit id="user.deleteadmin">
-<source>You cannot delete <strong>another</strong> organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
+<source>You cannot delete another organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/CreateUser</context>
</context-group>
- <target>Вы не можете удалить <strong>другого</strong> администратора организации. Удалите роль «Администратора организации» из профиля данного пользователя, а затем повторите попытку его удаления.</target></trans-unit>
+ <target>Вы не можете удалить другого администратора организации. Удалите роль «Администратора организации» из профиля данного пользователя, а затем повторите попытку его удаления.</target></trans-unit>
<trans-unit id="user.cannot.delete.last.sat.admin">
<source>Cannot delete the last remaining satellite administrator.</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml
index b45e4e7..342fce8 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml
@@ -1113,11 +1113,11 @@
<target>{0}க்கு சேட்டிலைட் நிர்வாக பங்குடன் சேர்க்கப்படுகிறது</target></trans-unit>
<trans-unit id="user.deleteadmin">
-<source>You cannot delete <strong>another</strong> organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
+<source>You cannot delete another organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/CreateUser</context>
</context-group>
- <target>நீங்கள் <strong>வேறு</strong> நிறுவன நிர்வாகியை அழிக்க முடியாது. அவர்களுடைய கணக்கினை அழிக்கும் முன், இந்தப் பயனருடைய நிறுவன நிர்வாகி பதவியை நீக்கவும்.</target></trans-unit>
+ <target>நீங்கள் வேறு நிறுவன நிர்வாகியை அழிக்க முடியாது. அவர்களுடைய கணக்கினை அழிக்கும் முன், இந்தப் பயனருடைய நிறுவன நிர்வாகி பதவியை நீக்கவும்.</target></trans-unit>
<trans-unit id="user.cannot.delete.last.sat.admin">
<source>Cannot delete the last remaining satellite administrator.</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
index fb9170e..f5127ce 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
@@ -1113,11 +1113,11 @@
<target>在 {0} 中添加 Satellite 管理员角色</target></trans-unit>
<trans-unit id="user.deleteadmin">
-<source>You cannot delete <strong>another</strong> organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
+<source>You cannot delete another organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/CreateUser</context>
</context-group>
- <target>您不能删除 <strong>另一个</strong> 机构管理员。在删除他们的帐户前请把他们从 '机构管理员' 角色中删除</target></trans-unit>
+ <target>您不能删除 另一个 机构管理员。在删除他们的帐户前请把他们从 '机构管理员' 角色中删除</target></trans-unit>
<trans-unit id="user.cannot.delete.last.sat.admin">
<source>Cannot delete the last remaining satellite administrator.</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
index 7ec4fd2..14588d8 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
@@ -1113,11 +1113,11 @@
<target>已將衛星伺服器管理員角色新增至 {0}</target></trans-unit>
<trans-unit id="user.deleteadmin">
-<source>You cannot delete <strong>another</strong> organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
+<source>You cannot delete another organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/CreateUser</context>
</context-group>
- <target>您不能刪除「<strong>另一個</strong>」組織管理員。在試圖刪除「組織管理員」的帳號前,請先移除這使用者的組織管理員角色。</target></trans-unit>
+ <target>您不能刪除「另一個」組織管理員。在試圖刪除「組織管理員」的帳號前,請先移除這使用者的組織管理員角色。</target></trans-unit>
<trans-unit id="user.cannot.delete.last.sat.admin">
<source>Cannot delete the last remaining satellite administrator.</source>
commit 34d34e26d57890dc5c884e8779aba4729a65012a
Author: Johannes Renner <jrenner(a)suse.de>
Date: Tue Nov 15 13:55:02 2011 +0100
Remove markup from error message in all translation files
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml
index e9be614..0939242 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml
@@ -3136,13 +3136,13 @@ available for this kickstart profile to function properly.
<target>মূল প্রতিষ্ঠান {0} মুছে ফেলা যাবে না</target></trans-unit>
<trans-unit id="userdisable.error.orgadmin">
-<source>You cannot deactivate <strong>another</strong> organization
+<source>You cannot deactivate another organization
administrator. Please remove the 'Organization Administrator' role from this
user before attempting to deactivate their account.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/DisableUser</context>
</context-group>
- <target>আপনি <strong>অন্যান্য</strong> প্রাতিষ্ঠানিক অ্যাডমিনিস্ট্রেটরের অ্যাকাউন্ট
+ <target>আপনি অন্যান্য প্রাতিষ্ঠানিক অ্যাডমিনিস্ট্রেটরের অ্যাকাউন্ট
নিষ্ক্রিয় করতে সক্ষম হবেন না। ব্যবহারকারীর অ্যাকাউন্ট নিষ্ক্রিয় করার পূর্বে অ্যাকাউন্ট থেকে
'প্রাতিষ্ঠানিক অ্যাডমিনিস্ট্রেটরের' ভূমিকা সরিয়ে নিন।</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
index 6ac2f57..6e78db8 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
@@ -3161,13 +3161,13 @@ verfügbar machen, damit dieses Kickstart-Profil einwandfrei funktionieren kann.
<target>Sie k&ouml;nnen die Basisorganisation {0} nicht l&ouml;schen</target></trans-unit>
<trans-unit id="userdisable.error.orgadmin">
-<source>You cannot deactivate <strong>another</strong> organization
+<source>You cannot deactivate another organization
administrator. Please remove the 'Organization Administrator' role from this
user before attempting to deactivate their account.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/DisableUser</context>
</context-group>
- <target>Sie k&ouml;nnen keinen <strong>anderen</strong> Organisations-
+ <target>Sie k&ouml;nnen keinen anderen Organisations-
Administrator deaktivieren. Bitte entfernen Sie 'die Organisations-Administrator'-Funktion dieses
Benutzers vor dem Versuch, den Account zu deaktivieren.</target></trans-unit>
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 fda871a..4750b1c 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
@@ -3177,7 +3177,7 @@ available for this kickstart profile to function properly.
</trans-unit>
<trans-unit id="userdisable.error.orgadmin">
-<source>You cannot deactivate <strong>another</strong> organization
+<source>You cannot deactivate another organization
administrator. Please remove the 'Organization Administrator' role from this
user before attempting to deactivate their account.</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
index 2ff8dbe..afc968b 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
@@ -3155,13 +3155,13 @@ asegurarse de que estén disponibles para que este perfil kickstart funcione apr
<target>No puede borrar la organización base {0}</target></trans-unit>
<trans-unit id="userdisable.error.orgadmin">
-<source>You cannot deactivate <strong>another</strong> organization
+<source>You cannot deactivate another organization
administrator. Please remove the 'Organization Administrator' role from this
user before attempting to deactivate their account.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/DisableUser</context>
</context-group>
- <target>No puede desactivar <strong>otro</strong> administrador de
+ <target>No puede desactivar otro administrador de
la organización. Por favor elimine el rol de 'Administrador de la organización'
de este usuario antes de intentar desactivar esta cuenta.</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
index d1ae7bc..3dcb299 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
@@ -3157,13 +3157,13 @@ disponibles pour que ce profil kickstart puisse fonctionner correctement.
<target>Vous ne pouvez pas supprimer l'organisation de base {0}</target></trans-unit>
<trans-unit id="userdisable.error.orgadmin">
-<source>You cannot deactivate <strong>another</strong> organization
+<source>You cannot deactivate another organization
administrator. Please remove the 'Organization Administrator' role from this
user before attempting to deactivate their account.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/DisableUser</context>
</context-group>
- <target>Vous ne pouvez pas désactiver <strong>un autre</strong> administrateur
+ <target>Vous ne pouvez pas désactiver un autre administrateur
d'organisation. Supprimez le rôle "Administrateur d'organisation" de cet
utilisateur avant de désactiver son compte.</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml
index 85d64de..7d8dbe5 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml
@@ -3130,13 +3130,13 @@ available for this kickstart profile to function properly.
<target>તમે આધાર સંસ્થા {0} ને કાઢી શકતા નથી</target></trans-unit>
<trans-unit id="userdisable.error.orgadmin">
-<source>You cannot deactivate <strong>another</strong> organization
+<source>You cannot deactivate another organization
administrator. Please remove the 'Organization Administrator' role from this
user before attempting to deactivate their account.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/DisableUser</context>
</context-group>
- <target>તમે <strong>અન્ય</strong> સંસ્થા સંચાલકને અસક્રિય કરી શકશો
+ <target>તમે અન્ય સંસ્થા સંચાલકને અસક્રિય કરી શકશો
નહિં. મહેરબાની કરીને આ વપરાશકર્તામાંથી 'સંસ્થા સંચાલક' ભૂમિકાને
તેમનું ખાતું અસક્રિય કરવા પહેલાં દૂર કરો.</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml
index 9f956db..15f89d9 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml
@@ -3130,13 +3130,13 @@ available for this kickstart profile to function properly.
<target>आप बेस संगठन {0} को मिटा नहीं सकते हैं</target></trans-unit>
<trans-unit id="userdisable.error.orgadmin">
-<source>You cannot deactivate <strong>another</strong> organization
+<source>You cannot deactivate another organization
administrator. Please remove the 'Organization Administrator' role from this
user before attempting to deactivate their account.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/DisableUser</context>
</context-group>
- <target>आप <strong>अन्य</strong> संगठन प्रशासक को निष्क्रिय नहीं
+ <target>आप अन्य संगठन प्रशासक को निष्क्रिय नहीं
कर सकते हैं. कृपया 'संगठन प्रशासक' भूमिका को इस
उपयोक्ता से उनके खाता के निष्क्रिय किये जाने के प्रयास पहले हटायें.</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
index 4101087..53d434c 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
@@ -3154,13 +3154,13 @@ disponibili per un corretto funzionamento di questo profilo kickstart.
<target>Impossibile cancellare l'Organizzazione di base {0}</target></trans-unit>
<trans-unit id="userdisable.error.orgadmin">
-<source>You cannot deactivate <strong>another</strong> organization
+<source>You cannot deactivate another organization
administrator. Please remove the 'Organization Administrator' role from this
user before attempting to deactivate their account.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/DisableUser</context>
</context-group>
- <target>Non è possibile disabilitare un <strong>altro</strong> organization
+ <target>Non è possibile disabilitare un altro organization
administrator. Si prega di rimuovere il ruolo di 'Organization Administrator' da questo
utente prima di disabilitare l'account in questione.</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
index f9109a0..b99877a 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
@@ -3154,13 +3154,13 @@ rhn-kickstart* パッケージが利用可能であることを確認します
<target>土台となる組織 {0} は削除できません。</target></trans-unit>
<trans-unit id="userdisable.error.orgadmin">
-<source>You cannot deactivate <strong>another</strong> organization
+<source>You cannot deactivate another organization
administrator. Please remove the 'Organization Administrator' role from this
user before attempting to deactivate their account.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/DisableUser</context>
</context-group>
- <target><strong>別の</strong> Organization Administrator (組織管理者) を非アクティブにすることはできません。
+ <target>別の Organization Administrator (組織管理者) を非アクティブにすることはできません。
このユーザーの「Organization Administrator」ロールを削除してからアカウントを非アクティブ
にしてください</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
index 822ed1a..b77180b 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
@@ -3130,13 +3130,13 @@ available for this kickstart profile to function properly.
<target>{0} 조직을 삭제할 수 없습니다. </target></trans-unit>
<trans-unit id="userdisable.error.orgadmin">
-<source>You cannot deactivate <strong>another</strong> organization
+<source>You cannot deactivate another organization
administrator. Please remove the 'Organization Administrator' role from this
user before attempting to deactivate their account.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/DisableUser</context>
</context-group>
- <target><strong>또 다른</strong> 조직 관리자를 비활성화하실 수 없습니다.
+ <target>또 다른 조직 관리자를 비활성화하실 수 없습니다.
사용자 계정을 비활성화하기 전에 해당 사용자의 '조직 관리자' 역할을 먼저
삭제하셔야 합니다. </target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml
index 54f3de6..94b1276 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml
@@ -3132,13 +3132,13 @@ available for this kickstart profile to function properly.
<target>ਤੁਸੀਂ ਇਧਾਰ ਸੰਗਠਨ {0} ਨੂੰ ਹਟਾ ਨਹੀਂ ਸਕਦੇ</target></trans-unit>
<trans-unit id="userdisable.error.orgadmin">
-<source>You cannot deactivate <strong>another</strong> organization
+<source>You cannot deactivate another organization
administrator. Please remove the 'Organization Administrator' role from this
user before attempting to deactivate their account.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/DisableUser</context>
</context-group>
- <target>ਤੁਸੀਂ <strong>ਹੋਰ</strong> ਸੰਸਥਾ ਪਰਬੰਧਕ ਨੂੰ ਅਯੋਗ ਨਹੀਂ
+ <target>ਤੁਸੀਂ ਹੋਰ ਸੰਸਥਾ ਪਰਬੰਧਕ ਨੂੰ ਅਯੋਗ ਨਹੀਂ
ਕਰ ਸਕਦੇ। ਇਹਨਾਂ ਦੇ ਖਾਤੇ ਅਯੋਗ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਕਿਰਪਾ ਕਰਕੇ
ਇਸ ਉਪਭੋਗੀ ਤੋਂ 'ਸੰਸਥਾ ਪਰਬੰਧਕ' ਰੋਲ ਹਟਾਓ।</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
index db82ad9..8d7f1e5 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
@@ -3144,13 +3144,13 @@ disponíveis para seu perfil kickstart funcionar corretamente./n</li>
<target>Você é possível remover a Organização base {0}.</target></trans-unit>
<trans-unit id="userdisable.error.orgadmin">
-<source>You cannot deactivate <strong>another</strong> organization
+<source>You cannot deactivate another organization
administrator. Please remove the 'Organization Administrator' role from this
user before attempting to deactivate their account.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/DisableUser</context>
</context-group>
- <target>Você não pode desativar <strong>outro</strong> administrador da organização. Por favor remova a função 'Administrador da Organização' deste usuário antes de tentar desativar sua conta.</target></trans-unit>
+ <target>Você não pode desativar outro administrador da organização. Por favor remova a função 'Administrador da Organização' deste usuário antes de tentar desativar sua conta.</target></trans-unit>
<trans-unit id="userdisable.error.userdisabled">
<source>User is already deactivated.</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
index 9fc7ebb..dd3bec6 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
@@ -3130,13 +3130,13 @@ available for this kickstart profile to function properly.
<target>Вы не можете удалить базовую Организацию {0}</target></trans-unit>
<trans-unit id="userdisable.error.orgadmin">
-<source>You cannot deactivate <strong>another</strong> organization
+<source>You cannot deactivate another organization
administrator. Please remove the 'Organization Administrator' role from this
user before attempting to deactivate their account.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/DisableUser</context>
</context-group>
- <target>Вы не можете деактивировать <strong>другого</strong> Администратора
+ <target>Вы не можете деактивировать другого Администратора
организации. Удалите роль «Администратора организации» из профиля
данного пользователя, а затем повторите попытку.</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml
index 06c614f..b45e4e7 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml
@@ -3130,13 +3130,13 @@ available for this kickstart profile to function properly.
<target>நீங்கள் அடிப்படை நிறுவனம் {0} ஐ அழிக்க முடியாது</target></trans-unit>
<trans-unit id="userdisable.error.orgadmin">
-<source>You cannot deactivate <strong>another</strong> organization
+<source>You cannot deactivate another organization
administrator. Please remove the 'Organization Administrator' role from this
user before attempting to deactivate their account.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/DisableUser</context>
</context-group>
- <target>நீங்கள் <strong>மற்றொரு</strong> நிறுவன
+ <target>நீங்கள் மற்றொரு நிறுவன
நிர்வாகியை செயலிழக்க முடியாது. முதலில் நிறுவன நிர்வாகி பதவியை இந்த
பயனருக்கு நீக்கிவிட்டு அவருடைய கணக்கினை செயலிழக்கச்செய்யவும்.</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
index 09099be..fb9170e 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
@@ -3155,13 +3155,13 @@ available for this kickstart profile to function properly.
<target>您不能删除基本机构 {0}</target></trans-unit>
<trans-unit id="userdisable.error.orgadmin">
-<source>You cannot deactivate <strong>another</strong> organization
+<source>You cannot deactivate another organization
administrator. Please remove the 'Organization Administrator' role from this
user before attempting to deactivate their account.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/DisableUser</context>
</context-group>
- <target>您不能取消激活 <strong>另一个</strong> 机构管理
+ <target>您不能取消激活 另一个 机构管理
员。在取消激活他们的帐户前请把他们从 '机构管理员' 角色中
删除。</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
index b2b3556..7ec4fd2 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
@@ -3130,13 +3130,13 @@ available for this kickstart profile to function properly.
<target>您不能刪除基礎組織 {0}</target></trans-unit>
<trans-unit id="userdisable.error.orgadmin">
-<source>You cannot deactivate <strong>another</strong> organization
+<source>You cannot deactivate another organization
administrator. Please remove the 'Organization Administrator' role from this
user before attempting to deactivate their account.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/DisableUser</context>
</context-group>
- <target>您不能停用「<strong>另一個</strong>」組織管理員。在試圖停用「組織管理員」
+ <target>您不能停用「另一個」組織管理員。在試圖停用「組織管理員」
的帳號前,請先移除這使用者的「組織管理員」角色。</target></trans-unit>
<trans-unit id="userdisable.error.userdisabled">
12 years, 5 months