updated the various connectivity plugins

addes the gpli connectivity plugin
updated the french locale

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@1840 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 8bc676e09ef4c3d9b5a74e9cf4da5e388c44602b..abaa77abf7f5aff4925e6fa85a59a96fcd9b9b20 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -170,6 +170,7 @@
                <tab class="intranetAccount" />
 <!--           <tab class="pptpAccount" /> -->
 <!--           <tab class="phpscheduleitAccount" /> -->
+<!--           <tab class="glpiAccount" /> -->
        </connectivity>
 
        <ldiftab>

diff --git a/contrib/openldap/glpi.schema b/contrib/openldap/glpi.schema
new file mode 100644 (file)
index 0000000..6028bfd
--- /dev/null
+++ b/contrib/openldap/glpi.schema
@@ -0,0 +1,21 @@
+#
+## schema file for OpenLDAP 2.x
+## Schema for storing glpi User Configuration in LDAP
+## OIDs are owned by OpenSides
+##
+#
+# $Id: glpi.schema,v 1.1 2005/11/02 16:48:16 benoit Exp $
+#
+
+attributetype ( 1.3.6.1.4.1.22262.1.1.1.4.1 NAME 'glpiAccountLogin'
+        DESC 'glpi Account Login'
+        EQUALITY caseIgnoreIA5Match
+        SUBSTR caseExactIA5SubstringsMatch
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+#
+# all objectclass 
+#
+
+objectclass ( 1.3.6.1.4.1.22262.1.1.2.4.1 NAME 'glpiAccount' SUP top AUXILIARY
+ DESC 'glpi Account'
+ MAY ( glpiAccountLogin  ))
\ No newline at end of file

diff --git a/contrib/opensides/glpi.README b/contrib/opensides/glpi.README
new file mode 100644 (file)
index 0000000..52cfcf2
--- /dev/null
+++ b/contrib/opensides/glpi.README
@@ -0,0 +1,13 @@
+To use the glpi connectivity extension
+
+1) Add the glpi.schema to your schema directory
+
+2) Remove the comment in front of glpiAccount in gosa.conf
+
+<!--    <tab class="glpiAccount" /> -->
+
+Benoit Mortier
+OpenSides November 2005
+
+
+

diff --git a/contrib/opensides/nagios.README b/contrib/opensides/nagios.README
index beec8e5a28eb107f75c7a5b2ca7607386d094d62..5878e4059cf09eccce70c7eda1c64c321cf46f31 100644 (file)
--- a/contrib/opensides/nagios.README
+++ b/contrib/opensides/nagios.README
@@ -12,9 +12,9 @@ To use the nagios plugin
                 <tab class="nagiosAccount" />
         </nagios> -->
 
-
+Benoit Mortier
 Guillaume Delecourt
-OpenSides October 2005
+OpenSides October-November 2005
 
 
 

diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index f82de5b95519b81607251d2b204fa2c34caed737..cf8917bd5968a4b2989ac291ed5b8e4024ae9f1e 100644 (file)
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -198,7 +198,7 @@ msgstr "Datenbanken"
 msgid "Services"
 msgstr "Dienste"
 
-#: contrib/gosa.conf:176 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:177 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 #: plugins/addons/ldapmanager/contentexportxls.tpl:19
@@ -207,11 +207,11 @@ msgstr "Dienste"
 msgid "Export"
 msgstr "Export"
 
-#: contrib/gosa.conf:177
+#: contrib/gosa.conf:178
 msgid "Excel Export"
 msgstr "Excel-Export"
 
-#: contrib/gosa.conf:178 plugins/personal/mail/generic.tpl:112
+#: contrib/gosa.conf:179 plugins/personal/mail/generic.tpl:112
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:117
@@ -220,73 +220,73 @@ msgstr "Excel-Export"
 msgid "Import"
 msgstr "Importieren"
 
-#: contrib/gosa.conf:179
+#: contrib/gosa.conf:180
 msgid "CSV Import"
 msgstr "CSV Import"
 
-#: contrib/gosa.conf:183
+#: contrib/gosa.conf:184
 msgid "Partitions"
 msgstr "Partitionen"
 
-#: contrib/gosa.conf:187 plugins/personal/environment/logonManagement.tpl:55
+#: contrib/gosa.conf:188 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:81
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 msgid "Script"
 msgstr "Skript"
 
-#: contrib/gosa.conf:191 plugins/admin/fai/class_faiManagement.inc:545
+#: contrib/gosa.conf:192 plugins/admin/fai/class_faiManagement.inc:545
 #: plugins/admin/fai/class_faiManagement.inc:546
 msgid "Hooks"
 msgstr "Hooks"
 
-#: contrib/gosa.conf:195 plugins/admin/fai/class_faiManagement.inc:538
+#: contrib/gosa.conf:196 plugins/admin/fai/class_faiManagement.inc:538
 #: plugins/admin/fai/class_faiManagement.inc:539
 msgid "Variables"
 msgstr "Variablen"
 
-#: contrib/gosa.conf:199 plugins/admin/fai/class_faiManagement.inc:559
+#: contrib/gosa.conf:200 plugins/admin/fai/class_faiManagement.inc:559
 #: plugins/admin/fai/class_faiManagement.inc:560
 msgid "Templates"
 msgstr "Vorlagen"
 
-#: contrib/gosa.conf:203 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:204 plugins/personal/environment/environment.tpl:7
 msgid "Profiles"
 msgstr "Profile"
 
-#: contrib/gosa.conf:207
+#: contrib/gosa.conf:208
 msgid "Packages"
 msgstr "Pakete"
 
-#: contrib/gosa.conf:223
+#: contrib/gosa.conf:224
 msgid "{LOCATIONNAME}"
 msgstr "{LOCATIONNAME}"
 
-#: contrib/gosa.conf:240 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:241 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Deutsch"
 
-#: contrib/gosa.conf:241
+#: contrib/gosa.conf:242
 msgid "Russian"
 msgstr "Russisch"
 
-#: contrib/gosa.conf:242
+#: contrib/gosa.conf:243
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: contrib/gosa.conf:243
+#: contrib/gosa.conf:244
 msgid "French"
 msgstr "Französisch"
 
-#: contrib/gosa.conf:244
+#: contrib/gosa.conf:245
 msgid "Dutch"
 msgstr "Niederländisch"
 
-#: contrib/gosa.conf:245
+#: contrib/gosa.conf:246
 msgid "English"
 msgstr "Englisch"
 
-#: contrib/gosa.conf:246
+#: contrib/gosa.conf:247
 msgid "Italian"
 msgstr "Italienisch"
 
@@ -303,8 +303,9 @@ msgstr "Italienisch"
 #: plugins/personal/connectivity/class_connectivity.inc:16
 #: plugins/personal/connectivity/class_proxyAccount.inc:6
 #: plugins/personal/connectivity/class_intranetAccount.inc:16
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:7
-#: plugins/personal/connectivity/class_pptpAccount.inc:7
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
+#: plugins/personal/connectivity/class_pptpAccount.inc:27
+#: plugins/personal/connectivity/class_glpiAccount.inc:26
 #: plugins/personal/environment/class_environment.inc:13
 #: plugins/personal/nagios/class_nagiosAccount.inc:19
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:6
@@ -2507,13 +2508,15 @@ msgstr ""
 msgid "Intranet"
 msgstr "Intranet"
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:6
-msgid "PHPscheduleit Account"
-msgstr ""
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
+#, fuzzy
+msgid "PHPscheduleit"
+msgstr "phpGroupware-Konto"
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:6
-msgid "PPTP Server"
-msgstr "PPTP-Server"
+#: plugins/personal/connectivity/class_pptpAccount.inc:26
+#, fuzzy
+msgid "PPTP"
+msgstr "PT"
 
 #: plugins/personal/connectivity/phpscheduleit.tpl:1
 #, fuzzy
@@ -2521,8 +2524,18 @@ msgid "PHPscheduleit account"
 msgstr "phpGroupware-Konto"
 
 #: plugins/personal/connectivity/pptp.tpl:1
-msgid "PPTP Server account"
-msgstr "PPTP-Konto"
+#, fuzzy
+msgid "PPTP account"
+msgstr "FTP Konto"
+
+#: plugins/personal/connectivity/class_glpiAccount.inc:25
+msgid "GLPI"
+msgstr ""
+
+#: plugins/personal/connectivity/glpi.tpl:1
+#, fuzzy
+msgid "GLPI account"
+msgstr "FTP Konto"
 
 #: plugins/personal/environment/main.inc:124
 msgid "User environment settings"
