March 2012 - spacewalk-commits - Fedora Mailing-Lists

Branch 'SPACEWALK-1.7' - 2 commits - rel-eng/packages spacewalk/config spacewalk/setup

by Jan Pazdziora

rel-eng/packages/spacewalk-setup | 2 +- spacewalk/config/var/lib/rhn/rhn-satellite-prep/etc/rhn/rhn.conf | 1 + spacewalk/setup/spacewalk-setup.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 1f9d5b7aaa6c10b06e04d3915748afc948defccb Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Mar 20 14:45:36 2012 +0100 Automatic commit of package [spacewalk-setup] release [1.7.10-1]. diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup index c003da8..9762a99 100644 --- a/rel-eng/packages/spacewalk-setup +++ b/rel-eng/packages/spacewalk-setup @@ -1 +1 @@ -1.7.9-1 spacewalk/setup/ +1.7.10-1 spacewalk/setup/ diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec index 1aed630..9966f71 100644 --- a/spacewalk/setup/spacewalk-setup.spec +++ b/spacewalk/setup/spacewalk-setup.spec @@ -1,5 +1,5 @@ Name: spacewalk-setup -Version: 1.7.9 +Version: 1.7.10 Release: 1%{?dist} Summary: Initial setup tools for Red Hat Spacewalk @@ -106,6 +106,9 @@ rm -rf %{buildroot} %{_mandir}/man8/spacewalk-make-mount-points* %changelog +* Tue Mar 20 2012 Jan Pazdziora 1.7.10-1 +- Reverting removal of traceback_mail. + * Fri Mar 02 2012 Jan Pazdziora 1.7.9-1 - Update the copyright year info. commit d361f960f51081f210f627ed9a742ade5bbab7c5 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Mar 20 13:56:59 2012 +0100 Reverting removal of traceback_mail. It was removed by accident in 251e06c97f7039363afb79abec5a90bf30a195ed. (cherry picked from commit 97fb06024c8e9d25d1b314077e507d65a1bce0ab) diff --git a/spacewalk/config/var/lib/rhn/rhn-satellite-prep/etc/rhn/rhn.conf b/spacewalk/config/var/lib/rhn/rhn-satellite-prep/etc/rhn/rhn.conf index d08becf..fc0fa6a 100644 --- a/spacewalk/config/var/lib/rhn/rhn-satellite-prep/etc/rhn/rhn.conf +++ b/spacewalk/config/var/lib/rhn/rhn-satellite-prep/etc/rhn/rhn.conf @@ -1,3 +1,4 @@ +traceback_mail = @@traceback_mail@@ mount_point = @@mount_point@@ kickstart_mount_point = @@kickstart_mount_point@@ repomd_cache_mount_point = /var/cache

12 years, 3 months

1
0
0 / 0

2 commits - backend/common spacewalk/config

by Jan Pazdziora

backend/common/spacewalk-cfg-get | 2 +- spacewalk/config/var/lib/rhn/rhn-satellite-prep/etc/rhn/rhn.conf | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 97fb06024c8e9d25d1b314077e507d65a1bce0ab Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Mar 20 13:56:59 2012 +0100 Reverting removal of traceback_mail. It was removed by accident in 251e06c97f7039363afb79abec5a90bf30a195ed. diff --git a/spacewalk/config/var/lib/rhn/rhn-satellite-prep/etc/rhn/rhn.conf b/spacewalk/config/var/lib/rhn/rhn-satellite-prep/etc/rhn/rhn.conf index d08becf..fc0fa6a 100644 --- a/spacewalk/config/var/lib/rhn/rhn-satellite-prep/etc/rhn/rhn.conf +++ b/spacewalk/config/var/lib/rhn/rhn-satellite-prep/etc/rhn/rhn.conf @@ -1,3 +1,4 @@ +traceback_mail = @@traceback_mail@@ mount_point = @@mount_point@@ kickstart_mount_point = @@kickstart_mount_point@@ repomd_cache_mount_point = /var/cache commit 47a4d9694ef14f014fd0251510017d5db050f3ba Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Mar 20 12:10:18 2012 +0100 Avoid printing "None" when uninitialized value is found. diff --git a/backend/common/spacewalk-cfg-get b/backend/common/spacewalk-cfg-get index 71552f4..7b2c57e 100644 --- a/backend/common/spacewalk-cfg-get +++ b/backend/common/spacewalk-cfg-get @@ -44,6 +44,6 @@ else: elif isinstance(val, list): for i in val: print i - else: + elif val != None: print val

12 years, 3 months

1
0
0 / 0

2 commits - java/code

by Šimon Lukašík

