OCS Inventory: OCSReports

Merge lp:~pieroliste/ocsinventory-ocsreports/trunk into lp:ocsinventory-ocsreports

  1. trunk
  2. Merge into trunk
Proposed by Pierfrancesco Passerini
Status: Merged
Merged at revision: 445
Proposed branch: lp:~pieroliste/ocsinventory-ocsreports/trunk
Merge into: lp:ocsinventory-ocsreports
Diff against target: 168 lines (+13/-13)
13 files modified
plugins/language/brazilian_portuguese/brazilian_portuguese.txt (+1/-1)
plugins/language/english/english.txt (+1/-1)
plugins/language/french/french.txt (+1/-1)
plugins/language/german/german.txt (+1/-1)
plugins/language/hungarian/hungarian.txt (+1/-1)
plugins/language/polish/polish.txt (+1/-1)
plugins/language/russian/russian.txt (+1/-1)
plugins/language/slovenian/slovenian.txt (+1/-1)
plugins/language/turkish/turkish.txt (+1/-1)
plugins/main_sections/ms_label/ms_label.php (+1/-1)
plugins/main_sections/ms_multi_search/ms_custom_tag.php (+1/-1)
plugins/main_sections/ms_multi_search/ms_multi_search.php (+1/-1)
plugins/main_sections/ms_users/ms_custom_perim.php (+1/-1)
To merge this branch: bzr merge lp:~pieroliste/ocsinventory-ocsreports/trunk
Reviewer Review Type Date Requested Status
OCS Inventory Dev Team Pending
Review via email: mp+31026@code.launchpad.net

Description of the change

Cosmetics fix

To post a comment you must log in.
lp:~pieroliste/ocsinventory-ocsreports/trunk updated
442. By Erwan

fix bug: generate table cache if requete and arg are new (mysql2_query_secure)

tx to Zefox! very good debug man! :)

443. By Erwan

fix: add message when status is updated + keep the values sent when error was detected
tx to zefox!

444. By Erwan

fix bug: you can update and post request deployment
tx to Zefox again...

445. By Erwan