@@ -2920,15 +2933,15 @@ msgstr "Schliessen"
 msgid "Nagios settings"
 msgstr "Nagios-Einstellungen"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:85
+#: plugins/personal/nagios/class_nagiosAccount.inc:86
 msgid "This account has no nagios extensions."
 msgstr "Dieses Konto besitzt keine Nagios-Erweiterungen."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:94
+#: plugins/personal/nagios/class_nagiosAccount.inc:95
 msgid "Remove nagios account"
 msgstr "Nagios-Konto entfernen"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:95
+#: plugins/personal/nagios/class_nagiosAccount.inc:96
 msgid ""
 "This account has nagios features enabled. You can disable them by clicking "
 "below."
@@ -2936,11 +2949,11 @@ msgstr ""
 "Dieses Konto besitzt aktivierte Nagios-Erweiterungen. Sie können diese "
 "deaktivieren, indem Sie auf die Schaltfläche unten klicken."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:97
+#: plugins/personal/nagios/class_nagiosAccount.inc:98
 msgid "Create nagios account"
 msgstr "Neues Nagios-Konto erzeugen"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:97
+#: plugins/personal/nagios/class_nagiosAccount.inc:98
 msgid ""
 "This account has nagios features disabled. You can enable them by clicking "
 "below."
@@ -2948,16 +2961,16 @@ msgstr ""
 "Dieses Konto besitzt keine aktivierten Nagios-Erweiterungen. Sie können "
 "diese aktivieren, indem Sie auf die Schaltfläche unten klicken."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:172
+#: plugins/personal/nagios/class_nagiosAccount.inc:174
 msgid "The required field 'NagiosAlias' is not set."
 msgstr "Das benötigte Feld 'NagiosAlias' ist nicht gesetzt."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:175
+#: plugins/personal/nagios/class_nagiosAccount.inc:177
 msgid "The required field 'NagiosMail' is not set."
 msgstr "Das benötigte Feld 'NagiosMail' ist nicht gesetzt."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:179
-#: plugins/personal/nagios/class_nagiosAccount.inc:183
+#: plugins/personal/nagios/class_nagiosAccount.inc:181
+#: plugins/personal/nagios/class_nagiosAccount.inc:185
 msgid "Please enter a valid email address in 'NagiosMail' field."
 msgstr ""
 "Bitte geben Sie eine gültige E-Mail-Adresse in das Feld 'NagiosMail' ein."
@@ -10542,6 +10555,16 @@ msgstr ""
 "Versionen). In einigen Fällen ist es hilfreich, das 'error_reporting' zu "
 "aktivieren (dies kann jedoch ein Sicherheitsrisiko darstellen)."
 
+#~ msgid "PPTP Server account"
+#~ msgstr "PPTP-Konto"
+
+#~ msgid "PPTP Server"
+#~ msgstr "PPTP-Server"
+
+#, fuzzy
+#~ msgid "GLPI Account"
+#~ msgstr "Konto"
+
 #, fuzzy
 #~ msgid "Firstname"
 #~ msgstr "Listenname"

diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 60797d2cb4c5c5f689a29fdd539103ead65fee60..bf548d61b5e0b14d29ab3bf17f8b54b5fd5e63af 100644 (file)
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -194,7 +194,7 @@ msgstr "Bases de datos"
 msgid "Services"
 msgstr "Servicios"
 
-#: contrib/gosa.conf:176 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:177 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 #: plugins/addons/ldapmanager/contentexportxls.tpl:19
@@ -203,12 +203,12 @@ msgstr "Servicios"
 msgid "Export"
 msgstr "Exportar"
 
-#: contrib/gosa.conf:177
+#: contrib/gosa.conf:178
 #, fuzzy
 msgid "Excel Export"
 msgstr "Exportar"
 
-#: contrib/gosa.conf:178 plugins/personal/mail/generic.tpl:112
+#: contrib/gosa.conf:179 plugins/personal/mail/generic.tpl:112
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:117
@@ -217,16 +217,16 @@ msgstr "Exportar"
 msgid "Import"
 msgstr "Importar"
 
-#: contrib/gosa.conf:179
+#: contrib/gosa.conf:180
 msgid "CSV Import"
 msgstr "Importación desde CVS"
 
-#: contrib/gosa.conf:183
+#: contrib/gosa.conf:184
 #, fuzzy
 msgid "Partitions"
 msgstr "Destino"
 
-#: contrib/gosa.conf:187 plugins/personal/environment/logonManagement.tpl:55
+#: contrib/gosa.conf:188 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:81
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
@@ -234,62 +234,62 @@ msgstr "Destino"
 msgid "Script"
 msgstr "Ruta del Script"
 
-#: contrib/gosa.conf:191 plugins/admin/fai/class_faiManagement.inc:545
+#: contrib/gosa.conf:192 plugins/admin/fai/class_faiManagement.inc:545
 #: plugins/admin/fai/class_faiManagement.inc:546
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:195 plugins/admin/fai/class_faiManagement.inc:538
+#: contrib/gosa.conf:196 plugins/admin/fai/class_faiManagement.inc:538
 #: plugins/admin/fai/class_faiManagement.inc:539
 #, fuzzy
 msgid "Variables"
 msgstr "Variable"
 
-#: contrib/gosa.conf:199 plugins/admin/fai/class_faiManagement.inc:559
+#: contrib/gosa.conf:200 plugins/admin/fai/class_faiManagement.inc:559
 #: plugins/admin/fai/class_faiManagement.inc:560
 #, fuzzy
 msgid "Templates"
 msgstr "Plantilla"
 
-#: contrib/gosa.conf:203 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:204 plugins/personal/environment/environment.tpl:7
 #, fuzzy
 msgid "Profiles"
 msgstr "Ruta del Perfil"
 
-#: contrib/gosa.conf:207
+#: contrib/gosa.conf:208
 #, fuzzy
 msgid "Packages"
 msgstr "Mostrar teléfonos"
 
-#: contrib/gosa.conf:223
+#: contrib/gosa.conf:224
 msgid "{LOCATIONNAME}"
 msgstr "{LOCATIONNAME}"
 
-#: contrib/gosa.conf:240 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:241 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Alemán"
 
-#: contrib/gosa.conf:241
+#: contrib/gosa.conf:242
 msgid "Russian"
 msgstr "Ruso"
 
-#: contrib/gosa.conf:242
+#: contrib/gosa.conf:243
 msgid "Spanish"
 msgstr "Español"
 
-#: contrib/gosa.conf:243
+#: contrib/gosa.conf:244
 msgid "French"
 msgstr "Francés"
 
-#: contrib/gosa.conf:244
+#: contrib/gosa.conf:245
 msgid "Dutch"
 msgstr "Holandés"
 
-#: contrib/gosa.conf:245
+#: contrib/gosa.conf:246
 msgid "English"
 msgstr "Inglés"
 
-#: contrib/gosa.conf:246
+#: contrib/gosa.conf:247
 msgid "Italian"
 msgstr "Italiano"
 
@@ -306,8 +306,9 @@ msgstr "Italiano"
 #: plugins/personal/connectivity/class_connectivity.inc:16
 #: plugins/personal/connectivity/class_proxyAccount.inc:6
 #: plugins/personal/connectivity/class_intranetAccount.inc:16
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:7
-#: plugins/personal/connectivity/class_pptpAccount.inc:7
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
+#: plugins/personal/connectivity/class_pptpAccount.inc:27
+#: plugins/personal/connectivity/class_glpiAccount.inc:26
 #: plugins/personal/environment/class_environment.inc:13
 #: plugins/personal/nagios/class_nagiosAccount.inc:19
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:6
@@ -2506,14 +2507,14 @@ msgstr "El valor de 'Tamaño de Cola' no es valido."
 msgid "Intranet"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:6
-msgid "PHPscheduleit Account"
-msgstr ""
-
-#: plugins/personal/connectivity/class_pptpAccount.inc:6
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
 #, fuzzy
-msgid "PPTP Server"
-msgstr "Servidor NTP"
+msgid "PHPscheduleit"
+msgstr "Cuenta PHPGroupware"
+
+#: plugins/personal/connectivity/class_pptpAccount.inc:26
+msgid "PPTP"
+msgstr ""
 
 #: plugins/personal/connectivity/phpscheduleit.tpl:1
 #, fuzzy
@@ -2522,7 +2523,16 @@ msgstr "Cuenta PHPGroupware"
 
 #: plugins/personal/connectivity/pptp.tpl:1
 #, fuzzy
