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: 424
Proposed branch: lp:~pieroliste/ocsinventory-ocsreports/trunk
Merge into: lp:ocsinventory-ocsreports
Diff against target: 85 lines (+2/-8)
5 files modified
footer.php (+1/-1)
plugins/language/english/english.txt (+0/-2)
plugins/language/french/french.txt (+0/-2)
plugins/language/italian/italian.txt (+0/-2)
plugins/main_sections/ms_all_soft/ms_exportallsoft.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+29701@code.launchpad.net

Description of the change

sync & delete double voices (133 and 392)

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

merge with Passero branch.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'footer.php'
2--- footer.php 2010-07-02 09:11:38 +0000
3+++ footer.php 2010-07-12 13:59:38 +0000
4@@ -24,7 +24,7 @@
5 $form_language="ADMIN_LANGUAGE";
6 echo "<hr/>";
7 $action['MODIF']=$l->g(115);
8- $action['DEL']=$l->g(392);
9+ $action['DEL']=$l->g(122);
10 $action['ADD']=$l->g(116);
11 $tab_typ_champ[0]['DEFAULT_VALUE']=$action;
12 $tab_typ_champ[0]['INPUT_NAME']="ACTION";
13
14=== modified file 'plugins/language/english/english.txt'
15--- plugins/language/english/english.txt 2010-07-08 07:56:04 +0000
16+++ plugins/language/english/english.txt 2010-07-12 13:59:38 +0000
17@@ -75,7 +75,6 @@
18 122 Delete
19 129 LIKE
20 130 DIFFERENT
21-133 Inventory
22 134 Add a new file in the database
23 135 Be careful, you're about to delete this file definitively !
24 137 File
25@@ -297,7 +296,6 @@
26 389 Nothing
27 390 Dictionnary categories
28 391 Category name
29-392 Delete
30 393 Search
31 394 Search Category
32 395 Search software EVERYWHERE
33
34=== modified file 'plugins/language/french/french.txt'
35--- plugins/language/french/french.txt 2010-07-08 07:56:04 +0000
36+++ plugins/language/french/french.txt 2010-07-12 13:59:38 +0000
37@@ -74,7 +74,6 @@
38 130 DIFFERENT
39 131 Fichier icône
40 132 Fichier image
41-133 Inventaire
42 134 Ajout d'un nouveau fichier dans la base
43 135 Attention, vous allez supprimer ce fichier définitivement !
44 137 Fichier
45@@ -321,7 +320,6 @@
46 389 Rien
47 390 Catégories du dictionnaire
48 391 Nom catégorie
49-392 Supprimer
50 393 Chercher
51 394 Chercher catégorie
52 395 Chercher logiciel PARTOUT
53
54=== modified file 'plugins/language/italian/italian.txt'
55--- plugins/language/italian/italian.txt 2010-07-08 07:56:04 +0000
56+++ plugins/language/italian/italian.txt 2010-07-12 13:59:38 +0000
57@@ -74,7 +74,6 @@
58 122 Elimina
59 129 COME
60 130 DIVERSO
61-133 Inventario
62 134 Aggiungi un nuovo file nel database
63 135 Attenzione, stai per eliminare questo file definitivamente!
64 137 File
65@@ -296,7 +295,6 @@
66 389 Niente
67 390 Categorie del dizionario
68 391 Nome categoria
69-392 Elimina
70 393 Cerca
71 394 Cerca categoria
72 395 Cerca software OVUNQUE
73
74=== modified file 'plugins/main_sections/ms_all_soft/ms_exportallsoft.php'
75--- plugins/main_sections/ms_all_soft/ms_exportallsoft.php 2010-07-06 12:56:57 +0000
76+++ plugins/main_sections/ms_all_soft/ms_exportallsoft.php 2010-07-12 13:59:38 +0000
77@@ -23,7 +23,7 @@
78 "h.name"=>$l->g(23),
79 "h.userid"=>$l->g(24),
80 "h.description"=>$l->g(53),
81- "h.lastdate"=>$l->g(133));
82+ "h.lastdate"=>$l->g(728));
83 $sql=" select ";
84 $affich="";
85 foreach($fields as $sql_field=>$lbl){

Subscribers

People subscribed via source and target branches