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

Proposed by Pierfrancesco Passerini
Status: Merged
Merged at revision: 783
Proposed branch: lp:~pieroliste/ocsinventory-ocsreports/trunk
Merge into: lp:ocsinventory-ocsreports
Diff against target: 50 lines (+1/-34)
2 files modified
plugins/language/italian/italian.txt (+1/-1)
var.php (+0/-33)
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+74243@code.launchpad.net

Description of the change

Italian update

To post a comment you must log in.
783. By Erwan

Italian file update

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/language/italian/italian.txt'
2--- plugins/language/italian/italian.txt 2011-09-05 13:14:38 +0000
3+++ plugins/language/italian/italian.txt 2011-09-06 15:15:15 +0000
4@@ -1291,7 +1291,7 @@
5 2103 Modalità dimostrativa: non puoi aggiornare i dati
6 2104 STAI UTILIZZANDO LA VERSIONE DIMOSTRATIVA DI
7 2105 Il database è aggiornato.<br>Nessuna modifica apportata.
8-2106 in MySQL configuration, the variable 'max_allowed_packet' allows only file size <
9+2106 la configurazione di MySQL, variabile 'max_allowed_packet', permette file grandi fino a <
10
11 5000 [DEBUG]computers insertions request =>[DEBUG]
12 5001 [DEBUG]REQUEST MADE => [DEBUG]
13
14=== removed file 'var.php'
15--- var.php 2011-09-06 08:02:04 +0000
16+++ var.php 1970-01-01 00:00:00 +0000
17@@ -1,33 +0,0 @@
18-<?php
19-//====================================================================================
20-// OCS INVENTORY REPORTS
21-// Copyleft Erwan GOALOU 2010 (erwan(at)ocsinventory-ng(pt)org)
22-// Web: http://www.ocsinventory-ng.org
23-//
24-// This code is open source and may be copied and modified as long as the source
25-// code is always made freely available.
26-// Please refer to the General Public Licence http://www.gnu.org/ or Licence.txt
27-//====================================================================================
28-
29-@session_start();
30-define("GUI_VER", "6005"); // Version of the database
31-define("GUI_VER_SHOW","2.0.1"); // Version of the GUI
32-define("MAC_FILE", "files/oui.txt"); // File containing MAC database
33-define("DEFAULT_LANGUAGE","english"); // Default language
34-define("PAG_INDEX","function"); // define name in url (like multi=32)
35-define("DEMO",false); // Define if we use demo version or not (for OCS TEAM, other=> DO NOT USE IT)
36-define("DEMO_LOGIN",'demo'); // Define demo login for connexion
37-define("DEMO_PASSWD",'demo'); // Define demo password for connexion
38-define("DFT_DB_CMPT",'ocs'); // Define default login to connect to database
39-define("DFT_DB_PSWD",'ocs'); // Define default password to connect to database
40-define("DFT_GUI_CMPT",'admin'); // Define default login to connect to GUI
41-define("DFT_GUI_PSWD",'admin'); // Define default password to connect to GUI
42-define('BACKEND',"backend/"); // Define backend Directory
43-define('PLUGINS_DIR',"plugins/"); // Define plugins Directory
44-define('CONF_MYSQL',"dbconfig.inc.php"); // Define dbconf file
45-define('HEADER_HTML',"require/html_header.php"); // Define html_header file
46-define('FOOTER_HTML',"require/footer.php"); // Define footer file
47-define('MAIN_SECTIONS_DIR',PLUGINS_DIR."main_sections/"); //
48-define('DEV_OPTION',false); // Define DEV Options DO NOT USE
49-define('PC4PAGE',1000000); // Define result by page MUST in (5,10,15,20,50,100,200,1000000);
50-?>

Subscribers

People subscribed via source and target branches