Webconsole for OCS Inventory NG

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

Proposed by Pierfrancesco Passerini on 2011-12-10
Status: Merged
Merged at revision: 806
Proposed branch: lp:~pieroliste/ocsinventory-ocsreports/trunk
Merge into: lp:ocsinventory-ocsreports
Diff against target: 216 lines (+35/-12) 13 files modified
To merge this branch: bzr merge lp:~pieroliste/ocsinventory-ocsreports/trunk
Reviewer Review Type Date Requested Status
OCS Inventory Core Team 2011-12-10 Pending
Review via email: mp+85222@code.launchpad.net

Description of the Change

Translations update.
Erwan, please, update French.

To post a comment you must log in.

Preview Diff

1=== modified file 'plugins/language/brazilian_portuguese/brazilian_portuguese.txt'
2--- plugins/language/brazilian_portuguese/brazilian_portuguese.txt 2011-09-05 13:14:38 +0000
3+++ plugins/language/brazilian_portuguese/brazilian_portuguese.txt 2011-12-10 12:37:24 +0000
4@@ -1286,6 +1286,17 @@
5 2017 using
6 2018 was imported
7 2019 were already imported
8+2020 Your install.php exists in your installation directory.
9+2021 Your logs directory is not writable
10+2022 You can't send a file larger than
11+2023 Delete it
12+2024 The default SQL login/password is activate on your database:
13+2025 Change your login password for 'ocs' user in MySQL
14+2026 The default login/password is activate on OCS-NG GUI
15+2027 Change your 'admin' password on OCS-NG GUI
16+2028 Authentication key
17+
18+
19 2030 OCS Inventory Installation
20 2031 Current installed version
21 2032 is lower than this version
22@@ -1385,4 +1396,4 @@
23 5022 [DEBUG]NORMAL CONDITION REQUEST[DEBUG]
24 5023 [DEBUG]DIFF CONDITION REQUEST[DEBUG]
25
26-6000 Plugins
27+6000 Plugins
28\ No newline at end of file
29
30=== modified file 'plugins/language/english/english.txt'
31--- plugins/language/english/english.txt 2011-11-20 11:13:37 +0000
32+++ plugins/language/english/english.txt 2011-12-10 12:37:24 +0000
33@@ -1218,6 +1218,7 @@
34 2025 Change your login password for 'ocs' user in MySQL
35 2026 The default login/password is activate on OCS-NG GUI
36 2027 Change your 'admin' password on OCS-NG GUI
37+2028 Authentication key
38
39
40 2030 OCS-NG Inventory Installation
41@@ -1319,4 +1320,4 @@
42 5022 [DEBUG]NORMAL CONDITION REQUEST[DEBUG]
43 5023 [DEBUG]DIFF CONDITION REQUEST[DEBUG]
44
45-6000 Plugins
46+6000 Plugins
47\ No newline at end of file
48
49=== modified file 'plugins/language/french/french.txt'
50--- plugins/language/french/french.txt 2011-09-08 17:53:01 +0000
51+++ plugins/language/french/french.txt 2011-12-10 12:37:24 +0000
52@@ -1218,6 +1218,7 @@
53 2025 Changer le mot de passe du compte 'ocs' dans MySQL
54 2026 Le compte/mot de passe par défaut de l'interface WEB est actif
55 2027 Changer le mot de passe du compte 'admin' dans l'interface web
56+2028 Authentication key
57
58
59 2030 Installation d'OCS-NG Inventory
60
61=== modified file 'plugins/language/german/german.txt'
62--- plugins/language/german/german.txt 2011-09-05 13:14:38 +0000
63+++ plugins/language/german/german.txt 2011-12-10 12:37:24 +0000
64@@ -1292,6 +1292,8 @@
65 2025 Ändern Sie das OCS-Datenbankpasswort in MySQL
66 2026 Sicherheitsproblem: Sie verwenden das Standard-Admin-Passwort für die OCS-GUI!
67 2027 Ändern Sie das Admin-Kennwort in der OCS-GUI!
68+2028 Authentication key
69+
70
71 2030 OCS-NG Inventory Installation
72 2031 Derzeit installierte Version
73
74=== modified file 'plugins/language/hungarian/hungarian.txt'
75--- plugins/language/hungarian/hungarian.txt 2011-09-05 13:14:38 +0000
76+++ plugins/language/hungarian/hungarian.txt 2011-12-10 12:37:24 +0000
77@@ -1312,6 +1312,7 @@
78 2025 Change your password for ocs login in MySQL
79 2026 The default login/password is activate on OCS GUI
80 2027 Change admin password on OCS GUI
81+2028 Authentication key
82
83
84 2030 OCS-NG Inventory Installation
85
86=== modified file 'plugins/language/italian/italian.txt'
87--- plugins/language/italian/italian.txt 2011-11-20 11:13:37 +0000
88+++ plugins/language/italian/italian.txt 2011-12-10 12:37:24 +0000
89@@ -1218,6 +1218,7 @@
90 2025 Cambia la password dell'account 'ocs' in MySQL
91 2026 Sono attive le credenziali di default per l'accesso alla GUI di OCS-NG
92 2027 Cambia la password dell'account 'admin' per l'accesso alla GUI di OCS-NG
93+2028 Chiave di autenticazione
94
95
96 2030 Installazione OCS-NG Inventory
97@@ -1287,13 +1288,12 @@
98 2099 ERRORE: le credenziali MySQL fornite non hanno i diritti necessari per la creazione del database
99 2100 Aggiorna informazioni account
100 2101 Aggiunto dallo script
101-2102 ATTENZIONE: se cambi i valori di default, del database (ocsweb) od dell'utente (ocs), non dimenticare di aggiornare il file 'z-ocsinventory-server.conf' nella directory di configurazione di Apache
102+2102 ATTENZIONE: se cambi i valori di default, del database (ocsweb) o dell'utente (ocs), non dimenticare di aggiornare il file 'z-ocsinventory-server.conf' nella directory di configurazione di Apache
103 2103 Modalità dimostrativa: non puoi aggiornare i dati
104 2104 STAI UTILIZZANDO LA VERSIONE DIMOSTRATIVA DI
105 2105 Il database è aggiornato.<br>Nessuna modifica apportata.
106 2106 la configurazione di MySQL, variabile 'max_allowed_packet', permette file grandi fino a <
107
108-
109 5000 [DEBUG]computers insertions request =>[DEBUG]
110 5001 [DEBUG]REQUEST MADE => [DEBUG]
111 5002 [DEBUG] => weight: [DEBUG]
112@@ -1319,4 +1319,4 @@
113 5022 [DEBUG]NORMAL CONDITION REQUEST[DEBUG]
114 5023 [DEBUG]DIFF CONDITION REQUEST[DEBUG]
115
116-6000 Plugin
117+6000 Plugin
118\ No newline at end of file
119
120=== modified file 'plugins/language/polish/polish.txt'
121--- plugins/language/polish/polish.txt 2011-11-02 19:38:28 +0000
122+++ plugins/language/polish/polish.txt 2011-12-10 12:37:24 +0000
123@@ -1228,6 +1228,8 @@
124 2025 Zmień swoje hasło dla OCS do logowania w MySQL
125 2026 Domyślny login/hasło jest aktywne w OCS GUI
126 2027 Zmień hasło administratora w OCS GUI
127+2028 Authentication key
128+
129
130 2030 OCS-NG Inventory Installation
131 2031 Current installed version
132
133=== modified file 'plugins/language/portuguese/portuguese.txt'
134--- plugins/language/portuguese/portuguese.txt 2011-09-05 13:14:38 +0000
135+++ plugins/language/portuguese/portuguese.txt 2011-12-10 12:37:24 +0000
136@@ -1297,6 +1297,7 @@
137 2025 Change your password for ocs login in MySQL
138 2026 The default login/password is activate on OCS GUI
139 2027 Change admin password on OCS GUI
140+2028 Authentication key
141
142
143 2030 OCS-NG Inventory Installation
144
145=== modified file 'plugins/language/russian/russian.txt'
146--- plugins/language/russian/russian.txt 2011-09-05 13:14:38 +0000
147+++ plugins/language/russian/russian.txt 2011-12-10 12:37:24 +0000
148@@ -1224,6 +1224,7 @@
149 2025 Change your password for ocs login in MySQL
150 2026 The default login/password is activate on OCS GUI
151 2027 Change admin password on OCS GUI
152+2028 Authentication key
153
154
155 2030 OCS-NG Inventory Installation
156
157=== modified file 'plugins/language/slovenian/slovenian.txt'
158--- plugins/language/slovenian/slovenian.txt 2011-09-05 13:14:38 +0000
159+++ plugins/language/slovenian/slovenian.txt 2011-12-10 12:37:24 +0000
160@@ -1222,6 +1222,7 @@
161 2025 Change your password for ocs login in MySQL
162 2026 The default login/password is activate on OCS GUI
163 2027 Change admin password on OCS GUI
164+2028 Authentication key
165
166
167 2030 OCS-NG Inventory Installation
168
169=== modified file 'plugins/language/spanish/spanish.txt'
170--- plugins/language/spanish/spanish.txt 2011-09-05 13:14:38 +0000
171+++ plugins/language/spanish/spanish.txt 2011-12-10 12:37:24 +0000
172@@ -1222,6 +1222,7 @@
173 2025 Change your password for ocs login in MySQL
174 2026 The default login/password is activate on OCS GUI
175 2027 Change admin password on OCS GUI
176+2028 Authentication key
177
178
179 2030 OCS-NG Inventory Installation
180
181=== modified file 'plugins/language/turkish/turkish.txt'
182--- plugins/language/turkish/turkish.txt 2011-09-05 13:14:38 +0000
183+++ plugins/language/turkish/turkish.txt 2011-12-10 12:37:24 +0000
184@@ -1217,6 +1217,7 @@
185 2025 Change your password for ocs login in MySQL
186 2026 The default login/password is activate on OCS GUI
187 2027 Change admin password on OCS GUI
188+2028 Authentication key
189
190
191 2030 OCS-NG Inventory Installation
192
193=== modified file 'plugins/main_sections/ms_ipdiscover/ms_admin_ipdiscover.php'
194--- plugins/main_sections/ms_ipdiscover/ms_admin_ipdiscover.php 2011-11-02 19:38:28 +0000
195+++ plugins/main_sections/ms_ipdiscover/ms_admin_ipdiscover.php 2011-12-10 12:37:24 +0000
196@@ -244,13 +244,13 @@
197
198 }else{
199 $sql="select * from snmp_communities";
200- $list_fields= array('VERSION' => 'VERSION',
201- $l->g(49)=>'NAME',
202- 'USERNAME'=>'USERNAME',
203- 'AUTHKEY'=>'AUTHKEY',
204- 'AUTHPASSWD'=>'AUTHPASSWD',
205- 'MODIF'=>'ID',
206- 'SUP'=>'ID');
207+ $list_fields= array($l->g(277)=> 'VERSION',
208+ $l->g(49)=>'NAME',
209+ $l->g(24)=>'USERNAME',
210+ $l->g(2028)=>'AUTHKEY',
211+ $l->g(217)=>'AUTHPASSWD',
212+ 'MODIF'=>'ID',
213+ 'SUP'=>'ID');
214 //$list_fields['SUP']='ID';
215 $default_fields=$list_fields;
216 $list_col_cant_del=$list_fields;

Subscribers

People subscribed via source and target branches