-msgid "PPTP Server account"
+msgid "PPTP account"
+msgstr "Cuenta FTP"
+
+#: plugins/personal/connectivity/class_glpiAccount.inc:25
+msgid "GLPI"
+msgstr ""
+
+#: plugins/personal/connectivity/glpi.tpl:1
+#, fuzzy
+msgid "GLPI account"
 msgstr "Cuenta FTP"
 
 #: plugins/personal/environment/main.inc:124
@@ -2957,17 +2967,17 @@ msgstr "Elige"
 msgid "Nagios settings"
 msgstr "Parametros del correo de usuarios"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:85
+#: plugins/personal/nagios/class_nagiosAccount.inc:86
 #, fuzzy
 msgid "This account has no nagios extensions."
 msgstr "Esta cuenta no tiene extensiones validas de correo."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:94
+#: plugins/personal/nagios/class_nagiosAccount.inc:95
 #, fuzzy
 msgid "Remove nagios account"
 msgstr "Borrar cuenta de correo"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:95
+#: plugins/personal/nagios/class_nagiosAccount.inc:96
 #, fuzzy
 msgid ""
 "This account has nagios features enabled. You can disable them by clicking "
@@ -2976,12 +2986,12 @@ msgstr ""
 "Esta cuenta tiene las características de correo activas. Puede desactivarlas "
 "apretando a continuación."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:97
+#: plugins/personal/nagios/class_nagiosAccount.inc:98
 #, fuzzy
 msgid "Create nagios account"
 msgstr "Crear cuenta de correo"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:97
+#: plugins/personal/nagios/class_nagiosAccount.inc:98
 #, fuzzy
 msgid ""
 "This account has nagios features disabled. You can enable them by clicking "
@@ -2990,18 +3000,18 @@ msgstr ""
 "Esta cuenta tiene las características de correo desactivadas.Puede "
 "activarlas pulsando aqui."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:172
+#: plugins/personal/nagios/class_nagiosAccount.inc:174
 #, fuzzy
 msgid "The required field 'NagiosAlias' is not set."
 msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:175
+#: plugins/personal/nagios/class_nagiosAccount.inc:177
 #, fuzzy
 msgid "The required field 'NagiosMail' is not set."
 msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:179
-#: plugins/personal/nagios/class_nagiosAccount.inc:183
+#: plugins/personal/nagios/class_nagiosAccount.inc:181
+#: plugins/personal/nagios/class_nagiosAccount.inc:185
 #, fuzzy
 msgid "Please enter a valid email address in 'NagiosMail' field."
 msgstr ""
@@ -10808,6 +10818,18 @@ msgid ""
 "(But it could be a security risk)  "
 msgstr ""
 
+#, fuzzy
+#~ msgid "PPTP Server account"
+#~ msgstr "Cuenta FTP"
+
+#, fuzzy
+#~ msgid "PPTP Server"
+#~ msgstr "Servidor NTP"
+
+#, fuzzy
+#~ msgid "GLPI Account"
+#~ msgstr "Cuenta"
+
 #, fuzzy
 #~ msgid "Firstname"
 #~ msgstr "Nombre de la lista"

diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index eef51350cd9cfacba5bb30add8a2acb497aeaf01..fe49329656a93d0d4cc9daf93493f41e432e268b 100644 (file)
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -10,12 +10,13 @@
 # translation of messages.po to
 # translation of messages.po to
 # translation of messages.po to
+# translation of messages.po to
 # translation of messages.po to French
 # Benoit Mortier <benoit.mortier@opensides.be>, 2005.
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"PO-Revision-Date: 2005-11-05 12:33+0100\n"
+"PO-Revision-Date: 2005-11-06 21:52+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -201,7 +202,7 @@ msgstr "Base de données"
 msgid "Services"
 msgstr "Services"
 
-#: contrib/gosa.conf:176 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:177 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 #: plugins/addons/ldapmanager/contentexportxls.tpl:19
@@ -210,11 +211,11 @@ msgstr "Services"
 msgid "Export"
 msgstr "Exporter"
 
-#: contrib/gosa.conf:177
+#: contrib/gosa.conf:178
 msgid "Excel Export"
 msgstr "Exporter en Excel"
 
-#: contrib/gosa.conf:178 plugins/personal/mail/generic.tpl:112
+#: contrib/gosa.conf:179 plugins/personal/mail/generic.tpl:112
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:117
@@ -223,73 +224,73 @@ msgstr "Exporter en Excel"
 msgid "Import"
 msgstr "Importer"
 
-#: contrib/gosa.conf:179
+#: contrib/gosa.conf:180
 msgid "CSV Import"
 msgstr "Importer un fichier CSV"
 
-#: contrib/gosa.conf:183
+#: contrib/gosa.conf:184
 msgid "Partitions"
 msgstr "Partitions"
 
-#: contrib/gosa.conf:187 plugins/personal/environment/logonManagement.tpl:55
+#: contrib/gosa.conf:188 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:81
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 msgid "Script"
 msgstr "Script"
 
-#: contrib/gosa.conf:191 plugins/admin/fai/class_faiManagement.inc:545
+#: contrib/gosa.conf:192 plugins/admin/fai/class_faiManagement.inc:545
 #: plugins/admin/fai/class_faiManagement.inc:546
 msgid "Hooks"
 msgstr "Connexions"
 
-#: contrib/gosa.conf:195 plugins/admin/fai/class_faiManagement.inc:538
+#: contrib/gosa.conf:196 plugins/admin/fai/class_faiManagement.inc:538
 #: plugins/admin/fai/class_faiManagement.inc:539
 msgid "Variables"
 msgstr "Variables"
 
-#: contrib/gosa.conf:199 plugins/admin/fai/class_faiManagement.inc:559
+#: contrib/gosa.conf:200 plugins/admin/fai/class_faiManagement.inc:559
 #: plugins/admin/fai/class_faiManagement.inc:560
 msgid "Templates"
 msgstr "Modèles"
 
-#: contrib/gosa.conf:203 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:204 plugins/personal/environment/environment.tpl:7
 msgid "Profiles"
 msgstr "Profils"
 
-#: contrib/gosa.conf:207
+#: contrib/gosa.conf:208
 msgid "Packages"
 msgstr "Paquets"
 
-#: contrib/gosa.conf:223
+#: contrib/gosa.conf:224
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:240 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:241 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Allemand"
 
-#: contrib/gosa.conf:241
+#: contrib/gosa.conf:242
 msgid "Russian"
 msgstr "Russe"
 
-#: contrib/gosa.conf:242
+#: contrib/gosa.conf:243
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: contrib/gosa.conf:243
+#: contrib/gosa.conf:244
 msgid "French"
 msgstr "Français"
 
-#: contrib/gosa.conf:244
+#: contrib/gosa.conf:245
 msgid "Dutch"
 msgstr "Hollandais"
 
-#: contrib/gosa.conf:245
+#: contrib/gosa.conf:246
 msgid "English"
 msgstr "Anglais"
 
-#: contrib/gosa.conf:246
+#: contrib/gosa.conf:247
 msgid "Italian"
 msgstr "Italien"
 
@@ -306,8 +307,9 @@ msgstr "Italien"
 #: plugins/personal/connectivity/class_connectivity.inc:16
 #: plugins/personal/connectivity/class_proxyAccount.inc:6
 #: plugins/personal/connectivity/class_intranetAccount.inc:16
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:7
-#: plugins/personal/connectivity/class_pptpAccount.inc:7
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
+#: plugins/personal/connectivity/class_pptpAccount.inc:27
+#: plugins/personal/connectivity/class_glpiAccount.inc:26
 #: plugins/personal/environment/class_environment.inc:13
 #: plugins/personal/nagios/class_nagiosAccount.inc:19
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:6
@@ -2497,22 +2499,30 @@ msgstr "La valeur dans le champ 'Quota Setting' n'est pas valide."
 msgid "Intranet"
 msgstr "Intranet"
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:6
-msgid "PHPscheduleit Account"
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
+msgid "PHPscheduleit"
 msgstr "Compte PHPscheduleit"
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:6
-msgid "PPTP Server"
-msgstr "Serveur PPTP"
+#: plugins/personal/connectivity/class_pptpAccount.inc:26
+msgid "PPTP"
+msgstr "Compte PPTP"
 
 #: plugins/personal/connectivity/phpscheduleit.tpl:1
 msgid "PHPscheduleit account"
 msgstr "Compte PHPscheduleit"
 
 #: plugins/personal/connectivity/pptp.tpl:1