merge with passero branch.
Tx again for your contirbution.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/language/brazilian_portuguese/brazilian_portuguese.txt'
2--- plugins/language/brazilian_portuguese/brazilian_portuguese.txt 2010-07-26 09:47:41 +0000
3+++ plugins/language/brazilian_portuguese/brazilian_portuguese.txt 2010-07-27 08:44:50 +0000
4@@ -373,7 +373,7 @@
5 374 Sociedade registrada
6 375 Versão do agente OCS NG
7 376 Computador indisponível. Por favor tente novamente em alguns instantes.
8-377 Velocidade do processador (Mhz)
9+377 Velocidade do processador (MHz)
10 380 Dicionário
11 381 Número
12 382 Nome do software
13
14=== modified file 'plugins/language/english/english.txt'
15--- plugins/language/english/english.txt 2010-07-20 19:06:31 +0000
16+++ plugins/language/english/english.txt 2010-07-27 08:44:50 +0000
17@@ -281,7 +281,7 @@
18 374 Updated user
19 375 OCS NG Agent Vesion
20 376 Computer locked. Please retry in a few minutes
21-377 Processor Speed (Mhz)
22+377 Processor Speed (MHz)
23 380 Dictionnary
24 381 Number of installation
25 382 Software name
26
27=== modified file 'plugins/language/french/french.txt'
28--- plugins/language/french/french.txt 2010-07-26 13:07:08 +0000
29+++ plugins/language/french/french.txt 2010-07-27 08:44:50 +0000
30@@ -302,7 +302,7 @@
31 374 Utilisateur modifié
32 375 Version Agent OCS NG
33 376 Ordinateur verrouillé. Merci de réessayer plus tard
34-377 Vitesse CPU (Mhz)
35+377 Vitesse CPU (MHz)
36 380 Dictionnaire
37 381 Nombre installation
38 382 Nom du logiciel
39
40=== modified file 'plugins/language/german/german.txt'
41--- plugins/language/german/german.txt 2010-07-02 09:11:38 +0000
42+++ plugins/language/german/german.txt 2010-07-27 08:44:50 +0000
43@@ -372,7 +372,7 @@
44 374 Registered society
45 375 OCS NG Agent Vesion
46 376 Computer locked. Please retry in a few minutes
47-377 Processor Speed (Mhz)
48+377 Processor Speed (MHz)
49 380 Dictionnary
50 381 Number
51 382 Software name
52
53=== modified file 'plugins/language/hungarian/hungarian.txt'
54--- plugins/language/hungarian/hungarian.txt 2010-07-02 09:11:38 +0000
55+++ plugins/language/hungarian/hungarian.txt 2010-07-27 08:44:50 +0000
56@@ -373,7 +373,7 @@
57 374 Regisztr�lt szervezet
58 375 OCS NG Agens verzi�
59 376 A sz�m�t�g�p z�rolt. Pr�b�lja k�sobb
60-377 Processzor sebess�g (Mhz)
61+377 Processzor sebess�g (MHz)
62 380 Szoftver
63 381 Sz�m
64 382 Szoftver n�v
65
66=== modified file 'plugins/language/polish/polish.txt'
67--- plugins/language/polish/polish.txt 2010-07-02 09:11:38 +0000
68+++ plugins/language/polish/polish.txt 2010-07-27 08:44:50 +0000
69@@ -283,7 +283,7 @@
70 374 Registered society
71 375 Wersja agenta OCS NG
72 376 Komputer zablokowany. Proszę spr�bowa� za kilka minut
73-377 Szybkość procesora (Mhz)
74+377 Szybkość procesora (MHz)
75 380 Słownik
76 381 Numer
77 382 Nazwa oprogramowania
78
79=== modified file 'plugins/language/russian/russian.txt'
80--- plugins/language/russian/russian.txt 2010-07-02 09:11:38 +0000
81+++ plugins/language/russian/russian.txt 2010-07-27 08:44:50 +0000
82@@ -282,7 +282,7 @@
83 374 Registered society
84 375 OCS NG Agent Vesion
85 376 Computer locked. Please retry in a few minutes
86-377 Processor Speed (Mhz)
87+377 Processor Speed (MHz)
88 380 Dictionnary
89 381 Number
90 382 Software name
91
92=== modified file 'plugins/language/slovenian/slovenian.txt'
93--- plugins/language/slovenian/slovenian.txt 2010-07-02 09:11:38 +0000
94+++ plugins/language/slovenian/slovenian.txt 2010-07-27 08:44:50 +0000
95@@ -283,7 +283,7 @@
96 374 Registrirana druĹžba
97 375 OCS NG Verzija agenta
98 376 RaÄ?unalnik je zaklenjen. Prosim ponovno poskusi Ä?ez nekaj minut.
99-377 Hitrost procesorja(Mhz)
100+377 Hitrost procesorja(MHz)
101 380 Slovar
102 381 Ĺ tevilo
103 382 Ime programske opreme
104
105=== modified file 'plugins/language/turkish/turkish.txt'
106--- plugins/language/turkish/turkish.txt 2010-07-02 09:11:38 +0000
107+++ plugins/language/turkish/turkish.txt 2010-07-27 08:44:50 +0000
108@@ -282,7 +282,7 @@
109 374 Kay�tl� Kurum
110 375 OCS NG Acenta versiyonu
111 376 Bilgisayar kapal�. L�tfen bir ka� saniye sonra tekrar deneyiniz.
112-377 ��lemci h�z� (Mhz)
113+377 ��lemci h�z� (MHz)
114 380 S�zl�k
115 381 Say�
116 382 Yaz�l�m ad�
117
118=== modified file 'plugins/main_sections/ms_label/ms_label.php'
119--- plugins/main_sections/ms_label/ms_label.php 2010-07-02 09:11:38 +0000
120+++ plugins/main_sections/ms_label/ms_label.php 2010-07-27 08:44:50 +0000
121@@ -39,7 +39,7 @@
122 ?><br>
123 <center><b><?php echo $l->g(262);?>:</b>
124 <form name='lab' method='post'>
125- <textarea name='newlabel'><?php echo $con[0]?></textarea>
126+ <textarea name='newlabel'><?php echo $con[0]?></textarea><br>
127 <input name='sublabel' type='submit' value='<?php echo $l->g(13);?>'>
128 </form>
129 </center>
130\ No newline at end of file
131
132=== modified file 'plugins/main_sections/ms_multi_search/ms_custom_tag.php'
133--- plugins/main_sections/ms_multi_search/ms_custom_tag.php 2010-07-05 15:40:30 +0000
134+++ plugins/main_sections/ms_multi_search/ms_custom_tag.php 2010-07-27 08:44:50 +0000
135@@ -127,7 +127,7 @@
136 $List[$val["fileid"]]=$val["name"];
137 }
138 $select=show_modif($List,'pack_list',2,$form_name);
139- echo "<tr><td align=center>".$l->g(970)." :".$select."</td></tr>";
140+ echo "<tr><td align=center>".$l->g(970).": ".$select."</td></tr>";
141 if ($protectedPost['pack_list'] != ""){
142 $sql ="select count(*) c, tvalue from download_enable d_e,devices d
143 where d.name='DOWNLOAD' and d.IVALUE=d_e.ID and d_e.fileid='%s'
144
145=== modified file 'plugins/main_sections/ms_multi_search/ms_multi_search.php'
146--- plugins/main_sections/ms_multi_search/ms_multi_search.php 2010-07-27 07:38:52 +0000
147+++ plugins/main_sections/ms_multi_search/ms_multi_search.php 2010-07-27 08:44:50 +0000
148@@ -942,7 +942,7 @@
149 "HARDWARE-MEMORY-LBL"=>"MB",
150 "HARDWARE-MEMORY-SELECT"=>$lbl_default,
151 "HARDWARE-PROCESSORS"=>$sort_list_Select2Field["HARDWARE-PROCESSORS"],//$l->g(54).": ".$l->g(377),
152- "HARDWARE-PROCESSORS-LBL"=>"Mhz",
153+ "HARDWARE-PROCESSORS-LBL"=>"MHz",
154 "HARDWARE-PROCESSORS-SELECT"=>$lbl_default);
155 //composotion du tableau
156 //option : TABLE-NOMCHAMP-SELECT =>array des valeurs du champ select ou requete sql (1er select)
157
158=== modified file 'plugins/main_sections/ms_users/ms_custom_perim.php'
159--- plugins/main_sections/ms_users/ms_custom_perim.php 2010-07-06 12:56:57 +0000
160+++ plugins/main_sections/ms_users/ms_custom_perim.php 2010-07-27 08:44:50 +0000
161@@ -55,7 +55,7 @@
162 //
163 echo "<FONT FACE='tahoma' SIZE=2>";
164 echo $l->g(617)." ".$_SESSION['OCS']['TAG_LBL']['TAG'].": <input type='text' id='newtag' name='newtag' value='".$protectedPost['newtag']."'>
165- <input type='submit' name='ADD_TAG' value='envoyer'>";
166+ <input type='submit' name='ADD_TAG' value='" . $l->g(13) . "'>";
167 echo "</form>";
168 ?>
169

Subscribers

People subscribed via source and target branches