java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml | 2 - java/code/src/com/redhat/rhn/manager/audit/ScapManager.java | 13 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) New commits: commit 301f99da7c428f5547ac3559f69bcad8c0b6af64 Author: Simon Lukasik <slukasik(a)redhat.com> Date: Tue Mar 20 13:00:35 2012 +0100 Ensure the comparison uses correct type Addressing the issue with id=128, where the condition was never true. diff --git a/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java b/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java index 9292817..e7cddb2 100644 --- a/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java +++ b/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java @@ -79,7 +79,8 @@ public class ScapManager extends BaseManager { List<Map<String, Object>> resultView = new ArrayList<Map<String, Object>>(); Map<String, Object> currResult = null; for (Map row : (DataResult<Map>) testResultsRaw) { - if (currResult != null && currResult.get("id") == row.get("id")) { + if (currResult != null && + ((Long) currResult.get("id")).equals((Long) row.get("id"))) { String label = (String) row.get("label"); Long figure = (Long) row.get("figure"); currResult.put(label, figure); commit 609eaafc00edd3c5a28b460fb6b7cbfb84a8d07d Author: Simon Lukasik <slukasik(a)redhat.com> Date: Tue Mar 20 10:05:19 2012 +0100 Set column name explicitly, because it varies by db backend. Oracle sets the column name to COUNT(*), PostgreSQL to COUNT. Addressing: ERROR org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/rhn].[action] - Servlet.service() for servlet action threw exception java.lang.NullPointerException at com.redhat.rhn.manager.audit.ScapManager.transposeView(ScapManager.java:73) at com.redhat.rhn.manager.audit.ScapManager.allScans(ScapManager.java:62) at com.redhat.rhn.frontend.action.systems.audit.ListScapAction.getResult(ListScapAction.java:60) at com.redhat.rhn.frontend.taglibs.list.helper.ListHelper.setupDataSet(ListHelper.java:107) at com.redhat.rhn.frontend.taglibs.list.helper.ListHelper.execute(ListHelper.java:100) at com.redhat.rhn.frontend.action.systems.audit.ListScapAction.execute(ListScapAction.java:50) diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml index aa9f1bd..c30a097 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml @@ -14,7 +14,7 @@ <mode name="show_system_scans"> <query params="sid"> - SELECT tr.id, tr.identifier as test_result, rrt.label, count(*), + SELECT tr.id, tr.identifier as test_result, rrt.label, count(*) as figure, TO_CHAR(sa.completion_time, 'YYYY-MM-DD HH24:MI:SS') AS completion_time FROM rhnXccdfTestresult tr, rhnXccdfRuleresult rr, diff --git a/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java b/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java index ac00463..9292817 100644 --- a/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java +++ b/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java @@ -81,9 +81,9 @@ public class ScapManager extends BaseManager { for (Map row : (DataResult<Map>) testResultsRaw) { if (currResult != null && currResult.get("id") == row.get("id")) { String label = (String) row.get("label"); - Long count = (Long) row.get("count"); - currResult.put(label, count); - currResult.put("sum", ((Long) currResult.get("sum")) + count); + Long figure = (Long) row.get("figure"); + currResult.put(label, figure); + currResult.put("sum", ((Long) currResult.get("sum")) + figure); } else { if (currResult != null) { @@ -92,8 +92,8 @@ public class ScapManager extends BaseManager { currResult = new HashMap<String, Object>(); currResult.put("id", row.get("id")); currResult.put("testResult", row.get("test_result")); - currResult.put((String) row.get("label"), row.get("count")); - currResult.put("sum", row.get("count")); + currResult.put((String) row.get("label"), row.get("figure")); + currResult.put("sum", row.get("figure")); currResult.put("completionTime", row.get("completion_time")); } }

12 years, 3 months

1
0
0 / 0

backend/satellite_tools

by Jan Pazdziora

backend/satellite_tools/satellite-sync.sgml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit dca583a18e332337acb139913e4989e7e0a48ba4 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Mar 20 11:00:39 2012 +0100 The parameter/option is traceback_mail. diff --git a/backend/satellite_tools/satellite-sync.sgml b/backend/satellite_tools/satellite-sync.sgml index 8b447ea..a6bd163 100644 --- a/backend/satellite_tools/satellite-sync.sgml +++ b/backend/satellite_tools/satellite-sync.sgml @@ -332,7 +332,7 @@ Incrementally synchronize an RHN Satellite's DB data and RPM repository with Red <term>--email</term> <listitem> <para>e-mail a report of what was synced/imported (sent to whomever - is considered the receiver of "traceback_email").</para> + is considered the receiver of "traceback_mail").</para> </listitem> </varlistentry> <varlistentry>

12 years, 3 months

1
0
0 / 0

Changes to 'refs/tags/spacewalk-web-1.8.5-1'

by Michael Mraka

Tag 'spacewalk-web-1.8.5-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-03-20 09:36 +0000 Tagging package [spacewalk-web] version [1.8.5-1] in directory [web/]. Changes since spacewalk-setup-1.8.3-1: Michael Mraka (2): fixed rhn_server.delete_from_servergroup() call Automatic commit of package [spacewalk-web] release [1.8.5-1]. Miroslav Suchý (7): Revert "removing unused string with trans-id 'systemsearch_ram_lt_column'" Revert "removing unused string with trans-id 'systemsearch_ram_gt_column'" Revert "removing unused string with trans-id 'systemsearch_num_of_cpus_lt_column'" Revert "removing unused string with trans-id 'systemsearch_num_of_cpus_gt_column'" Revert "removing unused string with trans-id 'systemsearch_name_and_description_column'" Revert "removing unused string with trans-id 'systemsearch_cpu_mhz_lt_column'" Revert "removing unused string with trans-id 'systemsearch_cpu_mhz_gt_column'" Simon Lukasik (1): Show details of SCAP event. Stephen Herr (1): 804810 - Taught SSM to look at flex as well as regular entitlements when trying to add child channels --- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 42 +++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 42 +++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 42 +++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 42 +++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 42 +++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 42 +++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 42 +++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 42 +++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 42 +++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 42 +++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 42 +++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 42 +++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 42 +++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 42 +++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 42 +++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 42 +++++++ java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java | 53 ++++++++-- rel-eng/packages/spacewalk-web | 2 web/modules/rhn/RHN/DB/Server.pm | 27 ++++- web/modules/rhn/RHN/Server.pm | 31 +++++ web/spacewalk-web.spec | 6 - 21 files changed, 778 insertions(+), 13 deletions(-) ---

12 years, 3 months

1
0
0 / 0

rel-eng/packages web/spacewalk-web.spec

by Michael Mraka

rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit a79fc4a18b15861a87f3ba6227e5c54078d634cf Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Mar 20 10:36:15 2012 +0100 Automatic commit of package [spacewalk-web] release [1.8.5-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index 16a352b..a99b179 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -1.8.4-1 web/ +1.8.5-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index ee7df35..d088e15 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -2,7 +2,7 @@ Name: spacewalk-web Summary: Spacewalk Web site - Perl modules Group: Applications/Internet License: GPLv2 -Version: 1.8.4 +Version: 1.8.5 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk/ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -254,6 +254,10 @@ rm -rf $RPM_BUILD_ROOT # $Id$ %changelog +* Tue Mar 20 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.5-1 +- fixed rhn_server.delete_from_servergroup() call +- Show details of SCAP event. + * Mon Mar 19 2012 Jan Pazdziora 1.8.4-1 - We no longer have /install/index.pxt, so satellite_install cannot be used.

12 years, 3 months

1
0
0 / 0

web/modules

by Michael Mraka

web/modules/rhn/RHN/DB/Server.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e5b731b5e1f6f0d580b73d2cd45e20a6bd83d879 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Mar 20 10:34:26 2012 +0100 fixed rhn_server.delete_from_servergroup() call fixing [Sat Mar 17 09:06:59 2012] [error] Execution of /var/www/html/network/systems/de tails/history/snapshots/rollback.pxt failed at Sat Mar 17 09:06:59 2012: RHN::Ex ception: DBD::Oracle::st execute failed: ORA-06550: line 2, column 11:\nPLS-0022 2: no function with name 'DELETE_FROM_SERVERGROUP' exists in this scope\nORA-065 50: line 2, column 3:\nPL/SQL: Statement ignored (DBD ERROR: error possibly near <*> indicator at char 16 in 'BEGIN\n :ret := <*>rhn_server.delete_from_serverg roup(:p1, :p2);\nEND;') [for Statement "BEGIN\n :ret := rhn_server.delete_from_ servergroup(:p1, :p2);\nEND;" with ParamValues: :ret=undef, :p1='1000010040', :p 2="3"]\n RHN::DB /usr/lib/perl5/vendor_perl/5.8.8/RHN/DB.pm 121 RHN::Exception: ... diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm index 5ab7520..9e90fcf 100644 --- a/web/modules/rhn/RHN/DB/Server.pm +++ b/web/modules/rhn/RHN/DB/Server.pm @@ -1752,7 +1752,7 @@ sub remove_servers_from_groups { for my $server (@servers) { for my $group (@groups) { - $dbh->call_function('rhn_server.delete_from_servergroup', $server, $group); + $dbh->call_procedure('rhn_server.delete_from_servergroup', $server, $group); } }

12 years, 3 months

1
0
0 / 0

web/modules

by Šimon Lukašík

web/modules/rhn/RHN/DB/Server.pm | 25 +++++++++++++++++++++++++ web/modules/rhn/RHN/Server.pm | 31 +++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) New commits: commit 7ac3cf3b9e4e419227f5c8e8eef21b41ede32958 Author: Simon Lukasik <slukasik(a)redhat.com> Date: Mon Mar 19 15:09:28 2012 +0100 Show details of SCAP event. diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm index b20f0c1..5ab7520 100644 --- a/web/modules/rhn/RHN/DB/Server.pm +++ b/web/modules/rhn/RHN/DB/Server.pm @@ -952,6 +952,28 @@ sub server_event_config_diff { return $ret; } +sub server_event_xccdf_eval { + my $class = shift; + my $sid = shift; + my $aid = shift; + my $action_type = shift; + + my $ret = $class->server_event_simple_action($sid, $aid); + my $dbh = RHN::DB->connect; + my $sth = $dbh->prepare(<<EOS); +SELECT ras.path, ras.parameters, tr.id as test_result + FROM rhnActionScap ras + LEFT OUTER JOIN rhnXccdfTestresult tr ON ras.id = tr.action_scap_id + AND tr.server_id = :sid + WHERE ras.action_id = :aid +EOS + $sth->execute_h(sid => $sid, aid => $aid); + $ret->{DATA} = $sth->fetchrow_hashref_copy; + $sth->finish; + + return $ret; +} + sub server_event_details { my $class = shift; @@ -998,6 +1020,9 @@ EOS elsif ($label eq 'configfiles.diff') { return ($label, $class->server_event_config_diff($sid, $aid, $label)); } + elsif ($label eq 'scap.xccdf_eval') { + return ($label, $class->server_event_xccdf_eval($sid, $aid, $label)); + } else { return ($label, $class->server_event_simple_action($sid, $aid)); } diff --git a/web/modules/rhn/RHN/Server.pm b/web/modules/rhn/RHN/Server.pm index 312b86b..47342ef 100644 --- a/web/modules/rhn/RHN/Server.pm +++ b/web/modules/rhn/RHN/Server.pm @@ -84,6 +84,9 @@ sub lookup_server_event { elsif ($label eq 'script.run') { return bless $struct, "RHN::ServerEvent::RemoteCommand"; } + elsif ($label eq 'scap.xccdf_eval') { + return bless $struct, "RHN::ServerEvent::XccdfEval"; + } else { return bless $struct, "RHN::ServerEvent::SimpleAction"; } @@ -523,5 +526,33 @@ EOQ return $ret; } +package RHN::ServerEvent::XccdfEval; +our @ISA = qw/RHN::ServerEvent::SimpleAction/; + +sub render { + my $self = shift; + my $details_url = "/rhn/systems/details/audit/XccdfDetails.do"; + + my $ret = $self->SUPER::render(@_); + $ret->{server_event_details} .= + sprintf(<<EOQ, PXT::Utils->escapeHTML($self->{DATA}->{PATH}), PXT::Utils->escapeHTML($self->{DATA}->{PARAMETERS})); + +Path to XCCDF document: %s +Parameters: %s +EOQ + + if (defined $self->{DATA}->{TEST_RESULT}) { + $ret->{server_event_details} .= + PXT::HTML->link2(-url => $details_url, + -params => {sid => $self->{SERVER_ID}, + xid => $self->{DATA}->{TEST_RESULT}}, + -text => 'View detailed results.'); + } + else { + $ret->{server_event_details} .= qq{Detailed results not available.}; + } + return $ret; +} + 1;

12 years, 3 months

1
0
0 / 0

7 commits - java/code

by Miroslav Suchý

java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 42 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 42 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 42 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 42 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 42 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 42 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 42 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 42 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 42 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 42 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 42 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 42 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 42 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 42 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 42 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 42 ++++++++++ 16 files changed, 672 insertions(+) New commits: commit 1aa4418d3d2476e0dd000d4811a613aecf9233a1 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Tue Mar 20 09:06:31 2012 +0100 Revert "removing unused string with trans-id 'systemsearch_cpu_mhz_gt_column'" diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml index ef596b1..9bce980 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml @@ -5403,6 +5403,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>CPU Mhz</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_gt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU Mhz</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> <source>Number of CPUs</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml index 8e854a2..d697edf 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml @@ -5405,6 +5405,12 @@ für diese Berechtigung, mit Ausnahme des Verbrauchs der Standardorganisation.</ </context-group> <target>CPU MHz</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_gt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU MHz</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> <source>Number of CPUs</source> 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 f67c38a..822b046 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 @@ -5756,6 +5756,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> </trans-unit> + <trans-unit id="systemsearch_cpu_mhz_gt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + </trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> <source>Number of CPUs</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml index a32faa7..8c9a211 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml @@ -5403,6 +5403,12 @@ para este derecho, excluyendo el consumo de la organización predeterminada.</ta </context-group> <target>CPU Mhz</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_gt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU Mhz</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> <source>Number of CPUs</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml index 37afc7b..3b29d8e 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml @@ -5404,6 +5404,12 @@ pour ce droit d'accès, moins la consommation par défaut de l'organisation.</ta </context-group> <target>Mhz CPU</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_gt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>Mhz CPU</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> <source>Number of CPUs</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml index 3fdf364..5714b8d 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml @@ -5403,6 +5403,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>CPU Mhz</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_gt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU Mhz</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> <source>Number of CPUs</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml index 4f729b4..ca0420d 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml @@ -5403,6 +5403,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>CPU Mhz</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_gt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU Mhz</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> <source>Number of CPUs</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml index 8fabeb4..5dbf437 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml @@ -5403,6 +5403,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>CPU Mhz</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_gt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU Mhz</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> <source>Number of CPUs</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml index 2949174..5d2bc71 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml @@ -5397,6 +5397,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>CPU Mhz</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_gt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU Mhz</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> <source>Number of CPUs</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml index 5b97887..171610d 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml @@ -5402,6 +5402,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>CPU Mhz</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_gt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU Mhz</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> <source>Number of CPUs</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml index 71660af..0d5cb3e 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml @@ -5403,6 +5403,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>CPU Mhz</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_gt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU Mhz</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> <source>Number of CPUs</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml index 609c557..af4cd4f 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml @@ -5401,6 +5401,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>CPU Mhz</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_gt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU Mhz</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> <source>Number of CPUs</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml index b0e3543..3eecc1d 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml @@ -5400,6 +5400,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>Процессор (МГц)</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_gt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>Процессор (МГц)</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> <source>Number of CPUs</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml index 7ab95cc..d0c76ad 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml @@ -5403,6 +5403,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>CPU Mhz</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_gt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU Mhz</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> <source>Number of CPUs</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml index 4f8ed4c..b438bb5 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml @@ -5403,6 +5403,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>CPU Mhz</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_gt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU Mhz</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> <source>Number of CPUs</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml index 2aaf5e5..cf8bae5 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml @@ -5399,6 +5399,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>CPU Mhz</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_gt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU Mhz</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> <source>Number of CPUs</source> commit 582410f8d0d3b865fd802dfc83de8ac3bedca5f0 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Tue Mar 20 09:06:25 2012 +0100 Revert "removing unused string with trans-id 'systemsearch_cpu_mhz_lt_column'" diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml index 25a7c1e..ef596b1 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml @@ -5396,6 +5396,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>বিবরণ</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_lt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU Mhz</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml index 7d518b1..8e854a2 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml @@ -5398,6 +5398,12 @@ für diese Berechtigung, mit Ausnahme des Verbrauchs der Standardorganisation.</ </context-group> <target>Beschreibung</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_lt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU MHz</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> 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 d73a404..f67c38a 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 @@ -5749,6 +5749,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> </trans-unit> + <trans-unit id="systemsearch_cpu_mhz_lt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + </trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml index a555e06..a32faa7 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml @@ -5396,6 +5396,12 @@ para este derecho, excluyendo el consumo de la organización predeterminada.</ta </context-group> <target>Descripción</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_lt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU Mhz</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml index 1130881..37afc7b 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml @@ -5397,6 +5397,12 @@ pour ce droit d'accès, moins la consommation par défaut de l'organisation.</ta </context-group> <target>Description</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_lt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>Mhz CPU</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml index 84acce6..3fdf364 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml @@ -5396,6 +5396,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>વર્ણન</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_lt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU Mhz</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml index 1b230f1..4f729b4 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml @@ -5396,6 +5396,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>विवरण</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_lt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU Mhz</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml index 737df1d..8fabeb4 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml @@ -5396,6 +5396,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>Descrizione</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_lt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU Mhz</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml index 3d349db..2949174 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml @@ -5390,6 +5390,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>詳細</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_lt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU Mhz</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml index 4f9e8fe..5b97887 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml @@ -5395,6 +5395,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>설명</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_lt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU Mhz</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml index 49a2f0d..71660af 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml @@ -5396,6 +5396,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>ਵੇਰਵਾ</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_lt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU Mhz</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml index 2ffd081..609c557 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml @@ -5394,6 +5394,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>Descrição</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_lt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU Mhz</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml index ea6b32a..b0e3543 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml @@ -5393,6 +5393,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>Описание</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_lt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>Процессор (МГц)</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml index 79b4acd..7ab95cc 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml @@ -5396,6 +5396,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>விவரம்</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_lt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU Mhz</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml index 677bc1c..4f8ed4c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml @@ -5396,6 +5396,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>描述</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_lt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU Mhz</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml index 116bc3c..2aaf5e5 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml @@ -5392,6 +5392,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>描述</target></trans-unit> + <trans-unit id="systemsearch_cpu_mhz_lt_column"> + <source>CPU Mhz</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU Mhz</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt_column"> commit f7e4ce118349afa971f59e13c7384b1b1e64868d Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Tue Mar 20 09:06:18 2012 +0100 Revert "removing unused string with trans-id 'systemsearch_name_and_description_column'" diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml index 0ee6dd7..25a7c1e 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml @@ -5389,6 +5389,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>কোনো ফলাফল পাওয়া যায়নি।</target></trans-unit> + <trans-unit id="systemsearch_name_and_description_column"> + <source>Description</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>বিবরণ</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml index dff3ac0..7d518b1 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml @@ -5391,6 +5391,12 @@ für diese Berechtigung, mit Ausnahme des Verbrauchs der Standardorganisation.</ </context-group> <target>Keine Ergebnisse gefunden.</target></trans-unit> + <trans-unit id="systemsearch_name_and_description_column"> + <source>Description</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>Beschreibung</target></trans-unit> 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 6349cd6..d73a404 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 @@ -5742,6 +5742,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> </trans-unit> + <trans-unit id="systemsearch_name_and_description_column"> + <source>Description</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + </trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml index 6cc440b..a555e06 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml @@ -5389,6 +5389,12 @@ para este derecho, excluyendo el consumo de la organización predeterminada.</ta </context-group> <target>Ningún resultado encontrado.</target></trans-unit> + <trans-unit id="systemsearch_name_and_description_column"> + <source>Description</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>Descripción</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml index de207f1..1130881 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml @@ -5390,6 +5390,12 @@ pour ce droit d'accès, moins la consommation par défaut de l'organisation.</ta </context-group> <target>Aucun résultat trouvé.</target></trans-unit> + <trans-unit id="systemsearch_name_and_description_column"> + <source>Description</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>Description</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml index f769ba6..84acce6 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml @@ -5389,6 +5389,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>કોઈ પરિણામો મળ્યા નહિં.</target></trans-unit> + <trans-unit id="systemsearch_name_and_description_column"> + <source>Description</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>વર્ણન</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml index 87fe8e9..1b230f1 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml @@ -5389,6 +5389,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>कोई परिणाम नहीं पाया गया.</target></trans-unit> + <trans-unit id="systemsearch_name_and_description_column"> + <source>Description</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>विवरण</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml index 2e7b96c..737df1d 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml @@ -5389,6 +5389,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>Nessun risultato trovato.</target></trans-unit> + <trans-unit id="systemsearch_name_and_description_column"> + <source>Description</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>Descrizione</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml index d399bb8..3d349db 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml @@ -5383,6 +5383,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>何も見つかりませんでした。</target></trans-unit> + <trans-unit id="systemsearch_name_and_description_column"> + <source>Description</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>詳細</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml index 8499213..4f9e8fe 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml @@ -5388,6 +5388,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>결과를 찾을 수 없음.</target></trans-unit> + <trans-unit id="systemsearch_name_and_description_column"> + <source>Description</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>설명</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml index d6aa557..49a2f0d 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml @@ -5389,6 +5389,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>ਕੋਈ ਨਤੀਜਾ ਨਹੀਂ ਲੱਭਿਆ।</target></trans-unit> + <trans-unit id="systemsearch_name_and_description_column"> + <source>Description</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>ਵੇਰਵਾ</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml index dd9faeb..2ffd081 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml @@ -5387,6 +5387,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>Nenhum resultado encontrado.</target></trans-unit> + <trans-unit id="systemsearch_name_and_description_column"> + <source>Description</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>Descrição</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml index 036442d..ea6b32a 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml @@ -5386,6 +5386,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>Ничего не найдено.</target></trans-unit> + <trans-unit id="systemsearch_name_and_description_column"> + <source>Description</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>Описание</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml index 07a3229..79b4acd 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml @@ -5389,6 +5389,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>ஒன்றும் இல்லை.</target></trans-unit> + <trans-unit id="systemsearch_name_and_description_column"> + <source>Description</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>விவரம்</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml index f7137f6..677bc1c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml @@ -5389,6 +5389,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>没有找到任何结果。</target></trans-unit> + <trans-unit id="systemsearch_name_and_description_column"> + <source>Description</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>描述</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml index cd87c35..116bc3c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml @@ -5385,6 +5385,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>找不到結果。</target></trans-unit> + <trans-unit id="systemsearch_name_and_description_column"> + <source>Description</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>描述</target></trans-unit> commit 29cd9098969bffc08fe75463914109b35ee00d4f Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Tue Mar 20 09:06:12 2012 +0100 Revert "removing unused string with trans-id 'systemsearch_num_of_cpus_gt_column'" diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml index c0ef14c..0ee6dd7 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml @@ -5399,6 +5399,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>CPU-র সংখ্যা</target></trans-unit> + <trans-unit id="systemsearch_num_of_cpus_gt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU-র সংখ্যা</target></trans-unit> <trans-unit id="systemsearch_ram_lt_column"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml index 2532f3c..dff3ac0 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml @@ -5401,6 +5401,12 @@ für diese Berechtigung, mit Ausnahme des Verbrauchs der Standardorganisation.</ </context-group> <target>Anzahl der CPUs:</target></trans-unit> + <trans-unit id="systemsearch_num_of_cpus_gt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>Anzahl der CPUs:</target></trans-unit> <trans-unit id="systemsearch_ram_lt_column"> 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 f92e33c..6349cd6 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 @@ -5752,6 +5752,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> </trans-unit> + <trans-unit id="systemsearch_num_of_cpus_gt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + </trans-unit> <trans-unit id="systemsearch_ram_lt_column"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml index ea5d7d1..6cc440b 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml @@ -5399,6 +5399,12 @@ para este derecho, excluyendo el consumo de la organización predeterminada.</ta </context-group> <target>Número de CPUs</target></trans-unit> + <trans-unit id="systemsearch_num_of_cpus_gt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>Número de CPUs</target></trans-unit> <trans-unit id="systemsearch_ram_lt_column"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml index cd8f46f..de207f1 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml @@ -5400,6 +5400,12 @@ pour ce droit d'accès, moins la consommation par défaut de l'organisation.</ta </context-group> <target>Nombre de CPU :</target></trans-unit> + <trans-unit id="systemsearch_num_of_cpus_gt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>Nombre de CPU :</target></trans-unit> <trans-unit id="systemsearch_ram_lt_column"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml index 34f6585..f769ba6 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml @@ -5399,6 +5399,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>CPUs ની સંખ્યા</target></trans-unit> + <trans-unit id="systemsearch_num_of_cpus_gt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPUs ની સંખ્યા</target></trans-unit> <trans-unit id="systemsearch_ram_lt_column"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml index bb27a15..87fe8e9 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml @@ -5399,6 +5399,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>CPU की संख्या</target></trans-unit> + <trans-unit id="systemsearch_num_of_cpus_gt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU की संख्या</target></trans-unit> <trans-unit id="systemsearch_ram_lt_column"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml index 4384f66..2e7b96c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml @@ -5399,6 +5399,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>Numero di CPU</target></trans-unit> + <trans-unit id="systemsearch_num_of_cpus_gt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>Numero di CPU</target></trans-unit> <trans-unit id="systemsearch_ram_lt_column"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml index 7986199..d399bb8 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml @@ -5393,6 +5393,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>CPU 数:</target></trans-unit> + <trans-unit id="systemsearch_num_of_cpus_gt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU 数:</target></trans-unit> <trans-unit id="systemsearch_ram_lt_column"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml index 5d16d1b..8499213 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml @@ -5398,6 +5398,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>CPU 수: </target></trans-unit> + <trans-unit id="systemsearch_num_of_cpus_gt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU 수: </target></trans-unit> <trans-unit id="systemsearch_ram_lt_column"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml index 7a9e66e..d6aa557 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml @@ -5399,6 +5399,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>CPUs ਦੀ ਗਿਣਤੀ</target></trans-unit> + <trans-unit id="systemsearch_num_of_cpus_gt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPUs ਦੀ ਗਿਣਤੀ</target></trans-unit> <trans-unit id="systemsearch_ram_lt_column"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml index e45e83a..dd9faeb 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml @@ -5397,6 +5397,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>Número de CPUs:</target></trans-unit> + <trans-unit id="systemsearch_num_of_cpus_gt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>Número de CPUs:</target></trans-unit> <trans-unit id="systemsearch_ram_lt_column"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml index 2059efa..036442d 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml @@ -5396,6 +5396,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>Число процессоров:</target></trans-unit> + <trans-unit id="systemsearch_num_of_cpus_gt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>Число процессоров:</target></trans-unit> <trans-unit id="systemsearch_ram_lt_column"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml index e7accd3..07a3229 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml @@ -5399,6 +5399,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>CPUகளின் எண்ணிக்கை:</target></trans-unit> + <trans-unit id="systemsearch_num_of_cpus_gt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPUகளின் எண்ணிக்கை:</target></trans-unit> <trans-unit id="systemsearch_ram_lt_column"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml index 9a4fa34..f7137f6 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml @@ -5399,6 +5399,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>CPU 数目</target></trans-unit> + <trans-unit id="systemsearch_num_of_cpus_gt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU 数目</target></trans-unit> <trans-unit id="systemsearch_ram_lt_column"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml index 8081038..cd87c35 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml @@ -5395,6 +5395,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>CPU 數量</target></trans-unit> + <trans-unit id="systemsearch_num_of_cpus_gt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU 數量</target></trans-unit> <trans-unit id="systemsearch_ram_lt_column"> commit 297c297b8c34298f56feb57cbb85b001b0f3e16c Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Tue Mar 20 09:06:05 2012 +0100 Revert "removing unused string with trans-id 'systemsearch_num_of_cpus_lt_column'" diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml index 6906731..c0ef14c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml @@ -5392,6 +5392,12 @@ value for this entitlement, excluding the default organization's consumption.</s + <trans-unit id="systemsearch_num_of_cpus_lt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU-র সংখ্যা</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml index 89bdd2c..2532f3c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml @@ -5394,6 +5394,12 @@ für diese Berechtigung, mit Ausnahme des Verbrauchs der Standardorganisation.</ + <trans-unit id="systemsearch_num_of_cpus_lt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>Anzahl der CPUs:</target></trans-unit> 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 948c938..f92e33c 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 @@ -5745,6 +5745,12 @@ value for this entitlement, excluding the default organization's consumption.</s + <trans-unit id="systemsearch_num_of_cpus_lt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + </trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml index 1490292..ea5d7d1 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml @@ -5392,6 +5392,12 @@ para este derecho, excluyendo el consumo de la organización predeterminada.</ta + <trans-unit id="systemsearch_num_of_cpus_lt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>Número de CPUs</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml index 16a806d..cd8f46f 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml @@ -5393,6 +5393,12 @@ pour ce droit d'accès, moins la consommation par défaut de l'organisation.</ta + <trans-unit id="systemsearch_num_of_cpus_lt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>Nombre de CPU :</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml index 4f7e522..34f6585 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml @@ -5392,6 +5392,12 @@ value for this entitlement, excluding the default organization's consumption.</s + <trans-unit id="systemsearch_num_of_cpus_lt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPUs ની સંખ્યા</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml index f94b251..bb27a15 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml @@ -5392,6 +5392,12 @@ value for this entitlement, excluding the default organization's consumption.</s + <trans-unit id="systemsearch_num_of_cpus_lt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU की संख्या</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml index 3827f2d..4384f66 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml @@ -5392,6 +5392,12 @@ value for this entitlement, excluding the default organization's consumption.</s + <trans-unit id="systemsearch_num_of_cpus_lt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>Numero di CPU</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml index de5cc79..7986199 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml @@ -5386,6 +5386,12 @@ value for this entitlement, excluding the default organization's consumption.</s + <trans-unit id="systemsearch_num_of_cpus_lt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU 数:</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml index 54e76b6..5d16d1b 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml @@ -5391,6 +5391,12 @@ value for this entitlement, excluding the default organization's consumption.</s + <trans-unit id="systemsearch_num_of_cpus_lt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU 수: </target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml index 258d7bc..7a9e66e 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml @@ -5392,6 +5392,12 @@ value for this entitlement, excluding the default organization's consumption.</s + <trans-unit id="systemsearch_num_of_cpus_lt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPUs ਦੀ ਗਿਣਤੀ</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml index affc850..e45e83a 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml @@ -5390,6 +5390,12 @@ value for this entitlement, excluding the default organization's consumption.</s + <trans-unit id="systemsearch_num_of_cpus_lt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>Número de CPUs:</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml index e537ab4..2059efa 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml @@ -5389,6 +5389,12 @@ value for this entitlement, excluding the default organization's consumption.</s + <trans-unit id="systemsearch_num_of_cpus_lt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>Число процессоров:</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml index 794ab71..e7accd3 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml @@ -5392,6 +5392,12 @@ value for this entitlement, excluding the default organization's consumption.</s + <trans-unit id="systemsearch_num_of_cpus_lt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPUகளின் எண்ணிக்கை:</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml index f1ccaeb..9a4fa34 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml @@ -5392,6 +5392,12 @@ value for this entitlement, excluding the default organization's consumption.</s + <trans-unit id="systemsearch_num_of_cpus_lt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU 数目</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml index 6a485e5..8081038 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml @@ -5388,6 +5388,12 @@ value for this entitlement, excluding the default organization's consumption.</s + <trans-unit id="systemsearch_num_of_cpus_lt_column"> + <source>Number of CPUs</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>CPU 數量</target></trans-unit> commit ff645a8dd938f668de3cde5c3cc9ad41ef4f72c3 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Tue Mar 20 09:05:58 2012 +0100 Revert "removing unused string with trans-id 'systemsearch_ram_gt_column'" diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml index 275d420..6906731 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml @@ -5402,6 +5402,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>RAM</target></trans-unit> + <trans-unit id="systemsearch_ram_gt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>RAM</target></trans-unit>  diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml index 0b6443f..89bdd2c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml @@ -5404,6 +5404,12 @@ für diese Berechtigung, mit Ausnahme des Verbrauchs der Standardorganisation.</ </context-group> <target>RAM</target></trans-unit> + <trans-unit id="systemsearch_ram_gt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>RAM</target></trans-unit>  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 2a9d112..948c938 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 @@ -5755,6 +5755,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> </trans-unit> + <trans-unit id="systemsearch_ram_gt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + </trans-unit>  diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml index 4f48d7c..1490292 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml @@ -5402,6 +5402,12 @@ para este derecho, excluyendo el consumo de la organización predeterminada.</ta </context-group> <target>RAM</target></trans-unit> + <trans-unit id="systemsearch_ram_gt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>RAM</target></trans-unit>  diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml index a064206..16a806d 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml @@ -5403,6 +5403,12 @@ pour ce droit d'accès, moins la consommation par défaut de l'organisation.</ta </context-group> <target>RAM</target></trans-unit> + <trans-unit id="systemsearch_ram_gt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>RAM</target></trans-unit>  diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml index 525c0b1..4f7e522 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml @@ -5402,6 +5402,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>RAM</target></trans-unit> + <trans-unit id="systemsearch_ram_gt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>RAM</target></trans-unit>  diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml index 9bec08e..f94b251 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml @@ -5402,6 +5402,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>RAM</target></trans-unit> + <trans-unit id="systemsearch_ram_gt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>RAM</target></trans-unit>  diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml index 698aafd..3827f2d 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml @@ -5402,6 +5402,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>RAM</target></trans-unit> + <trans-unit id="systemsearch_ram_gt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>RAM</target></trans-unit>  diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml index 2393c60..de5cc79 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml @@ -5396,6 +5396,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>RAM</target></trans-unit> + <trans-unit id="systemsearch_ram_gt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>RAM</target></trans-unit>  diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml index 279027f..54e76b6 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml @@ -5401,6 +5401,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>RAM</target></trans-unit> + <trans-unit id="systemsearch_ram_gt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>RAM</target></trans-unit>  diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml index 51033fc..258d7bc 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml @@ -5402,6 +5402,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>RAM</target></trans-unit> + <trans-unit id="systemsearch_ram_gt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>RAM</target></trans-unit>  diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml index be17bdf..affc850 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml @@ -5400,6 +5400,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>RAM</target></trans-unit> + <trans-unit id="systemsearch_ram_gt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>RAM</target></trans-unit>  diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml index c8cf7f4..e537ab4 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml @@ -5399,6 +5399,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>ОЗУ</target></trans-unit> + <trans-unit id="systemsearch_ram_gt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>ОЗУ</target></trans-unit>  diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml index 579a3ff..794ab71 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml @@ -5402,6 +5402,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>ரேம்</target></trans-unit> + <trans-unit id="systemsearch_ram_gt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>ரேம்</target></trans-unit>  diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml index c4ff48b..f1ccaeb 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml @@ -5402,6 +5402,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>RAM</target></trans-unit> + <trans-unit id="systemsearch_ram_gt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>RAM</target></trans-unit>  diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml index 30c5a89..6a485e5 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml @@ -5398,6 +5398,12 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> <target>RAM</target></trans-unit> + <trans-unit id="systemsearch_ram_gt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>RAM</target></trans-unit>  commit ed7fb60f55a79f0f72bb16e6174196a8d6a86640 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Tue Mar 20 09:05:45 2012 +0100 Revert "removing unused string with trans-id 'systemsearch_ram_lt_column'" diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml index c5223e8..275d420 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml @@ -5395,6 +5395,12 @@ value for this entitlement, excluding the default organization's consumption.</s + <trans-unit id="systemsearch_ram_lt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>RAM</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml index 3549e97..0b6443f 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml @@ -5397,6 +5397,12 @@ für diese Berechtigung, mit Ausnahme des Verbrauchs der Standardorganisation.</ + <trans-unit id="systemsearch_ram_lt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>RAM</target></trans-unit> 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 9f4432f..2a9d112 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 @@ -5748,6 +5748,12 @@ value for this entitlement, excluding the default organization's consumption.</s + <trans-unit id="systemsearch_ram_lt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + </trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml index ae1fe62..4f48d7c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml @@ -5395,6 +5395,12 @@ para este derecho, excluyendo el consumo de la organización predeterminada.</ta + <trans-unit id="systemsearch_ram_lt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>RAM</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml index 209ce2f..a064206 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml @@ -5396,6 +5396,12 @@ pour ce droit d'accès, moins la consommation par défaut de l'organisation.</ta + <trans-unit id="systemsearch_ram_lt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>RAM</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml index e240280..525c0b1 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml @@ -5395,6 +5395,12 @@ value for this entitlement, excluding the default organization's consumption.</s + <trans-unit id="systemsearch_ram_lt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>RAM</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml index d864979..9bec08e 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml @@ -5395,6 +5395,12 @@ value for this entitlement, excluding the default organization's consumption.</s + <trans-unit id="systemsearch_ram_lt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>RAM</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml index 864f416..698aafd 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml @@ -5395,6 +5395,12 @@ value for this entitlement, excluding the default organization's consumption.</s + <trans-unit id="systemsearch_ram_lt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>RAM</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml index 20bd1e5..2393c60 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml @@ -5389,6 +5389,12 @@ value for this entitlement, excluding the default organization's consumption.</s + <trans-unit id="systemsearch_ram_lt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>RAM</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml index 5a4f96c..279027f 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml @@ -5394,6 +5394,12 @@ value for this entitlement, excluding the default organization's consumption.</s + <trans-unit id="systemsearch_ram_lt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>RAM</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml index cc8ebe6..51033fc 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml @@ -5395,6 +5395,12 @@ value for this entitlement, excluding the default organization's consumption.</s + <trans-unit id="systemsearch_ram_lt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>RAM</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml index 14521df..be17bdf 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml @@ -5393,6 +5393,12 @@ value for this entitlement, excluding the default organization's consumption.</s + <trans-unit id="systemsearch_ram_lt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>RAM</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml index 7f49d26..c8cf7f4 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml @@ -5392,6 +5392,12 @@ value for this entitlement, excluding the default organization's consumption.</s + <trans-unit id="systemsearch_ram_lt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>ОЗУ</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml index 95188f2..579a3ff 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml @@ -5395,6 +5395,12 @@ value for this entitlement, excluding the default organization's consumption.</s + <trans-unit id="systemsearch_ram_lt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>ரேம்</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml index f571711..c4ff48b 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml @@ -5395,6 +5395,12 @@ value for this entitlement, excluding the default organization's consumption.</s + <trans-unit id="systemsearch_ram_lt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>RAM</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml index 4bb36f6..30c5a89 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml @@ -5391,6 +5391,12 @@ value for this entitlement, excluding the default organization's consumption.</s + <trans-unit id="systemsearch_ram_lt_column"> + <source>RAM</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/Search</context> + </context-group> + <target>RAM</target></trans-unit>

12 years, 3 months

1
0
0 / 0

java/code

by StephenHerr

java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java | 53 ++++++++++++--- 1 file changed, 43 insertions(+), 10 deletions(-) New commits: commit c60f37a013cb7baddc90324314d4a8927a709608 Author: Stephen Herr <sherr(a)redhat.com> Date: Mon Mar 19 16:10:27 2012 -0400 804810 - Taught SSM to look at flex as well as regular entitlements when trying to add child channels diff --git a/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java b/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java index a2d8c57..611e07e 100644 --- a/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java +++ b/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java @@ -18,12 +18,17 @@ import com.redhat.rhn.common.db.datasource.CallableMode; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.rhnset.RhnSet; +import com.redhat.rhn.domain.rhnset.RhnSetElement; +import com.redhat.rhn.domain.server.Server; +import com.redhat.rhn.domain.server.ServerFactory; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.action.channel.ssm.ChannelActionDAO; import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; +import com.redhat.rhn.manager.system.SystemManager; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -69,6 +74,11 @@ public class SsmManager { idToChan.put(c.getId(), c); } + RhnSet ssm = RhnSetDecl.SYSTEMS.lookup(user); + List<Server> servers = new ArrayList<Server>(); + for (RhnSetElement rse : ssm.getElements()) { + servers.add(SystemManager.lookupByIdAndUser(rse.getElement(), user)); + } // Keeps a mapping of how many entitlements are left on each channel. This map // will be updated as the processing continues, however changes won't be written @@ -77,31 +87,54 @@ public class SsmManager { // always loading the static value from the DB. Map<Channel, Long> channelToAvailableEntitlements = new HashMap<Channel, Long>(allChannels.size()); + Map<Channel, Long> channelToAvailableFteEntitlements = + new HashMap<Channel, Long>(allChannels.size()); - - for (Long sysid : sysMapping.keySet()) { + for (Server server : servers) { + Long sysid = server.getId(); Set<Long> chanIds = sysMapping.get(sysid).getSubscribeChannelIds(); //Use an iterator so i can remove from the set - Iterator it = chanIds.iterator(); + Iterator<Long> it = chanIds.iterator(); while (it.hasNext()) { Channel channel = idToChan.get(it.next()); Long availableEntitlements = channelToAvailableEntitlements.get(channel); - + Long availableFteEntitlements = + channelToAvailableFteEntitlements.get(channel); + if (availableEntitlements == null) { availableEntitlements = ChannelManager.getAvailableEntitlements(user.getOrg(), channel); channelToAvailableEntitlements.put(channel, availableEntitlements); } - //Most likely acustom channel1 + if (availableFteEntitlements == null) { + availableFteEntitlements = + ChannelManager.getAvailableFveEntitlements( + user.getOrg(), channel); + // null fte entitlements means not found + if (availableFteEntitlements == null) { + availableFteEntitlements = 0L; + } + channelToAvailableFteEntitlements.put(channel, availableFteEntitlements); + } + + //Most likely a custom channel, null means unlimited entitlements if (availableEntitlements == null) { continue; } - if (availableEntitlements > 0) { - // Update our cached count for what will happen when - // the subscribe is done - availableEntitlements = availableEntitlements - 1; - channelToAvailableEntitlements.put(channel, availableEntitlements); + + // First try to consume an FTE entitlement, then try regular, + // then remove the system + if (availableFteEntitlements > 0 + && SystemManager.isServerFveEligible(server)) { + availableFteEntitlements -= 1; + channelToAvailableEntitlements.put(channel, availableFteEntitlements); + } + else if (availableEntitlements > 0) { + // Update our cached count for what will happen when + // the subscribe is done + availableEntitlements = availableEntitlements - 1; + channelToAvailableEntitlements.put(channel, availableEntitlements); } else { sysMapping.get(sysid).getSubscribeChannelIds().remove(channel.getId());

12 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits March 2012