-msgid "PPTP Server account"
+msgid "PPTP account"
 msgstr "Compte PPTP"
 
+#: plugins/personal/connectivity/class_glpiAccount.inc:25
+msgid "GLPI"
+msgstr "Compte GLPI"
+
+#: plugins/personal/connectivity/glpi.tpl:1
+msgid "GLPI account"
+msgstr "Compte GLPI"
+
 #: plugins/personal/environment/main.inc:124
 msgid "User environment settings"
 msgstr "Utiliser les préférences d'environnement"
@@ -2908,15 +2918,15 @@ msgstr "Fermer"
 msgid "Nagios settings"
 msgstr "Paramètres Nagios"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:85
+#: plugins/personal/nagios/class_nagiosAccount.inc:86
 msgid "This account has no nagios extensions."
 msgstr "Ce compte n'a pas d'extensions Nagios."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:94
+#: plugins/personal/nagios/class_nagiosAccount.inc:95
 msgid "Remove nagios account"
 msgstr "Supprimer l'extension Nagios"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:95
+#: plugins/personal/nagios/class_nagiosAccount.inc:96
 msgid ""
 "This account has nagios features enabled. You can disable them by clicking "
 "below."
@@ -2924,11 +2934,11 @@ msgstr ""
 "L'extension nagios est activée pour ce compte, vous pouvez la désactiver en "
 "cliquant sur le bouton ci-dessous."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:97
+#: plugins/personal/nagios/class_nagiosAccount.inc:98
 msgid "Create nagios account"
 msgstr "Créer un compte nagios"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:97
+#: plugins/personal/nagios/class_nagiosAccount.inc:98
 msgid ""
 "This account has nagios features disabled. You can enable them by clicking "
 "below."
@@ -2936,16 +2946,16 @@ msgstr ""
 "L'extension nagios est désactivée pour ce compte, vous pouvez l'activer en "
 "cliquant sur le bouton ci-dessous."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:172
+#: plugins/personal/nagios/class_nagiosAccount.inc:174
 msgid "The required field 'NagiosAlias' is not set."
 msgstr "Le champ obligatoire 'NagiosAlias' n'est pas rempli."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:175
+#: plugins/personal/nagios/class_nagiosAccount.inc:177
 msgid "The required field 'NagiosMail' is not set."
 msgstr "Le champ obligatoire 'NagiosMail' n'est pas rempli."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:179
-#: plugins/personal/nagios/class_nagiosAccount.inc:183
+#: plugins/personal/nagios/class_nagiosAccount.inc:181
+#: plugins/personal/nagios/class_nagiosAccount.inc:185
 msgid "Please enter a valid email address in 'NagiosMail' field."
 msgstr ""
 "Veuillez entrer une adresse de messagerie valide dans le champ 'Adresse "
@@ -4223,7 +4233,9 @@ msgstr "En bas"
 msgid ""
 "Please check your 'gosa.conf' the value for 'MAILQUEUE_QUERY_COMMAND' can't "
 "be executed."
-msgstr "Veuillez vérifier votre fichier 'gosa.conf' la valeur de la commande 'MAILQUEUE_QUERY_COMMAND' ne peut pas être exécutée."
+msgstr ""
+"Veuillez vérifier votre fichier 'gosa.conf' la valeur de la commande "
+"'MAILQUEUE_QUERY_COMMAND' ne peut pas être exécutée."
 
 #: plugins/addons/mailqueue/class_mailqueue.inc:75
 #: plugins/admin/users/class_userManagement.inc:488
@@ -7961,7 +7973,9 @@ msgstr ""
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:351
 msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
-msgstr "Veuillez utiliser 'swap' comme point de montage, si 'swap' est utilisé comme type de fichier."
+msgstr ""
+"Veuillez utiliser 'swap' comme point de montage, si 'swap' est utilisé comme "
+"type de fichier."
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:357
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:361

diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index d545f1f1e33249d786e75dae3d9d03e936a2fae9..cd2200a829919b6554d064fd33d1395b445bccd9 100644 (file)
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -194,7 +194,7 @@ msgstr "Database"
 msgid "Services"
 msgstr "Servizi"
 
-#: contrib/gosa.conf:176 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:177 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 #: plugins/addons/ldapmanager/contentexportxls.tpl:19
@@ -203,12 +203,12 @@ msgstr "Servizi"
 msgid "Export"
 msgstr "Esporta"
 
-#: contrib/gosa.conf:177
+#: contrib/gosa.conf:178
 #, fuzzy
 msgid "Excel Export"
 msgstr "Esporta"
 
-#: contrib/gosa.conf:178 plugins/personal/mail/generic.tpl:112
+#: contrib/gosa.conf:179 plugins/personal/mail/generic.tpl:112
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:117
@@ -217,16 +217,16 @@ msgstr "Esporta"
 msgid "Import"
 msgstr "Importa"
 
-#: contrib/gosa.conf:179
+#: contrib/gosa.conf:180
 msgid "CSV Import"
 msgstr "Importa da CSV"
 
-#: contrib/gosa.conf:183
+#: contrib/gosa.conf:184
 #, fuzzy
 msgid "Partitions"
 msgstr "Destinazione"
 
-#: contrib/gosa.conf:187 plugins/personal/environment/logonManagement.tpl:55
+#: contrib/gosa.conf:188 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:81
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
@@ -234,62 +234,62 @@ msgstr "Destinazione"
 msgid "Script"
 msgstr "Script path"
 
-#: contrib/gosa.conf:191 plugins/admin/fai/class_faiManagement.inc:545
+#: contrib/gosa.conf:192 plugins/admin/fai/class_faiManagement.inc:545
 #: plugins/admin/fai/class_faiManagement.inc:546
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:195 plugins/admin/fai/class_faiManagement.inc:538
+#: contrib/gosa.conf:196 plugins/admin/fai/class_faiManagement.inc:538
 #: plugins/admin/fai/class_faiManagement.inc:539
 #, fuzzy
 msgid "Variables"
 msgstr "Mostra terminali"
 
-#: contrib/gosa.conf:199 plugins/admin/fai/class_faiManagement.inc:559
+#: contrib/gosa.conf:200 plugins/admin/fai/class_faiManagement.inc:559
 #: plugins/admin/fai/class_faiManagement.inc:560
 #, fuzzy
 msgid "Templates"
 msgstr "Mostra utenti template"
 
-#: contrib/gosa.conf:203 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:204 plugins/personal/environment/environment.tpl:7
 #, fuzzy
 msgid "Profiles"
 msgstr "Path del profilo"
 
-#: contrib/gosa.conf:207
+#: contrib/gosa.conf:208
 #, fuzzy
 msgid "Packages"
 msgstr "Mostra telefoni"
 
-#: contrib/gosa.conf:223
+#: contrib/gosa.conf:224
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:240 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:241 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Tedesco"
 
-#: contrib/gosa.conf:241
+#: contrib/gosa.conf:242
 msgid "Russian"
 msgstr "Russo"
 
-#: contrib/gosa.conf:242
+#: contrib/gosa.conf:243
 msgid "Spanish"
 msgstr "Spagnolo"
 
-#: contrib/gosa.conf:243
+#: contrib/gosa.conf:244
 msgid "French"
 msgstr "Francese"
 
-#: contrib/gosa.conf:244
+#: contrib/gosa.conf:245
 msgid "Dutch"
 msgstr "Tedesco"
 
-#: contrib/gosa.conf:245
+#: contrib/gosa.conf:246
 msgid "English"
 msgstr "Inglese"
 
-#: contrib/gosa.conf:246
+#: contrib/gosa.conf:247
 msgid "Italian"
 msgstr "Italiano"
 
@@ -306,8 +306,9 @@ msgstr "Italiano"
 #: plugins/personal/connectivity/class_connectivity.inc:16
 #: plugins/personal/connectivity/class_proxyAccount.inc:6
 #: plugins/personal/connectivity/class_intranetAccount.inc:16
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:7
-#: plugins/personal/connectivity/class_pptpAccount.inc:7
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
+#: plugins/personal/connectivity/class_pptpAccount.inc:27
+#: plugins/personal/connectivity/class_glpiAccount.inc:26
 #: plugins/personal/environment/class_environment.inc:13
 #: plugins/personal/nagios/class_nagiosAccount.inc:19
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:6
@@ -2448,14 +2449,14 @@ msgstr "Il valore di 'Dimensione quota' non è valido"
 msgid "Intranet"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:6
