fixed problem introduced by translating to English

Author: martin-kuba

cloud/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>cz.metacentrum</groupId>
         <artifactId>accounting-parent</artifactId>
-        <version>3.34</version>
+        <version>3.35</version>
     </parent>
 
     <artifactId>cloud</artifactId>

metaacct/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>cz.metacentrum</groupId>
         <artifactId>accounting-parent</artifactId>
-        <version>3.34</version>
+        <version>3.35</version>
     </parent>
 
     <artifactId>metaacct</artifactId>

metaacct_cmd/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>cz.metacentrum</groupId>
         <artifactId>accounting-parent</artifactId>
-        <version>3.34</version>
+        <version>3.35</version>
     </parent>
 
     <artifactId>metaacct_cmd</artifactId>

pbsmon/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>cz.metacentrum</groupId>
         <artifactId>accounting-parent</artifactId>
-        <version>3.34</version>
+        <version>3.35</version>
     </parent>
 
     <artifactId>pbsmon</artifactId>

pbsmon/src/main/java/cz/cesnet/meta/stripes/HardwareActionBean.java

@@ -30,7 +30,7 @@ public Resolution show() {
         return new ForwardResolution("/nodes/hardware.jsp");
     }
 
-    public PhysicalMachines getFyzickeStroje() {
+    public PhysicalMachines getPhysicalMachines() {
         return physicalMachines;
     }
 }

pbsmon/src/main/resources/StripesResources_cs.properties

@@ -9,8 +9,8 @@ job_exectime=\u010Dek\u00E1 do
 job_etime=zp\u016Fsobil\u00E1 k b\u011Bhu
 job_expected_endtime=skon\u010D\u00ED do
 job_headline=\u00DAloha
-job_hosts=pou\u017Eit\u00FD perunMachine/cpu
-job_first_host=perunMachine/cpu
+job_hosts=pou\u017Eit\u00FD stroj/cpu
+job_first_host=stroj/cpu
 job_mtime=posledn\u00ED zm\u011Bna stavu
 job_credential=kerberos l\u00EDstek
 job_planned_nodes=pl\u00E1novan\u00E9 uzly
@@ -163,7 +163,7 @@ nodes_jsp_personlink_link=osobn\u00ED pohled na v\u00FDpo\u010Detn\u00ED stroje
 nodes_jsp_computing_machines=V\u00FDpo\u010Detn\u00ED stroje
 nodes_jsp_barvy=Barvy stav\u016F
 nodes_jsp_celkem_cpu=Celkem CPU v MetaCentru
-nodes_jsp_lock_legend=perunMachine je vyhrazen pro ur\u010Ditou frontu
+nodes_jsp_lock_legend=stroj je vyhrazen pro ur\u010Ditou frontu
 nodes_jsp_nezarazene=Neza\u0159azen\u00E9 stroje
 nodesjsp_personlink=Osobn\u00ED pohled
 nodesjsp_server=server
@@ -195,15 +195,15 @@ nodes_pbs.titul=Stav PBS uzl\u016F
 node.titul=PBS uzel {0}
 
 person_accessible_queues=Fronty dostupn\u00E9 u\u017Eivateli