-msgid "PHPscheduleit Account"
-msgstr ""
-
-#: plugins/personal/connectivity/class_pptpAccount.inc:6
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
 #, fuzzy
-msgid "PPTP Server"
-msgstr "Server"
+msgid "PHPscheduleit"
+msgstr "Estenzioni PHPGroupware"
+
+#: plugins/personal/connectivity/class_pptpAccount.inc:26
+msgid "PPTP"
+msgstr ""
 
 #: plugins/personal/connectivity/phpscheduleit.tpl:1
 #, fuzzy
@@ -2464,7 +2465,16 @@ msgstr "Estenzioni PHPGroupware"
 
 #: plugins/personal/connectivity/pptp.tpl:1
 #, fuzzy
-msgid "PPTP Server account"
+msgid "PPTP account"
+msgstr "Estenzioni FTP"
+
+#: plugins/personal/connectivity/class_glpiAccount.inc:25
+msgid "GLPI"
+msgstr ""
+
+#: plugins/personal/connectivity/glpi.tpl:1
+#, fuzzy
+msgid "GLPI account"
 msgstr "Estenzioni FTP"
 
 #: plugins/personal/environment/main.inc:124
@@ -2889,47 +2899,47 @@ msgstr "Scegli"
 msgid "Nagios settings"
 msgstr "Opzioni di posta dell'identità"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:85
+#: plugins/personal/nagios/class_nagiosAccount.inc:86
 #, fuzzy
 msgid "This account has no nagios extensions."
 msgstr "Questa identità non ha le estensioni per la posta"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:94
+#: plugins/personal/nagios/class_nagiosAccount.inc:95
 #, fuzzy
 msgid "Remove nagios account"
 msgstr "Rimuovi le estensioni di posta"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:95
+#: plugins/personal/nagios/class_nagiosAccount.inc:96
 #, fuzzy
 msgid ""
 "This account has nagios features enabled. You can disable them by clicking "
 "below."
 msgstr "Questa identià possiede estensioni di posta."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:97
+#: plugins/personal/nagios/class_nagiosAccount.inc:98
 #, fuzzy
 msgid "Create nagios account"
 msgstr "Crea estensioni di posta"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:97
+#: plugins/personal/nagios/class_nagiosAccount.inc:98
 #, fuzzy
 msgid ""
 "This account has nagios features disabled. You can enable them by clicking "
 "below."
 msgstr "Questa identità non possiede estensioni di posta."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:172
+#: plugins/personal/nagios/class_nagiosAccount.inc:174
 #, fuzzy
 msgid "The required field 'NagiosAlias' is not set."
 msgstr "Il campo 'Indirizzo principale' non è stao inserito"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:175
+#: plugins/personal/nagios/class_nagiosAccount.inc:177
 #, fuzzy
 msgid "The required field 'NagiosMail' is not set."
 msgstr "Il campo 'Indirizzo principale' non è stao inserito"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:179
-#: plugins/personal/nagios/class_nagiosAccount.inc:183
+#: plugins/personal/nagios/class_nagiosAccount.inc:181
+#: plugins/personal/nagios/class_nagiosAccount.inc:185
 #, fuzzy
 msgid "Please enter a valid email address in 'NagiosMail' field."
 msgstr ""
@@ -10371,6 +10381,18 @@ msgid ""
 "(But it could be a security risk)  "
 msgstr ""
 
+#, fuzzy
+#~ msgid "PPTP Server account"
+#~ msgstr "Estenzioni FTP"
+
+#, fuzzy
+#~ msgid "PPTP Server"
+#~ msgstr "Server"
+
+#, fuzzy
+#~ msgid "GLPI Account"
+#~ msgstr "Sicurezza"
+
 #, fuzzy
 #~ msgid "Firstname"
 #~ msgstr "Liste di blocco"

diff --git a/locale/messages.po b/locale/messages.po
index 88940bf3928176316568d10a3c9f88d062094652..c9a2ff302e2a7dfd7d952e2f4c3a67400d650a89 100644 (file)
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -176,7 +176,7 @@ msgstr ""
 msgid "Services"
 msgstr ""
 
-#: contrib/gosa.conf:176 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:177 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 #: plugins/addons/ldapmanager/contentexportxls.tpl:19
@@ -185,11 +185,11 @@ msgstr ""
 msgid "Export"
 msgstr ""
 
-#: contrib/gosa.conf:177
+#: contrib/gosa.conf:178
 msgid "Excel Export"
 msgstr ""
 
-#: contrib/gosa.conf:178 plugins/personal/mail/generic.tpl:112
+#: contrib/gosa.conf:179 plugins/personal/mail/generic.tpl:112
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:117
@@ -198,73 +198,73 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
-#: contrib/gosa.conf:179
+#: contrib/gosa.conf:180
 msgid "CSV Import"
 msgstr ""
 
-#: contrib/gosa.conf:183
+#: contrib/gosa.conf:184
 msgid "Partitions"
 msgstr ""
 
-#: contrib/gosa.conf:187 plugins/personal/environment/logonManagement.tpl:55
+#: contrib/gosa.conf:188 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:81
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 msgid "Script"
 msgstr ""
 
-#: contrib/gosa.conf:191 plugins/admin/fai/class_faiManagement.inc:545
+#: contrib/gosa.conf:192 plugins/admin/fai/class_faiManagement.inc:545
 #: plugins/admin/fai/class_faiManagement.inc:546
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:195 plugins/admin/fai/class_faiManagement.inc:538
+#: contrib/gosa.conf:196 plugins/admin/fai/class_faiManagement.inc:538
 #: plugins/admin/fai/class_faiManagement.inc:539
 msgid "Variables"
 msgstr ""
 
-#: contrib/gosa.conf:199 plugins/admin/fai/class_faiManagement.inc:559
+#: contrib/gosa.conf:200 plugins/admin/fai/class_faiManagement.inc:559
 #: plugins/admin/fai/class_faiManagement.inc:560
 msgid "Templates"
 msgstr ""
 
-#: contrib/gosa.conf:203 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:204 plugins/personal/environment/environment.tpl:7
 msgid "Profiles"
 msgstr ""
 
-#: contrib/gosa.conf:207
+#: contrib/gosa.conf:208
 msgid "Packages"
 msgstr ""
 
-#: contrib/gosa.conf:223
+#: contrib/gosa.conf:224
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:240 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:241 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr ""
 
-#: contrib/gosa.conf:241
+#: contrib/gosa.conf:242
 msgid "Russian"
 msgstr ""
 
-#: contrib/gosa.conf:242
+#: contrib/gosa.conf:243
 msgid "Spanish"
 msgstr ""
 
-#: contrib/gosa.conf:243
+#: contrib/gosa.conf:244
 msgid "French"
 msgstr ""
 
-#: contrib/gosa.conf:244
+#: contrib/gosa.conf:245
 msgid "Dutch"
 msgstr ""
 
-#: contrib/gosa.conf:245
+#: contrib/gosa.conf:246
 msgid "English"
 msgstr ""
 
-#: contrib/gosa.conf:246
+#: contrib/gosa.conf:247
 msgid "Italian"
 msgstr ""
 
@@ -281,8 +281,9 @@ msgstr ""
 #: plugins/personal/connectivity/class_connectivity.inc:16
 #: plugins/personal/connectivity/class_proxyAccount.inc:6
 #: plugins/personal/connectivity/class_intranetAccount.inc:16
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:7
-#: plugins/personal/connectivity/class_pptpAccount.inc:7
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
+#: plugins/personal/connectivity/class_pptpAccount.inc:27
+#: plugins/personal/connectivity/class_glpiAccount.inc:26
 #: plugins/personal/environment/class_environment.inc:13
 #: plugins/personal/nagios/class_nagiosAccount.inc:19
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:6
@@ -2381,12 +2382,12 @@ msgstr ""
 msgid "Intranet"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:6
-msgid "PHPscheduleit Account"
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
+msgid "PHPscheduleit"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:6
-msgid "PPTP Server"
+#: plugins/personal/connectivity/class_pptpAccount.inc:26
+msgid "PPTP"
 msgstr ""
 
 #: plugins/personal/connectivity/phpscheduleit.tpl:1
@@ -2394,7 +2395,15 @@ msgid "PHPscheduleit account"
 msgstr ""
 
 #: plugins/personal/connectivity/pptp.tpl:1
-msgid "PPTP Server account"
+msgid "PPTP account"
+msgstr ""
+
+#: plugins/personal/connectivity/class_glpiAccount.inc:25
+msgid "GLPI"
+msgstr ""
+
+#: plugins/personal/connectivity/glpi.tpl:1
+msgid "GLPI account"
 msgstr ""
 
 #: plugins/personal/environment/main.inc:124
@@ -2768,40 +2777,40 @@ msgstr ""
 msgid "Nagios settings"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:85
+#: plugins/personal/nagios/class_nagiosAccount.inc:86
 msgid "This account has no nagios extensions."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:94
+#: plugins/personal/nagios/class_nagiosAccount.inc:95
 msgid "Remove nagios account"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:95
+#: plugins/personal/nagios/class_nagiosAccount.inc:96
 msgid ""
 "This account has nagios features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:97
+#: plugins/personal/nagios/class_nagiosAccount.inc:98
 msgid "Create nagios account"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:97
+#: plugins/personal/nagios/class_nagiosAccount.inc:98
 msgid ""
 "This account has nagios features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:172
+#: plugins/personal/nagios/class_nagiosAccount.inc:174
 msgid "The required field 'NagiosAlias' is not set."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:175
+#: plugins/personal/nagios/class_nagiosAccount.inc:177
 msgid "The required field 'NagiosMail' is not set."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:179
-#: plugins/personal/nagios/class_nagiosAccount.inc:183
+#: plugins/personal/nagios/class_nagiosAccount.inc:181
+#: plugins/personal/nagios/class_nagiosAccount.inc:185
 msgid "Please enter a valid email address in 'NagiosMail' field."
 msgstr ""
 

diff --git a/locale/nl/LC_MESSAGES/messages.po b/locale/nl/LC_MESSAGES/messages.po
index 64801b9e7049d8d68198a8c2937814706411c572..e507ae1aa847dc3751614ee0caa2a3cff7a20347 100644 (file)
--- a/locale/nl/LC_MESSAGES/messages.po
+++ b/locale/nl/LC_MESSAGES/messages.po
@@ -197,7 +197,7 @@ msgstr "Databases"
 msgid "Services"
 msgstr "Services"
 
-#: contrib/gosa.conf:176 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:177 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 #: plugins/addons/ldapmanager/contentexportxls.tpl:19
@@ -206,11 +206,11 @@ msgstr "Services"
 msgid "Export"
 msgstr "Exporteer"
 
-#: contrib/gosa.conf:177
+#: contrib/gosa.conf:178
 msgid "Excel Export"
 msgstr "Excel Export"
 
-#: contrib/gosa.conf:178 plugins/personal/mail/generic.tpl:112
+#: contrib/gosa.conf:179 plugins/personal/mail/generic.tpl:112
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:117
@@ -219,73 +219,73 @@ msgstr "Excel Export"
 msgid "Import"
 msgstr "Importeren"
 
-#: contrib/gosa.conf:179
+#: contrib/gosa.conf:180
 msgid "CSV Import"
 msgstr "CSV Import"
 
-#: contrib/gosa.conf:183
+#: contrib/gosa.conf:184
 msgid "Partitions"
 msgstr "Partities"
 
-#: contrib/gosa.conf:187 plugins/personal/environment/logonManagement.tpl:55
+#: contrib/gosa.conf:188 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:81
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 msgid "Script"
 msgstr "Script"
 
-#: contrib/gosa.conf:191 plugins/admin/fai/class_faiManagement.inc:545
+#: contrib/gosa.conf:192 plugins/admin/fai/class_faiManagement.inc:545
 #: plugins/admin/fai/class_faiManagement.inc:546
 msgid "Hooks"
 msgstr "Inhakers"
 
-#: contrib/gosa.conf:195 plugins/admin/fai/class_faiManagement.inc:538
+#: contrib/gosa.conf:196 plugins/admin/fai/class_faiManagement.inc:538
 #: plugins/admin/fai/class_faiManagement.inc:539
 msgid "Variables"
 msgstr "Variabelen"
 
-#: contrib/gosa.conf:199 plugins/admin/fai/class_faiManagement.inc:559
+#: contrib/gosa.conf:200 plugins/admin/fai/class_faiManagement.inc:559
 #: plugins/admin/fai/class_faiManagement.inc:560
 msgid "Templates"
 msgstr "Sjablonen"
 
-#: contrib/gosa.conf:203 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:204 plugins/personal/environment/environment.tpl:7
 msgid "Profiles"
 msgstr "Profielen"
 
-#: contrib/gosa.conf:207
+#: contrib/gosa.conf:208
 msgid "Packages"
 msgstr "Pakketten"
 
-#: contrib/gosa.conf:223
+#: contrib/gosa.conf:224
 msgid "{LOCATIONNAME}"
 msgstr "{LOCATIONNAME}"
 
-#: contrib/gosa.conf:240 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:241 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Duits"
 
-#: contrib/gosa.conf:241
+#: contrib/gosa.conf:242
 msgid "Russian"
 msgstr "Russisch"
 
-#: contrib/gosa.conf:242
+#: contrib/gosa.conf:243
 msgid "Spanish"
 msgstr "Spaans"
 
-#: contrib/gosa.conf:243
+#: contrib/gosa.conf:244
 msgid "French"
 msgstr "Frans"
 
-#: contrib/gosa.conf:244
+#: contrib/gosa.conf:245
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: contrib/gosa.conf:245
+#: contrib/gosa.conf:246
 msgid "English"
 msgstr "Engels"
 
-#: contrib/gosa.conf:246
+#: contrib/gosa.conf:247
 msgid "Italian"
 msgstr "Italiaans"
 
@@ -302,8 +302,9 @@ msgstr "Italiaans"
 #: plugins/personal/connectivity/class_connectivity.inc:16
 #: plugins/personal/connectivity/class_proxyAccount.inc:6
 #: plugins/personal/connectivity/class_intranetAccount.inc:16
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:7
-#: plugins/personal/connectivity/class_pptpAccount.inc:7
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
+#: plugins/personal/connectivity/class_pptpAccount.inc:27
+#: plugins/personal/connectivity/class_glpiAccount.inc:26
 #: plugins/personal/environment/class_environment.inc:13
 #: plugins/personal/nagios/class_nagiosAccount.inc:19
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:6
@@ -2487,21 +2488,33 @@ msgstr "De nummerieke waarde opgegeven voor Quota Instellingen is niet geldig."
 msgid "Intranet"
 msgstr "Intranet"
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:6
-msgid "PHPscheduleit Account"
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
+#, fuzzy
+msgid "PHPscheduleit"
 msgstr "PHPScheduleIt account"
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:6
-msgid "PPTP Server"
-msgstr "PPTP Server"
+#: plugins/personal/connectivity/class_pptpAccount.inc:26
+#, fuzzy
+msgid "PPTP"
+msgstr "PT"
 
 #: plugins/personal/connectivity/phpscheduleit.tpl:1
 msgid "PHPscheduleit account"
 msgstr "PHPScheduleIt account"
 
 #: plugins/personal/connectivity/pptp.tpl:1
-msgid "PPTP Server account"
-msgstr "PPTP account"
+#, fuzzy
+msgid "PPTP account"
+msgstr "FTP account"
+
+#: plugins/personal/connectivity/class_glpiAccount.inc:25
+msgid "GLPI"
+msgstr ""
+
+#: plugins/personal/connectivity/glpi.tpl:1
+#, fuzzy
+msgid "GLPI account"
+msgstr "FTP account"
 
 #: plugins/personal/environment/main.inc:124
 msgid "User environment settings"
@@ -2892,15 +2905,15 @@ msgstr "Sluiten"
 msgid "Nagios settings"
 msgstr "Nagios instellingen"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:85
+#: plugins/personal/nagios/class_nagiosAccount.inc:86
 msgid "This account has no nagios extensions."
 msgstr "Dit account heeft nagios mogelijkheden uitgeschakeld."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:94
+#: plugins/personal/nagios/class_nagiosAccount.inc:95
 msgid "Remove nagios account"
 msgstr "Nagios account verwijderen"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:95
+#: plugins/personal/nagios/class_nagiosAccount.inc:96
 msgid ""
 "This account has nagios features enabled. You can disable them by clicking "
 "below."
@@ -2908,11 +2921,11 @@ msgstr ""
 "Dit account heeft Nagios mogelijkheden ingeschakeld. U kunt deze "
 "uitschakelen door de knop hieronder te gebruiken."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:97
+#: plugins/personal/nagios/class_nagiosAccount.inc:98
 msgid "Create nagios account"
 msgstr "Nagios account aanmaken"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:97
+#: plugins/personal/nagios/class_nagiosAccount.inc:98
 msgid ""
 "This account has nagios features disabled. You can enable them by clicking "
 "below."