-person_dost_volnych={0,choice,0#\u017D\u00E1dn\u00FD perunMachine nebyl po\u017Eadov\u00E1n|1#Po\u017Eadov\u00E1n byl 1 perunMachine|2#Po\u017Eadov\u00E1ny byly {0} stroje|4<Po\u017Eadov\u00E1no bylo {0} stroj\u016F}, a pr\u00E1v\u011B te\u010F {1,choice,0#0 stroj\u016F|1#je voln\u00FD 1 perunMachine|2#jsou voln\u00E9 {1} stroje|4<je voln\u00FDch {1} stroj\u016F} {2,choice,0#0 stroj\u016F|1#z 1 stroje spl\u0148uj\u00EDc\u00EDho po\u017Eadavky|1<z {2} stroj\u016F spl\u0148uj\u00EDc\u00EDch po\u017Eadavky}. Je mo\u017En\u00E9, \u017Ee bude \u00FAloha spu\u0161t\u011Bna okam\u017Eit\u011B, ale pokud se tak nestane, nepropadejte panice. Ve front\u011B p\u0159ed Va\u0161\u00ED \u00FAlohou m\u016F\u017Ee b\u00FDt v\u00EDceprocesorov\u00E1 \u00FAloha, a pl\u00E1nova\u010D m\u016F\u017Ee shroma\u017E\u010Fovat voln\u00E9 procesory pro ni.
+person_dost_volnych={0,choice,0#\u017D\u00E1dn\u00FD stroj nebyl po\u017Eadov\u00E1n|1#Po\u017Eadov\u00E1n byl 1 stroj|2#Po\u017Eadov\u00E1ny byly {0} stroje|4<Po\u017Eadov\u00E1no bylo {0} stroj\u016F}, a pr\u00E1v\u011B te\u010F {1,choice,0#0 stroj\u016F|1#je voln\u00FD 1 stroj|2#jsou voln\u00E9 {1} stroje|4<je voln\u00FDch {1} stroj\u016F} {2,choice,0#0 stroj\u016F|1#z 1 stroje spl\u0148uj\u00EDc\u00EDho po\u017Eadavky|1<z {2} stroj\u016F spl\u0148uj\u00EDc\u00EDch po\u017Eadavky}. Je mo\u017En\u00E9, \u017Ee bude \u00FAloha spu\u0161t\u011Bna okam\u017Eit\u011B, ale pokud se tak nestane, nepropadejte panice. Ve front\u011B p\u0159ed Va\u0161\u00ED \u00FAlohou m\u016F\u017Ee b\u00FDt v\u00EDceprocesorov\u00E1 \u00FAloha, a pl\u00E1nova\u010D m\u016F\u017Ee shroma\u017E\u010Fovat voln\u00E9 procesory pro ni.
 person_dotaz=V\u00FDb\u011Br
 person_qsub_cli=zad\u00E1n\u00ED z p\u0159\u00EDkazov\u00E9ho \u0159\u00E1dku
 person_qsub_bash=zad\u00E1n\u00ED v shellov\u00E9m skriptu
 person_headline=Osobn\u00ED pohled
 person_hosts_h3=Stroje dostupn\u00E9 u\u017Eivateli "{0}" z fronty "{1}"
 person_jobs=\u00DAlohy u\u017Eivatele {0}
-person_malo_potencialnich={0,choice,0#\u017D\u00E1dn\u00FD perunMachine nebyl po\u017Eadov\u00E1n|1#Po\u017Eadov\u00E1n byl 1 perunMachine|2#Po\u017Eadov\u00E1ny byly {0} stroje|4<Po\u017Eadov\u00E1no bylo {0} stroj\u016F}, ale po\u017Eadavku {1,choice,0#neodpov\u00EDd\u00E1 \u017E\u00E1dn\u00FD perunMachine|1#odpov\u00EDd\u00E1 jen 1 perunMachine|2#odpov\u00EDdaj\u00ED jen {1} stroje|4<odpov\u00EDd\u00E1 jen {1} stroj\u016F}, {1,choice,0#na kter\u00E9m|1<na kter\u00FDch} m\u00E1te \u00FA\u010Det, \u00FAloha nebude nikdy spu\u0161t\u011Bna !
-person_malo_volnych={0,choice,0#\u017D\u00E1dn\u00FD perunMachine nebyl po\u017Eadov\u00E1n|1#Po\u017Eadov\u00E1n byl 1 perunMachine|2#Po\u017Eadov\u00E1ny byly {0} stroje|4<Po\u017Eadov\u00E1no bylo {0} stroj\u016F}, ale pr\u00E1v\u011B te\u010F {1,choice,0#nen\u00ED voln\u00FD \u017E\u00E1dn\u00FD perunMachine|1#je voln\u00FD jen 1 perunMachine|2#jsou voln\u00E9 jen {1} stroje|4<je voln\u00FDch jen {1} stroj\u016F}, \u00FAloha bude \u010Dekat ve front\u011B.
+person_malo_potencialnich={0,choice,0#\u017D\u00E1dn\u00FD stroj nebyl po\u017Eadov\u00E1n|1#Po\u017Eadov\u00E1n byl 1 stroj|2#Po\u017Eadov\u00E1ny byly {0} stroje|4<Po\u017Eadov\u00E1no bylo {0} stroj\u016F}, ale po\u017Eadavku {1,choice,0#neodpov\u00EDd\u00E1 \u017E\u00E1dn\u00FD stroj|1#odpov\u00EDd\u00E1 jen 1 stroj|2#odpov\u00EDdaj\u00ED jen {1} stroje|4<odpov\u00EDd\u00E1 jen {1} stroj\u016F}, {1,choice,0#na kter\u00E9m|1<na kter\u00FDch} m\u00E1te \u00FA\u010Det, \u00FAloha nebude nikdy spu\u0161t\u011Bna !
+person_malo_volnych={0,choice,0#\u017D\u00E1dn\u00FD stroj nebyl po\u017Eadov\u00E1n|1#Po\u017Eadov\u00E1n byl 1 stroj|2#Po\u017Eadov\u00E1ny byly {0} stroje|4<Po\u017Eadov\u00E1no bylo {0} stroj\u016F}, ale pr\u00E1v\u011B te\u010F {1,choice,0#nen\u00ED voln\u00FD \u017E\u00E1dn\u00FD stroj|1#je voln\u00FD jen 1 stroj|2#jsou voln\u00E9 jen {1} stroje|4<je voln\u00FDch jen {1} stroj\u016F}, \u00FAloha bude \u010Dekat ve front\u011B.
 person_nalezt=Nal\u00E9zt stroje odpov\u00EDdaj\u00EDc\u00ED po\u017Eadavku
 person_potencialni=V\u0161echny stroje odpov\u00EDdaj\u00EDc\u00ED po\u017Eadavku
 person_sestavovac=Sestavova\u010D p\u0159\u00EDkazu qsub
@@ -263,7 +263,7 @@ q_jcu2_txt=Fronta pro u\u017Eivatele z J\u010CU - Jiho\u010Desk\u00E9 Univerzity
 q_preempt_txt=Fronta umo\u017E\u0148uj\u00EDc\u00ED pozastavit i b\u011B\u017E\u00EDc\u00ED \u00FAlohy. Jen pro \u00FAlohy s alespo\u0148 10 CPU. Kontaktujte n\u00E1s, pokud m\u00E1te takov\u00E9 \u00FAlohy.
 q_preemptible_txt=Fronta umo\u017E\u0148uj\u00EDc\u00ED b\u011B\u017En\u00FDm u\u017Eivatel\u016Fm vyu\u017E\u00EDt i stroje, na kter\u00FDch jejich vlastn\u00EDci maj\u00ED mo\u017Enost pozastavovat ciz\u00ED b\u011B\u017E\u00EDc\u00ED \u00FAlohy a spou\u0161t\u011Bt svoje \u00FAlohy okam\u017Eit\u011B. \u00DAlohy mohou b\u00FDt zdr\u017Eeny a\u017E o 30 dn\u016F.
 q_lsd_txt=Fronta pro u\u017Eivatele z LSD - Laborato\u0159e vyhled\u00E1v\u00E1n\u00ED a dialogu (MU)
-q_backfill_txt=Fronta pro "v\u00FDpl\u0148ov\u00E9" \u00FAlohy - maj\u00ED n\u00EDzkou prioritu, mohou b\u00FDt v p\u0159\u00EDpad\u011B pot\u0159eby ukon\u010Deny, pot\u0159ebuj\u00ED maxim\u00E1ln\u011B jeden perunMachine, ale m\u016F\u017Ee jich b\u00FDt velmi mnoho 
+q_backfill_txt=Fronta pro "v\u00FDpl\u0148ov\u00E9" \u00FAlohy - maj\u00ED n\u00EDzkou prioritu, mohou b\u00FDt v p\u0159\u00EDpad\u011B pot\u0159eby ukon\u010Deny, pot\u0159ebuj\u00ED maxim\u00E1ln\u011B jeden stroj, ale m\u016F\u017Ee jich b\u00FDt velmi mnoho 
 q_feec_txt=Fronta pro u\u017Eivatele z FEKT VUT Brno
 q_loslab_txt=Fronta pro u\u017Eivatele z Loschmidt Laboratories (P\u0159F MU)
 q_mufin_txt=Fronta pro u\u017Eivatele projektu MUFIN (skupina prof. Zezuly, FI MU), p\u0159ednostn\u00ED p\u0159\u00EDstup k manwe3+4
@@ -363,14 +363,14 @@ mapping_jsp_virtualni=Virtu\u00E1ln\u00ED stroje
 stripes.errors.header=<div style="color:#b72222; font-weight: bold">Pros\u00EDm opravte n\u00E1sleduj\u00EDc\u00ED chyby:</div><ol>
 memi.errorMessage=Velikost pam\u011Bti v parametru mem ({1}) mus\u00ED b\u00FDt kladn\u00E9 \u010D\u00EDslo
 scratch.errorMessage=Velikost m\u00EDsta na disku v parametru scratch ({1}) mus\u00ED b\u00FDt kladn\u00E9 \u010D\u00EDslo
-machine.titul=Fyzick\u00FD perunMachine {0}
-machine_jsp_ma_pbs_node=Fyzick\u00FD perunMachine obsahuje PBS uzel
-machine_jsp_ma_virts=Fyzick\u00FD perunMachine m\u00E1 {0,choice,0#0 virtu\u00E1ln\u00EDch stroj\u016F.|1#1 virtu\u00E1ln\u00ED perunMachine:|2#{0} virtu\u00E1ln\u00ED stroje:|4<{0} virtu\u00E1ln\u00EDch stroj\u016F:}
-machine_jsp_physical=Fyzick\u00FD perunMachine
+machine.titul=Fyzick\u00FD stroj {0}
+machine_jsp_ma_pbs_node=Fyzick\u00FD stroj obsahuje PBS uzel
+machine_jsp_ma_virts=Fyzick\u00FD stroj m\u00E1 {0,choice,0#0 virtu\u00E1ln\u00EDch stroj\u016F.|1#1 virtu\u00E1ln\u00ED stroj:|2#{0} virtu\u00E1ln\u00ED stroje:|4<{0} virtu\u00E1ln\u00EDch stroj\u016F:}
+machine_jsp_physical=Fyzick\u00FD stroj
 machine_jsp_virtual=PBS uzel 
 machine_jsp_neni_v_pbs=nen\u00ED v PBS
-machine_jsp_in_cloud=Fyzick\u00FD perunMachine {0} je zapojen v cloudu.
-machine_jsp_cloud_vms=Fyzick\u00FD perunMachine v cloudu host\u00ED n\u00E1sleduj\u00EDc\u00ED virtu\u00E1ln\u00ED stroje:
+machine_jsp_in_cloud=Fyzick\u00FD stroj {0} je zapojen v cloudu.
+machine_jsp_cloud_vms=Fyzick\u00FD stroj v cloudu host\u00ED n\u00E1sleduj\u00EDc\u00ED virtu\u00E1ln\u00ED stroje:
 node_detail_fronty=P\u0159\u00EDstupn\u00FD p\u0159es fronty na PBS serveru
 queue_line_tag_locked=vyhrazena pro
 queue_line_tag_routing=sm\u011Brovac\u00ED fronta
@@ -394,16 +394,16 @@ machine_jsp_fyzicky_frontend=Stroj <b>{0}</b> je frontend clusteru, tj. je mo\u0
 machine_jsp_virtual_frontend=(frontend clusteru)
 stats_vyuziti=vyu\u017Eit\u00ED
 stats_cluster=cluster {0} stroj\u016F s {1} CPU
-stats_samostatny_stroj=samostatn\u00FD perunMachine s {0} CPU
+stats_samostatny_stroj=samostatn\u00FD stroj s {0} CPU
 
 node_detail_tag_outages=Zaznamenan\u00E1 omezen\u00ED b\u011B\u017En\u00E9ho provozu
 node_detail_tag_typ=typ
 node_detail_tag_start=za\u010D\u00E1tek
 node_detail_tag_end=konec
 node_detail_tag_comment=koment\u00E1\u0159
 node_detail_tag_none_found=\u017E\u00E1dn\u00E1 nenalezena
-node_detail_max_walltime=Tento perunMachine akceptuje jen \u00FAlohy s walltime nanejv\u00FD\u0161 <b>{0}</b>.
-node_detail_min_walltime=Tento perunMachine akceptuje jen \u00FAlohy s walltime nejm\u00E9n\u011B <b>{0}</b>.
+node_detail_max_walltime=Tento stroj akceptuje jen \u00FAlohy s walltime nanejv\u00FD\u0161 <b>{0}</b>.
+node_detail_min_walltime=Tento stroj akceptuje jen \u00FAlohy s walltime nejm\u00E9n\u011B <b>{0}</b>.
 
 jobs.show.zobrazit.moje.ulohy=Zobrazit moje \u00FAlohy
 jobs.show.zobrazit.vsechny.ulohy=Zobrazit v\u0161echny \u00FAlohy
@@ -435,7 +435,7 @@ jobs_queued_byqueuetrue=Server m\u00E1 nastaveno by_queue=true.
 
 nodes_jsp_gpu_title=GPU
 job_scheduled_nodespec=p\u0159id\u011Blen\u00E9 prost\u0159edky
-job_nodespec_node=perunMachine
+job_nodespec_node=stroj
 cloud_jsp_celkem_cpu=Celkem CPU v cloudu:
 cloud_jsp_headline_physical_machines=P\u0159ehled fyzick\u00FDch stroj\u016F zapojen\u00FDch do cloudu
 cloud_jsp_headline_vm_assignment=P\u0159i\u0159azen\u00ED virtu\u00E1ln\u00EDch stroj\u016F na fyzick\u00E9

pbsmon/src/main/resources/logback.xml

@@ -79,4 +79,5 @@
     <logger name="cz.cesnet.meta.cloud.CloudPhysicalHost" level="error"/>
     <logger name="cz.cesnet.meta.pbscache.PbsCacheImpl" level="error"/>
     <logger name="cz.cesnet.meta.cloud.CloudImpl" level="info"/>
+<!--    <logger name="cz.cesnet.meta.pbs.PbsConnectorFile" level="debug"/>-->
 </configuration>

…n/src/main/webapp/WEB-INF/tags/stroj.tag …ain/webapp/WEB-INF/tags/perunMachine.tagpbsmon/src/main/webapp/WEB-INF/tags/stroj.tag renamed to pbsmon/src/main/webapp/WEB-INF/tags/perunMachine.tag pbsmon/src/main/webapp/WEB-INF/tags/stroj.tag renamed to pbsmon/src/main/webapp/WEB-INF/tags/perunMachine.tag

@@ -13,13 +13,13 @@
     <s:layout-component name="telo">
 
         <ul>
-        <c:forEach items="${actionBean.physicalMachines.centra}" var="ownerOrganisation">
-            <li> <strong><f:message key="${ownerOrganisation.nazevKey}"/></strong> (${actionBean.physicalMachines.cpuMap[ownerOrganisation.id]} CPU)
+        <c:forEach items="${actionBean.physicalMachines.ownerOrganisations}" var="ownerOrganisation">
+            <li> <strong><f:message key="${ownerOrganisation.nameKey}"/></strong> (${actionBean.physicalMachines.cpuMap[ownerOrganisation.id]} CPU)
                 <ul>
-            <c:forEach var="zdr" items="${ownerOrganisation.zdroje}" varStatus="s">
-                <li><a href="#<c:out value='${zdr.id}'/>"><c:out value="${zdr.nazev}"/></a>
+            <c:forEach var="zdr" items="${ownerOrganisation.perunComputingResources}" varStatus="s">
+                <li><a href="#<c:out value='${zdr.id}'/>"><c:out value="${zdr.name}"/></a>
                     (${actionBean.physicalMachines.cpuMap[zdr.id]} CPU<c:if test="${zdr.cluster}">,
-                         <f:message key="hardware.uzlu"><f:param value="${fn:length(zdr.stroje)}"/></f:message></c:if>)
+                         <f:message key="hardware.uzlu"><f:param value="${fn:length(zdr.perunMachines)}"/></f:message></c:if>)
                 </li>
             </c:forEach>
                 </ul>
@@ -28,15 +28,15 @@
         </ul>
         <hr>
 
-        <c:forEach items="${actionBean.physicalMachines.centra}" var="ownerOrganisation">
+        <c:forEach items="${actionBean.physicalMachines.ownerOrganisations}" var="ownerOrganisation">
 
-            <c:forEach var="zdr" items="${ownerOrganisation.zdroje}" varStatus="s">
+            <c:forEach var="zdr" items="${ownerOrganisation.perunComputingResources}" varStatus="s">
                 <div id="<c:out value='${zdr.id}'/>">
-                <s:link href="/resource/${zdr.id}"><c:out value="${zdr.nazev}"/></s:link>
+                <s:link href="/resource/${zdr.id}"><c:out value="${zdr.name}"/></s:link>
                 <c:if test="${zdr.cluster}">
-                    (${actionBean.physicalMachines.cpuMap[zdr.id]} CPU, <f:message key="hardware.uzlu"><f:param value="${fn:length(zdr.stroje)}"/></f:message> )
+                    (${actionBean.physicalMachines.cpuMap[zdr.id]} CPU, <f:message key="hardware.uzlu"><f:param value="${fn:length(zdr.perunMachines)}"/></f:message> )
                 </c:if>
-                - <f:message key="${zdr.popisKey}"/><br>
+                - <f:message key="${zdr.descriptionKey}"/><br>
                 <table>
                     <tr>
                         <td>

pbsmon/src/main/webapp/nodes/hardware.jsp

@@ -14,15 +14,15 @@
     <s:layout-component name="telo">
 
         <%-- variantní hláška o clusteru nebo SMP stroji --%>
-        <% if (actionBean.getPerunMachine().getVypocetniZdroj().isCluster()) {%>
+        <% if (actionBean.getPerunMachine().getPerunComputingResource().isCluster()) {%>
         <f:message key="machine_jsp_soucast_clusteru1"/>
         <s:link href="/resource/${actionBean.perunMachine.perunComputingResource.id}"><c:out
-                value="${actionBean.perunMachine.perunComputingResource.nazev}"/></s:link>
+                value="${actionBean.perunMachine.perunComputingResource.name}"/></s:link>
         <f:message key="machine_jsp_soucast_clusteru2"/>
         <% } else { %>
         <f:message key="machine_jsp_smp_stroj1"/>
         <s:link href="/resource/${actionBean.perunMachine.perunComputingResource.id}"><c:out
-                value="${actionBean.perunMachine.perunComputingResource.nazev}"/></s:link>
+                value="${actionBean.perunMachine.perunComputingResource.name}"/></s:link>
         <f:message key="machine_jsp_smp_stroj2"/>
         <% } %>