@@ -2920,16 +2933,16 @@ msgstr ""
 "Dit account heeft geen Nagios mogelijkheden. U kunt deze inschakelen door de "
 "knop hieronder te gebruiken."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:172
+#: plugins/personal/nagios/class_nagiosAccount.inc:174
 msgid "The required field 'NagiosAlias' is not set."
 msgstr "Het vereiste veld 'NagiosAlias' is leeg."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:175
+#: plugins/personal/nagios/class_nagiosAccount.inc:177
 msgid "The required field 'NagiosMail' is not set."
 msgstr "Het vereiste veld 'NagiosMail' is leeg."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:179
-#: plugins/personal/nagios/class_nagiosAccount.inc:183
+#: plugins/personal/nagios/class_nagiosAccount.inc:181
+#: plugins/personal/nagios/class_nagiosAccount.inc:185
 msgid "Please enter a valid email address in 'NagiosMail' field."
 msgstr "Geef a.u.b. een geldig E-mail adres voor het 'NagiosMail' veld op."
 
@@ -10415,3 +10428,16 @@ msgstr ""
 "Het kan, met name bij Beta versies, voorkomen dat GOsa PHP fouten genereerd. "
 "In sommige gevallen kan het handig zijn om foutrapportage aan te zetten "
 "(maar dit kan een veiligheidsrisico vormen) "
+
+#~ msgid "PPTP Server account"
+#~ msgstr "PPTP account"
+
+#~ msgid "PHPscheduleit Account"
+#~ msgstr "PHPScheduleIt account"
+
+#~ msgid "PPTP Server"
+#~ msgstr "PPTP Server"
+
+#, fuzzy
+#~ msgid "GLPI Account"
+#~ msgstr "Account"

diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po
index 834aa3b5b6d6faccf09234feb7a96a7045a3fd0b..893235c4cff1f32d9e42fdf393b13d0fe052527f 100644 (file)
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -193,7 +193,7 @@ msgstr "Базы данных"
 msgid "Services"
 msgstr "Сервисы"
 
-#: contrib/gosa.conf:176 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:177 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 #: plugins/addons/ldapmanager/contentexportxls.tpl:19
@@ -202,12 +202,12 @@ msgstr "Сервисы"
 msgid "Export"
 msgstr "Экспорт"
 
-#: contrib/gosa.conf:177
+#: contrib/gosa.conf:178
 #, fuzzy
 msgid "Excel Export"
 msgstr "Экспорт"
 
-#: contrib/gosa.conf:178 plugins/personal/mail/generic.tpl:112
+#: contrib/gosa.conf:179 plugins/personal/mail/generic.tpl:112
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:117
@@ -216,17 +216,17 @@ msgstr "Экспорт"
 msgid "Import"
 msgstr "Импортировать"
 
-#: contrib/gosa.conf:179
+#: contrib/gosa.conf:180
 #, fuzzy
 msgid "CSV Import"
 msgstr "Импортировать"
 
-#: contrib/gosa.conf:183
+#: contrib/gosa.conf:184
 #, fuzzy
 msgid "Partitions"
 msgstr "Назначение"
 
-#: contrib/gosa.conf:187 plugins/personal/environment/logonManagement.tpl:55
+#: contrib/gosa.conf:188 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:81
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
@@ -234,62 +234,62 @@ msgstr "Назначение"
 msgid "Script"
 msgstr "Путь к сценариям"
 
-#: contrib/gosa.conf:191 plugins/admin/fai/class_faiManagement.inc:545
+#: contrib/gosa.conf:192 plugins/admin/fai/class_faiManagement.inc:545
 #: plugins/admin/fai/class_faiManagement.inc:546
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:195 plugins/admin/fai/class_faiManagement.inc:538
+#: contrib/gosa.conf:196 plugins/admin/fai/class_faiManagement.inc:538
 #: plugins/admin/fai/class_faiManagement.inc:539
 #, fuzzy
 msgid "Variables"
 msgstr "Переменная"
 
-#: contrib/gosa.conf:199 plugins/admin/fai/class_faiManagement.inc:559
+#: contrib/gosa.conf:200 plugins/admin/fai/class_faiManagement.inc:559
 #: plugins/admin/fai/class_faiManagement.inc:560
 #, fuzzy
 msgid "Templates"
 msgstr "Шаблон"
 
-#: contrib/gosa.conf:203 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:204 plugins/personal/environment/environment.tpl:7
 #, fuzzy
 msgid "Profiles"
 msgstr "Путь к профилю"
 
-#: contrib/gosa.conf:207
+#: contrib/gosa.conf:208
 #, fuzzy
 msgid "Packages"
 msgstr "Показать телефоны"
 
-#: contrib/gosa.conf:223
+#: contrib/gosa.conf:224
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:240 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:241 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Немецкий"
 
-#: contrib/gosa.conf:241
+#: contrib/gosa.conf:242
 msgid "Russian"
 msgstr "Русский"
 
-#: contrib/gosa.conf:242
+#: contrib/gosa.conf:243
 msgid "Spanish"
 msgstr "Испанский"
 
-#: contrib/gosa.conf:243
+#: contrib/gosa.conf:244
 msgid "French"
 msgstr "Французский"
 
-#: contrib/gosa.conf:244
+#: contrib/gosa.conf:245
 msgid "Dutch"
 msgstr "Датский"
 
-#: contrib/gosa.conf:245
+#: contrib/gosa.conf:246
 msgid "English"
 msgstr "Английский"
 
-#: contrib/gosa.conf:246
+#: contrib/gosa.conf:247
 msgid "Italian"
 msgstr ""
 
@@ -306,8 +306,9 @@ msgstr ""
 #: plugins/personal/connectivity/class_connectivity.inc:16
 #: plugins/personal/connectivity/class_proxyAccount.inc:6
 #: plugins/personal/connectivity/class_intranetAccount.inc:16
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:7
-#: plugins/personal/connectivity/class_pptpAccount.inc:7
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
+#: plugins/personal/connectivity/class_pptpAccount.inc:27
+#: plugins/personal/connectivity/class_glpiAccount.inc:26
 #: plugins/personal/environment/class_environment.inc:13
 #: plugins/personal/nagios/class_nagiosAccount.inc:19
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:6
@@ -2502,14 +2503,14 @@ msgstr "Значение поля \"Квота\" некорректно."
 msgid "Intranet"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:6
-msgid "PHPscheduleit Account"
-msgstr ""
-
-#: plugins/personal/connectivity/class_pptpAccount.inc:6
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
 #, fuzzy
-msgid "PPTP Server"
-msgstr "Сервер NTP"
+msgid "PHPscheduleit"
+msgstr "Учетная запись Groupware"
+
+#: plugins/personal/connectivity/class_pptpAccount.inc:26
+msgid "PPTP"
+msgstr ""
 
 #: plugins/personal/connectivity/phpscheduleit.tpl:1
 #, fuzzy
@@ -2518,7 +2519,16 @@ msgstr "Учетная запись Groupware"
 
 #: plugins/personal/connectivity/pptp.tpl:1
 #, fuzzy
-msgid "PPTP Server account"
+msgid "PPTP account"
+msgstr "Аккаунт FTP"
+
+#: plugins/personal/connectivity/class_glpiAccount.inc:25
+msgid "GLPI"
+msgstr ""
+
+#: plugins/personal/connectivity/glpi.tpl:1
+#, fuzzy
+msgid "GLPI account"
 msgstr "Аккаунт FTP"
 
 #: plugins/personal/environment/main.inc:124
@@ -2952,17 +2962,17 @@ msgstr "Выбрать"
 msgid "Nagios settings"
 msgstr "Почтовые настройки пользователя"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:85
+#: plugins/personal/nagios/class_nagiosAccount.inc:86
 #, fuzzy
 msgid "This account has no nagios extensions."
 msgstr "В этой учетной записи нет почтовых расширений."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:94
+#: plugins/personal/nagios/class_nagiosAccount.inc:95
 #, fuzzy
 msgid "Remove nagios account"
 msgstr "Удалить настройки эл. почты"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:95
+#: plugins/personal/nagios/class_nagiosAccount.inc:96
 #, fuzzy
 msgid ""
 "This account has nagios features enabled. You can disable them by clicking "
@@ -2971,12 +2981,12 @@ msgstr ""
 "В этой учетной записи есть настройки электронной почты. Вы можете удалить "
 "их, щелкнув ниже."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:97
+#: plugins/personal/nagios/class_nagiosAccount.inc:98
 #, fuzzy
 msgid "Create nagios account"
 msgstr "Создать настройки запись эл. почты"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:97
+#: plugins/personal/nagios/class_nagiosAccount.inc:98
 #, fuzzy
 msgid ""
 "This account has nagios features disabled. You can enable them by clicking "
@@ -2985,18 +2995,18 @@ msgstr ""
 "В этой учетной записи нет настроек электронной почты. Вы можете добавить их, "
 "щелкнув ниже."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:172
+#: plugins/personal/nagios/class_nagiosAccount.inc:174
 #, fuzzy
 msgid "The required field 'NagiosAlias' is not set."
 msgstr "Обязательное поле \"Имя\" не заполнено."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:175
+#: plugins/personal/nagios/class_nagiosAccount.inc:177
 #, fuzzy
 msgid "The required field 'NagiosMail' is not set."
 msgstr "Обязательное поле \"Имя\" не заполнено."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:179
-#: plugins/personal/nagios/class_nagiosAccount.inc:183
+#: plugins/personal/nagios/class_nagiosAccount.inc:181
+#: plugins/personal/nagios/class_nagiosAccount.inc:185
 #, fuzzy
 msgid "Please enter a valid email address in 'NagiosMail' field."
 msgstr "Введите корректное значение в поле \"Основной адрес\"."
@@ -10757,6 +10767,18 @@ msgid ""
 "(But it could be a security risk)  "
 msgstr ""
 
+#, fuzzy
+#~ msgid "PPTP Server account"
+#~ msgstr "Аккаунт FTP"
+
+#, fuzzy
+#~ msgid "PPTP Server"
+#~ msgstr "Сервер NTP"
+
+#, fuzzy
+#~ msgid "GLPI Account"
+#~ msgstr "Учетная запись"
+
 #, fuzzy
 #~ msgid "Firstname"
 #~ msgstr "Список"

diff --git a/plugins/personal/connectivity/class_glpiAccount.inc b/plugins/personal/connectivity/class_glpiAccount.inc
new file mode 100644 (file)
index 0000000..5b5cead
--- /dev/null
+++ b/plugins/personal/connectivity/class_glpiAccount.inc
@@ -0,0 +1,139 @@
+<?php
+
+/*
+  This code is part of GOsa (https://gosa.gonicus.de)
+  Copyright (C) 2005 Benoit Mortier
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+class glpiAccount extends plugin
+{
+  /* Definitions */
+  var $plHeadline= "GLPI";
+  var $plDescription= "This does something";
+
+  /* CLI vars */
+  var $cli_summary= "Manage users gpli account";
+  var $cli_description= "Some longer text\nfor help";
+  var $cli_parameters= array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
+
+  /* attribute list for save action */
+  var $attributes= array();
+  var $objectclasses= array("glpiAccount");
+
+  function glpiAccount ($config, $dn= NULL)
+  {
+    plugin::plugin ($config, $dn);
+  }
+
+  function execute()
+  {
+       /* Call parent execute */
+       plugin::execute();
+
+    /* Show tab dialog headers */
+    $display= "";
+
+    /* Show main page */
+    $smarty= get_smarty();
+
+    if ($this->is_account){
+      $smarty->assign("glpiState", "checked");
+    } else {
+      $smarty->assign("glpiState", "");
+      $smarty->assign("wstate", "disabled");
+    }
+
+    if ($this->parent != NULL){
+      $smarty->assign("tabbed", 1);
+    }
+
+    $smarty->assign('glpiACL', chkacl($this->acl, 'gosaglpi'));
+
+    $display.= $smarty->fetch (get_template_path('glpi.tpl', TRUE, dirname(__FILE__)));
+    return ($display);
+  }
+
+  function remove_from_parent()
+  {
+    /* Cancel if there's nothing to do here */
+    if (!$this->initially_was_account){
+      return;
+    }
+
+    plugin::remove_from_parent();
+    $ldap= $this->config->get_ldap_link();
+
+    $ldap->cd($this->dn);
+    @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
+        $this->attributes, "Save");
+    $ldap->modify($this->attrs);
+    show_ldap_error($ldap->get_error());
+
+    /* Optionally execute a command after we're done */
+    $this->handle_post_events('remove');
+  }
+
+
+  /* Save data to object */
+  function save_object()
+  {
+    /* Do we need to flip is_account state? */
+    if (isset($_POST['connectivityTab'])){
+      if (isset($_POST['glpi'])){
+        if (!$this->is_account && $_POST['glpi'] == "B"){
+          $this->is_account= TRUE;
+        }
+      } else {
+        $this->is_account= FALSE;
+      }
+    }
+
+    plugin::save_object();
+    if (isset($_POST["glpiStatus"])){
+      $this->glpiStatus = "disabled";
+    } else {
+      $this->glpiStatus = "enabled";
+    }
+  }
+
+
+  /* Save to LDAP */
+  function save()
+  {
+    plugin::save();
+
+    /* Write back to ldap */
+    $ldap= $this->config->get_ldap_link();
+    $ldap->cd($this->dn);
+    $ldap->modify($this->attrs);
+    show_ldap_error($ldap->get_error());
+
+    /* Optionally execute a command after we're done */
+    if ($this->initially_was_account == $this->is_account){
+      if ($this->is_modified){
+        $this->handle_post_events("mofify");
+      }
+    } else {
+      $this->handle_post_events("add");
+    }
+
+  }
+
+}
+
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
+?>

diff --git a/plugins/personal/connectivity/class_phpscheduleitAccount.inc b/plugins/personal/connectivity/class_phpscheduleitAccount.inc
index b924c328b3ee5d0fb49918338d2762b764712252..c59915c779c054f88c734b749ffe02a4d32bf590 100644 (file)
--- a/plugins/personal/connectivity/class_phpscheduleitAccount.inc
+++ b/plugins/personal/connectivity/class_phpscheduleitAccount.inc
@@ -1,9 +1,30 @@
 <?php
 
+/*
+  This code is part of GOsa (https://gosa.gonicus.de)
+  Copyright (C) 2005 Guillaume Delecourt
+  Copuright (C) 2005 Benoit Mortier
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+
 class phpscheduleitAccount extends plugin
 {
   /* Definitions */
-  var $plHeadline= "PHPscheduleit Account";
+  var $plHeadline= "PHPscheduleit";
   var $plDescription= "This does something";
 
   /* CLI vars */

diff --git a/plugins/personal/connectivity/class_pptpAccount.inc b/plugins/personal/connectivity/class_pptpAccount.inc
index 44eda7c3301b05a7de2c30c91b0abbf73cc84ac3..3a23148bc1e90fe490c181551b300554cdded296 100644 (file)
--- a/plugins/personal/connectivity/class_pptpAccount.inc
+++ b/plugins/personal/connectivity/class_pptpAccount.inc
@@ -1,9 +1,29 @@
 <?php
 
+/*
+  This code is part of GOsa (https://gosa.gonicus.de)
+  Copyright (C) 2005 Guillaume Delecourt
+  Copyright (C) 2005 Benoit Mortier
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
 class pptpAccount extends plugin
 {
   /* Definitions */
-  var $plHeadline= "PPTP Server";
+  var $plHeadline= "PPTP";
   var $plDescription= "This does something";
 
   /* CLI vars */

diff --git a/plugins/personal/connectivity/glpi.tpl b/plugins/personal/connectivity/glpi.tpl
new file mode 100644 (file)
index 0000000..245b903
--- /dev/null
+++ b/plugins/personal/connectivity/glpi.tpl
@@ -0,0 +1 @@
+<h2>{if $tabbed eq 1}<input type="checkbox" name="glpi" value="B" {$glpiState} {$glpiACL}>{/if}{t}GLPI account{/t}</h2>

diff --git a/plugins/personal/connectivity/pptp.tpl b/plugins/personal/connectivity/pptp.tpl
index 70e9958a63cb6ddacaafc771fb52008ee166a197..961d23fa48eafbadef8ed33a8d22bb97b10c360a 100644 (file)
--- a/plugins/personal/connectivity/pptp.tpl
+++ b/plugins/personal/connectivity/pptp.tpl
@@ -1 +1 @@
-<h2>{if $tabbed eq 1}<input type="checkbox" name="pptp" value="B" {$pptpState} {$gosapptpACL}>{/if}{t}PPTP Server account{/t}</h2>
+<h2>{if $tabbed eq 1}<input type="checkbox" name="pptp" value="B" {$pptpState} {$gosapptpACL}>{/if}{t}PPTP account{/t}</h2>